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 4aecb6b589a (chores) camel-core: prefer emptiness checks instead of
length checks
4aecb6b589a is described below
commit 4aecb6b589a2c431dea384b315b3fb2f3dd39d0b
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Wed Sep 27 15:45:45 2023 +0200
(chores) camel-core: prefer emptiness checks instead of length checks
---
.../apache/camel/impl/converter/AnnotationTypeConverterLoader.java | 2 +-
.../org/apache/camel/impl/scan/AssignableToPackageScanFilter.java | 2 +-
.../main/java/org/apache/camel/impl/console/RouteDevConsole.java | 2 +-
.../java/org/apache/camel/impl/console/RouteDumpDevConsole.java | 2 +-
.../src/main/java/org/apache/camel/impl/console/TopDevConsole.java | 6 +++---
.../java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java | 2 +-
.../main/java/org/apache/camel/language/simple/SimpleTokenizer.java | 2 +-
.../apache/camel/language/simple/ast/SimpleFunctionExpression.java | 4 ++--
.../src/main/java/org/apache/camel/builder/ExchangeBuilder.java | 2 +-
.../src/main/java/org/apache/camel/builder/NotifyBuilder.java | 4 ++--
.../src/main/java/org/apache/camel/support/DefaultComponent.java | 4 ++--
.../main/java/org/apache/camel/support/PropertyBindingSupport.java | 2 +-
.../main/java/org/apache/camel/support/ScheduledPollConsumer.java | 2 +-
.../java/org/apache/camel/support/builder/ExpressionBuilder.java | 2 +-
.../src/main/java/org/apache/camel/support/jndi/JndiContext.java | 2 +-
.../src/main/java/org/apache/camel/util/AntPathMatcher.java | 2 +-
core/camel-util/src/main/java/org/apache/camel/util/OgnlHelper.java | 2 +-
core/camel-util/src/main/java/org/apache/camel/util/URIScanner.java | 2 +-
core/camel-util/src/main/java/org/apache/camel/util/URISupport.java | 4 ++--
.../src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java | 6 +++---
.../org/apache/camel/support/builder/xml/XMLConverterHelper.java | 2 +-
.../main/java/org/apache/camel/util/xml/XmlLineNumberParser.java | 2 +-
22 files changed, 30 insertions(+), 30 deletions(-)
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 3f9cc8ecb83..34b026ee6e0 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
@@ -259,7 +259,7 @@ public class AnnotationTypeConverterLoader implements
TypeConverterLoader {
StringTokenizer iter = new StringTokenizer(line, ",");
while (iter.hasMoreTokens()) {
String name = iter.nextToken().trim();
- if (name.length() > 0) {
+ if (!name.isEmpty()) {
packages.add(name);
}
}
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/scan/AssignableToPackageScanFilter.java
b/core/camel-base/src/main/java/org/apache/camel/impl/scan/AssignableToPackageScanFilter.java
index 79457e909f2..52deb837c8c 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/scan/AssignableToPackageScanFilter.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/scan/AssignableToPackageScanFilter.java
@@ -78,7 +78,7 @@ public class AssignableToPackageScanFilter implements
PackageScanFilter {
for (Class<?> parent : parents) {
sb.append(parent.getSimpleName()).append(", ");
}
- sb.setLength(sb.length() > 0 ? sb.length() - 2 : 0);
+ sb.setLength(!sb.isEmpty() ? sb.length() - 2 : 0);
return "is assignable to any of " + sb;
}
}
diff --git
a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
index 8e465acf4d3..31f2607b583 100644
---
a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
+++
b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
@@ -65,7 +65,7 @@ public class RouteDevConsole extends AbstractDevConsole {
final boolean processors =
"true".equals(options.getOrDefault(PROCESSORS, "false"));
final StringBuilder sb = new StringBuilder();
Function<ManagedRouteMBean, Object> task = mrb -> {
- if (sb.length() > 0) {
+ if (!sb.isEmpty()) {
sb.append("\n");
}
sb.append(String.format(" Id: %s", mrb.getRouteId()));
diff --git
a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDumpDevConsole.java
b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDumpDevConsole.java
index 71ebdb7d26d..659f388c439 100644
---
a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDumpDevConsole.java
+++
b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDumpDevConsole.java
@@ -80,7 +80,7 @@ public class RouteDumpDevConsole extends AbstractDevConsole {
if (mrb.getSourceLocation() != null) {
sb.append(String.format("\n Source: %s",
mrb.getSourceLocation()));
}
- if (dump != null && dump.length() > 0) {
+ if (dump != null && !dump.isEmpty()) {
sb.append("\n\n");
for (String line : dump.split("\n")) {
sb.append(" ").append(line).append("\n");
diff --git
a/core/camel-console/src/main/java/org/apache/camel/impl/console/TopDevConsole.java
b/core/camel-console/src/main/java/org/apache/camel/impl/console/TopDevConsole.java
index dc38fd77d30..995c25a952a 100644
---
a/core/camel-console/src/main/java/org/apache/camel/impl/console/TopDevConsole.java
+++
b/core/camel-console/src/main/java/org/apache/camel/impl/console/TopDevConsole.java
@@ -71,7 +71,7 @@ public class TopDevConsole extends AbstractDevConsole {
if (mcc != null) {
if (subPath == null || subPath.isBlank()) {
Function<ManagedRouteMBean, Object> task = mrb -> {
- if (sb.length() > 0) {
+ if (!sb.isEmpty()) {
sb.append("\n");
}
sb.append(String.format(" Route Id: %s",
mrb.getRouteId()));
@@ -97,7 +97,7 @@ public class TopDevConsole extends AbstractDevConsole {
topRoutes(filter, max, mcc, task);
} else {
Function<ManagedProcessorMBean, Object> task = mpb -> {
- if (sb.length() > 0) {
+ if (!sb.isEmpty()) {
sb.append("\n");
}
sb.append(String.format(" Route Id: %s",
mpb.getRouteId()));
@@ -131,7 +131,7 @@ public class TopDevConsole extends AbstractDevConsole {
}
if (loc != null) {
sb.append(String.format("\n Source: %s", loc));
- if (code.length() > 0) {
+ if (!code.isEmpty()) {
sb.append(code);
}
}
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 2061558b099..e9a316cfc81 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
@@ -1025,7 +1025,7 @@ public abstract class AbstractCamelCatalog {
}
}
// anything left over?
- if (current.length() > 0) {
+ if (!current.isEmpty()) {
tokens.add(current.toString());
}
}
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
index 7cb4d40aede..bd31095a183 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
@@ -179,7 +179,7 @@ public final class SimpleTokenizer {
continue;
}
}
- if (sb.length() > 0) {
+ if (!sb.isEmpty()) {
return new SimpleToken(new
SimpleTokenType(TokenType.numericValue, sb.toString()), index);
}
}
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
index 4f2f27d8552..20995e04116 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
@@ -609,7 +609,7 @@ public class SimpleFunctionExpression extends
LiteralExpression {
private String ifStartsWithReturnRemainder(String prefix, String text) {
if (text.startsWith(prefix)) {
String remainder = text.substring(prefix.length());
- if (remainder.length() > 0) {
+ if (!remainder.isEmpty()) {
return remainder;
}
}
@@ -1495,7 +1495,7 @@ public class SimpleFunctionExpression extends
LiteralExpression {
}
}
- if (sb.length() > 0) {
+ if (!sb.isEmpty()) {
return sb.toString();
} else {
return remainder;
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/ExchangeBuilder.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/ExchangeBuilder.java
index 792d550acf5..8bc2252e105 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/builder/ExchangeBuilder.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/ExchangeBuilder.java
@@ -111,7 +111,7 @@ public final class ExchangeBuilder {
exchange.getMessage().setBody(body);
- if (headers.size() > 0) {
+ if (!headers.isEmpty()) {
exchange.getMessage().setHeaders(headers);
}
// setup the properties on the exchange
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/NotifyBuilder.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/NotifyBuilder.java
index 687db9c34a0..04e1267623d 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/builder/NotifyBuilder.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/NotifyBuilder.java
@@ -1271,7 +1271,7 @@ public class NotifyBuilder {
public String toString() {
StringBuilder sb = new StringBuilder();
for (EventPredicateHolder eventPredicateHolder : predicates) {
- if (sb.length() > 0) {
+ if (!sb.isEmpty()) {
sb.append(".");
}
sb.append(eventPredicateHolder.toString());
@@ -1644,7 +1644,7 @@ public class NotifyBuilder {
public String toString() {
StringBuilder sb = new StringBuilder();
for (EventPredicate eventPredicate : predicates) {
- if (sb.length() > 0) {
+ if (!sb.isEmpty()) {
sb.append(".");
}
sb.append(eventPredicate.toString());
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 cc220905c77..6e7b52ff956 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
@@ -291,7 +291,7 @@ public abstract class DefaultComponent extends
ServiceSupport implements Compone
param = PropertiesHelper.extractProperties(parameters,
optionPrefix);
}
- if (param.size() > 0) {
+ if (!param.isEmpty()) {
throw new ResolveEndpointFailedException(
uri, "There are " + param.size()
+ " parameters that couldn't be set on the endpoint."
@@ -673,7 +673,7 @@ public abstract class DefaultComponent extends
ServiceSupport implements Compone
protected String ifStartsWithReturnRemainder(String prefix, String text) {
if (text.startsWith(prefix)) {
String remainder = text.substring(prefix.length());
- if (remainder.length() > 0) {
+ if (!remainder.isEmpty()) {
return remainder;
}
}
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 c8153a261fe..d93c9a845fd 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
@@ -1686,7 +1686,7 @@ public final class PropertyBindingSupport {
sb.append(ch);
}
}
- if (sb.length() > 0) {
+ if (!sb.isEmpty()) {
parts.add(sb.toString());
}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java
b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java
index ff24dfffa8f..0daad35354a 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java
@@ -611,7 +611,7 @@ public abstract class ScheduledPollConsumer extends
DefaultConsumer
PropertyBindingSupport.build().bind(getEndpoint().getCamelContext(), scheduler,
"triggerParameters",
triggerParameters);
PropertyBindingSupport.build().bind(getEndpoint().getCamelContext(), scheduler,
"jobParameters", jobParameters);
- if (copy.size() > 0) {
+ if (!copy.isEmpty()) {
throw new FailedToCreateConsumerException(
getEndpoint(), "There are " + copy.size()
+ " scheduler parameters that couldn't
be set on the endpoint."
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
b/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
index 6b8828b5561..115199271c5 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
@@ -1452,7 +1452,7 @@ public class ExpressionBuilder {
if (o != null) {
String s = converter.tryConvertTo(String.class,
exchange, o);
if (s != null) {
- if (sb.length() > 0) {
+ if (!sb.isEmpty()) {
sb.append(separator);
}
if (prefix != null) {
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 9f1f4e2ce55..9811292e05d 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
@@ -224,7 +224,7 @@ public class JndiContext implements Context, Serializable {
}
if (result instanceof JndiContext) {
String prefix = getNameInNamespace();
- if (prefix.length() > 0) {
+ if (!prefix.isEmpty()) {
prefix = prefix + SEPARATOR;
}
result = new JndiContext((JndiContext) result, environment, prefix
+ name);
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/AntPathMatcher.java
b/core/camel-util/src/main/java/org/apache/camel/util/AntPathMatcher.java
index affea538374..47fa914446f 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/AntPathMatcher.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/AntPathMatcher.java
@@ -454,7 +454,7 @@ public class AntPathMatcher {
while (st.hasMoreTokens()) {
String token = st.nextToken();
token = token.trim();
- if (token.length() > 0) {
+ if (!token.isEmpty()) {
tokens.add(token);
}
}
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/OgnlHelper.java
b/core/camel-util/src/main/java/org/apache/camel/util/OgnlHelper.java
index c1376b54450..76bce3eaa2f 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/OgnlHelper.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/OgnlHelper.java
@@ -272,7 +272,7 @@ public final class OgnlHelper {
}
// add remainder in buffer when reached end of data
- if (sb.length() > 0) {
+ if (!sb.isEmpty()) {
methods.add(sb.toString());
}
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/URIScanner.java
b/core/camel-util/src/main/java/org/apache/camel/util/URIScanner.java
index 9753dda63fe..b53cef0158d 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/URIScanner.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/URIScanner.java
@@ -117,7 +117,7 @@ class URIScanner {
}
// any left over parameters, then add that
- if (key.length() > 0) {
+ if (!key.isEmpty()) {
addParameter(answer, useRaw || isRaw);
}
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 e7861d0a39e..4e2da8fff68 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
@@ -484,7 +484,7 @@ public final class URISupport {
*/
@Deprecated
public static String createQueryString(Map<String, String> options, String
ampersand, boolean encode) {
- if (options.size() > 0) {
+ if (!options.isEmpty()) {
StringBuilder rc = new StringBuilder();
boolean first = true;
for (String key : options.keySet()) {
@@ -873,7 +873,7 @@ public final class URISupport {
public static String buildMultiValueQuery(String key, Iterable<Object>
values) {
StringBuilder sb = new StringBuilder();
for (Object v : values) {
- if (sb.length() > 0) {
+ if (!sb.isEmpty()) {
sb.append("&");
}
sb.append(key);
diff --git
a/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
index d91a9cc4e14..f2b8ad063dc 100644
---
a/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
+++
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
@@ -234,7 +234,7 @@ public class XmlConverter {
// check the camelContext properties first
Properties properties
=
CamelContextHelper.getCamelPropertiesWithPrefix(OUTPUT_PROPERTIES_PREFIX,
exchange.getContext());
- if (properties.size() > 0) {
+ if (!properties.isEmpty()) {
toResult(source, new StreamResult(buffer), properties);
return buffer.toString();
}
@@ -258,7 +258,7 @@ public class XmlConverter {
// check the camelContext properties first
Properties properties =
CamelContextHelper.getCamelPropertiesWithPrefix(OUTPUT_PROPERTIES_PREFIX,
exchange.getContext());
- if (properties.size() > 0) {
+ if (!properties.isEmpty()) {
toResult(source, new StreamResult(buffer), properties);
return buffer.toByteArray();
}
@@ -942,7 +942,7 @@ public class XmlConverter {
StringBuilder featureString = new StringBuilder();
// just log the configured feature
for (String feature : features) {
- if (featureString.length() != 0) {
+ if (!featureString.isEmpty()) {
featureString.append(", ");
}
featureString.append(feature);
diff --git
a/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/XMLConverterHelper.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/XMLConverterHelper.java
index 399b135910a..4405d7608ba 100644
---
a/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/XMLConverterHelper.java
+++
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/XMLConverterHelper.java
@@ -312,7 +312,7 @@ public class XMLConverterHelper {
StringBuilder featureString = new StringBuilder();
// just log the configured feature
for (String feature : features) {
- if (featureString.length() != 0) {
+ if (!featureString.isEmpty()) {
featureString.append(", ");
}
featureString.append(feature);
diff --git
a/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/XmlLineNumberParser.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/XmlLineNumberParser.java
index 9d5aa0b43a6..3336c1066e2 100644
---
a/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/XmlLineNumberParser.java
+++
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/XmlLineNumberParser.java
@@ -232,7 +232,7 @@ public final class XmlLineNumberParser {
// Outputs text accumulated under the current node
private void addTextIfNeeded() {
- if (textBuffer.length() > 0) {
+ if (!textBuffer.isEmpty()) {
final Element el = elementStack.isEmpty() ? null :
elementStack.peek();
if (el != null) {
final Node textNode =
doc.createTextNode(textBuffer.toString());
