(camel) branch main updated: CAMEL-20774: Add more SSL configuration to camel.ssl in camel-main

[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.git


The following commit(s) were added to refs/heads/main by this push:
     new bfe113b714b CAMEL-20774: Add more SSL configuration to camel.ssl in 
camel-main
bfe113b714b is described below

commit bfe113b714ba4ac391d8f72596a6c4900962673a
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat Aug 17 16:29:35 2024 +0200

    CAMEL-20774: Add more SSL configuration to camel.ssl in camel-main
---
 .../src/main/java/org/apache/camel/main/BaseMainSupport.java   | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git 
a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java 
b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
index b8e5147925f..1bff8efdc48 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
@@ -1667,16 +1667,14 @@ public abstract class BaseMainSupport extends 
BaseService {
         }
         ksp.setType(sslConfig.getKeyStoreType());
         ksp.setPassword(sslConfig.getKeystorePassword());
-        String provider = sslConfig.getKeyStoreProvider() != null ? 
sslConfig.getKeyStoreProvider() : sslConfig.getProvider();
-        ksp.setProvider(provider);
+        ksp.setProvider(sslConfig.getKeyStoreProvider());
 
         KeyManagersParameters kmp = new KeyManagersParameters();
         kmp.setCamelContext(camelContext);
         kmp.setKeyPassword(sslConfig.getKeystorePassword());
         kmp.setKeyStore(ksp);
         kmp.setAlgorithm(sslConfig.getKeyManagerAlgorithm());
-        provider = sslConfig.getKeyManagerProvider() != null ? 
sslConfig.getKeyManagerProvider() : sslConfig.getProvider();
-        kmp.setProvider(provider);
+        kmp.setProvider(sslConfig.getKeyManagerProvider());
 
         final SSLContextParameters sslContextParameters = 
createSSLContextParameters(camelContext, sslConfig, kmp);
         camelContext.setSSLContextParameters(sslContextParameters);
@@ -1710,9 +1708,7 @@ public abstract class BaseMainSupport extends BaseService 
{
             srp = new SecureRandomParameters();
             srp.setCamelContext(camelContext);
             srp.setAlgorithm(sslConfig.getSecureRandomAlgorithm());
-            String provider = sslConfig.getSecureRandomProvider() != null
-                    ? sslConfig.getSecureRandomProvider() : 
sslConfig.getProvider();
-            srp.setProvider(provider);
+            srp.setProvider(sslConfig.getSecureRandomProvider());
         }
 
         SSLContextParameters sslContextParameters = new SSLContextParameters();