You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/01/20 11:04:47 UTC
[camel] 01/03: Fix "Boxed variable is never null" warnings reported
by lgtm.com.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 73a7ef7b74b41bcc4d8bb7f41b915ede5f84f6a2
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Sun Jan 19 11:24:00 2020 +0100
Fix "Boxed variable is never null" warnings reported by lgtm.com.
---
.../apache/camel/parser/helper/CamelJavaParserHelper.java | 12 ++++++------
.../camel/parser/helper/CamelJavaRestDslParserHelper.java | 12 ++++++------
.../camel/parser/helper/CamelJavaTreeParserHelper.java | 12 ++++++------
.../camel/cdi/transaction/TransactionErrorHandler.java | 6 ++----
.../org/apache/camel/spring/spi/TransactionErrorHandler.java | 3 +--
.../org/apache/camel/management/mbean/ManagedChoice.java | 4 ++--
.../camel/management/mbean/ManagedPerformanceCounter.java | 6 ++----
.../management/mbean/ManagedRuntimeEndpointRegistry.java | 4 ++--
8 files changed, 27 insertions(+), 32 deletions(-)
diff --git a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaParserHelper.java b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaParserHelper.java
index c69f8a0..fe830ef 100644
--- a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaParserHelper.java
+++ b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaParserHelper.java
@@ -681,9 +681,9 @@ public final class CamelJavaParserHelper {
// if numeric then we plus the values, otherwise we string concat
boolean numeric = isNumericOperator(clazz, block, ie.getLeftOperand()) && isNumericOperator(clazz, block, ie.getRightOperand());
if (numeric) {
- Long num1 = val1 != null ? Long.valueOf(val1) : 0;
- Long num2 = val2 != null ? Long.valueOf(val2) : 0;
- answer = "" + (num1 + num2);
+ long num1 = val1 != null ? Long.parseLong(val1) : 0;
+ long num2 = val2 != null ? Long.parseLong(val2) : 0;
+ answer = Long.toString(num1 + num2);
} else {
answer = (val1 != null ? val1 : "") + (val2 != null ? val2 : "");
}
@@ -695,9 +695,9 @@ public final class CamelJavaParserHelper {
for (Object ext : extended) {
String val3 = getLiteralValue(clazz, block, (Expression) ext);
if (numeric) {
- Long num3 = val3 != null ? Long.valueOf(val3) : 0;
- Long num = Long.valueOf(answer);
- answer = "" + (num + num3);
+ long num3 = val3 != null ? Long.parseLong(val3) : 0;
+ long num = Long.parseLong(answer);
+ answer = Long.toString(num + num3);
} else {
answer += val3 != null ? val3 : "";
}
diff --git a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaRestDslParserHelper.java b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaRestDslParserHelper.java
index da6658f..1504be6 100644
--- a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaRestDslParserHelper.java
+++ b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaRestDslParserHelper.java
@@ -609,9 +609,9 @@ public final class CamelJavaRestDslParserHelper {
// if numeric then we plus the values, otherwise we string concat
boolean numeric = isNumericOperator(clazz, block, ie.getLeftOperand()) && isNumericOperator(clazz, block, ie.getRightOperand());
if (numeric) {
- Long num1 = val1 != null ? Long.valueOf(val1) : 0;
- Long num2 = val2 != null ? Long.valueOf(val2) : 0;
- answer = "" + (num1 + num2);
+ long num1 = val1 != null ? Long.parseLong(val1) : 0;
+ long num2 = val2 != null ? Long.parseLong(val2) : 0;
+ answer = Long.toString(num1 + num2);
} else {
answer = (val1 != null ? val1 : "") + (val2 != null ? val2 : "");
}
@@ -623,9 +623,9 @@ public final class CamelJavaRestDslParserHelper {
for (Object ext : extended) {
String val3 = getLiteralValue(clazz, block, (Expression) ext);
if (numeric) {
- Long num3 = val3 != null ? Long.valueOf(val3) : 0;
- Long num = Long.valueOf(answer);
- answer = "" + (num + num3);
+ long num3 = val3 != null ? Long.parseLong(val3) : 0;
+ long num = Long.parseLong(answer);
+ answer = Long.toString(num + num3);
} else {
answer += val3 != null ? val3 : "";
}
diff --git a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaTreeParserHelper.java b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaTreeParserHelper.java
index deb3c4b..fe936fe 100644
--- a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaTreeParserHelper.java
+++ b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaTreeParserHelper.java
@@ -455,9 +455,9 @@ public final class CamelJavaTreeParserHelper {
// if numeric then we plus the values, otherwise we string concat
boolean numeric = isNumericOperator(clazz, block, ie.getLeftOperand()) && isNumericOperator(clazz, block, ie.getRightOperand());
if (numeric) {
- Long num1 = val1 != null ? Long.valueOf(val1) : 0;
- Long num2 = val2 != null ? Long.valueOf(val2) : 0;
- answer = "" + (num1 + num2);
+ long num1 = val1 != null ? Long.parseLong(val1) : 0;
+ long num2 = val2 != null ? Long.parseLong(val2) : 0;
+ answer = Long.toString(num1 + num2);
} else {
answer = (val1 != null ? val1 : "") + (val2 != null ? val2 : "");
}
@@ -469,9 +469,9 @@ public final class CamelJavaTreeParserHelper {
for (Object ext : extended) {
String val3 = getLiteralValue(clazz, block, (Expression) ext);
if (numeric) {
- Long num3 = val3 != null ? Long.valueOf(val3) : 0;
- Long num = Long.valueOf(answer);
- answer = "" + (num + num3);
+ long num3 = val3 != null ? Long.parseLong(val3) : 0;
+ long num = Long.parseLong(answer);
+ answer = Long.toString(num + num3);
} else {
answer += val3 != null ? val3 : "";
}
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionErrorHandler.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionErrorHandler.java
index af9e0ce..47751ce 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionErrorHandler.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionErrorHandler.java
@@ -128,10 +128,8 @@ public class TransactionErrorHandler extends ErrorHandlerSupport
}
protected void processInTransaction(final Exchange exchange) throws Exception {
- // is the exchange redelivered, for example JMS brokers support such
- // details
- Boolean externalRedelivered = exchange.isExternalRedelivered();
- final String redelivered = externalRedelivered != null ? externalRedelivered.toString() : "unknown";
+ // is the exchange redelivered, for example JMS brokers support such details
+ final String redelivered = Boolean.toString(exchange.isExternalRedelivered());
final String ids = ExchangeHelper.logIds(exchange);
try {
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
index 99b3d04..eb30ff7 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
@@ -125,8 +125,7 @@ public class TransactionErrorHandler extends RedeliveryErrorHandler {
protected void processInTransaction(final Exchange exchange) {
// is the exchange redelivered, for example JMS brokers support such details
- Boolean externalRedelivered = exchange.isExternalRedelivered();
- final String redelivered = externalRedelivered != null ? externalRedelivered.toString() : "unknown";
+ final String redelivered = Boolean.toString(exchange.isExternalRedelivered());
final String ids = ExchangeHelper.logIds(exchange);
try {
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedChoice.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedChoice.java
index d84eef9..db40fc7 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedChoice.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedChoice.java
@@ -75,7 +75,7 @@ public class ManagedChoice extends ManagedProcessor implements ManagedChoiceMBea
CompositeType ct = CamelOpenMBeanTypes.choiceCompositeType();
String predicate = when.getExpression().getExpression();
String language = when.getExpression().getLanguage();
- Long matches = filter.getFilteredCount();
+ long matches = filter.getFilteredCount();
CompositeData data = new CompositeDataSupport(ct,
new String[]{"predicate", "language", "matches"},
@@ -86,7 +86,7 @@ public class ManagedChoice extends ManagedProcessor implements ManagedChoiceMBea
CompositeType ct = CamelOpenMBeanTypes.choiceCompositeType();
String predicate = "otherwise";
String language = "";
- Long matches = processor.getNotFilteredCount();
+ long matches = processor.getNotFilteredCount();
CompositeData data = new CompositeDataSupport(ct,
new String[]{"predicate", "language", "matches"},
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedPerformanceCounter.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedPerformanceCounter.java
index c575f07..3f09c51 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedPerformanceCounter.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedPerformanceCounter.java
@@ -230,8 +230,7 @@ public abstract class ManagedPerformanceCounter extends ManagedCounter implement
if (ExchangeHelper.isFailureHandled(exchange)) {
failuresHandled.increment();
}
- Boolean externalRedelivered = exchange.isExternalRedelivered();
- if (externalRedelivered != null && externalRedelivered) {
+ if (exchange.isExternalRedelivered()) {
externalRedeliveries.increment();
}
@@ -270,8 +269,7 @@ public abstract class ManagedPerformanceCounter extends ManagedCounter implement
if (ExchangeHelper.isRedelivered(exchange)) {
redeliveries.increment();
}
- Boolean externalRedelivered = exchange.isExternalRedelivered();
- if (externalRedelivered != null && externalRedelivered) {
+ if (exchange.isExternalRedelivered()) {
externalRedeliveries.increment();
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRuntimeEndpointRegistry.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRuntimeEndpointRegistry.java
index 50013af..6e0d6c2 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRuntimeEndpointRegistry.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRuntimeEndpointRegistry.java
@@ -103,8 +103,8 @@ public class ManagedRuntimeEndpointRegistry extends ManagedService implements Ma
CompositeType ct = CamelOpenMBeanTypes.listRuntimeEndpointsCompositeType();
String url = stat.getUri();
- Boolean isStatic = staticRegistry.isStatic(url);
- Boolean isDynamic = staticRegistry.isDynamic(url);
+ boolean isStatic = staticRegistry.isStatic(url);
+ boolean isDynamic = staticRegistry.isDynamic(url);
if (sanitize) {
url = URISupport.sanitizeUri(url);
}