You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/08/17 09:15:48 UTC
[camel] branch main updated: (chores) cleanup duplicated capitalization code (#11129)
This is an automated email from the ASF dual-hosted git repository.
orpiske 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 9e8ffcf9d40 (chores) cleanup duplicated capitalization code (#11129)
9e8ffcf9d40 is described below
commit 9e8ffcf9d405191133c5438de1ec798060a55ed4
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Thu Aug 17 11:15:40 2023 +0200
(chores) cleanup duplicated capitalization code (#11129)
Adjusted the code to use the StringHelper capitalize method
---
.../camel/component/jetty/async/MyAsyncComponent.java | 3 ++-
.../camel/component/jms/async/MyAsyncComponent.java | 3 ++-
.../component/sjms/support/MyAsyncComponent.java | 4 ++--
.../apache/camel/component/xchange/XChangeHelper.java | 3 ++-
.../camel/impl/engine/IntrospectionSupport.java | 2 +-
.../camel/processor/async/MyAsyncComponent.java | 3 ++-
.../org/apache/camel/xml/out/ModelWriterTest.java | 19 ++++++++++++++-----
7 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/MyAsyncComponent.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/MyAsyncComponent.java
index f9887b21847..9bf4a44acaa 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/MyAsyncComponent.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/MyAsyncComponent.java
@@ -20,6 +20,7 @@ import java.util.Map;
import org.apache.camel.Endpoint;
import org.apache.camel.support.DefaultComponent;
+import org.apache.camel.util.StringHelper;
public class MyAsyncComponent extends DefaultComponent {
@@ -38,7 +39,7 @@ public class MyAsyncComponent extends DefaultComponent {
String result = "";
for (String word : words) {
result += result.isEmpty() ? "" : " ";
- result += word.substring(0, 1).toUpperCase() + word.substring(1);
+ result += StringHelper.capitalize(word);
}
return result;
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/MyAsyncComponent.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/MyAsyncComponent.java
index 6c6663295d5..0b273a2da7a 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/MyAsyncComponent.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/MyAsyncComponent.java
@@ -20,6 +20,7 @@ import java.util.Map;
import org.apache.camel.Endpoint;
import org.apache.camel.support.DefaultComponent;
+import org.apache.camel.util.StringHelper;
/**
*
@@ -41,7 +42,7 @@ public class MyAsyncComponent extends DefaultComponent {
String result = "";
for (String word : words) {
result += result.isEmpty() ? "" : " ";
- result += word.substring(0, 1).toUpperCase() + word.substring(1);
+ result += StringHelper.capitalize(word);
}
return result;
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/MyAsyncComponent.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/MyAsyncComponent.java
index 881ff952d67..d6cce02a7fc 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/MyAsyncComponent.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/MyAsyncComponent.java
@@ -16,11 +16,11 @@
*/
package org.apache.camel.component.sjms.support;
-import java.util.Locale;
import java.util.Map;
import org.apache.camel.Endpoint;
import org.apache.camel.support.DefaultComponent;
+import org.apache.camel.util.StringHelper;
/**
*
@@ -42,7 +42,7 @@ public class MyAsyncComponent extends DefaultComponent {
String result = "";
for (String word : words) {
result += result.isEmpty() ? "" : " ";
- result += word.substring(0, 1).toUpperCase(Locale.ENGLISH) + word.substring(1);
+ result += StringHelper.capitalize(word);
}
return result;
}
diff --git a/components/camel-xchange/src/main/java/org/apache/camel/component/xchange/XChangeHelper.java b/components/camel-xchange/src/main/java/org/apache/camel/component/xchange/XChangeHelper.java
index f785800ccab..68fd815307b 100644
--- a/components/camel-xchange/src/main/java/org/apache/camel/component/xchange/XChangeHelper.java
+++ b/components/camel-xchange/src/main/java/org/apache/camel/component/xchange/XChangeHelper.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.xchange;
import org.apache.camel.CamelContext;
+import org.apache.camel.util.StringHelper;
import org.knowm.xchange.Exchange;
public final class XChangeHelper {
@@ -25,7 +26,7 @@ public final class XChangeHelper {
}
public static Class<? extends Exchange> loadXChangeClass(CamelContext camelContext, String name) {
- String firstUpper = name.substring(0, 1).toUpperCase() + name.substring(1);
+ String firstUpper = StringHelper.capitalize(name);
String className = "org.knowm.xchange." + name + "." + firstUpper + "Exchange";
try {
return camelContext.getClassResolver().resolveClass(className, Exchange.class);
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/IntrospectionSupport.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/IntrospectionSupport.java
index e175fe086a1..675599a14dd 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/IntrospectionSupport.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/IntrospectionSupport.java
@@ -335,7 +335,7 @@ final class IntrospectionSupport {
ObjectHelper.notNull(target, "target");
ObjectHelper.notNull(propertyName, "property");
- propertyName = propertyName.substring(0, 1).toUpperCase(Locale.ENGLISH) + propertyName.substring(1);
+ propertyName = StringHelper.capitalize(propertyName);
Class<?> clazz = target.getClass();
Method method = getPropertyGetter(clazz, propertyName);
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/async/MyAsyncComponent.java b/core/camel-core/src/test/java/org/apache/camel/processor/async/MyAsyncComponent.java
index 375e6baf309..2c2dadc3e83 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/async/MyAsyncComponent.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/async/MyAsyncComponent.java
@@ -21,6 +21,7 @@ import java.util.Map;
import org.apache.camel.Endpoint;
import org.apache.camel.support.DefaultComponent;
+import org.apache.camel.util.StringHelper;
public class MyAsyncComponent extends DefaultComponent {
@@ -39,7 +40,7 @@ public class MyAsyncComponent extends DefaultComponent {
StringBuilder result = new StringBuilder();
for (String word : words) {
result.append(result.isEmpty() ? "" : " ");
- result.append(word.substring(0, 1).toUpperCase(Locale.ENGLISH)).append(word.substring(1));
+ result.append(StringHelper.capitalize(word));
}
return result.toString();
}
diff --git a/core/camel-xml-io/src/test/java/org/apache/camel/xml/out/ModelWriterTest.java b/core/camel-xml-io/src/test/java/org/apache/camel/xml/out/ModelWriterTest.java
index 65d316e0546..6be1f3e5ffc 100644
--- a/core/camel-xml-io/src/test/java/org/apache/camel/xml/out/ModelWriterTest.java
+++ b/core/camel-xml-io/src/test/java/org/apache/camel/xml/out/ModelWriterTest.java
@@ -16,13 +16,19 @@
*/
package org.apache.camel.xml.out;
-import java.io.*;
+import java.io.IOError;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringReader;
+import java.io.StringWriter;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.nio.file.Files;
import java.nio.file.Paths;
-import java.util.*;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Stream;
@@ -36,6 +42,7 @@ import org.apache.camel.model.RoutesDefinition;
import org.apache.camel.model.TemplatedRoutesDefinition;
import org.apache.camel.model.app.BeansDefinition;
import org.apache.camel.model.rest.RestsDefinition;
+import org.apache.camel.util.StringHelper;
import org.apache.camel.xml.in.ModelParser;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.params.ParameterizedTest;
@@ -43,7 +50,9 @@ import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.fail;
public class ModelWriterTest {
@@ -227,7 +236,7 @@ public class ModelWriterTest {
String name = field.getName();
try {
Method method = field.getDeclaringClass().getDeclaredMethod(
- "get" + name.substring(0, 1).toUpperCase() + name.substring(1));
+ "get" + StringHelper.capitalize(name));
if (method.getAnnotation(XmlTransient.class) != null) {
return true;
}
@@ -236,7 +245,7 @@ public class ModelWriterTest {
}
try {
Method method = field.getDeclaringClass().getDeclaredMethod(
- "set" + name.substring(0, 1).toUpperCase() + name.substring(1),
+ "set" + StringHelper.capitalize(name),
field.getType());
if (method.getAnnotation(XmlTransient.class) != null) {
return true;