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/09/22 13:40:53 UTC

[camel] branch main updated: (chores) Cleanup String-related operations (#11530)

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 97f761d1efa (chores) Cleanup String-related operations (#11530)
97f761d1efa is described below

commit 97f761d1efa863e48011e3536408aa3f51a3a66b
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Fri Sep 22 15:40:45 2023 +0200

    (chores) Cleanup String-related operations (#11530)
    
    - Use isEmpty instead of checking for length
    - Use ObjectHelper.isBoolean
---
 .../org/apache/camel/component/aws/xray/json/JsonParser.java     | 9 +++++----
 .../org/apache/camel/component/cxf/util/CxfUtilsTestHelper.java  | 6 +++---
 .../test/java/org/apache/camel/non_wrapper/PersonProcessor.java  | 2 +-
 .../org/apache/camel/component/file/remote/SftpOperations.java   | 2 +-
 .../src/main/java/org/apache/camel/http/base/HttpHelper.java     | 2 +-
 .../java/org/apache/camel/http/common/HttpCommonEndpoint.java    | 2 +-
 .../java/org/apache/camel/component/irc/IrcConfiguration.java    | 2 +-
 .../main/java/org/apache/camel/service/lra/LRAUrlBuilder.java    | 2 +-
 .../java/org/apache/camel/component/mllp/internal/Hl7Util.java   | 2 +-
 .../camel/component/netty/codec/DatagramPacketStringEncoder.java | 2 +-
 .../java/org/apache/camel/component/pgevent/PgEventEndpoint.java | 2 +-
 .../src/main/java/org/apache/camel/spring/Main.java              | 2 +-
 .../component/sql/stored/template/generated/TokenMgrError.java   | 2 +-
 .../camel/language/xtokenizer/XMLTokenExpressionIterator.java    | 4 ++--
 .../java/org/apache/camel/component/xj/JsonXmlStreamReader.java  | 2 +-
 .../org/apache/camel/language/xpath/MessageVariableResolver.java | 2 +-
 .../camel/impl/converter/AnnotationTypeConverterLoader.java      | 2 +-
 .../org/apache/camel/language/simple/SimpleExpressionParser.java | 4 ++--
 .../camel/processor/transformer/AnnotationTransformerLoader.java | 2 +-
 .../src/test/java/org/apache/camel/component/xslt/MyEcho.java    | 2 +-
 .../src/main/java/org/apache/camel/support/jndi/JndiContext.java | 2 +-
 .../src/main/java/org/apache/camel/util/StringQuoteHelper.java   | 6 +++---
 .../src/main/java/org/apache/camel/util/URISupport.java          | 2 +-
 .../src/main/java/org/apache/camel/xml/io/MXParser.java          | 4 ++--
 .../org/apache/camel/support/builder/xml/StAX2SAXSource.java     | 2 +-
 .../main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java | 2 +-
 .../src/main/java/org/apache/camel/tooling/model/Strings.java    | 2 +-
 .../src/main/java/org/apache/camel/tooling/util/Strings.java     | 6 +++---
 .../camel/maven/packaging/EndpointUriFactoryGenerator.java       | 2 +-
 .../java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java  | 2 +-
 .../org/apache/camel/generator/openapi/RestDslGenerator.java     | 2 +-
 31 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/json/JsonParser.java b/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/json/JsonParser.java
index 0c137f1e11a..363b21d5e80 100644
--- a/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/json/JsonParser.java
+++ b/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/json/JsonParser.java
@@ -20,6 +20,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Stack;
 
+import org.apache.camel.util.ObjectHelper;
 import org.apache.commons.lang3.StringUtils;
 
 public final class JsonParser {
@@ -104,13 +105,13 @@ public final class JsonParser {
                         break;
                     }
                 default:
-                    if (('"' == c && curToken.length() == 0)
-                            || ('"' == c && curToken.length() > 0 && curToken.charAt(curToken.length() - 1) != '\\')) {
+                    if (('"' == c && curToken.isEmpty())
+                            || ('"' == c && !curToken.isEmpty() && curToken.charAt(curToken.length() - 1) != '\\')) {
                         inWord = !inWord;
                     }
                     if (!inWord && !doNotIncludeSymbols.contains(String.valueOf(c))) {
                         curToken.append(c);
-                    } else if ('"' != c || (curToken.length() > 0 && curToken.charAt(curToken.length() - 1) == '\\')) {
+                    } else if ('"' != c || (!curToken.isEmpty() && curToken.charAt(curToken.length() - 1) == '\\')) {
                         curToken.append(c);
                     }
             }
@@ -135,7 +136,7 @@ public final class JsonParser {
 
     private static Object sanitizeData(String data) {
         data = data.trim();
-        if (data.toLowerCase().equals("true") || data.toLowerCase().equals("false")) {
+        if (ObjectHelper.isBoolean(data)) {
             return Boolean.valueOf(data);
         }
         if (data.contains(".") && StringUtils.countMatches(data, ".") == 1 && data.matches("[0-9\\.]+")) {
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 9e02b45e7cd..93076b2e116 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
@@ -73,7 +73,7 @@ public final class CxfUtilsTestHelper {
         String decUri = writer.getNamespaceContext().getNamespaceURI(prefix);
         boolean declareNamespace = decUri == null || !decUri.equals(ns);
 
-        if (ns == null || ns.length() == 0) {
+        if (ns == null || ns.isEmpty()) {
             writer.writeStartElement(localName);
             if (StringUtils.isEmpty(decUri)) {
                 declareNamespace = false;
@@ -112,9 +112,9 @@ public final class CxfUtilsTestHelper {
                 } else {
                     String attns = attr.getNamespaceURI();
                     String value = attr.getNodeValue();
-                    if (attns == null || attns.length() == 0) {
+                    if (attns == null || attns.isEmpty()) {
                         writer.writeAttribute(name, value);
-                    } else if (attrPrefix == null || attrPrefix.length() == 0) {
+                    } else if (attrPrefix == null || attrPrefix.isEmpty()) {
                         writer.writeAttribute(attns, name, value);
                     } else {
                         writer.writeAttribute(attrPrefix, attns, name, value);
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/non_wrapper/PersonProcessor.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/non_wrapper/PersonProcessor.java
index 0baee7db6c3..723ce6afbe3 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/non_wrapper/PersonProcessor.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/non_wrapper/PersonProcessor.java
@@ -42,7 +42,7 @@ public class PersonProcessor implements Processor {
         String personId = person.getPersonId();
         GetPersonResponse response = new GetPersonResponse();
 
-        if (personId == null || personId.length() == 0) {
+        if (personId == null || personId.isEmpty()) {
             LOG.info("person id 123, so throwing exception");
             // Try to throw out the soap fault message
             org.apache.camel.non_wrapper.types.UnknownPersonFault personFault
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
index c9365079152..c03b97b8d16 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
@@ -676,7 +676,7 @@ public class SftpOperations implements RemoteFileOperations<SftpRemoteFile> {
             // extract the path segment relative to the target path and make
             // sure it keeps the preceding '/' for the regex op
             String p = getCurrentDirectory().substring(path.length() - (path.endsWith("/") ? 1 : 0));
-            if (p.length() == 0) {
+            if (p.isEmpty()) {
                 return;
             }
             // the first character must be '/' and hence removed
diff --git a/components/camel-http-base/src/main/java/org/apache/camel/http/base/HttpHelper.java b/components/camel-http-base/src/main/java/org/apache/camel/http/base/HttpHelper.java
index eb96f728b00..8a9cbe22ecd 100644
--- a/components/camel-http-base/src/main/java/org/apache/camel/http/base/HttpHelper.java
+++ b/components/camel-http-base/src/main/java/org/apache/camel/http/base/HttpHelper.java
@@ -136,7 +136,7 @@ public final class HttpHelper {
      * @return       the extracted parameter value, see more details in javadoc.
      */
     public static Object extractHttpParameterValue(String value) {
-        if (value == null || ObjectHelper.isEmpty(value)) {
+        if (ObjectHelper.isEmpty(value)) {
             return value;
         }
 
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java
index 2399d24e799..6c6a090d693 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java
@@ -259,7 +259,7 @@ public abstract class HttpCommonEndpoint extends DefaultEndpoint implements Head
 
     public String getPath() {
         //if the path is empty, we just return the default path here
-        return httpUri.getPath().length() == 0 ? "/" : httpUri.getPath();
+        return httpUri.getPath().isEmpty() ? "/" : httpUri.getPath();
     }
 
     public int getPort() {
diff --git a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConfiguration.java b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConfiguration.java
index df7624d1ea9..fed80ae45bb 100644
--- a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConfiguration.java
+++ b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConfiguration.java
@@ -130,7 +130,7 @@ public class IrcConfiguration implements Cloneable {
     public String getSpaceSeparatedChannelNames() {
         StringBuilder retval = new StringBuilder();
         for (IrcChannel channel : channelList) {
-            retval.append(retval.length() == 0 ? "" : " ").append(channel.getName());
+            retval.append(retval.isEmpty() ? "" : " ").append(channel.getName());
         }
         return retval.toString();
     }
diff --git a/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAUrlBuilder.java b/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAUrlBuilder.java
index ea270ee6585..4c247877f90 100644
--- a/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAUrlBuilder.java
+++ b/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAUrlBuilder.java
@@ -94,7 +94,7 @@ public class LRAUrlBuilder {
         try {
             key = URLEncoder.encode(toNonnullString(key), StandardCharsets.UTF_8.name());
             value = URLEncoder.encode(toNonnullString(value), StandardCharsets.UTF_8.name());
-            if (copy.query.length() == 0) {
+            if (copy.query.isEmpty()) {
                 copy.query += "?";
             } else {
                 copy.query += "&";
diff --git a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/Hl7Util.java b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/Hl7Util.java
index 714d1461503..838a3d5f924 100644
--- a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/Hl7Util.java
+++ b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/Hl7Util.java
@@ -311,7 +311,7 @@ public final class Hl7Util {
     public String convertToPrintFriendlyString(String phiString) {
         if (null == phiString) {
             return NULL_REPLACEMENT_VALUE;
-        } else if (phiString.length() == 0) {
+        } else if (phiString.isEmpty()) {
             return EMPTY_REPLACEMENT_VALUE;
         }
 
diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/codec/DatagramPacketStringEncoder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/codec/DatagramPacketStringEncoder.java
index a10d6bf242f..a7518461389 100644
--- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/codec/DatagramPacketStringEncoder.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/codec/DatagramPacketStringEncoder.java
@@ -63,7 +63,7 @@ public class DatagramPacketStringEncoder
             throws Exception {
         if (msg.content() instanceof CharSequence) {
             CharSequence payload = (CharSequence) msg.content();
-            if (payload.length() == 0) {
+            if (payload.isEmpty()) {
                 return;
             }
             AddressedEnvelope<Object, InetSocketAddress> addressedEnvelop = new DefaultAddressedEnvelope<>(
diff --git a/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventEndpoint.java b/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventEndpoint.java
index 4cd1c85510e..c9757840617 100644
--- a/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventEndpoint.java
+++ b/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventEndpoint.java
@@ -146,7 +146,7 @@ public class PgEventEndpoint extends DefaultEndpoint {
     }
 
     private void validateInputs() throws IllegalArgumentException {
-        if (getChannel() == null || getChannel().length() == 0) {
+        if (getChannel() == null || getChannel().isEmpty()) {
             throw new IllegalArgumentException("A required parameter was not set when creating this Endpoint (channel)");
         }
 
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 acbd9dd64a1..79a7727847a 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
@@ -317,7 +317,7 @@ public class Main extends MainCommandLineSupport {
                         break;
                     }
                     line = line.trim();
-                    if (line.startsWith("#") || line.length() == 0) {
+                    if (line.startsWith("#") || line.isEmpty()) {
                         continue;
                     }
                     locations.add(line);
diff --git a/components/camel-sql/src/generated/java/org/apache/camel/component/sql/stored/template/generated/TokenMgrError.java b/components/camel-sql/src/generated/java/org/apache/camel/component/sql/stored/template/generated/TokenMgrError.java
index c20c8309271..3305f598388 100644
--- a/components/camel-sql/src/generated/java/org/apache/camel/component/sql/stored/template/generated/TokenMgrError.java
+++ b/components/camel-sql/src/generated/java/org/apache/camel/component/sql/stored/template/generated/TokenMgrError.java
@@ -107,7 +107,7 @@ public class TokenMgrError extends Error
           errorLine + ", column " + //
           errorColumn + ".  Encountered: " + //
           (EOFSeen ? "<EOF>" : ("'" + addEscapes(String.valueOf(curChar)) + "' (" + curChar + "),")) + //
-          (errorAfter == null || errorAfter.length() == 0 ? "" : " after prefix \"" + addEscapes(errorAfter) + "\"")) + //
+          (errorAfter == null || errorAfter.isEmpty() ? "" : " after prefix \"" + addEscapes(errorAfter) + "\"")) + //
           (lexState == 0 ? "" : " (in lexical state " + lexState + ")");
   }
 
diff --git a/components/camel-stax/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIterator.java b/components/camel-stax/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIterator.java
index ccb6580bf5b..1cd7381eec0 100644
--- a/components/camel-stax/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIterator.java
+++ b/components/camel-stax/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIterator.java
@@ -406,7 +406,7 @@ public class XMLTokenExpressionIterator extends ExpressionAdapter implements Nam
                 sb.append(token, 0, stag.length() - (empty ? 2 : 1));
                 for (Entry<String, String> e : getCurrentNamespaceBindings().entrySet()) {
                     if (!skip.contains(e.getKey())) {
-                        boolean defaultNS = e.getKey() == null || e.getKey().length() == 0;
+                        boolean defaultNS = e.getKey() == null || e.getKey().isEmpty();
                         if (defaultNS) {
                             sb.append(" xmlns").append("=").append(quote).append(e.getValue()).append(quote);
                         } else {
@@ -582,7 +582,7 @@ public class XMLTokenExpressionIterator extends ExpressionAdapter implements Nam
 
         private static String makeName(QName qname) {
             String pfx = qname.getPrefix();
-            return pfx.length() == 0 ? qname.getLocalPart() : qname.getPrefix() + ":" + qname.getLocalPart();
+            return pfx.isEmpty() ? qname.getLocalPart() : qname.getPrefix() + ":" + qname.getLocalPart();
         }
 
         @Override
diff --git a/components/camel-xj/src/main/java/org/apache/camel/component/xj/JsonXmlStreamReader.java b/components/camel-xj/src/main/java/org/apache/camel/component/xj/JsonXmlStreamReader.java
index a01a588afbf..48f32b8647b 100644
--- a/components/camel-xj/src/main/java/org/apache/camel/component/xj/JsonXmlStreamReader.java
+++ b/components/camel-xj/src/main/java/org/apache/camel/component/xj/JsonXmlStreamReader.java
@@ -539,7 +539,7 @@ public class JsonXmlStreamReader implements XMLStreamReader {
     }
 
     private String toXmlString(String input) {
-        if (input == null || input.length() == 0) {
+        if (input == null || input.isEmpty()) {
             return null;
         }
 
diff --git a/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/MessageVariableResolver.java b/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/MessageVariableResolver.java
index 62789225847..935cc90937a 100644
--- a/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/MessageVariableResolver.java
+++ b/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/MessageVariableResolver.java
@@ -56,7 +56,7 @@ public class MessageVariableResolver implements XPathVariableResolver {
         Object answer = null;
 
         Message in = exchange.get().getIn();
-        if (uri == null || uri.length() == 0) {
+        if (uri == null || uri.isEmpty()) {
             answer = variables.get(localPart);
             if (answer == null) {
                 if (in != null) {
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
index c4bcac407a8..faabeb5225d 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
@@ -240,7 +240,7 @@ public class AnnotationTypeConverterLoader implements TypeConverterLoader {
                             break;
                         }
                         line = line.trim();
-                        if (line.startsWith("#") || line.length() == 0) {
+                        if (line.startsWith("#") || line.isEmpty()) {
                             continue;
                         }
                         tokenize(packages, line);
diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
index 558f859fca9..03587e0d8ee 100644
--- a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
+++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
@@ -208,10 +208,10 @@ public class SimpleExpressionParser extends BaseSimpleParser {
         for (SimpleNode node : nodes) {
             String exp = node.createCode(expression);
             if (exp != null) {
-                if (sb.length() == 0 && node instanceof LiteralNode) {
+                if (sb.isEmpty() && node instanceof LiteralNode) {
                     firstIsLiteral = true;
                 }
-                if (sb.length() > 0) {
+                if (!sb.isEmpty()) {
                     // okay we append together and this requires that the first node to be literal
                     if (!firstIsLiteral) {
                         // then insert an empty string + to force type into string so the compiler
diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/AnnotationTransformerLoader.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/AnnotationTransformerLoader.java
index 77b23515cc8..b6056d674d5 100644
--- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/AnnotationTransformerLoader.java
+++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/AnnotationTransformerLoader.java
@@ -167,7 +167,7 @@ public class AnnotationTransformerLoader extends Transformer implements Transfor
                             break;
                         }
                         line = line.trim();
-                        if (line.startsWith("#") || line.length() == 0) {
+                        if (line.startsWith("#") || line.isEmpty()) {
                             continue;
                         }
                         packages.add(line);
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/xslt/MyEcho.java b/core/camel-core/src/test/java/org/apache/camel/component/xslt/MyEcho.java
index 02e4d0b5054..2a047c9a0b4 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/xslt/MyEcho.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/xslt/MyEcho.java
@@ -27,7 +27,7 @@ public final class MyEcho {
 
     public static String echoString(String str) {
         // throw a runtime exception
-        if (str == null || str.length() == 0) {
+        if (str == null || str.isEmpty()) {
             throw new IllegalArgumentException("Cannot take the null String.");
         }
         return str;
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/jndi/JndiContext.java b/core/camel-support/src/main/java/org/apache/camel/support/jndi/JndiContext.java
index 64dd2a98c0d..1bcfb964945 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/jndi/JndiContext.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/jndi/JndiContext.java
@@ -173,7 +173,7 @@ public class JndiContext implements Context, Serializable {
 
     @Override
     public Object lookup(String name) throws NamingException {
-        if (name.length() == 0) {
+        if (name.isEmpty()) {
             return this;
         }
         Object result = treeBindings.get(name);
diff --git a/core/camel-util/src/main/java/org/apache/camel/util/StringQuoteHelper.java b/core/camel-util/src/main/java/org/apache/camel/util/StringQuoteHelper.java
index 0860765ff74..59677acd257 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/StringQuoteHelper.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/StringQuoteHelper.java
@@ -129,7 +129,7 @@ public final class StringQuoteHelper {
             boolean last = i == input.length() - 1;
 
             if (!doubleQuoted && ch == '\'') {
-                if (singleQuoted && prev == ch && sb.length() == 0) {
+                if (singleQuoted && prev == ch && sb.isEmpty()) {
                     // its an empty quote so add empty text
                     if (keepQuotes) {
                         answer.add("''");
@@ -157,7 +157,7 @@ public final class StringQuoteHelper {
                 }
                 continue;
             } else if (!singleQuoted && ch == '"') {
-                if (doubleQuoted && prev == ch && sb.length() == 0) {
+                if (doubleQuoted && prev == ch && sb.isEmpty()) {
                     // its an empty quote so add empty text
                     if (keepQuotes) {
                         answer.add("\""); // append ending quote
@@ -167,7 +167,7 @@ public final class StringQuoteHelper {
                 }
                 // special logic needed if this quote is the end
                 if (last) {
-                    if (doubleQuoted && sb.length() > 0) {
+                    if (doubleQuoted && !sb.isEmpty()) {
                         String text = sb.toString();
                         // do not trim a quoted string
                         if (keepQuotes) {
diff --git a/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java b/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
index 6564b7255f2..e7861d0a39e 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
@@ -546,7 +546,7 @@ public final class URISupport {
      */
     public static URI createRemainingURI(URI originalURI, Map<String, Object> params) throws URISyntaxException {
         String s = createQueryString(params);
-        if (s.length() == 0) {
+        if (s.isEmpty()) {
             s = null;
         }
         return createURIWithQuery(originalURI, s);
diff --git a/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/MXParser.java b/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/MXParser.java
index 91360e9e342..dda06971504 100644
--- a/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/MXParser.java
+++ b/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/MXParser.java
@@ -922,7 +922,7 @@ public class MXParser implements XmlPullParser {
                 }
             }
         } else {
-            if (namespace != null && namespace.length() == 0) {
+            if (namespace != null && namespace.isEmpty()) {
                 namespace = null;
             }
             if (namespace != null)
@@ -2054,7 +2054,7 @@ public class MXParser implements XmlPullParser {
             ensureNamespacesCapacity(namespaceEnd);
             int prefixHash = -1;
             if (colonPos != -1) {
-                if (ns.length() == 0) {
+                if (ns.isEmpty()) {
                     throw new XmlPullParserException(
                             "non-default namespace can not be declared to be empty string", this, null);
                 }
diff --git a/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/StAX2SAXSource.java b/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/StAX2SAXSource.java
index 3bea945dc70..96704d230c0 100644
--- a/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/StAX2SAXSource.java
+++ b/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/StAX2SAXSource.java
@@ -170,7 +170,7 @@ public class StAX2SAXSource extends SAXSource implements XMLReader {
     }
 
     private String getPrefixedName(String prefix, String localName) {
-        if (prefix == null || prefix.length() == 0) {
+        if (prefix == null || prefix.isEmpty()) {
             return localName;
         }
         return prefix + ":" + localName;
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java
index 5c44caac10c..3fd5d4f09f7 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java
@@ -200,7 +200,7 @@ public class Bind extends CamelCommand {
         }
 
         // create a dummy placeholder, so it is easier to add new properties manually
-        if (sb.length() == 0) {
+        if (sb.isEmpty()) {
             sb.append("#properties:\n      #key: \"value\"");
         }
 
diff --git a/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/Strings.java b/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/Strings.java
index 6188c2ef561..b095f95b198 100644
--- a/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/Strings.java
+++ b/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/Strings.java
@@ -29,7 +29,7 @@ public final class Strings {
      * Returns true if the given text is null or empty string or has <tt>null</tt> as the value
      */
     public static boolean isNullOrEmpty(String text) {
-        return text == null || text.length() == 0 || "null".equals(text);
+        return text == null || text.isEmpty() || "null".equals(text);
     }
 
     public static String cutLastZeroDigit(String version) {
diff --git a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/Strings.java b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/Strings.java
index 27e222e5a1c..007a9c9c0f3 100644
--- a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/Strings.java
+++ b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/Strings.java
@@ -36,7 +36,7 @@ public final class Strings {
      * Returns true if the given text is null or empty string or has <tt>null</tt> as the value
      */
     public static boolean isNullOrEmpty(String text) {
-        return text == null || text.length() == 0 || "null".equals(text);
+        return text == null || text.isEmpty() || "null".equals(text);
     }
 
     public static String safeNull(String text) {
@@ -129,7 +129,7 @@ public final class Strings {
         StringBuilder sb = new StringBuilder();
         for (char c : name.toCharArray()) {
             boolean upper = Character.isUpperCase(c);
-            boolean first = sb.length() == 0;
+            boolean first = sb.isEmpty();
             if (first) {
                 sb.append(Character.toUpperCase(c));
             } else if (upper) {
@@ -180,7 +180,7 @@ public final class Strings {
                 sb.append(Character.toUpperCase(c));
             } else {
                 // upper case first
-                if (sb.length() == 0) {
+                if (sb.isEmpty()) {
                     sb.append(Character.toUpperCase(c));
                 } else {
                     sb.append(c);
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriFactoryGenerator.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriFactoryGenerator.java
index 618bf31bc24..17f6067f68d 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriFactoryGenerator.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriFactoryGenerator.java
@@ -216,7 +216,7 @@ public final class EndpointUriFactoryGenerator {
             sb.append(sj);
             sb.append("}");
         }
-        if (sb.length() == 0) {
+        if (sb.isEmpty()) {
             return null;
         }
         return sb.toString();
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
index cacfd6383c5..d790d61b0ed 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
@@ -496,7 +496,7 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo {
             // find manual attributes
             Map<String, String> manualAttributes = new LinkedHashMap<>();
             for (String line : lines) {
-                if (!RELOCATE_MANUAL_ATTRIBUTES && line.length() == 0) {
+                if (!RELOCATE_MANUAL_ATTRIBUTES && line.isEmpty()) {
                     break;
                 }
                 for (Pattern attrName : MANUAL_ATTRIBUTES) {
diff --git a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslGenerator.java b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslGenerator.java
index ae99a3a809b..d03233897ce 100644
--- a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslGenerator.java
+++ b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslGenerator.java
@@ -210,7 +210,7 @@ public abstract class RestDslGenerator<G> {
     }
 
     private static String prepareBasePath(String basePath) {
-        if (basePath == null || basePath.length() == 0) {
+        if (basePath == null || basePath.isEmpty()) {
             return "";
         }