You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2014/12/08 13:23:13 UTC
[2/2] camel git commit: Lets use same locale English when we refer to
uk/english
Lets use same locale English when we refer to uk/english
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5c46d208
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5c46d208
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5c46d208
Branch: refs/heads/camel-2.14.x
Commit: 5c46d2088739480d46221f70bf6c619e34b15368
Parents: 4405e6d
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Dec 8 13:22:15 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Dec 8 13:23:01 2014 +0100
----------------------------------------------------------------------
.../properties/ServicePropertiesFunction.java | 2 +-
.../processor/binding/RestBindingProcessor.java | 20 ++++++++++----------
.../java/org/apache/camel/util/FileUtil.java | 2 +-
.../test/java/org/apache/camel/TestSupport.java | 10 +++++-----
.../InstanceFallbackConverterTest.java | 4 ++--
.../apache/camel/processor/ConvertBodyTest.java | 2 +-
.../support/XMLTokenExpressionIteratorTest.java | 2 +-
7 files changed, 21 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5c46d208/camel-core/src/main/java/org/apache/camel/component/properties/ServicePropertiesFunction.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/properties/ServicePropertiesFunction.java b/camel-core/src/main/java/org/apache/camel/component/properties/ServicePropertiesFunction.java
index 5acf7ea..c9c49f7 100644
--- a/camel-core/src/main/java/org/apache/camel/component/properties/ServicePropertiesFunction.java
+++ b/camel-core/src/main/java/org/apache/camel/component/properties/ServicePropertiesFunction.java
@@ -52,7 +52,7 @@ public class ServicePropertiesFunction implements PropertiesFunction {
}
// make sure to use upper case
- key = key.toUpperCase(Locale.US);
+ key = key.toUpperCase(Locale.ENGLISH);
// a service should have both the host and port defined
String host = System.getenv(key + HOST_PREFIX);
http://git-wip-us.apache.org/repos/asf/camel/blob/5c46d208/camel-core/src/main/java/org/apache/camel/processor/binding/RestBindingProcessor.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/binding/RestBindingProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/binding/RestBindingProcessor.java
index dcf4e0d..9be0118 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/binding/RestBindingProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/binding/RestBindingProcessor.java
@@ -112,14 +112,14 @@ public class RestBindingProcessor extends ServiceSupport implements AsyncProcess
String contentType = ExchangeHelper.getContentType(exchange);
if (contentType != null) {
- isXml = contentType.toLowerCase(Locale.US).contains("xml");
- isJson = contentType.toLowerCase(Locale.US).contains("json");
+ isXml = contentType.toLowerCase(Locale.ENGLISH).contains("xml");
+ isJson = contentType.toLowerCase(Locale.ENGLISH).contains("json");
}
// if content type could not tell us if it was json or xml, then fallback to if the binding was configured with
// that information in the consumes
if (!isXml && !isJson) {
- isXml = consumes != null && consumes.toLowerCase(Locale.US).contains("xml");
- isJson = consumes != null && consumes.toLowerCase(Locale.US).contains("json");
+ isXml = consumes != null && consumes.toLowerCase(Locale.ENGLISH).contains("xml");
+ isJson = consumes != null && consumes.toLowerCase(Locale.ENGLISH).contains("json");
}
// only allow xml/json if the binding mode allows that
@@ -270,22 +270,22 @@ public class RestBindingProcessor extends ServiceSupport implements AsyncProcess
// accept takes precedence
if (accept != null) {
- isXml = accept.toLowerCase(Locale.US).contains("xml");
- isJson = accept.toLowerCase(Locale.US).contains("json");
+ isXml = accept.toLowerCase(Locale.ENGLISH).contains("xml");
+ isJson = accept.toLowerCase(Locale.ENGLISH).contains("json");
}
// fallback to content type if still undecided
if (!isXml && !isJson) {
String contentType = ExchangeHelper.getContentType(exchange);
if (contentType != null) {
- isXml = contentType.toLowerCase(Locale.US).contains("xml");
- isJson = contentType.toLowerCase(Locale.US).contains("json");
+ isXml = contentType.toLowerCase(Locale.ENGLISH).contains("xml");
+ isJson = contentType.toLowerCase(Locale.ENGLISH).contains("json");
}
}
// if content type could not tell us if it was json or xml, then fallback to if the binding was configured with
// that information in the consumes
if (!isXml && !isJson) {
- isXml = produces != null && produces.toLowerCase(Locale.US).contains("xml");
- isJson = produces != null && produces.toLowerCase(Locale.US).contains("json");
+ isXml = produces != null && produces.toLowerCase(Locale.ENGLISH).contains("xml");
+ isJson = produces != null && produces.toLowerCase(Locale.ENGLISH).contains("json");
}
// only allow xml/json if the binding mode allows that
http://git-wip-us.apache.org/repos/asf/camel/blob/5c46d208/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/FileUtil.java b/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
index abedc64..e59b575 100644
--- a/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
+++ b/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
@@ -53,7 +53,7 @@ public final class FileUtil {
private static boolean initWindowsOs() {
// initialize once as System.getProperty is not fast
- String osName = System.getProperty("os.name").toLowerCase(Locale.US);
+ String osName = System.getProperty("os.name").toLowerCase(Locale.ENGLISH);
return osName.contains("windows");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/5c46d208/camel-core/src/test/java/org/apache/camel/TestSupport.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/TestSupport.java b/camel-core/src/test/java/org/apache/camel/TestSupport.java
index abd1aea..dca6532 100644
--- a/camel-core/src/test/java/org/apache/camel/TestSupport.java
+++ b/camel-core/src/test/java/org/apache/camel/TestSupport.java
@@ -489,8 +489,8 @@ public abstract class TestSupport extends TestCase {
* @return <tt>true</tt> if its that platform.
*/
public static boolean isPlatform(String platform) {
- String osName = System.getProperty("os.name").toLowerCase(Locale.US);
- return osName.contains(platform.toLowerCase(Locale.US));
+ String osName = System.getProperty("os.name").toLowerCase(Locale.ENGLISH);
+ return osName.contains(platform.toLowerCase(Locale.ENGLISH));
}
/**
@@ -502,8 +502,8 @@ public abstract class TestSupport extends TestCase {
* @return <tt>true</tt> if its that vendor.
*/
public static boolean isJavaVendor(String vendor) {
- String javaVendor = System.getProperty("java.vendor").toLowerCase(Locale.US);
- return javaVendor.contains(vendor.toLowerCase(Locale.US));
+ String javaVendor = System.getProperty("java.vendor").toLowerCase(Locale.ENGLISH);
+ return javaVendor.contains(vendor.toLowerCase(Locale.ENGLISH));
}
/**
@@ -516,6 +516,6 @@ public abstract class TestSupport extends TestCase {
*/
public static boolean isJavaVersion(String version) {
String javaVersion = System.getProperty("java.version");
- return javaVersion.contains(version.toLowerCase(Locale.US));
+ return javaVersion.contains(version.toLowerCase(Locale.ENGLISH));
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/5c46d208/camel-core/src/test/java/org/apache/camel/converter/InstanceFallbackConverterTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/converter/InstanceFallbackConverterTest.java b/camel-core/src/test/java/org/apache/camel/converter/InstanceFallbackConverterTest.java
index befabe9..68ef9e6 100644
--- a/camel-core/src/test/java/org/apache/camel/converter/InstanceFallbackConverterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/converter/InstanceFallbackConverterTest.java
@@ -33,7 +33,7 @@ public class InstanceFallbackConverterTest extends ContextTestSupport {
public void testInstanceFallbackConverter() throws Exception {
Exchange exchange = new DefaultExchange(context);
- Currency cur = Currency.getInstance(Locale.US);
+ Currency cur = Currency.getInstance(Locale.ENGLISH);
String money = context.getTypeConverter().convertTo(String.class, exchange, cur);
assertEquals("Money talks", money);
@@ -41,7 +41,7 @@ public class InstanceFallbackConverterTest extends ContextTestSupport {
public void testInstanceFallbackMandatoryConverter() throws Exception {
Exchange exchange = new DefaultExchange(context);
- Currency cur = Currency.getInstance(Locale.US);
+ Currency cur = Currency.getInstance(Locale.ENGLISH);
String money = context.getTypeConverter().mandatoryConvertTo(String.class, exchange, cur);
assertEquals("Money talks", money);
http://git-wip-us.apache.org/repos/asf/camel/blob/5c46d208/camel-core/src/test/java/org/apache/camel/processor/ConvertBodyTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/ConvertBodyTest.java b/camel-core/src/test/java/org/apache/camel/processor/ConvertBodyTest.java
index 12e6e0e..7f64790 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/ConvertBodyTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/ConvertBodyTest.java
@@ -130,7 +130,7 @@ public class ConvertBodyTest extends ContextTestSupport {
public void testConvertToStringCharsetFail() throws Exception {
// does not work on AIX
- String osName = System.getProperty("os.name").toLowerCase(Locale.US);
+ String osName = System.getProperty("os.name").toLowerCase(Locale.ENGLISH);
boolean aix = osName.indexOf("aix") > -1;
if (aix) {
return;
http://git-wip-us.apache.org/repos/asf/camel/blob/5c46d208/camel-core/src/test/java/org/apache/camel/support/XMLTokenExpressionIteratorTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/support/XMLTokenExpressionIteratorTest.java b/camel-core/src/test/java/org/apache/camel/support/XMLTokenExpressionIteratorTest.java
index a7f4e00..3b991dc 100644
--- a/camel-core/src/test/java/org/apache/camel/support/XMLTokenExpressionIteratorTest.java
+++ b/camel-core/src/test/java/org/apache/camel/support/XMLTokenExpressionIteratorTest.java
@@ -444,6 +444,6 @@ public class XMLTokenExpressionIteratorTest extends TestCase {
public static boolean isJavaVersion(String version) {
String javaVersion = System.getProperty("java.version");
- return javaVersion.contains(version.toLowerCase(Locale.US));
+ return javaVersion.contains(version.toLowerCase(Locale.ENGLISH));
}
}