Skip to content

Commit 3bd84d7

Browse files
Sebastian JustSebastian Just
Sebastian Just
authored and
Sebastian Just
committed
Started unit tests
1 parent bcd5a49 commit 3bd84d7

File tree

15 files changed

+642
-335
lines changed

15 files changed

+642
-335
lines changed

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[![codecov.io](https://codecov.io/github/derjust/spring-data-dynamodb/coverage.svg?branch=master)](https://codecov.io/github/derjust/spring-data-dynamodb?branch=master) [![Build Status](https://travis-ci.org/derjust/spring-data-dynamodb.svg?branch=master)](https://travis-ci.org/derjust/spring-data-dynamodb)
2+
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.derjust/spring-data-dynamodb/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.derjust/spring-data-dynamodb)
13
# Spring Data DynamoDB ( Work in Progress ) #
24

35
The primary goal of the [Spring Data](http://www.springsource.org/spring-data) project is to make it easier to build Spring-powered applications that use data access technologies. This module deals with enhanced support for Amazon DynamoDB based data access layers.

‎checkstyle.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<property name="format" value="\.printStackTrace"/>
3737
</module>
3838
<!-- Deprecated DynamoDB paramters -->
39+
<!--
3940
<module name="RegexpSinglelineJava">
4041
<property name="format" value="setKeyConditions"/>
4142
</module>
@@ -54,6 +55,6 @@
5455
<module name="RegexpSinglelineJava">
5556
<property name="format" value="withScanFilter"/>
5657
</module>
57-
58+
-->
5859
</module>
5960
</module>

‎pom.xml‎

Lines changed: 58 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
43
<modelVersion>4.0.0</modelVersion>
54
<groupId>org.socialsignin</groupId>
65
<artifactId>spring-data-dynamodb</artifactId>
@@ -19,12 +18,12 @@
1918
<properties>
2019
<spring.version>4.2.0.RELEASE</spring.version>
2120
<hibernate-validator.version>5.2.2.Final</hibernate-validator.version>
22-
<aws-java-sdk.version>1.10.39</aws-java-sdk.version>
21+
<aws-java-sdk.version>1.10.43</aws-java-sdk.version>
2322
<mockito.version>1.10.19</mockito.version>
24-
<maven.cobertura.plugin.version>2.7</maven.cobertura.plugin.version>
2523

2624
<cdi>1.2</cdi>
2725
<commons.lang>3.4</commons.lang>
26+
<logback>1.1.3</logback>
2827

2928
<maven.compiler.source>1.7</maven.compiler.source>
3029
<maven.compiler.target>1.7</maven.compiler.target>
@@ -74,6 +73,13 @@
7473
<artifactId>commons-lang3</artifactId>
7574
<version>${commons.lang}</version>
7675
</dependency>
76+
77+
78+
<dependency>
79+
<groupId>ch.qos.logback</groupId>
80+
<artifactId>logback-classic</artifactId>
81+
<version>${logback}</version>
82+
</dependency>
7783
</dependencies>
7884
</dependencyManagement>
7985

@@ -103,7 +109,7 @@
103109
<groupId>org.apache.commons</groupId>
104110
<artifactId>commons-lang3</artifactId>
105111
</dependency>
106-
112+
107113
<!-- DynamoDB -->
108114
<dependency>
109115
<groupId>com.amazonaws</groupId>
@@ -134,25 +140,34 @@
134140
<artifactId>mockito-core</artifactId>
135141
<scope>test</scope>
136142
</dependency>
143+
144+
<dependency>
145+
<groupId>ch.qos.logback</groupId>
146+
<artifactId>logback-classic</artifactId>
147+
<scope>test</scope>
148+
</dependency>
137149
</dependencies>
138150

139151
<build>
140152
<plugins>
141153
<plugin>
142-
<groupId>org.codehaus.mojo</groupId>
143-
<artifactId>cobertura-maven-plugin</artifactId>
144-
<version>${maven.cobertura.plugin.version}</version>
145-
<configuration>
146-
<formats>
147-
<format>xml</format>
148-
<format>html</format>
149-
</formats>
150-
<check>
151-
<totalBranchRate>85</totalBranchRate>
152-
<totalLineRate>91</totalLineRate>
153-
<haltOnFailure>true</haltOnFailure>
154-
</check>
155-
</configuration>
154+
<groupId>org.jacoco</groupId>
155+
<artifactId>jacoco-maven-plugin</artifactId>
156+
<version>0.7.5.201505241946</version>
157+
<executions>
158+
<execution>
159+
<goals>
160+
<goal>prepare-agent</goal>
161+
</goals>
162+
</execution>
163+
<execution>
164+
<id>report</id>
165+
<phase>test</phase>
166+
<goals>
167+
<goal>report</goal>
168+
</goals>
169+
</execution>
170+
</executions>
156171
</plugin>
157172
<plugin>
158173
<groupId>org.apache.maven.plugins</groupId>
@@ -205,7 +220,7 @@
205220
<artifactItem>
206221
<groupId>com.jcabi</groupId>
207222
<artifactId>DynamoDBLocal</artifactId>
208-
<version>2015-04-27</version>
223+
<version>2015-07-16</version>
209224
<type>zip</type>
210225
<outputDirectory>${project.build.directory}/dynamodb-dist</outputDirectory>
211226
<overWrite>false</overWrite>
@@ -233,6 +248,30 @@
233248
</execution>
234249
</executions>
235250
</plugin>
251+
<plugin>
252+
<groupId>com.jcabi</groupId>
253+
<artifactId>jcabi-dynamodb-maven-plugin</artifactId>
254+
<version>0.7.1</version>
255+
<configuration>
256+
<tables>
257+
<table>src/test/resources/usertable.json</table>
258+
</tables>
259+
</configuration>
260+
<executions>
261+
<execution>
262+
<id>dynamodb-integration-test</id>
263+
<goals>
264+
<goal>start</goal>
265+
<goal>create-tables</goal>
266+
<goal>stop</goal>
267+
</goals>
268+
<configuration>
269+
<port>${dynamodblocal.port}</port>
270+
<dist>${project.build.directory}/dynamodb-dist</dist>
271+
</configuration>
272+
</execution>
273+
</executions>
274+
</plugin>
236275
<plugin>
237276
<groupId>org.apache.maven.plugins</groupId>
238277
<artifactId>maven-failsafe-plugin</artifactId>
@@ -251,15 +290,6 @@
251290
</execution>
252291
</executions>
253292
</plugin>
254-
255-
<plugin>
256-
<groupId>org.apache.maven.plugins</groupId>
257-
<artifactId>maven-assembly-plugin</artifactId>
258-
</plugin>
259-
<plugin>
260-
<groupId>org.codehaus.mojo</groupId>
261-
<artifactId>wagon-maven-plugin</artifactId>
262-
</plugin>
263293
</plugins>
264294
</build>
265295

‎src/main/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplate.java‎

Lines changed: 44 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import org.socialsignin.spring.data.dynamodb.mapping.event.BeforeDeleteEvent;
1212
import org.socialsignin.spring.data.dynamodb.mapping.event.BeforeSaveEvent;
1313
import org.socialsignin.spring.data.dynamodb.mapping.event.DynamoDBMappingEvent;
14-
import org.springframework.beans.BeansException;
1514
import org.springframework.context.ApplicationContext;
1615
import org.springframework.context.ApplicationContextAware;
1716
import org.springframework.context.ApplicationEventPublisher;
@@ -28,63 +27,60 @@
2827
import com.amazonaws.services.dynamodbv2.model.QueryResult;
2928
import com.amazonaws.services.dynamodbv2.model.Select;
3029

31-
public class DynamoDBTemplate implements DynamoDBOperations,ApplicationContextAware {
30+
public class DynamoDBTemplate implements DynamoDBOperations, ApplicationContextAware {
3231

33-
protected DynamoDBMapper dynamoDBMapper;
34-
private AmazonDynamoDB amazonDynamoDB;
35-
private DynamoDBMapperConfig dynamoDBMapperConfig;
32+
private final DynamoDBMapper dynamoDBMapper;
33+
private final AmazonDynamoDB amazonDynamoDB;
34+
private final DynamoDBMapperConfig dynamoDBMapperConfig;
3635
private ApplicationEventPublisher eventPublisher;
37-
38-
public DynamoDBTemplate(AmazonDynamoDB amazonDynamoDB,DynamoDBMapperConfig dynamoDBMapperConfig)
39-
{
40-
this.amazonDynamoDB = amazonDynamoDB;
41-
setDynamoDBMapperConfig(dynamoDBMapperConfig);
42-
}
43-
44-
public DynamoDBTemplate(AmazonDynamoDB amazonDynamoDB)
45-
{
46-
this.amazonDynamoDB = amazonDynamoDB;
47-
setDynamoDBMapperConfig(null);
36+
37+
public DynamoDBTemplate(AmazonDynamoDB amazonDynamoDB) {
38+
this(amazonDynamoDB, DynamoDBMapperConfig.DEFAULT);
39+
}
40+
41+
public DynamoDBTemplate(AmazonDynamoDB amazonDynamoDB,DynamoDBMapperConfig dynamoDBMapperConfig) {
42+
this(new DynamoDBMapper(amazonDynamoDB, dynamoDBMapperConfig), amazonDynamoDB, dynamoDBMapperConfig);
4843
}
49-
44+
45+
protected DynamoDBTemplate(DynamoDBMapper dynamoDBMapper, AmazonDynamoDB amazonDynamoDB,DynamoDBMapperConfig dynamoDBMapperConfig) {
46+
this.dynamoDBMapper = dynamoDBMapper;
47+
this.amazonDynamoDB = amazonDynamoDB;
48+
this.dynamoDBMapperConfig = dynamoDBMapperConfig;
49+
}
50+
5051
@Override
51-
public void setApplicationContext(ApplicationContext applicationContext)
52-
throws BeansException {
52+
public void setApplicationContext(ApplicationContext applicationContext) {
5353
this.eventPublisher = applicationContext;
5454
}
5555

56-
57-
public void setDynamoDBMapperConfig(DynamoDBMapperConfig dynamoDBMapperConfig)
58-
{
59-
this.dynamoDBMapperConfig = dynamoDBMapperConfig;
60-
dynamoDBMapper = dynamoDBMapperConfig == null ? new DynamoDBMapper(amazonDynamoDB) : new DynamoDBMapper(
61-
amazonDynamoDB, dynamoDBMapperConfig);
62-
if (dynamoDBMapperConfig == null)
63-
{
64-
this.dynamoDBMapperConfig = DynamoDBMapperConfig.DEFAULT;
65-
}
66-
}
67-
6856
@Override
6957
public <T> int count(Class<T> domainClass,
7058
DynamoDBQueryExpression<T> queryExpression) {
7159
return dynamoDBMapper.count(domainClass, queryExpression);
7260
}
7361

74-
@Override
75-
public <T> PaginatedQueryList<T> query(Class<T> domainClass,
76-
DynamoDBQueryExpression<T> queryExpression) {
77-
PaginatedQueryList<T> results = dynamoDBMapper.query(domainClass, queryExpression);
78-
maybeEmitEvent(new AfterQueryEvent<T>(results));
79-
return results;
80-
}
81-
8262
@Override
8363
public <T> int count(Class<T> domainClass,
8464
DynamoDBScanExpression scanExpression) {
8565
return dynamoDBMapper.count(domainClass, scanExpression);
8666
}
8767

68+
@Override
69+
public <T> int count(Class<T> clazz, QueryRequest mutableQueryRequest) {
70+
mutableQueryRequest.setSelect(Select.COUNT);
71+
72+
// Count queries can also be truncated for large datasets
73+
int count = 0;
74+
QueryResult queryResult = null;
75+
do {
76+
queryResult = amazonDynamoDB.query(mutableQueryRequest);
77+
count += queryResult.getCount();
78+
mutableQueryRequest.setExclusiveStartKey(queryResult.getLastEvaluatedKey());
79+
} while (queryResult.getLastEvaluatedKey() != null);
80+
81+
return count;
82+
}
83+
8884
@Override
8985
public <T> T load(Class<T> domainClass, Object hashKey, Object rangeKey) {
9086
T entity = dynamoDBMapper.load(domainClass, hashKey,rangeKey);
@@ -166,7 +162,6 @@ public void batchDelete(List<?> entities) {
166162
{
167163
maybeEmitEvent(new AfterDeleteEvent<Object>(entity));
168164
}
169-
170165
}
171166

172167
@Override
@@ -177,21 +172,13 @@ public <T> PaginatedQueryList<T> query(Class<T> clazz,
177172
dynamoDBMapperConfig.getPaginationLoadingStrategy(), dynamoDBMapperConfig);
178173
}
179174

180-
@Override
181-
public <T> int count(Class<T> clazz, QueryRequest mutableQueryRequest) {
182-
mutableQueryRequest.setSelect(Select.COUNT);
183-
184-
// Count queries can also be truncated for large datasets
185-
int count = 0;
186-
QueryResult queryResult = null;
187-
do {
188-
queryResult = amazonDynamoDB.query(mutableQueryRequest);
189-
count += queryResult.getCount();
190-
mutableQueryRequest.setExclusiveStartKey(queryResult.getLastEvaluatedKey());
191-
} while (queryResult.getLastEvaluatedKey() != null);
192-
193-
return count;
194-
}
175+
@Override
176+
public <T> PaginatedQueryList<T> query(Class<T> domainClass,
177+
DynamoDBQueryExpression<T> queryExpression) {
178+
PaginatedQueryList<T> results = dynamoDBMapper.query(domainClass, queryExpression);
179+
maybeEmitEvent(new AfterQueryEvent<T>(results));
180+
return results;
181+
}
195182

196183
@Override
197184
public String getOverriddenTableName(String tableName) {
@@ -205,12 +192,12 @@ public String getOverriddenTableName(String tableName) {
205192

206193
return tableName;
207194
}
208-
195+
209196
protected <T> void maybeEmitEvent(DynamoDBMappingEvent<T> event) {
210197
if (null != eventPublisher) {
211198
eventPublisher.publishEvent(event);
212199
}
213200
}
214201

215-
202+
216203
}

‎src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/DynamoDBMappingEvent.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,31 @@ public DynamoDBMappingEvent(T source) {
3434
public T getSource() {
3535
return (T) super.getSource();
3636
}
37+
38+
@Override
39+
public int hashCode() {
40+
final int prime = 31;
41+
int result = 1;
42+
result = prime * result + ((source == null) ? 0 : source.hashCode());
43+
return result;
44+
}
45+
46+
@Override
47+
public boolean equals(Object obj) {
48+
if (this == obj)
49+
return true;
50+
if (obj == null)
51+
return false;
52+
if (getClass() != obj.getClass())
53+
return false;
54+
DynamoDBMappingEvent<T> other = (DynamoDBMappingEvent) obj;
55+
if (source == null) {
56+
if (other.source != null)
57+
return false;
58+
} else if (!source.equals(other.source))
59+
return false;
60+
return true;
61+
}
62+
63+
3764
}

0 commit comments

Comments
 (0)