(camel-spring-boot) branch main updated: Add `@ConditionalOnMissingBeans` on Camel SSL bean auto configuration (#1006)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git


The following commit(s) were added to refs/heads/main by this push:
     new 1995b46ca1c Add `@ConditionalOnMissingBeans` on Camel SSL bean auto 
configuration (#1006)
1995b46ca1c is described below

commit 1995b46ca1c8f409743d58aaaeb5a8d3401b5646
Author: Adriano Machado <60320+ammach...@users.noreply.github.com>
AuthorDate: Thu Nov 9 15:49:17 2023 -0500

    Add `@ConditionalOnMissingBeans` on Camel SSL bean auto configuration 
(#1006)
---
 .../apache/camel/spring/boot/security/CamelSSLAutoConfiguration.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/security/CamelSSLAutoConfiguration.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/security/CamelSSLAutoConfiguration.java
index 83218f4ad41..2819d641e22 100644
--- 
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/security/CamelSSLAutoConfiguration.java
+++ 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/security/CamelSSLAutoConfiguration.java
@@ -30,6 +30,7 @@ import 
org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionMessage;
 import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
+import 
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
 import 
org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.context.properties.bind.Bindable;
@@ -46,6 +47,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata;
 public class CamelSSLAutoConfiguration {
 
     @Bean
+    @ConditionalOnMissingBean
     @Conditional(CamelSSLAutoConfiguration.SSLCondition.class)
     public SSLContextParameters sslContextParameters(CamelContext 
camelContext, CamelSSLConfigurationProperties properties) {
         // use any camel.ssl.config props
@@ -73,6 +75,7 @@ public class CamelSSLAutoConfiguration {
     }
 
     @Bean
+    @ConditionalOnMissingBean
     @Conditional(CamelSSLAutoConfiguration.SSLConfigCondition.class)
     public GlobalSSLContextParametersSupplier 
sslContextParametersSupplier(CamelSSLConfigurationProperties properties) {
         final SSLContextParameters config = properties.getConfig() != null ? 
properties.getConfig() : new SSLContextParameters();
@@ -100,7 +103,7 @@ public class CamelSSLAutoConfiguration {
             Binder binder = Binder.get(context.getEnvironment());
             Map<String, Object> sslProperties = 
binder.bind("camel.ssl.config", Bindable.mapOf(String.class, 
Object.class)).orElse(Collections.emptyMap());
             ConditionMessage.Builder message = 
ConditionMessage.forCondition("camel.ssl.config");
-            if (sslProperties.size() > 0) {
+            if (!sslProperties.isEmpty()) {
                 return ConditionOutcome.match(message.because("enabled"));
             }