Merge pull request #106 from derjust/issue_91

Follup PR to #105

Author: derjust

src/changes/changes.xml

@@ -16,14 +16,17 @@
       <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="92">
+      <action dev="Michael Wyraz" type="fix" issue="91">
         Add constructor to DynamoDBTemplate that takes a preconfigured DynamoDBMapper
       </action>
     </release>

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

src/test/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplateUnitTest.java

@@ -17,6 +17,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.junit.Assert.assertTrue;
+
 @RunWith(MockitoJUnitRunner.class)
 public class DynamoDBTemplateUnitTest {
 
@@ -28,12 +30,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()