Skip to content

Fix bug where the dynamoDBMapperRef config is not being read #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 24, 2020
Merged

Fix bug where the dynamoDBMapperRef config is not being read #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions ...ocialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoryConfigExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ public void postProcess(BeanDefinitionBuilder builder, AnnotationRepositoryConfi
String repositoryBeanName = config.generateBeanName(builder.getBeanDefinition());

postProcess(builder, repositoryBeanName, attributes.getString("amazonDynamoDBRef"),
attributes.getString("dynamoDBMapperConfigRef"), attributes.getString("dynamoDBOperationsRef"),
attributes.getString("mappingContextRef"));
attributes.getString("dynamoDBMapperRef"), attributes.getString("dynamoDBMapperConfigRef"),
attributes.getString("dynamoDBOperationsRef"), attributes.getString("mappingContextRef"));
}

/*
Expand Down Expand Up @@ -129,7 +129,8 @@ public void postProcess(BeanDefinitionBuilder builder, XmlRepositoryConfiguratio

private Map<String, String> dynamoDBTemplateCache = new HashMap<>();
private void postProcess(BeanDefinitionBuilder builder, String repositoryName, String amazonDynamoDBRef,
String dynamoDBMapperConfigRef, String dynamoDBOperationsRef, String dynamoDBMappingContextRef) {
String dynamoDBMapperRef, String dynamoDBMapperConfigRef, String dynamoDBOperationsRef,
String dynamoDBMappingContextRef) {

if (StringUtils.hasText(dynamoDBOperationsRef)) {
builder.addPropertyReference("dynamoDBOperations", dynamoDBOperationsRef);
Expand All @@ -155,7 +156,12 @@ private void postProcess(BeanDefinitionBuilder builder, String repositoryName, S
// AmazonDynamoDB amazonDynamoDB, DynamoDBMapper dynamoDBMapper,
// DynamoDBMapperConfig dynamoDBMapperConfig
dynamoDBTemplateBuilder.addConstructorArgReference(dynamoDBRef);
dynamoDBTemplateBuilder.addConstructorArgReference(this.dynamoDBMapperName);

if (StringUtils.hasText(dynamoDBMapperRef)) {
dynamoDBTemplateBuilder.addConstructorArgReference(dynamoDBMapperRef);
} else {
dynamoDBTemplateBuilder.addConstructorArgReference(this.dynamoDBMapperName);
}

if (StringUtils.hasText(dynamoDBMapperConfigRef)) {
dynamoDBTemplateBuilder.addConstructorArgReference(dynamoDBMapperConfigRef);
Expand Down