Skip to content

Commit 16cf5bc

Browse files
committed
Add @ConditionalOnMissingBean to ServerConfig and EbeanServer
1 parent 5dd8c32 commit 16cf5bc

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

spring-boot-autoconfigure-data-ebean/src/main/java/org/springframework/boot/autoconfigure/data/ebean/EbeanRepositoriesAutoConfiguration.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ public Object currentUser() {
7171

7272
@SuppressWarnings("SpringJavaAutowiringInspection")
7373
@Bean
74-
public ServerConfig defaultEbeanServerConfig(DataSource dataSource, CurrentUserProvider currentUserProvider) {
74+
@ConditionalOnMissingBean
75+
public ServerConfig serverConfig(DataSource dataSource, CurrentUserProvider currentUserProvider) {
7576
ServerConfig config = new ServerConfig();
7677

7778
config.setDataSource(dataSource);
@@ -89,8 +90,9 @@ public ServerConfig defaultEbeanServerConfig(DataSource dataSource, CurrentUserP
8990
}
9091

9192
@Bean
92-
public EbeanServer defaultEbeanServer(ServerConfig defaultEbeanServerConfig) {
93-
return EbeanServerFactory.create(defaultEbeanServerConfig);
93+
@ConditionalOnMissingBean
94+
public EbeanServer ebeanServer(ServerConfig serverConfig) {
95+
return EbeanServerFactory.create(serverConfig);
9496
}
9597

9698
@Bean

0 commit comments

Comments
 (0)