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 2023/04/04 18:37:15 UTC
[camel] branch main updated: String.equalsTo("") replaced with String.isEmpty(). The latter is more efficient (#9802)
This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 6e33af18b20 String.equalsTo("") replaced with String.isEmpty(). The latter is more efficient (#9802)
6e33af18b20 is described below
commit 6e33af18b20fa7ca1ba78d6d893680a73d6f7ab7
Author: dk2k <dk...@users.noreply.github.com>
AuthorDate: Tue Apr 4 21:37:08 2023 +0300
String.equalsTo("") replaced with String.isEmpty(). The latter is more efficient (#9802)
* String.equalsTo("") replaced with String.isEmpty(). The latter is more efficient
* fixed my checkstyle issue
* Added null checks and created a local var to avoid multiple getter calls
---------
Co-authored-by: dk2k <dk...@ya.ru>
---
.../camel/catalog/maven/DefaultMavenArtifactProvider.java | 2 +-
.../component/aws/xray/TraceAnnotatedTracingStrategy.java | 2 +-
.../org/apache/camel/component/aws/xray/FakeAWSDaemon.java | 2 +-
.../org/apache/camel/dataformat/bindy/BindyCsvFactory.java | 8 ++++----
.../camel/dataformat/bindy/BindyFixedLengthFactory.java | 14 +++++++-------
.../camel/dataformat/bindy/BindyKeyValuePairFactory.java | 2 +-
.../org/apache/camel/component/box/BoxUsersManagerIT.java | 6 +++---
.../camel/component/couchbase/CouchbaseConsumer.java | 2 +-
.../camel/component/couchbase/CouchbaseEndpoint.java | 2 +-
.../camel/component/cxf/util/CxfUtilsTestHelper.java | 2 +-
.../camel/component/cxf/util/CxfUtilsTestHelper.java | 2 +-
.../google/calendar/BatchGoogleCalendarClientFactory.java | 11 +++++------
.../google/drive/BatchGoogleDriveClientFactory.java | 4 ++--
.../google/mail/BatchGoogleMailClientFactory.java | 4 ++--
.../java/org/apache/camel/component/jcr/JcrConsumer.java | 4 ++--
.../apache/camel/component/jetty/JettyHttpComponent.java | 4 ++--
.../java/org/apache/camel/component/jpa/JpaConsumer.java | 2 +-
.../org/apache/camel/component/jpa/JpaPollingConsumer.java | 2 +-
.../apache/camel/component/mongodb/MongoDbEndpoint.java | 2 +-
.../src/main/java/org/apache/camel/openapi/BeanConfig.java | 2 +-
.../camel/component/quickfixj/QuickfixjEndpoint.java | 2 +-
.../component/robotframework/RobotFrameworkArguments.java | 2 +-
.../dataformat/soap/name/ServiceInterfaceStrategy.java | 7 ++++---
.../org/apache/camel/component/web3j/Web3jEndpoint.java | 2 +-
24 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java b/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
index 429a218a752..c7476a7c7cf 100644
--- a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
+++ b/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
@@ -94,7 +94,7 @@ public class DefaultMavenArtifactProvider implements MavenArtifactProvider {
}
try (OpenURLClassLoader classLoader = new OpenURLClassLoader()) {
- if (version == null || "".equals(version.trim())) {
+ if (version == null || version.trim().isEmpty()) {
version = "LATEST";
}
String gav = String.format("%s:%s:%s", groupId, artifactId, version);
diff --git a/components/camel-aws/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/TraceAnnotatedTracingStrategy.java b/components/camel-aws/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/TraceAnnotatedTracingStrategy.java
index ca8e71411f7..4b3871de4a6 100644
--- a/components/camel-aws/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/TraceAnnotatedTracingStrategy.java
+++ b/components/camel-aws/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/TraceAnnotatedTracingStrategy.java
@@ -79,7 +79,7 @@ public class TraceAnnotatedTracingStrategy implements InterceptStrategy {
String metricName = trace.metricName();
- if ("".equals(metricName)) {
+ if (metricName.isEmpty()) {
metricName = processorClass.getSimpleName();
}
diff --git a/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/FakeAWSDaemon.java b/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/FakeAWSDaemon.java
index 24be19d6a6f..31c1b60a929 100644
--- a/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/FakeAWSDaemon.java
+++ b/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/FakeAWSDaemon.java
@@ -109,7 +109,7 @@ public class FakeAWSDaemon {
for (String segment : segments) {
locSegment = segment;
LOG.trace("Processing received segment: {}", segment);
- if (!"".equals(segment)) {
+ if (!segment.isEmpty()) {
if (!segment.endsWith("}")
|| StringUtils.countMatches(segment, "{") != StringUtils.countMatches(segment, "}")
|| StringUtils.countMatches(segment, "[") != StringUtils.countMatches(segment, "]")) {
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 58c895c2a55..baab453b5f8 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
@@ -220,7 +220,7 @@ public class BindyCsvFactory extends BindyAbstractFactory implements BindyFactor
// Check if content of the field is empty
// This is not possible for mandatory fields
- if (data.equals("")) {
+ if (data.isEmpty()) {
throw new IllegalArgumentException(
"The mandatory field defined at the position " + pos + " is empty for the line: " + line);
}
@@ -245,9 +245,9 @@ public class BindyCsvFactory extends BindyAbstractFactory implements BindyFactor
Object modelField = model.get(field.getDeclaringClass().getName());
// format the data received
- Object value = null;
+ Object value;
- if (!data.equals("")) {
+ if (!data.isEmpty()) {
try {
if (quoting && quote != null && (data.contains("\\" + quote) || data.contains(quote)) && quotingEscaped) {
value = format.parse(data.replaceAll("\\\\" + quote, "\\" + quote));
@@ -591,7 +591,7 @@ public class BindyCsvFactory extends BindyAbstractFactory implements BindyFactor
// Get dataField
final String res;
- if (!dataField.columnName().equals("")) {
+ if (!dataField.columnName().isEmpty()) {
res = dataField.columnName();
} else {
res = field.getName();
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 3622638b02a..0bf10bd76c3 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
@@ -221,7 +221,7 @@ public class BindyFixedLengthFactory extends BindyAbstractFactory implements Bin
token = record.substring(offset - 1, endIndex);
}
offset += length;
- } else if (!delimiter.equals("")) {
+ } else if (!delimiter.isEmpty()) {
final UnicodeHelper tempToken = new UnicodeHelper(
record.substring(offset - 1, record.length()),
(this.countGrapheme) ? UnicodeHelper.Method.GRAPHEME : UnicodeHelper.Method.CODEPOINTS);
@@ -246,7 +246,7 @@ public class BindyFixedLengthFactory extends BindyAbstractFactory implements Bin
// Check if content of the field is empty
// This is not possible for mandatory fields
- if (token.equals("")) {
+ if (token.isEmpty()) {
throw new IllegalArgumentException(
"The mandatory field defined at the position " + pos
+ " is empty for the line: " + line);
@@ -272,12 +272,12 @@ public class BindyFixedLengthFactory extends BindyAbstractFactory implements Bin
Object modelField = model.get(field.getDeclaringClass().getName());
// format the data received
- Object value = null;
+ Object value;
- if ("".equals(token)) {
+ if (token.isEmpty()) {
token = dataField.defaultValue();
}
- if (!"".equals(token)) {
+ if (!token.isEmpty()) {
try {
value = format.parse(token);
} catch (FormatException ie) {
@@ -324,7 +324,7 @@ public class BindyFixedLengthFactory extends BindyAbstractFactory implements Bin
}
// check for unmapped non-whitespace data at the end of the line
- if (offset <= record.length() && !(record.substring(offset - 1, record.length())).trim().equals("")
+ if (offset <= record.length() && !(record.substring(offset - 1, record.length())).trim().isEmpty()
&& !isIgnoreTrailingChars()) {
throw new IllegalArgumentException(
"Unexpected / unmapped characters found at the end of the fixed-length record at line : " + line);
@@ -473,7 +473,7 @@ public class BindyFixedLengthFactory extends BindyAbstractFactory implements Bin
+ field.getName() + " is mandatory.");
}
- if (!datafield.delimiter().equals("")) {
+ if (!datafield.delimiter().isEmpty()) {
result = result + datafield.delimiter();
} else {
// Get length of the field, alignment (LEFT or RIGHT), pad
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
index 874719ef23f..77162834e57 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
@@ -393,7 +393,7 @@ public class BindyKeyValuePairFactory extends BindyAbstractFactory implements Bi
String targetClass = oneToMany.mappedTo();
- if (!targetClass.equals("")) {
+ if (!targetClass.isEmpty()) {
// Class cl = Class.forName(targetClass); Does not work in
// OSGI when class is defined in another bundle
Class<?> cl = null;
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxUsersManagerIT.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxUsersManagerIT.java
index 1ddbe12a081..e03a2d9acd9 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxUsersManagerIT.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxUsersManagerIT.java
@@ -124,7 +124,7 @@ public class BoxUsersManagerIT extends AbstractBoxITSupport {
assumeFalse(jwtAuthentication, "Test has to be executed with standard authentication.");
String enterpriseUser1Login = (String) options.get(CAMEL_TEST_ENTERPRISE_USER_LOGIN_KEY);
- if (enterpriseUser1Login != null && "".equals(enterpriseUser1Login.trim())) {
+ if (enterpriseUser1Login != null && enterpriseUser1Login.trim().isEmpty()) {
enterpriseUser1Login = null;
}
@@ -277,10 +277,10 @@ public class BoxUsersManagerIT extends AbstractBoxITSupport {
String enterpriseUser1Login = (String) options.get(CAMEL_TEST_ENTERPRISE_USER_LOGIN_KEY);
String enterpriseUser2Login = (String) options.get(CAMEL_TEST_ENTERPRISE_USER2_LOGIN_KEY);
- if (enterpriseUser1Login != null && "".equals(enterpriseUser1Login.trim())) {
+ if (enterpriseUser1Login != null && enterpriseUser1Login.trim().isEmpty()) {
enterpriseUser1Login = null;
}
- if (enterpriseUser2Login != null && "".equals(enterpriseUser2Login.trim())) {
+ if (enterpriseUser2Login != null && enterpriseUser2Login.trim().isEmpty()) {
enterpriseUser2Login = null;
}
diff --git a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConsumer.java b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConsumer.java
index 9a40ed96daa..af29bd51500 100644
--- a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConsumer.java
+++ b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConsumer.java
@@ -87,7 +87,7 @@ public class CouchbaseConsumer extends DefaultScheduledPollConsumer implements R
String rangeStartKey = endpoint.getRangeStartKey();
String rangeEndKey = endpoint.getRangeEndKey();
- if ("".equals(rangeStartKey) || "".equals(rangeEndKey)) {
+ if (rangeStartKey == null || rangeStartKey.isEmpty() || rangeEndKey == null || rangeEndKey.isEmpty()) {
return;
}
viewOptions.startKey(rangeStartKey).endKey(rangeEndKey);
diff --git a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseEndpoint.java b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseEndpoint.java
index 5a3b8217cd1..3196a3e1ea9 100644
--- a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseEndpoint.java
+++ b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseEndpoint.java
@@ -487,7 +487,7 @@ public class CouchbaseEndpoint extends ScheduledPollEndpoint {
public URI[] makeBootstrapURI() throws URISyntaxException {
- if (additionalHosts == null || "".equals(additionalHosts)) {
+ if (additionalHosts == null || additionalHosts.isEmpty()) {
return new URI[] { new URI(protocol + "://" + hostname + ":" + port + "/pools") };
}
return getAllUris();
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/util/CxfUtilsTestHelper.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/util/CxfUtilsTestHelper.java
index 1a40492d564..9e02b45e7cd 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/util/CxfUtilsTestHelper.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/util/CxfUtilsTestHelper.java
@@ -101,7 +101,7 @@ public final class CxfUtilsTestHelper {
declareNamespace = false;
}
} else {
- if ("xmlns".equals(name) && "".equals(attrPrefix)) {
+ if ("xmlns".equals(name) && attrPrefix.isEmpty()) {
writer.writeNamespace("", attr.getNodeValue());
if (attr.getNodeValue().equals(ns)) {
declareNamespace = false;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/util/CxfUtilsTestHelper.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/util/CxfUtilsTestHelper.java
index 1a40492d564..9e02b45e7cd 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/util/CxfUtilsTestHelper.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/util/CxfUtilsTestHelper.java
@@ -101,7 +101,7 @@ public final class CxfUtilsTestHelper {
declareNamespace = false;
}
} else {
- if ("xmlns".equals(name) && "".equals(attrPrefix)) {
+ if ("xmlns".equals(name) && attrPrefix.isEmpty()) {
writer.writeNamespace("", attr.getNodeValue());
if (attr.getNodeValue().equals(ns)) {
declareNamespace = false;
diff --git a/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/BatchGoogleCalendarClientFactory.java b/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/BatchGoogleCalendarClientFactory.java
index 04a93eb5a82..dd2f5056862 100644
--- a/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/BatchGoogleCalendarClientFactory.java
+++ b/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/BatchGoogleCalendarClientFactory.java
@@ -45,12 +45,11 @@ public class BatchGoogleCalendarClientFactory implements GoogleCalendarClientFac
String clientId, String clientSecret, Collection<String> scopes, String applicationName, String refreshToken,
String accessToken,
String emailAddress, String p12FileName, String user) {
- boolean serviceAccount = false;
// if emailAddress and p12FileName values are present, assume Google
// Service Account
- if (null != emailAddress && !"".equals(emailAddress) && null != p12FileName && !"".equals(p12FileName)) {
- serviceAccount = true;
- }
+ boolean serviceAccount
+ = null != emailAddress && !emailAddress.isEmpty() && null != p12FileName && !p12FileName.isEmpty();
+
if (!serviceAccount && (clientId == null || clientSecret == null)) {
throw new IllegalArgumentException("clientId and clientSecret are required to create Google Calendar client.");
}
@@ -61,10 +60,10 @@ public class BatchGoogleCalendarClientFactory implements GoogleCalendarClientFac
credential = authorizeServiceAccount(emailAddress, p12FileName, scopes, user);
} else {
credential = authorize(clientId, clientSecret);
- if (refreshToken != null && !"".equals(refreshToken)) {
+ if (refreshToken != null && !refreshToken.isEmpty()) {
credential.setRefreshToken(refreshToken);
}
- if (accessToken != null && !"".equals(accessToken)) {
+ if (accessToken != null && !accessToken.isEmpty()) {
credential.setAccessToken(accessToken);
}
}
diff --git a/components/camel-google/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/BatchGoogleDriveClientFactory.java b/components/camel-google/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/BatchGoogleDriveClientFactory.java
index fc98a021bc1..8218f561a34 100644
--- a/components/camel-google/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/BatchGoogleDriveClientFactory.java
+++ b/components/camel-google/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/BatchGoogleDriveClientFactory.java
@@ -66,10 +66,10 @@ public class BatchGoogleDriveClientFactory implements GoogleDriveClientFactory {
try {
Credential credential = authorize(clientId, clientSecret, scopes);
- if (refreshToken != null && !"".equals(refreshToken)) {
+ if (refreshToken != null && !refreshToken.isEmpty()) {
credential.setRefreshToken(refreshToken);
}
- if (accessToken != null && !"".equals(accessToken)) {
+ if (accessToken != null && !accessToken.isEmpty()) {
credential.setAccessToken(accessToken);
}
return new Drive.Builder(transport, jsonFactory, credential).setApplicationName(applicationName).build();
diff --git a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/BatchGoogleMailClientFactory.java b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/BatchGoogleMailClientFactory.java
index 76c7cfed439..5ad8ec1c505 100644
--- a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/BatchGoogleMailClientFactory.java
+++ b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/BatchGoogleMailClientFactory.java
@@ -47,10 +47,10 @@ public class BatchGoogleMailClientFactory implements GoogleMailClientFactory {
try {
Credential credential = authorize(clientId, clientSecret);
- if (refreshToken != null && !"".equals(refreshToken)) {
+ if (refreshToken != null && !refreshToken.isEmpty()) {
credential.setRefreshToken(refreshToken);
}
- if (accessToken != null && !"".equals(accessToken)) {
+ if (accessToken != null && !accessToken.isEmpty()) {
credential.setAccessToken(accessToken);
}
return new Gmail.Builder(transport, jsonFactory, credential).setApplicationName(applicationName).build();
diff --git a/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrConsumer.java b/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrConsumer.java
index 9a394851f28..4e778d8dc8e 100644
--- a/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrConsumer.java
+++ b/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrConsumer.java
@@ -90,7 +90,7 @@ public class JcrConsumer extends DefaultConsumer {
if (uuids != null) {
uuids = uuids.trim();
- if (!"".equals(uuids)) {
+ if (!uuids.isEmpty()) {
uuid = uuids.split(",");
}
}
@@ -101,7 +101,7 @@ public class JcrConsumer extends DefaultConsumer {
if (nodeTypeNames != null) {
nodeTypeNames = nodeTypeNames.trim();
- if (!"".equals(nodeTypeNames)) {
+ if (!nodeTypeNames.isEmpty()) {
nodeTypeName = nodeTypeNames.split(",");
}
}
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index 28adb274298..d2d8eb98ff6 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -409,7 +409,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent
}
filterHolder.setFilter(new CamelFilterWrapper(filter));
String pathSpec = endpoint.getPath();
- if (pathSpec == null || "".equals(pathSpec)) {
+ if (pathSpec == null || pathSpec.isEmpty()) {
pathSpec = "/";
}
if (endpoint.isMatchOnUriPrefix()) {
@@ -445,7 +445,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent
}
filterHolder.setFilter(new CamelFilterWrapper(filter));
String pathSpec = endpoint.getPath();
- if (pathSpec == null || "".equals(pathSpec)) {
+ if (pathSpec == null || pathSpec.isEmpty()) {
pathSpec = "/";
}
if (endpoint.isMatchOnUriPrefix()) {
diff --git a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java
index 334ede5c778..f4d9b451d64 100644
--- a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java
+++ b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java
@@ -406,7 +406,7 @@ public class JpaConsumer extends ScheduledBatchPollingConsumer {
Entity entity = clazz.getAnnotation(Entity.class);
// Check if the property name has been defined for Entity annotation
- if (entity != null && !entity.name().equals("")) {
+ if (entity != null && !entity.name().isEmpty()) {
return entity.name();
} else {
return null;
diff --git a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaPollingConsumer.java b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaPollingConsumer.java
index ba51c5df93a..8489e16157e 100644
--- a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaPollingConsumer.java
+++ b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaPollingConsumer.java
@@ -280,7 +280,7 @@ public class JpaPollingConsumer extends PollingConsumerSupport {
Entity entity = clazz.getAnnotation(Entity.class);
// Check if the property name has been defined for Entity annotation
- if (entity != null && !entity.name().equals("")) {
+ if (entity != null && !entity.name().isEmpty()) {
return entity.name();
} else {
return null;
diff --git a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
index 94c70efaa2e..b89d2b12bc5 100644
--- a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
+++ b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
@@ -339,7 +339,7 @@ public class MongoDbEndpoint extends DefaultEndpoint {
if (this.hosts != null) {
String credentials = username == null ? "" : username;
- if (!credentials.equals("")) {
+ if (!credentials.isEmpty()) {
credentials += this.password == null ? "@" : ":" + password + "@";
}
diff --git a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/BeanConfig.java b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/BeanConfig.java
index cb90922a050..a1d03684667 100644
--- a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/BeanConfig.java
+++ b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/BeanConfig.java
@@ -101,7 +101,7 @@ public class BeanConfig {
}
public void setBasePath(String basePath) {
- if (!"".equals(basePath) && basePath != null) {
+ if (basePath != null && !basePath.isEmpty()) {
if (!basePath.startsWith("/")) {
this.basePath = "/" + basePath;
} else {
diff --git a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEndpoint.java b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEndpoint.java
index 5d0f9704ca6..7f1772ecb32 100644
--- a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEndpoint.java
+++ b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEndpoint.java
@@ -203,7 +203,7 @@ public class QuickfixjEndpoint extends DefaultEndpoint implements QuickfixjEvent
}
private boolean isMatching(String s1, String s2) {
- return s1.equals("") || s1.equals("*") || s1.equals(s2);
+ return s1.isEmpty() || s1.equals("*") || s1.equals(s2);
}
private boolean isWildcarded() {
diff --git a/components/camel-robotframework/src/main/java/org/apache/camel/component/robotframework/RobotFrameworkArguments.java b/components/camel-robotframework/src/main/java/org/apache/camel/component/robotframework/RobotFrameworkArguments.java
index c9f267c3dab..5eabe5f165d 100644
--- a/components/camel-robotframework/src/main/java/org/apache/camel/component/robotframework/RobotFrameworkArguments.java
+++ b/components/camel-robotframework/src/main/java/org/apache/camel/component/robotframework/RobotFrameworkArguments.java
@@ -35,7 +35,7 @@ public class RobotFrameworkArguments {
}
protected boolean isFileValid(File file) {
- return file != null && file.getPath() != null && !file.getPath().equals("");
+ return file != null && file.getPath() != null && !file.getPath().isEmpty();
}
public void addNonEmptyStringToArguments(String variableToAdd, String flag) {
diff --git a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java
index 0678edfdfac..a90199bf27d 100644
--- a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java
+++ b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java
@@ -170,9 +170,10 @@ public class ServiceInterfaceStrategy implements ElementNameStrategy {
}
inTypeNameToQName.put(ti.getTypeName(), ti.getElName());
}
- if (info.getSoapAction() != null && !"".equals(info.getSoapAction())) {
- soapActionToMethodInfo.put(info.getSoapAction(), info);
- addExceptions(info.getSoapAction(), method);
+ String soapAction = info.getSoapAction();
+ if (soapAction != null && !soapAction.isEmpty()) {
+ soapActionToMethodInfo.put(soapAction, info);
+ addExceptions(soapAction, method);
} else {
addExceptions(null, method);
}
diff --git a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jEndpoint.java b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jEndpoint.java
index 5b4a8c51592..ee8f51a60ef 100644
--- a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jEndpoint.java
+++ b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jEndpoint.java
@@ -97,7 +97,7 @@ public class Web3jEndpoint extends DefaultEndpoint {
}
Web3jService web3jService;
- if (clientAddress == null || clientAddress.equals("")) {
+ if (clientAddress == null || clientAddress.isEmpty()) {
web3jService = new HttpService();
} else if (clientAddress.startsWith("http")) {
web3jService = new HttpService(clientAddress);