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 f870e62c203 (chores) camel-core: use StringHelper when possible
(#11278)
f870e62c203 is described below
commit f870e62c20346d397990dd469b075d7cbc84d8e3
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Sun Sep 3 09:38:06 2023 +0200
(chores) camel-core: use StringHelper when possible (#11278)
---
.../camel/catalog/impl/AbstractCamelCatalog.java | 8 ++------
.../org/apache/camel/catalog/impl/URISupport.java | 21 ++++++---------------
.../camel/impl/DefaultDumpRoutesStrategy.java | 3 ++-
.../component/file/FileRouteOnDosWithNoVolTest.java | 7 +++----
.../org/apache/camel/support/DefaultComponent.java | 7 ++-----
.../java/org/apache/camel/support/LoggerHelper.java | 3 ++-
.../camel/support/PropertyBindingSupport.java | 6 +-----
7 files changed, 18 insertions(+), 37 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 4b141027d7b..9cf9970e091 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
@@ -520,10 +520,7 @@ public abstract class AbstractCamelCatalog {
// strip user info from uri path
if (!userInfoOptions.isEmpty()) {
- int idx = uriPath.indexOf('@');
- if (idx > -1) {
- uriPath = uriPath.substring(idx + 1);
- }
+ uriPath = StringHelper.after(uriPath, "@", uriPath);
}
// strip double slash in the start
@@ -1110,8 +1107,7 @@ public abstract class AbstractCamelCatalog {
|| key.startsWith("lra.")
|| key.startsWith("health.")
|| key.startsWith("rest.")) {
- int idx = key.indexOf('.');
- String name = key.substring(0, idx);
+ String name = StringHelper.before(key, ".");
if (value != null) {
MainModel model = mainModel();
if (model == null) {
diff --git
a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/URISupport.java
b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/URISupport.java
index 9718cfc71c1..c9550652438 100644
---
a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/URISupport.java
+++
b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/URISupport.java
@@ -28,6 +28,8 @@ import java.util.List;
import java.util.Map;
import java.util.function.BiConsumer;
+import org.apache.camel.util.StringHelper;
+
/**
* Copied from org.apache.camel.util.URISupport
*/
@@ -78,11 +80,7 @@ public final class URISupport {
* @return the uri without the query parameter
*/
public static String stripQuery(String uri) {
- int idx = uri.indexOf('?');
- if (idx > -1) {
- uri = uri.substring(0, idx);
- }
- return uri;
+ return StringHelper.before(uri, "?", uri);
}
/**
@@ -92,11 +90,7 @@ public final class URISupport {
* @return query parameters, or <tt>null</tt> if no parameters
*/
public static String extractQuery(String uri) {
- int idx = uri.indexOf('?');
- if (idx > -1) {
- return uri.substring(idx + 1);
- }
- return null;
+ return StringHelper.after(uri, "?");
}
/**
@@ -110,12 +104,9 @@ public final class URISupport {
String query = uri.getQuery();
if (query == null) {
String schemeSpecificPart = uri.getSchemeSpecificPart();
- int idx = schemeSpecificPart.indexOf('?');
- if (idx < 0) {
- // return an empty map
+ query = StringHelper.after(schemeSpecificPart, "?");
+ if (query == null) {
return new LinkedHashMap<>(0);
- } else {
- query = schemeSpecificPart.substring(idx + 1);
}
} else {
query = stripPrefix(query, "?");
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultDumpRoutesStrategy.java
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultDumpRoutesStrategy.java
index 816d82b1f56..4f851c72810 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultDumpRoutesStrategy.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultDumpRoutesStrategy.java
@@ -622,7 +622,8 @@ public class DefaultDumpRoutesStrategy extends
ServiceSupport implements DumpRou
if (loc != null) {
if (loc.contains(":")) {
// strip prefix
- loc = loc.substring(loc.indexOf(':') + 1);
+ loc = StringHelper.after(loc, ":", loc);
+
// file based such as xml and yaml
loc = FileUtil.stripPath(loc);
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/file/FileRouteOnDosWithNoVolTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/file/FileRouteOnDosWithNoVolTest.java
index 55505359aa1..09fdfb56a93 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/file/FileRouteOnDosWithNoVolTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/file/FileRouteOnDosWithNoVolTest.java
@@ -21,6 +21,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.util.FileUtil;
+import org.apache.camel.util.StringHelper;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -37,10 +38,8 @@ public class FileRouteOnDosWithNoVolTest extends
ContextTestSupport {
public void setUp() throws Exception {
path = testDirectory("dosnovol").toAbsolutePath().toString();
if (FileUtil.isWindows()) {
- int dp = path.indexOf(":\\");
- if (dp > 0) {
- path = path.substring(dp + 1).replace('\\', '/');
- }
+ path = StringHelper.after(path, ":\\", path)
+ .replace('\\', '/');
}
super.setUp();
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultComponent.java
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultComponent.java
index 6c65a2dc94f..cc220905c77 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultComponent.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultComponent.java
@@ -107,11 +107,8 @@ public abstract class DefaultComponent extends
ServiceSupport implements Compone
Map<String, Object> parameters;
if (useRawUri()) {
// when using raw uri then the query is taking from the uri as is
- String query;
- int idx = uri.indexOf('?');
- if (idx > -1) {
- query = uri.substring(idx + 1);
- } else {
+ String query = StringHelper.after(uri, "?");
+ if (query == null) {
query = u.getRawQuery();
}
// and use method parseQuery
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/LoggerHelper.java
b/core/camel-support/src/main/java/org/apache/camel/support/LoggerHelper.java
index c2c1060d006..28cca1bf379 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/LoggerHelper.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/LoggerHelper.java
@@ -50,7 +50,8 @@ public final class LoggerHelper {
name = loc;
if (loc.contains(":")) {
// strip prefix
- loc = loc.substring(loc.indexOf(':') + 1);
+ loc = StringHelper.after(loc, ":", loc);
+
// file based such as xml and yaml
name = FileUtil.stripPath(loc);
} else {
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
index fcee3ae44ee..986cd2180d9 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
@@ -423,11 +423,7 @@ public final class PropertyBindingSupport {
boolean allowPrivateSetter, boolean ignoreCase) {
// if the name has collection lookup then ignore that as we want to
create the instance
- String key = name;
- int pos = name.indexOf('[');
- if (pos != -1) {
- key = name.substring(0, pos);
- }
+ String key = StringHelper.before(name, "[", name);
Object answer = null;
Method method = findBestSetterMethod(camelContext, newClass, key,
fluentBuilder, allowPrivateSetter, ignoreCase);
