Fixed changes in AWS lib calls (due to new AWS version)

Last commit introduced a new AWS library version which has slighlty
changed API calls for table name resolver/overrides causing failed unit
tests.
This changeset aligns with these changes in the AWS library and makes
the unit tests green again.

Author: derjust

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

@@ -31,40 +31,43 @@
 
 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)
+	public DynamoDBTemplate(AmazonDynamoDB amazonDynamoDB, DynamoDBMapperConfig dynamoDBMapperConfig)
 	{
-		this.amazonDynamoDB = amazonDynamoDB;
-		setDynamoDBMapperConfig(dynamoDBMapperConfig);
+	    this(amazonDynamoDB, dynamoDBMapperConfig, null);
 	}
 
 	public DynamoDBTemplate(AmazonDynamoDB amazonDynamoDB)
 	{
-		this.amazonDynamoDB = amazonDynamoDB;
-		setDynamoDBMapperConfig(null);
+        this(amazonDynamoDB, null, null);
 	}
 
+	DynamoDBTemplate(AmazonDynamoDB amazonDynamoDB, DynamoDBMapperConfig dynamoDBMapperConfig, DynamoDBMapper dynamoDBMapper) {
+       this.amazonDynamoDB = amazonDynamoDB;
+        if (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
+            assert dynamoDBMapper == null;
+        } else {
+            this.dynamoDBMapperConfig = dynamoDBMapperConfig;
+            if (dynamoDBMapper == null) {
+                this.dynamoDBMapper = new DynamoDBMapper(amazonDynamoDB, dynamoDBMapperConfig);
+            } else {
+                this.dynamoDBMapper = dynamoDBMapper;
+            }
+        }
+    }
+	
 	@Override
 	public void setApplicationContext(ApplicationContext applicationContext)
 			throws BeansException {
 		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,

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

@@ -23,18 +23,16 @@ public class DynamoDBTemplateUnitTest {
 
 	@Mock
 	private DynamoDBMapper dynamoDBMapper;
-	
 	@Mock
 	private AmazonDynamoDB dynamoDB;
+	@Mock
+	private DynamoDBMapperConfig dynamoDBMapperConfig;
 
 	private DynamoDBTemplate dynamoDBTemplate;
 
 	@Before
 	public void setUp() {
-		
-		this.dynamoDBTemplate = new DynamoDBTemplate(dynamoDB);
-		this.dynamoDBTemplate.dynamoDBMapper = dynamoDBMapper;
-		
+		this.dynamoDBTemplate = new DynamoDBTemplate(dynamoDB, dynamoDBMapperConfig, dynamoDBMapper);
 	}
 
 	@SuppressWarnings("unchecked")
@@ -58,41 +56,39 @@ public void testBatchSave_CallsCorrectDynamoDBMapperMethod()
 	@Test
 	public void testGetOverriddenTableName_WhenConfigIsNull()
 	{
-		String overriddenTableName = dynamoDBTemplate.getOverriddenTableName(Object.class, "someTableName");
+	    String overriddenTableName = dynamoDBTemplate.getOverriddenTableName(User.class, "someTableName");
 		Assert.assertEquals("someTableName", overriddenTableName);
 	}
 
     @Test
     public void testGetOverriddenTableName()
     {
-        String overriddenTableName = dynamoDBTemplate.getOverriddenTableName(Object.class, "someTableName");
+        String overriddenTableName = dynamoDBTemplate.getOverriddenTableName(User.class, "someTableName");
         Assert.assertEquals("someTableName", overriddenTableName);
     }
 
     @Test
     public void testGetOverriddenTableName_WithTableNameResolver()
     {
-        DynamoDBMapperConfig dynamoDBMapperConfig = Mockito.mock(DynamoDBMapperConfig.class);
         TableNameResolver tableNameResolver = Mockito.mock(TableNameResolver.class);
         Mockito.when(tableNameResolver.getTableName(Object.class, dynamoDBMapperConfig)).thenReturn(
             "someOtherTableName");
         Mockito.when(dynamoDBMapperConfig.getTableNameResolver()).thenReturn(tableNameResolver);
-        dynamoDBTemplate.setDynamoDBMapperConfig(dynamoDBMapperConfig);
         String overriddenTableName = dynamoDBTemplate.getOverriddenTableName(Object.class, "someTableName");
         Assert.assertEquals("someOtherTableName", overriddenTableName);
     }
 
 	@Test
 	public void testLoadByHashKey_WhenDynamoDBMapperReturnsNull()
 	{
-		User user = dynamoDBTemplate.load(User.class, "someHashKey");	
+		User user = dynamoDBTemplate.load(User.class, "someHashKey");
 		Assert.assertNull(user);
 	}
 
 	@Test
 	public void testLoadByHashKeyAndRangeKey_WhenDynamoDBMapperReturnsNull()
 	{
-		Playlist playlist = dynamoDBTemplate.load(Playlist.class, "someHashKey","someRangeKey");	
+		Playlist playlist = dynamoDBTemplate.load(Playlist.class, "someHashKey","someRangeKey");
 		Assert.assertNull(playlist);
 	}