Skip to content

Commit 8a3a9cd

Browse files
committed
Fix duplicate bean definition
1 parent eb1a9bd commit 8a3a9cd

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,6 @@
249249
<plugin>
250250
<artifactId>maven-compiler-plugin</artifactId>
251251
<version>3.8.1</version>
252-
<configuration>
253-
<release>8</release>
254-
</configuration>
255252
</plugin>
256253
<plugin>
257254
<artifactId>maven-surefire-plugin</artifactId>

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import java.util.HashMap;
1919
import java.util.Map;
20+
import java.util.Optional;
2021
import java.util.concurrent.ConcurrentHashMap;
2122
import org.slf4j.Logger;
2223
import org.slf4j.LoggerFactory;
@@ -237,11 +238,14 @@ public void registerBeansForRoot(BeanDefinitionRegistry registry,
237238
this.registry = registry;
238239

239240
this.dynamoDBMapperConfigName = getBeanNameWithModulePrefix("DynamoDBMapperConfig");
240-
// TODO only if it doesn't exist
241-
BeanDefinitionBuilder dynamoDBMapperConfigBuiilder = BeanDefinitionBuilder
242-
.genericBeanDefinition(DynamoDBMapperConfigFactory.class);
243-
registry.registerBeanDefinition(this.dynamoDBMapperConfigName,
244-
dynamoDBMapperConfigBuiilder.getBeanDefinition());
241+
Optional dynamoDBMapperConfigRef = configurationSource.getAttribute("dynamoDBMapperConfigRef");
242+
243+
if (!dynamoDBMapperConfigRef.isPresent()) {
244+
BeanDefinitionBuilder dynamoDBMapperConfigBuiilder = BeanDefinitionBuilder
245+
.genericBeanDefinition(DynamoDBMapperConfigFactory.class);
246+
registry.registerBeanDefinition(this.dynamoDBMapperConfigName,
247+
dynamoDBMapperConfigBuiilder.getBeanDefinition());
248+
}
245249

246250
this.dynamoDBMapperName = getBeanNameWithModulePrefix("DynamoDBMapper");
247251
BeanDefinitionBuilder dynamoDBMapperBuilder = BeanDefinitionBuilder

0 commit comments

Comments
 (0)