From e4f6dff77f1dff37f7d89becf5fce9ac77497f1d Mon Sep 17 00:00:00 2001 From: Dmytro Nosan Date: Thu, 26 Sep 2024 22:20:23 +0300 Subject: [PATCH] Polish HazelcastConnectionDetailsConfiguration See gh-42459 --- .../hazelcast/HazelcastConnectionDetailsConfiguration.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastConnectionDetailsConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastConnectionDetailsConfiguration.java index f77569ff37b..797da5fbbd2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastConnectionDetailsConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastConnectionDetailsConfiguration.java @@ -32,10 +32,11 @@ import org.springframework.core.io.ResourceLoader; * @author Moritz Halbritter */ @Configuration(proxyBeanMethods = false) +@ConditionalOnMissingBean(HazelcastConnectionDetails.class) class HazelcastConnectionDetailsConfiguration { @Configuration(proxyBeanMethods = false) - @ConditionalOnMissingBean({ ClientConfig.class, HazelcastConnectionDetails.class }) + @ConditionalOnMissingBean(ClientConfig.class) @Conditional(HazelcastClientConfigAvailableCondition.class) static class HazelcastClientConfigFileConfiguration { @@ -48,7 +49,6 @@ class HazelcastConnectionDetailsConfiguration { } @Configuration(proxyBeanMethods = false) - @ConditionalOnMissingBean(HazelcastConnectionDetails.class) @ConditionalOnSingleCandidate(ClientConfig.class) static class HazelcastClientConfigConfiguration {