Issue #235: Upgrading to 5.1.0 results in the error

derjust · derjust · commit 9c2d8a77f8e8 · 2019-03-10T15:05:52.000-04:00
Upgrading to 5.1.0 results in the error Bean property 'dynamoDBMapperConfig' is not writable or has an invalid setter method.
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -23,6 +23,11 @@
     <author email="zeeman@zeeman.de">derjust</author>
   </properties>
   <body>
+    <release version="5.1.1" description="Maintenance release">
+      <action dev="derjust" issue="235" type="fix" date="2019-03-10">
+        Upgrading to 5.1.0 results in the error Bean property 'dynamoDBMapperConfig' is not writable or has an invalid setter method
+      </action>
+    </release>
     <release version="5.1.0" date="2019-01-28" description="Spring Boot 2.1 and Spring Data Lovelace-SR1 support">
       <action dev="boostschicken" type="add" date="2018-10-28">
         Updated all code to work with Spring Boot 2.1 and Lovelace-SR1
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoryConfigExtension.java b/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoryConfigExtension.java
@@ -129,7 +129,16 @@ private void postProcess(BeanDefinitionBuilder builder, String repositoryName, S
 						.computeIfAbsent(getBeanNameWithModulePrefix("DynamoDBTemplate-" + dynamoDBRef), ref -> {
 							BeanDefinitionBuilder dynamoDBTemplateBuilder = BeanDefinitionBuilder
 									.genericBeanDefinition(DynamoDBTemplate.class);
+							// AmazonDynamoDB amazonDynamoDB, DynamoDBMapper dynamoDBMapper,
+							// DynamoDBMapperConfig dynamoDBMapperConfig
 							dynamoDBTemplateBuilder.addConstructorArgReference(dynamoDBRef);
+							dynamoDBTemplateBuilder.addConstructorArgReference(this.dynamoDBMapperName);
+
+							if (StringUtils.hasText(dynamoDBMapperConfigRef)) {
+								dynamoDBTemplateBuilder.addConstructorArgReference(dynamoDBMapperConfigRef);
+							} else {
+								dynamoDBTemplateBuilder.addConstructorArgReference(this.dynamoDBMapperConfigName);
+							}
 
 							registry.registerBeanDefinition(ref, dynamoDBTemplateBuilder.getBeanDefinition());
 							return ref;
@@ -138,9 +147,6 @@ private void postProcess(BeanDefinitionBuilder builder, String repositoryName, S
 
 			builder.addPropertyReference("dynamoDBOperations", dynamoDBOperationsRef);
 
-			if (StringUtils.hasText(dynamoDBMapperConfigRef)) {
-				builder.addPropertyReference("dynamoDBMapperConfig", dynamoDBMapperConfigRef);
-			}
 		}
 
 		if (!StringUtils.hasText(dynamoDBMappingContextRef)) {
@@ -184,6 +190,10 @@ private String registerEntity2DynamoDBTableSynchronizer(BeanDefinitionRegistry r
 	}
 
 	private final Map<String, String> dynamoDBMappingContextProcessorCache = new ConcurrentHashMap<>();
+
+	private String dynamoDBMapperName;
+
+	private String dynamoDBMapperConfigName;
 	private String registerDynamoDBMappingContextProcessor(BeanDefinitionRegistry registry,
 			String dynamoDBMappingContextRef) {
 		assert registry != null;
@@ -226,15 +236,17 @@ public void registerBeansForRoot(BeanDefinitionRegistry registry,
 		// Store for later to be used by #postProcess, too
 		this.registry = registry;
 
+		this.dynamoDBMapperConfigName = getBeanNameWithModulePrefix("DynamoDBMapperConfig");
+		// TODO only if it doesn't exist
 		BeanDefinitionBuilder dynamoDBMapperConfigBuiilder = BeanDefinitionBuilder
 				.genericBeanDefinition(DynamoDBMapperConfigFactory.class);
-		registry.registerBeanDefinition(getBeanNameWithModulePrefix("DynamoDBMapperConfig"),
+		registry.registerBeanDefinition(this.dynamoDBMapperConfigName,
 				dynamoDBMapperConfigBuiilder.getBeanDefinition());
 
+		this.dynamoDBMapperName = getBeanNameWithModulePrefix("DynamoDBMapper");
 		BeanDefinitionBuilder dynamoDBMapperBuilder = BeanDefinitionBuilder
 				.genericBeanDefinition(DynamoDBMapperFactory.class);
-		registry.registerBeanDefinition(getBeanNameWithModulePrefix("DynamoDBMapper"),
-				dynamoDBMapperBuilder.getBeanDefinition());
+		registry.registerBeanDefinition(this.dynamoDBMapperName, dynamoDBMapperBuilder.getBeanDefinition());
 	}
 
 	protected String getBeanNameWithModulePrefix(String baseBeanName) {
