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
commit c2062ad3605e7b964956cea343824345922846da Author: Claus Ibsen <[email protected]> AuthorDate: Sun Mar 22 10:06:22 2020 +0100 Lets use ENGLISH instead of US in lower case --- .../org/apache/camel/catalog/impl/AbstractCamelCatalog.java | 6 +++--- .../camel/support/PropertyBindingSupportConfigurerTest.java | 2 +- .../src/main/java/org/apache/camel/main/BaseMainSupport.java | 12 ++++++------ .../src/main/java/org/apache/camel/util/StringHelper.java | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java index ed0ef67..3dab3f7 100644 --- a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java +++ b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java @@ -903,7 +903,7 @@ public abstract class AbstractCamelCatalog { model.getOptions().forEach(o -> rows.put(o.getName(), o)); // lower case option and remove dash - String nOption = option.replace("-", "").toLowerCase(Locale.US); + String nOption = option.replace("-", "").toLowerCase(Locale.ENGLISH); String suffix = null; int posDot = nOption.indexOf('.'); int posBracket = nOption.indexOf('['); @@ -937,7 +937,7 @@ public abstract class AbstractCamelCatalog { model.getOptions().forEach(o -> rows.put(dashToCamelCase(o.getName()), o)); // lower case option and remove dash - String nOption = longKey.replace("-", "").toLowerCase(Locale.US); + String nOption = longKey.replace("-", "").toLowerCase(Locale.ENGLISH); // look for suffix or array index after 2nd dot int secondDot = nOption.indexOf('.', nOption.indexOf('.') + 1) + 1; @@ -971,7 +971,7 @@ public abstract class AbstractCamelCatalog { // find option String rowKey = rows.keySet().stream() - .filter(n -> n.toLowerCase(Locale.US).equals(lookupKey)).findFirst().orElse(null); + .filter(n -> n.toLowerCase(Locale.ENGLISH).equals(lookupKey)).findFirst().orElse(null); if (rowKey == null) { // unknown option result.addUnknown(longKey); diff --git a/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportConfigurerTest.java b/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportConfigurerTest.java index de5cf00..431c6ce 100644 --- a/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportConfigurerTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportConfigurerTest.java @@ -205,7 +205,7 @@ public class PropertyBindingSupportConfigurerTest extends ContextTestSupport { @Override public boolean configure(CamelContext camelContext, Object target, String name, Object value, boolean ignoreCase) { - name = name.toLowerCase(Locale.US); + name = name.toLowerCase(Locale.ENGLISH); name = name.replaceAll("-", ""); if (target instanceof Bar) { Bar bar = (Bar) target; 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 fe1b829..2493155 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 @@ -110,7 +110,7 @@ public abstract class BaseMainSupport extends BaseService { System.getenv().forEach((k, v) -> { k = k.toUpperCase(Locale.US); if (k.startsWith(pk) || k.startsWith(pk2)) { - String key = k.toLowerCase(Locale.US).replace('_', '.'); + String key = k.toLowerCase(Locale.ENGLISH).replace('_', '.'); answer.put(key, v); } }); @@ -122,7 +122,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.US); + key = key.toLowerCase(Locale.ENGLISH); return key; } @@ -574,7 +574,7 @@ public abstract class BaseMainSupport extends BaseService { if (mainConfigurationProperties.isAutoConfigurationLogSummary() && !autoConfiguredProperties.isEmpty()) { LOG.info("Auto-configuration summary:"); autoConfiguredProperties.forEach((k, v) -> { - boolean sensitive = SENSITIVE_KEYS.contains(k.toLowerCase(Locale.US)); + boolean sensitive = SENSITIVE_KEYS.contains(k.toLowerCase(Locale.ENGLISH)); if (sensitive) { LOG.info("\t{}=xxxxxx", k); } else { @@ -1076,10 +1076,10 @@ public abstract class BaseMainSupport extends BaseService { protected void doAutowireWildcardProperties(String name, Component component) { Map<PropertyOptionKey, Map<String, Object>> properties = new LinkedHashMap<>(); Map<String, String> autoConfiguredProperties = new LinkedHashMap<>(); - String match = ("camel.component." + name).toLowerCase(Locale.US); + String match = ("camel.component." + name).toLowerCase(Locale.ENGLISH); for (String key : wildcardProperties.stringPropertyNames()) { - String mKey = key.substring(0, key.indexOf('*')).toLowerCase(Locale.US); + String mKey = key.substring(0, key.indexOf('*')).toLowerCase(Locale.ENGLISH); if (match.startsWith(mKey)) { computeProperties("camel.component.", key, wildcardProperties, properties, s -> Collections.singleton(component)); } @@ -1100,7 +1100,7 @@ public abstract class BaseMainSupport extends BaseService { if (mainConfigurationProperties.isAutoConfigurationLogSummary() && !autoConfiguredProperties.isEmpty()) { LOG.info("Auto-configuration component {} summary:", name); autoConfiguredProperties.forEach((k, v) -> { - boolean sensitive = SENSITIVE_KEYS.contains(k.toLowerCase(Locale.US)); + boolean sensitive = SENSITIVE_KEYS.contains(k.toLowerCase(Locale.ENGLISH)); if (sensitive) { LOG.info("\t{}=xxxxxx", k); } else { diff --git a/core/camel-util/src/main/java/org/apache/camel/util/StringHelper.java b/core/camel-util/src/main/java/org/apache/camel/util/StringHelper.java index fd6fe35..440a8c2 100644 --- a/core/camel-util/src/main/java/org/apache/camel/util/StringHelper.java +++ b/core/camel-util/src/main/java/org/apache/camel/util/StringHelper.java @@ -861,7 +861,7 @@ public final class StringHelper { prev = ch; } - return answer.toString().toLowerCase(Locale.US); + return answer.toString().toLowerCase(Locale.ENGLISH); } }
