root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Polish HazelcastConnectionDetailsConfiguration 

See gh-42459
This commit is contained in:
Dmytro Nosan 2024-09-26 22:20:23 +03:00 committed by Moritz Halbritter
parent b82830c596
commit e4f6dff77f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastConnectionDetailsConfiguration.java
View File

@ -32,10 +32,11 @@ import org.springframework.core.io.ResourceLoader;
* @author Moritz Halbritter * @author Moritz Halbritter
*/ */
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
@ConditionalOnMissingBean(HazelcastConnectionDetails.class)
class HazelcastConnectionDetailsConfiguration { class HazelcastConnectionDetailsConfiguration {
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
@ConditionalOnMissingBean({ ClientConfig.class, HazelcastConnectionDetails.class }) @ConditionalOnMissingBean(ClientConfig.class)
@Conditional(HazelcastClientConfigAvailableCondition.class) @Conditional(HazelcastClientConfigAvailableCondition.class)
static class HazelcastClientConfigFileConfiguration { static class HazelcastClientConfigFileConfiguration {
@ -48,7 +49,6 @@ class HazelcastConnectionDetailsConfiguration {
} }
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
@ConditionalOnMissingBean(HazelcastConnectionDetails.class)
@ConditionalOnSingleCandidate(ClientConfig.class) @ConditionalOnSingleCandidate(ClientConfig.class)
static class HazelcastClientConfigConfiguration { static class HazelcastClientConfigConfiguration {