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/05/16 15:19:47 UTC
[camel] branch main updated: (chores) camel-core: removed unnecessary explicit calls to toString
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 1e16a10e94b (chores) camel-core: removed unnecessary explicit calls to toString
1e16a10e94b is described below
commit 1e16a10e94b54d02bfc6e2d6a4de82c380d10776
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Tue May 16 15:39:38 2023 +0200
(chores) camel-core: removed unnecessary explicit calls to toString
---
.../camel/language/simple/ast/SimpleFunctionExpression.java | 4 ++--
.../model/cloud/ServiceCallExpressionConfiguration.java | 2 +-
.../model/cloud/ServiceCallServiceChooserConfiguration.java | 2 +-
.../cloud/ServiceCallServiceDiscoveryConfiguration.java | 2 +-
.../model/cloud/ServiceCallServiceFilterConfiguration.java | 2 +-
.../cloud/ServiceCallServiceLoadBalancerConfiguration.java | 2 +-
.../camel/component/file/FileMoveAndMoveFailedIssueTest.java | 3 ++-
.../converter/myconverter/MyFallbackPromoteConverter.java | 2 +-
.../processor/aggregator/StringAggregationStrategyTest.java | 12 ++++++------
.../issues/DynamicRouterConvertBodyToIssueManualTest.java | 2 +-
.../main/java/org/apache/camel/support/DefaultEndpoint.java | 2 +-
.../org/apache/camel/support/component/ApiMethodHelper.java | 2 +-
12 files changed, 19 insertions(+), 18 deletions(-)
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 c30eef47c8b..5c590fa1438 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
@@ -775,9 +775,9 @@ public class SimpleFunctionExpression extends LiteralExpression {
}
ref = ref.trim();
if (method != null && scope != null) {
- return "bean(exchange, bean, \"" + ref + "\", \"" + method.toString() + "\", \"" + scope.toString() + "\")";
+ return "bean(exchange, bean, \"" + ref + "\", \"" + method + "\", \"" + scope + "\")";
} else if (method != null) {
- return "bean(exchange, bean, \"" + ref + "\", \"" + method.toString() + "\", null)";
+ return "bean(exchange, bean, \"" + ref + "\", \"" + method + "\", null)";
} else {
return "bean(exchange, bean, \"" + ref + "\", null, null)";
}
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java
index 9bc364333fb..69378a4ee8c 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java
@@ -204,7 +204,7 @@ public class ServiceCallExpressionConfiguration extends ServiceCallConfiguration
v = camelContext.resolvePropertyPlaceholders((String) v);
} catch (Exception e) {
throw new IllegalArgumentException(
- String.format("Exception while resolving %s (%s)", k, v.toString()), e);
+ String.format("Exception while resolving %s (%s)", k, v), e);
}
}
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceChooserConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceChooserConfiguration.java
index ad2b46e9dc4..4fcd063abed 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceChooserConfiguration.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceChooserConfiguration.java
@@ -118,7 +118,7 @@ public class ServiceCallServiceChooserConfiguration extends ServiceCallConfigura
v = camelContext.resolvePropertyPlaceholders((String) v);
} catch (Exception e) {
throw new IllegalArgumentException(
- String.format("Exception while resolving %s (%s)", k, v.toString()), e);
+ String.format("Exception while resolving %s (%s)", k, v), e);
}
}
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java
index 8a811af50d0..93266badf8b 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java
@@ -119,7 +119,7 @@ public class ServiceCallServiceDiscoveryConfiguration extends ServiceCallConfigu
v = camelContext.resolvePropertyPlaceholders((String) v);
} catch (Exception e) {
throw new IllegalArgumentException(
- String.format("Exception while resolving %s (%s)", k, v.toString()), e);
+ String.format("Exception while resolving %s (%s)", k, v), e);
}
}
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceFilterConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceFilterConfiguration.java
index 5dacc754399..777e4a29c36 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceFilterConfiguration.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceFilterConfiguration.java
@@ -124,7 +124,7 @@ public class ServiceCallServiceFilterConfiguration extends ServiceCallConfigurat
v = camelContext.resolvePropertyPlaceholders((String) v);
} catch (Exception e) {
throw new IllegalArgumentException(
- String.format("Exception while resolving %s (%s)", k, v.toString()), e);
+ String.format("Exception while resolving %s (%s)", k, v), e);
}
}
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java
index 59580be948b..9096dfa85f8 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java
@@ -125,7 +125,7 @@ public class ServiceCallServiceLoadBalancerConfiguration extends ServiceCallConf
v = camelContext.resolvePropertyPlaceholders((String) v);
} catch (Exception e) {
throw new IllegalArgumentException(
- String.format("Exception while resolving %s (%s)", k, v.toString()), e);
+ String.format("Exception while resolving %s (%s)", k, v), e);
}
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileMoveAndMoveFailedIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileMoveAndMoveFailedIssueTest.java
index 68e5724d70c..167a563e705 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileMoveAndMoveFailedIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileMoveAndMoveFailedIssueTest.java
@@ -48,7 +48,8 @@ public class FileMoveAndMoveFailedIssueTest extends ContextTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("file://" + testDirectory().toAbsolutePath().toString() + "/input?move=${file:parent}.bak/somedate/${file:onlyname}&moveFailed=${file:parent}.err/somedate/${file:onlyname}&initialDelay=0&delay=10")
+ fromF("file://%s/input?move=${file:parent}.bak/somedate/${file:onlyname}&moveFailed=${file:parent}.err/somedate/${file:onlyname}&initialDelay=0&delay=10",
+ testDirectory().toAbsolutePath())
.convertBodyTo(String.class)
.filter(body().contains("Kaboom"))
.throwException(new IllegalArgumentException("Forced"))
diff --git a/core/camel-core/src/test/java/org/apache/camel/converter/myconverter/MyFallbackPromoteConverter.java b/core/camel-core/src/test/java/org/apache/camel/converter/myconverter/MyFallbackPromoteConverter.java
index f4037ab4b0c..200b4d6e7c4 100644
--- a/core/camel-core/src/test/java/org/apache/camel/converter/myconverter/MyFallbackPromoteConverter.java
+++ b/core/camel-core/src/test/java/org/apache/camel/converter/myconverter/MyFallbackPromoteConverter.java
@@ -27,7 +27,7 @@ public class MyFallbackPromoteConverter {
@Converter(fallback = true, fallbackCanPromote = true)
public Object convertTo(Class<?> type, Exchange exchange, Object value, TypeConverterRegistry registry) {
if (MyCoolBean.class.isAssignableFrom(value.getClass())) {
- return "This is cool: " + value.toString();
+ return "This is cool: " + value;
}
return null;
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/StringAggregationStrategyTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/StringAggregationStrategyTest.java
index 7320d6f8901..ca9f45584fe 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/StringAggregationStrategyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/StringAggregationStrategyTest.java
@@ -29,13 +29,13 @@ public class StringAggregationStrategyTest extends ContextTestSupport {
Object objectBody = new Object();
Object objectHeader = new Object();
- getMockEndpoint("mock:aggregatedBody").expectedBodiesReceived("bodyAbodyB" + objectBody.toString());
- getMockEndpoint("mock:aggregatedBodyComma").expectedBodiesReceived("bodyA, bodyB, " + objectBody.toString());
- getMockEndpoint("mock:aggregatedBodyLines").expectedBodiesReceived("bodyA\nbodyB\n" + objectBody.toString());
+ getMockEndpoint("mock:aggregatedBody").expectedBodiesReceived("bodyAbodyB" + objectBody);
+ getMockEndpoint("mock:aggregatedBodyComma").expectedBodiesReceived("bodyA, bodyB, " + objectBody);
+ getMockEndpoint("mock:aggregatedBodyLines").expectedBodiesReceived("bodyA\nbodyB\n" + objectBody);
- getMockEndpoint("mock:aggregatedHeader").expectedBodiesReceived("headerAheaderB" + objectHeader.toString());
- getMockEndpoint("mock:aggregatedHeaderComma").expectedBodiesReceived("headerA, headerB, " + objectHeader.toString());
- getMockEndpoint("mock:aggregatedHeaderLines").expectedBodiesReceived("headerA\nheaderB\n" + objectHeader.toString());
+ getMockEndpoint("mock:aggregatedHeader").expectedBodiesReceived("headerAheaderB" + objectHeader);
+ getMockEndpoint("mock:aggregatedHeaderComma").expectedBodiesReceived("headerA, headerB, " + objectHeader);
+ getMockEndpoint("mock:aggregatedHeaderLines").expectedBodiesReceived("headerA\nheaderB\n" + objectHeader);
template.sendBodyAndHeader("direct:start", "bodyA", "header", "headerA");
template.sendBodyAndHeader("direct:start", "bodyB", "header", "headerB");
diff --git a/core/camel-management/src/test/java/org/apache/camel/issues/DynamicRouterConvertBodyToIssueManualTest.java b/core/camel-management/src/test/java/org/apache/camel/issues/DynamicRouterConvertBodyToIssueManualTest.java
index 43de4f51c4e..299259f87fa 100644
--- a/core/camel-management/src/test/java/org/apache/camel/issues/DynamicRouterConvertBodyToIssueManualTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/issues/DynamicRouterConvertBodyToIssueManualTest.java
@@ -68,7 +68,7 @@ public class DynamicRouterConvertBodyToIssueManualTest extends ContextTestSuppor
exchange.setProperty("EXIT", "NO");
StringBuilder sb = new StringBuilder();
for (int i = 0; i < 10000; i++) {
- sb.append(UUID.randomUUID().toString());
+ sb.append(UUID.randomUUID());
}
exchange.getIn().setBody(sb);
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultEndpoint.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultEndpoint.java
index f3cee0af263..2c4a4370684 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultEndpoint.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultEndpoint.java
@@ -516,7 +516,7 @@ public abstract class DefaultEndpoint extends ServiceSupport implements Endpoint
if (LOG.isDebugEnabled()) {
LOG.debug(
"Autowired property: {} on endpoint: {} as exactly one instance of type: {} ({}) found in the registry",
- name, toString(), type.getName(), value.getClass().getName());
+ name, this, type.getName(), value.getClass().getName());
}
}
}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/component/ApiMethodHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/component/ApiMethodHelper.java
index 1f9162e6b73..e20abf00b62 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/component/ApiMethodHelper.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/component/ApiMethodHelper.java
@@ -165,7 +165,7 @@ public final class ApiMethodHelper<T extends Enum<T> & ApiMethod> {
if (!tmpValidArguments.keySet().containsAll(this.nullableArguments)) {
List<String> unknowns = new ArrayList<>(this.nullableArguments);
unknowns.removeAll(tmpValidArguments.keySet());
- throw new IllegalArgumentException("Unknown nullable arguments " + unknowns.toString());
+ throw new IllegalArgumentException("Unknown nullable arguments " + unknowns);
}
// validate aliases