Merge pull request #107 from derjust/backport_issue_91

derjust · web-flow · commit 8835b5c90e01 · 2017-12-24T02:04:10.000+01:00
Backport PR #105
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -0,0 +1,39 @@
+<document xmlns="http://maven.apache.org/changes/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/xsd/changes-1.0.0.xsd">
+  <properties>
+    <title>spring-data-dynamodb Changes</title>
+    <author email="zeeman@zeeman.de" >derjust</author>
+  </properties>
+  <body>
+    <release version="5.0.1" date="" description="Maintenance release" >
+      <action dev="derjust" issue="68" type="fix" date="2017-12-01" >
+        Respecting DynamoDBOperations.batchSave()'s List&lt;FailedBatch&gt; return value and turn it into a BatchWriteException
+      </action>
+      <action dev="derjust" type="add" date="2017-12-01" >
+        Added maven-changes-plugin to build process
+      </action>
+      <action dev="derjust" type="add" date="2017-12-17" >
+        Update Mockito and resolve dependency clashes
+      </action>
+      <action dev="Gaurav Rawat" type="fix" issue="91">>
+        Fixed false assertion introduced implementing #91
+      </action>
+    </release>
+    <release version="5.0.0" date="2017-11-27" description="Spring 5 release" >
+      <action dev="derjust" type="add">
+        Added Spring 5 / Spring-Data Kay support
+      </action>
+    </release>
+    <release version="4.5.1" date="2017-12-19">
+      <action dev="Michael Wyraz" type="fix" issue="91">
+        Add constructor to DynamoDBTemplate that takes a preconfigured DynamoDBMapper
+      </action>
+    </release>
+    <release version="4.5.2" date="2017-12-24" description="Backport of PR #106">
+      <action dev="Gaurav Rawat" type="fix" issue="91">>
+        Fixed false assertion introduced implementing #91
+      </action>
+    </release>
+  </body>
+</document>
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplate.java b/src/main/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplate.java
@@ -53,7 +53,7 @@ public DynamoDBTemplate(AmazonDynamoDB amazonDynamoDB)
 	
 	DynamoDBTemplate(AmazonDynamoDB amazonDynamoDB, DynamoDBMapperConfig dynamoDBMapperConfig, DynamoDBMapper dynamoDBMapper) {
        this.amazonDynamoDB = amazonDynamoDB;
-        if (dynamoDBMapperConfig == null) {
+       if (dynamoDBMapper == null && dynamoDBMapperConfig == null) {
             this.dynamoDBMapperConfig = DynamoDBMapperConfig.DEFAULT;
             this.dynamoDBMapper = new DynamoDBMapper(amazonDynamoDB);
             // Mapper must be null as it could not have been constructed without a Config
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplateUnitTest.java b/src/test/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplateUnitTest.java
@@ -18,6 +18,8 @@
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig;
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.TableNameResolver;
 
+import static org.junit.Assert.assertTrue;
+
 @RunWith(MockitoJUnitRunner.class)
 public class DynamoDBTemplateUnitTest {
 	
@@ -29,12 +31,20 @@ public class DynamoDBTemplateUnitTest {
 	private DynamoDBMapperConfig dynamoDBMapperConfig;
 	
 	private DynamoDBTemplate dynamoDBTemplate;
-	
+
 	@Before
 	public void setUp() {
 		this.dynamoDBTemplate = new DynamoDBTemplate(dynamoDB, dynamoDBMapperConfig, dynamoDBMapper);
 	}
-	
+
+	@Test
+	public void testPreconfiguredDynamoDBMapper() {
+		// Introduced constructor via #91 should not fail its assert
+		DynamoDBTemplate usePreconfiguredDynamoDBMapper = new DynamoDBTemplate(dynamoDB, dynamoDBMapper);
+
+		assertTrue("The constructor should not fail with an assert error", true);
+	}
+
 	@SuppressWarnings("unchecked")
 	@Test
 	public void testBatchDelete_CallsCorrectDynamoDBMapperMethod()
