Started unit tests

Author: Sebastian Just

README.md

@@ -1,3 +1,5 @@
+[![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) 
+
 # Spring Data DynamoDB ( Work in Progress ) #
 
 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

@@ -36,6 +36,7 @@
             <property name="format" value="\.printStackTrace"/>
         </module>
         <!-- Deprecated DynamoDB paramters -->
+        <!-- 
         <module name="RegexpSinglelineJava">
             <property name="format" value="setKeyConditions"/>
         </module>
@@ -54,6 +55,6 @@
         <module name="RegexpSinglelineJava">
             <property name="format" value="withScanFilter"/>
         </module>
-        
+         -->
     </module>
 </module>

pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.derjust</groupId>
     <artifactId>spring-data-dynamodb</artifactId>
@@ -19,12 +18,12 @@
     <properties>
         <spring.version>4.2.0.RELEASE</spring.version>
         <hibernate-validator.version>5.2.2.Final</hibernate-validator.version>
-        <aws-java-sdk.version>1.10.39</aws-java-sdk.version>
+        <aws-java-sdk.version>1.10.43</aws-java-sdk.version>
         <mockito.version>1.10.19</mockito.version>
-        <maven.cobertura.plugin.version>2.7</maven.cobertura.plugin.version>
 
         <cdi>1.2</cdi>
         <commons.lang>3.4</commons.lang>
+        <logback>1.1.3</logback>
 
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
@@ -134,25 +133,36 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${logback}</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>cobertura-maven-plugin</artifactId>
-                <version>${maven.cobertura.plugin.version}</version>
-                <configuration>
-                    <formats>
-                        <format>xml</format>
-                        <format>html</format>
-                    </formats>
-                    <check>
-                        <totalBranchRate>85</totalBranchRate>
-                        <totalLineRate>91</totalLineRate>
-                        <haltOnFailure>true</haltOnFailure>
-                    </check>
-                </configuration>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.7.5.201505241946</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>report</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

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

@@ -11,7 +11,6 @@
 import org.socialsignin.spring.data.dynamodb.mapping.event.BeforeDeleteEvent;
 import org.socialsignin.spring.data.dynamodb.mapping.event.BeforeSaveEvent;
 import org.socialsignin.spring.data.dynamodb.mapping.event.DynamoDBMappingEvent;
-import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ApplicationEventPublisher;
@@ -28,63 +27,64 @@
 import com.amazonaws.services.dynamodbv2.model.QueryResult;
 import com.amazonaws.services.dynamodbv2.model.Select;
 
-public class DynamoDBTemplate implements DynamoDBOperations,ApplicationContextAware {
+public class DynamoDBTemplate implements DynamoDBOperations, ApplicationContextAware {
 
-	protected DynamoDBMapper dynamoDBMapper;
-	private AmazonDynamoDB amazonDynamoDB;
-	private DynamoDBMapperConfig dynamoDBMapperConfig;
+	private final DynamoDBMapper dynamoDBMapper;
+	private final AmazonDynamoDB amazonDynamoDB;
+	private final DynamoDBMapperConfig dynamoDBMapperConfig;
 	private ApplicationEventPublisher eventPublisher;
-	
-	public DynamoDBTemplate(AmazonDynamoDB amazonDynamoDB,DynamoDBMapperConfig dynamoDBMapperConfig)
-	{
-		this.amazonDynamoDB = amazonDynamoDB;
-		setDynamoDBMapperConfig(dynamoDBMapperConfig);
-	}
-	
-	public DynamoDBTemplate(AmazonDynamoDB amazonDynamoDB)
-	{
+
+    public DynamoDBTemplate(AmazonDynamoDB amazonDynamoDB) {
+        this.amazonDynamoDB = amazonDynamoDB;
+        this.dynamoDBMapperConfig = DynamoDBMapperConfig.DEFAULT;
+        this.dynamoDBMapper = new DynamoDBMapper(amazonDynamoDB, dynamoDBMapperConfig);
+    }
+
+	public DynamoDBTemplate(AmazonDynamoDB amazonDynamoDB,DynamoDBMapperConfig dynamoDBMapperConfig) {
 		this.amazonDynamoDB = amazonDynamoDB;
-		setDynamoDBMapperConfig(null);
+		this.dynamoDBMapperConfig = dynamoDBMapperConfig;
+        this.dynamoDBMapper = new DynamoDBMapper(amazonDynamoDB, dynamoDBMapperConfig);
 	}
-	
+
+    protected DynamoDBTemplate(DynamoDBMapper dynamoDBMapper, AmazonDynamoDB amazonDynamoDB,DynamoDBMapperConfig dynamoDBMapperConfig) {
+        this.dynamoDBMapper = dynamoDBMapper;
+        this.amazonDynamoDB = amazonDynamoDB;
+        this.dynamoDBMapperConfig = dynamoDBMapperConfig;
+    }
+
 	@Override
-	public void setApplicationContext(ApplicationContext applicationContext)
-			throws BeansException {
+	public void setApplicationContext(ApplicationContext applicationContext) {
 		this.eventPublisher = applicationContext;
 	}
 
-	
-	public void setDynamoDBMapperConfig(DynamoDBMapperConfig dynamoDBMapperConfig)
-	{
-		this.dynamoDBMapperConfig = dynamoDBMapperConfig;
-		dynamoDBMapper = dynamoDBMapperConfig == null ? new DynamoDBMapper(amazonDynamoDB) : new DynamoDBMapper(
-				amazonDynamoDB, dynamoDBMapperConfig);
-		if (dynamoDBMapperConfig == null)
-		{
-			this.dynamoDBMapperConfig = DynamoDBMapperConfig.DEFAULT;
-		}
-	}
-	
 	@Override
 	public <T> int count(Class<T> domainClass,
 			DynamoDBQueryExpression<T> queryExpression) {
 		return dynamoDBMapper.count(domainClass, queryExpression);
 	}
 
-	@Override
-	public <T> PaginatedQueryList<T> query(Class<T> domainClass,
-			DynamoDBQueryExpression<T> queryExpression) {
-		PaginatedQueryList<T> results = dynamoDBMapper.query(domainClass, queryExpression);
-		maybeEmitEvent(new AfterQueryEvent<T>(results));
-		return results;
-	}
-
 	@Override
 	public <T> int count(Class<T> domainClass,
 			DynamoDBScanExpression scanExpression) {
 		return dynamoDBMapper.count(domainClass, scanExpression);
 	}
 
+    @Override
+    public <T> int count(Class<T> clazz, QueryRequest mutableQueryRequest) {
+        mutableQueryRequest.setSelect(Select.COUNT);
+
+        // Count queries can also be truncated for large datasets
+        int count = 0;
+        QueryResult queryResult = null;
+        do {
+            queryResult = amazonDynamoDB.query(mutableQueryRequest);
+            count += queryResult.getCount();
+            mutableQueryRequest.setExclusiveStartKey(queryResult.getLastEvaluatedKey());
+        } while (queryResult.getLastEvaluatedKey() != null);
+
+        return count;
+    }
+
 	@Override
 	public <T> T load(Class<T> domainClass, Object hashKey, Object rangeKey) {
 		T entity =  dynamoDBMapper.load(domainClass, hashKey,rangeKey);
@@ -166,7 +166,6 @@ public void batchDelete(List<?> entities) {
 		{
 			maybeEmitEvent(new AfterDeleteEvent<Object>(entity));
 		}
-		
 	}
 
 	@Override
@@ -177,21 +176,13 @@ public <T> PaginatedQueryList<T> query(Class<T> clazz,
 				dynamoDBMapperConfig.getPaginationLoadingStrategy(), dynamoDBMapperConfig);
 	}
 
-	@Override
-	public <T> int count(Class<T> clazz, QueryRequest mutableQueryRequest) {
-		mutableQueryRequest.setSelect(Select.COUNT);
-
-        // Count queries can also be truncated for large datasets
-        int count = 0;
-        QueryResult queryResult = null;
-        do {
-            queryResult = amazonDynamoDB.query(mutableQueryRequest);
-            count += queryResult.getCount();
-            mutableQueryRequest.setExclusiveStartKey(queryResult.getLastEvaluatedKey());
-        } while (queryResult.getLastEvaluatedKey() != null);
-
-        return count;
-	}
+    @Override
+    public <T> PaginatedQueryList<T> query(Class<T> domainClass,
+            DynamoDBQueryExpression<T> queryExpression) {
+        PaginatedQueryList<T> results = dynamoDBMapper.query(domainClass, queryExpression);
+        maybeEmitEvent(new AfterQueryEvent<T>(results));
+        return results;
+    }
 
 	@Override
 	public String getOverriddenTableName(String tableName) {
@@ -205,12 +196,12 @@ public String getOverriddenTableName(String tableName) {
 
 		return tableName;
 	}
-	
+
 	protected <T> void maybeEmitEvent(DynamoDBMappingEvent<T> event) {
 		if (null != eventPublisher) {
 			eventPublisher.publishEvent(event);
 		}
 }
 
-	
+
 }

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

@@ -34,4 +34,31 @@ public DynamoDBMappingEvent(T source) {
 	public T getSource() {
 		return (T) super.getSource();
 	}
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((source == null) ? 0 : source.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        DynamoDBMappingEvent<T> other = (DynamoDBMappingEvent) obj;
+        if (source == null) {
+            if (other.source != null)
+                return false;
+        } else if (!source.equals(other.source))
+            return false;
+        return true;
+    }
+
+
 }