You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pa...@apache.org on 2020/04/06 18:33:19 UTC
[camel] 02/02: Switch to faster String#lastIndexOf method taking a
char parameter.
This is an automated email from the ASF dual-hosted git repository.
pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 961ca457e3e8120c4a9acdbe570669784bf3b12c
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Mon Apr 6 20:32:57 2020 +0200
Switch to faster String#lastIndexOf method taking a char parameter.
---
.../org/apache/camel/catalog/maven/ComponentArtifactHelper.java | 2 +-
.../main/java/org/apache/camel/component/aws/s3/S3Component.java | 2 +-
.../java/org/apache/camel/component/aws2/s3/AWS2S3Component.java | 2 +-
.../java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java | 4 ++--
.../org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java | 4 ++--
.../org/apache/camel/component/cassandra/CassandraComponent.java | 2 +-
.../java/org/apache/camel/component/file/GenericFileProducer.java | 4 ++--
.../src/main/java/org/apache/camel/component/grpc/GrpcUtils.java | 4 ++--
.../apache/camel/jsonpath/easypredicate/EasyPredicateParser.java | 2 +-
.../main/java/org/apache/camel/component/jt400/Jt400Component.java | 2 +-
.../org/apache/camel/component/servlet/HttpClientRouteTest.java | 2 +-
.../src/main/java/org/apache/camel/spring/Main.java | 2 +-
.../apache/camel/component/sql/stored/template/ast/ParseHelper.java | 4 ++--
.../main/java/org/apache/camel/component/thrift/ThriftUtils.java | 4 ++--
.../org/apache/camel/language/simple/SimpleExpressionBuilder.java | 2 +-
.../java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java | 6 +++---
.../main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java | 2 +-
.../apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java | 4 ++--
.../java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java | 2 +-
19 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/ComponentArtifactHelper.java b/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/ComponentArtifactHelper.java
index 2697976..9e76b39 100644
--- a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/ComponentArtifactHelper.java
+++ b/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/ComponentArtifactHelper.java
@@ -68,7 +68,7 @@ public final class ComponentArtifactHelper {
String path = null;
String javaType = extractComponentJavaType(log, classLoader, scheme);
if (javaType != null) {
- int pos = javaType.lastIndexOf(".");
+ int pos = javaType.lastIndexOf('.');
path = javaType.substring(0, pos);
path = path.replace('.', '/');
path = path + "/" + scheme + ".json";
diff --git a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Component.java b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Component.java
index 8d513b3..aa65aa4 100644
--- a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Component.java
+++ b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Component.java
@@ -49,7 +49,7 @@ public class S3Component extends DefaultComponent {
throw new IllegalArgumentException("Bucket name must be specified.");
}
if (remaining.startsWith("arn:")) {
- remaining = remaining.substring(remaining.lastIndexOf(":") + 1, remaining.length());
+ remaining = remaining.substring(remaining.lastIndexOf(':') + 1, remaining.length());
}
final S3Configuration configuration = this.configuration != null ? this.configuration.copy() : new S3Configuration();
configuration.setBucketName(remaining);
diff --git a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Component.java b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Component.java
index d01e76c..c4fe75e 100644
--- a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Component.java
+++ b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Component.java
@@ -54,7 +54,7 @@ public class AWS2S3Component extends DefaultComponent {
throw new IllegalArgumentException("Bucket name must be specified.");
}
if (remaining.startsWith("arn:")) {
- remaining = remaining.substring(remaining.lastIndexOf(":") + 1, remaining.length());
+ remaining = remaining.substring(remaining.lastIndexOf(':') + 1, remaining.length());
}
final AWS2S3Configuration configuration = this.configuration != null ? this.configuration.copy() : new AWS2S3Configuration();
configuration.setBucketName(remaining);
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
index d559ba3..9f8bf1b 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
@@ -267,12 +267,12 @@ public class BindyCsvFactory extends BindyAbstractFactory implements BindyFactor
if (value != null && !dataField.method().isEmpty()) {
Class<?> clazz;
if (dataField.method().contains(".")) {
- clazz = camelContext.getClassResolver().resolveMandatoryClass(dataField.method().substring(0, dataField.method().lastIndexOf(".")));
+ clazz = camelContext.getClassResolver().resolveMandatoryClass(dataField.method().substring(0, dataField.method().lastIndexOf('.')));
} else {
clazz = field.getType();
}
- String methodName = dataField.method().substring(dataField.method().lastIndexOf(".") + 1,
+ String methodName = dataField.method().substring(dataField.method().lastIndexOf('.') + 1,
dataField.method().length());
Method m = ReflectionHelper.findMethod(clazz, methodName, field.getType());
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
index f5100ff..1355fc6 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
@@ -287,12 +287,12 @@ public class BindyFixedLengthFactory extends BindyAbstractFactory implements Bin
if (value != null && !dataField.method().isEmpty()) {
Class<?> clazz;
if (dataField.method().contains(".")) {
- clazz = camelContext.getClassResolver().resolveMandatoryClass(dataField.method().substring(0, dataField.method().lastIndexOf(".")));
+ clazz = camelContext.getClassResolver().resolveMandatoryClass(dataField.method().substring(0, dataField.method().lastIndexOf('.')));
} else {
clazz = field.getType();
}
- String methodName = dataField.method().substring(dataField.method().lastIndexOf(".") + 1,
+ String methodName = dataField.method().substring(dataField.method().lastIndexOf('.') + 1,
dataField.method().length());
Method m = ReflectionHelper.findMethod(clazz, methodName, field.getType());
diff --git a/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraComponent.java b/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraComponent.java
index 3172ee6..bcfe4db 100644
--- a/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraComponent.java
+++ b/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraComponent.java
@@ -57,7 +57,7 @@ public class CassandraComponent extends DefaultComponent {
String port = null;
String keyspace = null;
- int pos = remaining.lastIndexOf("/");
+ int pos = remaining.lastIndexOf('/');
if (pos > 0) {
keyspace = remaining.substring(pos + 1);
remaining = remaining.substring(0, pos);
diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileProducer.java b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
index c4c9a0a..55d6114 100644
--- a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
+++ b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
@@ -367,7 +367,7 @@ public class GenericFileProducer<T> extends DefaultProducer {
// flatten name
if (name != null && endpoint.isFlatten()) {
// check for both windows and unix separators
- int pos = Math.max(name.lastIndexOf("/"), name.lastIndexOf("\\"));
+ int pos = Math.max(name.lastIndexOf('/'), name.lastIndexOf("\\"));
if (pos != -1) {
name = name.substring(pos + 1);
}
@@ -428,7 +428,7 @@ public class GenericFileProducer<T> extends DefaultProducer {
}
// check for both windows and unix separators
- int pos = Math.max(answer.lastIndexOf("/"), answer.lastIndexOf("\\"));
+ int pos = Math.max(answer.lastIndexOf('/'), answer.lastIndexOf("\\"));
if (pos == -1) {
// no path so use temp name as calculated
answer = tempName;
diff --git a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/GrpcUtils.java b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/GrpcUtils.java
index d7ee443..b1d8d93 100644
--- a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/GrpcUtils.java
+++ b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/GrpcUtils.java
@@ -38,11 +38,11 @@ public final class GrpcUtils {
}
public static String extractServiceName(String service) {
- return service.contains(".") ? service.substring(service.lastIndexOf(".") + 1) : service;
+ return service.contains(".") ? service.substring(service.lastIndexOf('.') + 1) : service;
}
public static String extractServicePackage(String service) {
- return service.contains(".") ? service.substring(0, service.lastIndexOf(".")) : "";
+ return service.contains(".") ? service.substring(0, service.lastIndexOf('.')) : "";
}
public static Object constructGrpcAsyncStub(String packageName, String serviceName, Channel channel, final CallCredentials creds, final CamelContext context) {
diff --git a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/easypredicate/EasyPredicateParser.java b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/easypredicate/EasyPredicateParser.java
index 258ebdf..c4e1a92 100644
--- a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/easypredicate/EasyPredicateParser.java
+++ b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/easypredicate/EasyPredicateParser.java
@@ -61,7 +61,7 @@ public class EasyPredicateParser {
if (isOperator(op)) {
String before;
String after;
- int pos = prev.lastIndexOf(".");
+ int pos = prev.lastIndexOf('.');
if (pos == -1) {
before = "..*";
after = prev;
diff --git a/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400Component.java b/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400Component.java
index 59dfd62..08f2f3c 100644
--- a/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400Component.java
+++ b/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400Component.java
@@ -73,7 +73,7 @@ public class Jt400Component extends DefaultComponent {
connectionPool = getConnectionPool();
}
- String type = remaining.substring(remaining.lastIndexOf(".") + 1).toUpperCase();
+ String type = remaining.substring(remaining.lastIndexOf('.') + 1).toUpperCase();
Jt400Endpoint endpoint = new Jt400Endpoint(uri, this, connectionPool);
setProperties(endpoint, properties);
endpoint.setType(Jt400Type.valueOf(type));
diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java
index 12fae25..b5a1678 100644
--- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java
+++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java
@@ -136,7 +136,7 @@ public class HttpClientRouteTest extends ServletCamelRouterTestSupport {
from("servlet:hello?matchOnUriPrefix=true").process(exchange -> {
String contentType = exchange.getIn().getHeader(Exchange.CONTENT_TYPE, String.class);
String path = exchange.getIn().getHeader(Exchange.HTTP_URI, String.class);
- path = path.substring(path.lastIndexOf("/"));
+ path = path.substring(path.lastIndexOf('/'));
assertEquals("Get a wrong content type", CONTENT_TYPE, contentType);
// assert camel http header
diff --git a/components/camel-spring-main/src/main/java/org/apache/camel/spring/Main.java b/components/camel-spring-main/src/main/java/org/apache/camel/spring/Main.java
index 73d0396..daaf8f9 100644
--- a/components/camel-spring-main/src/main/java/org/apache/camel/spring/Main.java
+++ b/components/camel-spring-main/src/main/java/org/apache/camel/spring/Main.java
@@ -243,7 +243,7 @@ public class Main extends MainCommandLineSupport {
String[] classes = routeBuilderClasses.split(",");
for (String clazz : classes) {
if (clazz.contains(".")) {
- String packageName = clazz.substring(0, clazz.lastIndexOf("."));
+ String packageName = clazz.substring(0, clazz.lastIndexOf('.'));
packages.add(packageName);
}
}
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/ast/ParseHelper.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/ast/ParseHelper.java
index 031786b..2223823 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/ast/ParseHelper.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/ast/ParseHelper.java
@@ -44,8 +44,8 @@ public final class ParseHelper {
String className;
String fieldName;
try {
- className = sqlType.substring(0, sqlType.lastIndexOf("."));
- fieldName = sqlType.substring(sqlType.lastIndexOf(".") + 1);
+ className = sqlType.substring(0, sqlType.lastIndexOf('.'));
+ fieldName = sqlType.substring(sqlType.lastIndexOf('.') + 1);
} catch (Exception ex) {
throw new ParseRuntimeException("Failed to parse class.field:" + sqlType);
}
diff --git a/components/camel-thrift/src/main/java/org/apache/camel/component/thrift/ThriftUtils.java b/components/camel-thrift/src/main/java/org/apache/camel/component/thrift/ThriftUtils.java
index c41d7cf..93097d3 100644
--- a/components/camel-thrift/src/main/java/org/apache/camel/component/thrift/ThriftUtils.java
+++ b/components/camel-thrift/src/main/java/org/apache/camel/component/thrift/ThriftUtils.java
@@ -53,11 +53,11 @@ public final class ThriftUtils {
}
public static String extractServiceName(String service) {
- return service.substring(service.lastIndexOf(".") + 1);
+ return service.substring(service.lastIndexOf('.') + 1);
}
public static String extractServicePackage(String service) {
- return service.substring(0, service.lastIndexOf("."));
+ return service.substring(0, service.lastIndexOf('.'));
}
@SuppressWarnings({"rawtypes", "unchecked"})
diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
index ed08790..7f7a689 100644
--- a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
+++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
@@ -716,7 +716,7 @@ public final class SimpleExpressionBuilder {
return type;
}
- int pos = text.lastIndexOf(".");
+ int pos = text.lastIndexOf('.');
if (pos > 0) {
String before = text.substring(0, pos);
String after = text.substring(pos + 1);
diff --git a/tooling/maven/camel-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java b/tooling/maven/camel-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
index 029b413..a750c79 100644
--- a/tooling/maven/camel-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/tooling/maven/camel-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -3810,7 +3810,7 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
}
while (link.endsWith("/")) {
- link = link.substring(0, link.lastIndexOf("/"));
+ link = link.substring(0, link.lastIndexOf('/'));
}
addArgIfNotEmpty(arguments, "-link", JavadocUtil.quotedPathArgument(link), true, false);
@@ -4007,7 +4007,7 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
continue;
}
- int lastIndexOfSeparator = currentFile.lastIndexOf("/");
+ int lastIndexOfSeparator = currentFile.lastIndexOf('/');
if (lastIndexOfSeparator != -1) {
String packagename = currentFile.substring(0, lastIndexOfSeparator).replace('/', '.');
@@ -5773,7 +5773,7 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
url = url.trim();
while (url.endsWith("/")) {
- url = url.substring(0, url.lastIndexOf("/"));
+ url = url.substring(0, url.lastIndexOf('/'));
}
return url;
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index 25dfbe1..6cfc51a 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -676,7 +676,7 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
}
private String getComponentNameFromType(String type) {
- int pos = type.lastIndexOf(".");
+ int pos = type.lastIndexOf('.');
String name = type.substring(pos + 1).replace("Component", "");
switch (type) {
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
index 6feccbf..74b2671 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
@@ -179,7 +179,7 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo {
if (parentUriEndpoint != null) {
String parentScheme = parentUriEndpoint.scheme().split(",")[0];
String superClassName = superclass.getName();
- String packageName = superClassName.substring(0, superClassName.lastIndexOf("."));
+ String packageName = superClassName.substring(0, superClassName.lastIndexOf('.'));
String fileName = packageName.replace('.', '/') + "/" + parentScheme + ".json";
String json = loadResource(fileName);
parentData = JsonMapper.generateComponentModel(json);
@@ -237,7 +237,7 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo {
// write json schema
String name = classElement.getName();
- String packageName = name.substring(0, name.lastIndexOf("."));
+ String packageName = name.substring(0, name.lastIndexOf('.'));
String fileName = scheme + PackageHelper.JSON_SUFIX;
String file = packageName.replace('.', '/') + "/" + fileName;
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java
index e49137c..c9d2db8 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java
@@ -219,7 +219,7 @@ public class SchemaGeneratorMojo extends AbstractGeneratorMojo {
}
// write json schema file
- String packageName = javaTypeName.substring(0, javaTypeName.lastIndexOf("."));
+ String packageName = javaTypeName.substring(0, javaTypeName.lastIndexOf('.'));
String json = JsonMapper.createParameterJsonSchema(eipModel);
updateResource(
resourcesOutputDir.toPath(),