Skip to content

Commit a3e6ba0

Browse files
authored
Fix bug where the dynamoDBMapperRef config is not being read (#26)
The class dynamoDBTemplateBuilder is still getting reference from field dynamoDBMapperName, while when we set attribute dynamoDBMapperRef in EnableDynamoDBRepositories, field of dynamoDBMapperName will always null. It makes the application failed to startup with Error java.lang.IllegalArgumentException: 'beanName' must not be empty Fixing by registering using the correct attribute. Co-authored-by: Felix Wimpy Wijaya <[email protected]>
1 parent 3d16c1b commit a3e6ba0

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoryConfigExtension.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ public void postProcess(BeanDefinitionBuilder builder, AnnotationRepositoryConfi
9393
String repositoryBeanName = config.generateBeanName(builder.getBeanDefinition());
9494

9595
postProcess(builder, repositoryBeanName, attributes.getString("amazonDynamoDBRef"),
96-
attributes.getString("dynamoDBMapperConfigRef"), attributes.getString("dynamoDBOperationsRef"),
97-
attributes.getString("mappingContextRef"));
96+
attributes.getString("dynamoDBMapperRef"), attributes.getString("dynamoDBMapperConfigRef"),
97+
attributes.getString("dynamoDBOperationsRef"), attributes.getString("mappingContextRef"));
9898
}
9999

100100
/*
@@ -129,7 +129,8 @@ public void postProcess(BeanDefinitionBuilder builder, XmlRepositoryConfiguratio
129129

130130
private Map<String, String> dynamoDBTemplateCache = new HashMap<>();
131131
private void postProcess(BeanDefinitionBuilder builder, String repositoryName, String amazonDynamoDBRef,
132-
String dynamoDBMapperConfigRef, String dynamoDBOperationsRef, String dynamoDBMappingContextRef) {
132+
String dynamoDBMapperRef, String dynamoDBMapperConfigRef, String dynamoDBOperationsRef,
133+
String dynamoDBMappingContextRef) {
133134

134135
if (StringUtils.hasText(dynamoDBOperationsRef)) {
135136
builder.addPropertyReference("dynamoDBOperations", dynamoDBOperationsRef);
@@ -155,7 +156,12 @@ private void postProcess(BeanDefinitionBuilder builder, String repositoryName, S
155156
// AmazonDynamoDB amazonDynamoDB, DynamoDBMapper dynamoDBMapper,
156157
// DynamoDBMapperConfig dynamoDBMapperConfig
157158
dynamoDBTemplateBuilder.addConstructorArgReference(dynamoDBRef);
158-
dynamoDBTemplateBuilder.addConstructorArgReference(this.dynamoDBMapperName);
159+
160+
if (StringUtils.hasText(dynamoDBMapperRef)) {
161+
dynamoDBTemplateBuilder.addConstructorArgReference(dynamoDBMapperRef);
162+
} else {
163+
dynamoDBTemplateBuilder.addConstructorArgReference(this.dynamoDBMapperName);
164+
}
159165

160166
if (StringUtils.hasText(dynamoDBMapperConfigRef)) {
161167
dynamoDBTemplateBuilder.addConstructorArgReference(dynamoDBMapperConfigRef);

0 commit comments

Comments
 (0)