[camel] branch master updated: CAMEL-14885: camel-main - Configuration names preserve mixed case

[davsclaus]

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

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new dfbc739  CAMEL-14885: camel-main - Configuration names preserve mixed 
case
dfbc739 is described below

commit dfbc739f9cf57f7eb4b6a66ca18433bbda7856ae
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Apr 28 14:31:08 2020 +0200

    CAMEL-14885: camel-main - Configuration names preserve mixed case
---
 .../java/org/apache/camel/main/BaseMainSupport.java | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 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 0c6a8df..7b646ad 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
@@ -87,7 +87,7 @@ public abstract class BaseMainSupport extends BaseService {
 
     private static final String SENSITIVE_KEYS = 
"passphrase|password|secretkey|accesstoken|clientsecret|authorizationtoken|sasljaasconfig";
 
-    private static final String VALID_THREAD_POOL_KEYS = 
"id|poolsize|maxpoolsize|keepalivetime|timeunit|maxqueuesize|allowcorethreadtimeout|rejectedpolicy";
+    private static final String VALID_THREAD_POOL_KEYS = 
"id|poolSize|maxPoolSize|keepAliveTime|timeUnit|maxQueueSize|allowCoreThreadTimeout|rejectedPolicy";
 
     protected final AtomicBoolean completed = new AtomicBoolean(false);
 
@@ -130,8 +130,7 @@ public abstract class BaseMainSupport extends BaseService {
 
     protected static String optionKey(String key) {
         // as we ignore case for property names we should use keys in same 
case and without dashes
-        key = StringHelper.replaceAll(key, "-", "");
-        key = key.toLowerCase(Locale.ENGLISH);
+        key = StringHelper.dashToCamelCase(key);
         return key;
     }
 
@@ -631,7 +630,7 @@ public abstract class BaseMainSupport extends BaseService {
             LOG.debug("    {}={}", key, prop.getProperty(key));
         }
 
-        // special for environment-variable-enbaled as we need to know this 
early before we set all the other options
+        // special for environment-variable-enabled as we need to know this 
early before we set all the other options
         Object envEnabled = 
prop.remove("camel.main.autoConfigurationEnvironmentVariablesEnabled");
         if (envEnabled == null) {
             envEnabled = 
prop.remove("camel.main.auto-configuration-environment-variables-enabled");
@@ -912,13 +911,13 @@ public abstract class BaseMainSupport extends BaseService 
{
             Map<String, String> map = profiles.get(id);
             // camel-main will lower-case keys
             String overrideId = map.remove("id");
-            String poolSize = map.remove("poolsize");
-            String maxPoolSize = map.remove("maxpoolsize");
-            String keepAliveTime = map.remove("keepalivetime");
-            String timeUnit = map.remove("timeunit");
-            String maxQueueSize = map.remove("maxqueuesize");
-            String allowCoreThreadTimeOut = 
map.remove("allowcorethreadtimeout");
-            String rejectedPolicy = map.remove("rejectedpolicy");
+            String poolSize = map.remove("poolSize");
+            String maxPoolSize = map.remove("maxPoolSize");
+            String keepAliveTime = map.remove("keepAliveTime");
+            String timeUnit = map.remove("timeUnit");
+            String maxQueueSize = map.remove("maxQueueSize");
+            String allowCoreThreadTimeOut = 
map.remove("allowCoreThreadTimeout");
+            String rejectedPolicy = map.remove("rejectedPolicy");
 
             if (overrideId != null) {
                 id = CamelContextHelper.parseText(camelContext, overrideId);