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 6a42f1045a1 (chores) Fix StringBuilder append misuses
6a42f1045a1 is described below
commit 6a42f1045a18aada122726f413815b52159ecb97
Author: Otavio R. Piske <[email protected]>
AuthorDate: Sat Aug 24 10:12:21 2024 +0200
(chores) Fix StringBuilder append misuses
Signed-off-by: Otavio R. Piske <[email protected]>
---
.../bindy/model/fix/complex/onetomany/Order.java | 11 ++-
.../camel/component/exec/ExecEndpointTest.java | 8 +-
.../exec/ExecJavaProcessRecipientListTest.java | 2 +-
.../camel/component/exec/ExecJavaProcessTest.java | 2 +-
.../camel/component/exec/ExecScriptTest.java | 2 +-
.../exec/impl/ExecDocumentationExamplesTest.java | 4 +-
.../camel/component/snmp/SnmpConverters.java | 2 +-
.../DefaultManagementObjectNameStrategy.java | 96 +++++++++++-----------
.../camel/maven/packaging/PackageModelMojo.java | 2 +-
9 files changed, 71 insertions(+), 58 deletions(-)
diff --git
a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/complex/onetomany/Order.java
b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/complex/onetomany/Order.java
index 6d66181682a..1b9424f1814 100644
---
a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/complex/onetomany/Order.java
+++
b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/complex/onetomany/Order.java
@@ -111,8 +111,15 @@ public class Order {
@Override
public String toString() {
StringBuilder temp = new StringBuilder();
- temp.append(Order.class.getName() + " --> 1: " + this.account + ", 11:
" + this.clOrdId
- + ", 58: " + this.text + ", 777: " + this.created);
+ temp.append(Order.class.getName())
+ .append(" --> 1: ")
+ .append(this.account)
+ .append(", 11: ")
+ .append(this.clOrdId)
+ .append(", 58: ")
+ .append(this.text)
+ .append(", 777: ")
+ .append(this.created);
temp.append("\r");
if (this.securities != null) {
diff --git
a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecEndpointTest.java
b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecEndpointTest.java
index 5870f4b6352..ed4b0509801 100644
---
a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecEndpointTest.java
+++
b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecEndpointTest.java
@@ -219,8 +219,12 @@ public class ExecEndpointTest {
String outFile = "target/outfile.xml";
long timeout = 10000;
StringBuilder builder = new StringBuilder();
- builder.append("exec:executable.exe").append("?workingDir=" +
workingDir).append("&timeout=" + timeout);
- builder.append("&outFile=" + outFile);
+ builder.append("exec:executable.exe")
+ .append("?workingDir=")
+ .append(workingDir)
+ .append("&timeout=")
+ .append(timeout);
+ builder.append("&outFile=").append(outFile);
builder.append("&commandExecutor=#customExecutor&binding=#customBinding");
ExecEndpoint e =
createExecEndpoint(UnsafeUriCharactersEncoder.encode(builder.toString()));
diff --git
a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessRecipientListTest.java
b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessRecipientListTest.java
index 5ae2a52851e..7f832d97b9d 100644
---
a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessRecipientListTest.java
+++
b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessRecipientListTest.java
@@ -235,7 +235,7 @@ public class ExecJavaProcessRecipientListTest extends
CamelTestSupport {
final StringBuilder builder = new StringBuilder();
int lines = 10;
for (int t = 1; t < lines; t++) {
- builder.append("Line" + t + System.lineSeparator());
+ builder.append("Line").append(t).append(System.lineSeparator());
}
String whiteSpaceSeparatedLines = builder.toString();
String expected = builder.toString();
diff --git
a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java
b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java
index e76705c29eb..55063981ba2 100644
---
a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java
+++
b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java
@@ -386,7 +386,7 @@ public class ExecJavaProcessTest extends CamelTestSupport {
final StringBuilder builder = new StringBuilder();
int lines = 10;
for (int t = 1; t < lines; t++) {
- builder.append("Line" + t + System.lineSeparator());
+ builder.append("Line").append(t).append(System.lineSeparator());
}
String whiteSpaceSeparatedLines = builder.toString();
String expected = builder.toString();
diff --git
a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecScriptTest.java
b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecScriptTest.java
index 3a8f968744a..8b375ec579d 100644
---
a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecScriptTest.java
+++
b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecScriptTest.java
@@ -85,7 +85,7 @@ public class ExecScriptTest {
private Exchange executeScript(final File scriptFile, long timeout,
String... args) {
StringBuilder argsBuilder = new StringBuilder();
for (String arg : args) {
- argsBuilder.append(arg + " ");
+ argsBuilder.append(arg).append(" ");
}
final String whiteSpaceSeparatedArgs = argsBuilder.toString().trim();
diff --git
a/components/camel-exec/src/test/java/org/apache/camel/component/exec/impl/ExecDocumentationExamplesTest.java
b/components/camel-exec/src/test/java/org/apache/camel/component/exec/impl/ExecDocumentationExamplesTest.java
index 357b40883d7..c488841cc0b 100644
---
a/components/camel-exec/src/test/java/org/apache/camel/component/exec/impl/ExecDocumentationExamplesTest.java
+++
b/components/camel-exec/src/test/java/org/apache/camel/component/exec/impl/ExecDocumentationExamplesTest.java
@@ -195,7 +195,9 @@ public class ExecDocumentationExamplesTest extends
CamelTestSupport {
StringBuilder builder = new StringBuilder();
builder.append("<project name=\"TestExec\" default=\"test\"
basedir=\".\">");
builder.append("<target name=\"test\">");
- builder.append("<echo message=\"" + TEST_MSG + "\"/>");
+ builder.append("<echo message=\"")
+ .append(TEST_MSG)
+ .append("\"/>");
builder.append("</target>");
builder.append("</project>");
return builder.toString();
diff --git
a/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpConverters.java
b/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpConverters.java
index e453f7ddb52..48eb2d7a58a 100644
---
a/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpConverters.java
+++
b/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpConverters.java
@@ -98,7 +98,7 @@ public final class SnmpConverters {
// prepare the header
if (pdu.getType() == PDU.V1TRAP) {
- sb.append("<" + SNMP_TAG + " messageType=\"v1\">");
+ sb.append("<").append(SNMP_TAG).append(" messageType=\"v1\">");
} else {
sb.append(SNMP_TAG_OPEN);
}
diff --git
a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectNameStrategy.java
b/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectNameStrategy.java
index 2225bf603b0..f8efacf6cba 100644
---
a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectNameStrategy.java
+++
b/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectNameStrategy.java
@@ -176,9 +176,9 @@ public class DefaultManagementObjectNameStrategy implements
ManagementObjectName
public ObjectName getObjectNameForCamelContext(String managementName,
String name) throws MalformedObjectNameException {
StringBuilder buffer = new StringBuilder();
buffer.append(domainName).append(":");
- buffer.append(KEY_CONTEXT +
"=").append(getContextId(managementName)).append(",");
- buffer.append(KEY_TYPE + "=" + TYPE_CONTEXT + ",");
- buffer.append(KEY_NAME + "=").append(ObjectName.quote(name));
+
buffer.append(KEY_CONTEXT).append("=").append(getContextId(managementName)).append(",");
+ buffer.append(KEY_TYPE).append("=").append(TYPE_CONTEXT).append(",");
+ buffer.append(KEY_NAME).append("=").append(ObjectName.quote(name));
return createObjectName(buffer);
}
@@ -203,9 +203,9 @@ public class DefaultManagementObjectNameStrategy implements
ManagementObjectName
StringBuilder buffer = new StringBuilder();
buffer.append(domainName).append(":");
- buffer.append(KEY_CONTEXT +
"=").append(getContextId(managementName)).append(",");
- buffer.append(KEY_TYPE + "=" + TYPE_HEALTH + ",");
- buffer.append(KEY_NAME + "=").append("DefaultHealthCheck");
+
buffer.append(KEY_CONTEXT).append("=").append(getContextId(managementName)).append(",");
+ buffer.append(KEY_TYPE).append("=").append(TYPE_HEALTH).append(",");
+ buffer.append(KEY_NAME).append("=").append("DefaultHealthCheck");
return createObjectName(buffer);
}
@@ -221,9 +221,9 @@ public class DefaultManagementObjectNameStrategy implements
ManagementObjectName
StringBuilder buffer = new StringBuilder();
buffer.append(domainName).append(":");
- buffer.append(KEY_CONTEXT +
"=").append(getContextId(managementName)).append(",");
- buffer.append(KEY_TYPE + "=" + TYPE_SERVICE + ",");
- buffer.append(KEY_NAME +
"=").append(routeController.getClass().getSimpleName());
+
buffer.append(KEY_CONTEXT).append("=").append(getContextId(managementName)).append(",");
+ buffer.append(KEY_TYPE).append("=").append(TYPE_SERVICE).append(",");
+
buffer.append(KEY_NAME).append("=").append(routeController.getClass().getSimpleName());
return createObjectName(buffer);
}
@@ -232,9 +232,9 @@ public class DefaultManagementObjectNameStrategy implements
ManagementObjectName
public ObjectName getObjectNameForEndpoint(Endpoint endpoint) throws
MalformedObjectNameException {
StringBuilder buffer = new StringBuilder();
buffer.append(domainName).append(":");
- buffer.append(KEY_CONTEXT +
"=").append(getContextId(endpoint.getCamelContext())).append(",");
- buffer.append(KEY_TYPE + "=" + TYPE_ENDPOINT + ",");
- buffer.append(KEY_NAME +
"=").append(ObjectName.quote(getEndpointId(endpoint)));
+
buffer.append(KEY_CONTEXT).append("=").append(getContextId(endpoint.getCamelContext())).append(",");
+ buffer.append(KEY_TYPE).append("=").append(TYPE_ENDPOINT).append(",");
+
buffer.append(KEY_NAME).append("=").append(ObjectName.quote(getEndpointId(endpoint)));
return createObjectName(buffer);
}
@@ -243,9 +243,9 @@ public class DefaultManagementObjectNameStrategy implements
ManagementObjectName
throws MalformedObjectNameException {
StringBuilder buffer = new StringBuilder();
buffer.append(domainName).append(":");
- buffer.append(KEY_CONTEXT +
"=").append(getContextId(context)).append(",");
- buffer.append(KEY_TYPE + "=" + TYPE_DATAFORMAT + ",");
- buffer.append(KEY_NAME +
"=").append(dataFormat.getClass().getSimpleName());
+
buffer.append(KEY_CONTEXT).append("=").append(getContextId(context)).append(",");
+
buffer.append(KEY_TYPE).append("=").append(TYPE_DATAFORMAT).append(",");
+
buffer.append(KEY_NAME).append("=").append(dataFormat.getClass().getSimpleName());
if (!(dataFormat instanceof StaticService)) {
buffer.append("(").append(ObjectHelper.getIdentityHashCode(dataFormat)).append(")");
}
@@ -256,9 +256,9 @@ public class DefaultManagementObjectNameStrategy implements
ManagementObjectName
public ObjectName getObjectNameForComponent(Component component, String
name) throws MalformedObjectNameException {
StringBuilder buffer = new StringBuilder();
buffer.append(domainName).append(":");
- buffer.append(KEY_CONTEXT +
"=").append(getContextId(component.getCamelContext())).append(",");
- buffer.append(KEY_TYPE + "=" + TYPE_COMPONENT + ",");
- buffer.append(KEY_NAME + "=").append(ObjectName.quote(name));
+
buffer.append(KEY_CONTEXT).append("=").append(getContextId(component.getCamelContext())).append(",");
+ buffer.append(KEY_TYPE).append("=").append(TYPE_COMPONENT).append(",");
+ buffer.append(KEY_NAME).append("=").append(ObjectName.quote(name));
return createObjectName(buffer);
}
@@ -267,14 +267,14 @@ public class DefaultManagementObjectNameStrategy
implements ManagementObjectName
throws MalformedObjectNameException {
StringBuilder buffer = new StringBuilder();
buffer.append(domainName).append(":");
- buffer.append(KEY_CONTEXT +
"=").append(getContextId(context)).append(",");
- buffer.append(KEY_TYPE + "=").append(TYPE_PROCESSOR).append(",");
+
buffer.append(KEY_CONTEXT).append("=").append(getContextId(context)).append(",");
+ buffer.append(KEY_TYPE).append("=").append(TYPE_PROCESSOR).append(",");
String id = definition.getId();
String prefix = definition.getNodePrefixId();
if (prefix != null) {
id = prefix + id;
}
- buffer.append(KEY_NAME + "=").append(ObjectName.quote(id));
+ buffer.append(KEY_NAME).append("=").append(ObjectName.quote(id));
return createObjectName(buffer);
}
@@ -283,14 +283,14 @@ public class DefaultManagementObjectNameStrategy
implements ManagementObjectName
throws MalformedObjectNameException {
StringBuilder buffer = new StringBuilder();
buffer.append(domainName).append(":");
- buffer.append(KEY_CONTEXT +
"=").append(getContextId(context)).append(",");
- buffer.append(KEY_TYPE + "=").append(TYPE_STEP).append(",");
+
buffer.append(KEY_CONTEXT).append("=").append(getContextId(context)).append(",");
+ buffer.append(KEY_TYPE).append("=").append(TYPE_STEP).append(",");
String id = definition.getId();
String prefix = definition.getNodePrefixId();
if (prefix != null) {
id = prefix + id;
}
- buffer.append(KEY_NAME + "=").append(ObjectName.quote(id));
+ buffer.append(KEY_NAME).append("=").append(ObjectName.quote(id));
return createObjectName(buffer);
}
@@ -298,14 +298,14 @@ public class DefaultManagementObjectNameStrategy
implements ManagementObjectName
public ObjectName getObjectNameForConsumer(CamelContext context, Consumer
consumer) throws MalformedObjectNameException {
StringBuilder buffer = new StringBuilder();
buffer.append(domainName).append(":");
- buffer.append(KEY_CONTEXT +
"=").append(getContextId(context)).append(",");
- buffer.append(KEY_TYPE + "=").append(TYPE_CONSUMER).append(",");
+
buffer.append(KEY_CONTEXT).append("=").append(getContextId(context)).append(",");
+ buffer.append(KEY_TYPE).append("=").append(TYPE_CONSUMER).append(",");
String name = consumer.getClass().getSimpleName();
if (ObjectHelper.isEmpty(name)) {
name = "Consumer";
}
- buffer.append(KEY_NAME + "=")
+ buffer.append(KEY_NAME).append("=")
.append(name)
.append("(").append(ObjectHelper.getIdentityHashCode(consumer)).append(")");
return createObjectName(buffer);
@@ -315,8 +315,8 @@ public class DefaultManagementObjectNameStrategy implements
ManagementObjectName
public ObjectName getObjectNameForProducer(CamelContext context, Producer
producer) throws MalformedObjectNameException {
StringBuilder buffer = new StringBuilder();
buffer.append(domainName).append(":");
- buffer.append(KEY_CONTEXT +
"=").append(getContextId(context)).append(",");
- buffer.append(KEY_TYPE + "=").append(TYPE_PRODUCER).append(",");
+
buffer.append(KEY_CONTEXT).append("=").append(getContextId(context)).append(",");
+ buffer.append(KEY_TYPE).append("=").append(TYPE_PRODUCER).append(",");
String name = producer.getClass().getSimpleName();
if (ObjectHelper.isEmpty(name)) {
@@ -341,9 +341,9 @@ public class DefaultManagementObjectNameStrategy implements
ManagementObjectName
StringBuilder buffer = new StringBuilder();
buffer.append(domainName).append(":");
- buffer.append(KEY_CONTEXT +
"=").append(getContextId(context)).append(",");
- buffer.append(KEY_TYPE + "=" + TYPE_TRACER + ",");
- buffer.append(KEY_NAME + "=").append(name);
+
buffer.append(KEY_CONTEXT).append("=").append(getContextId(context)).append(",");
+ buffer.append(KEY_TYPE).append("=").append(TYPE_TRACER).append(",");
+ buffer.append(KEY_NAME).append("=").append(name);
return createObjectName(buffer);
}
@@ -352,15 +352,15 @@ public class DefaultManagementObjectNameStrategy
implements ManagementObjectName
throws MalformedObjectNameException {
StringBuilder buffer = new StringBuilder();
buffer.append(domainName).append(":");
- buffer.append(KEY_CONTEXT +
"=").append(getContextId(context)).append(",");
- buffer.append(KEY_TYPE + "=" + TYPE_EVENT_NOTIFIER + ",");
+
buffer.append(KEY_CONTEXT).append("=").append(getContextId(context)).append(",");
+
buffer.append(KEY_TYPE).append("=").append(TYPE_EVENT_NOTIFIER).append(",");
if (eventNotifier instanceof JmxNotificationEventNotifier) {
// JMX notifier shall have an easy to use name
- buffer.append(KEY_NAME + "=").append("JmxEventNotifier");
+ buffer.append(KEY_NAME).append("=").append("JmxEventNotifier");
} else {
// others can be per instance
- buffer.append(KEY_NAME + "=")
+ buffer.append(KEY_NAME).append("=")
.append("EventNotifier")
.append("(").append(ObjectHelper.getIdentityHashCode(eventNotifier)).append(")");
}
@@ -371,9 +371,9 @@ public class DefaultManagementObjectNameStrategy implements
ManagementObjectName
public ObjectName getObjectNameForRoute(org.apache.camel.Route route)
throws MalformedObjectNameException {
StringBuilder buffer = new StringBuilder();
buffer.append(domainName).append(":");
- buffer.append(KEY_CONTEXT +
"=").append(getContextId(route.getCamelContext())).append(",");
- buffer.append(KEY_TYPE + "=" + TYPE_ROUTE + ",");
- buffer.append(KEY_NAME + "=").append(ObjectName.quote(route.getId()));
+
buffer.append(KEY_CONTEXT).append("=").append(getContextId(route.getCamelContext())).append(",");
+ buffer.append(KEY_TYPE).append("=").append(TYPE_ROUTE).append(",");
+
buffer.append(KEY_NAME).append("=").append(ObjectName.quote(route.getId()));
return createObjectName(buffer);
}
@@ -381,9 +381,9 @@ public class DefaultManagementObjectNameStrategy implements
ManagementObjectName
public ObjectName getObjectNameForService(CamelContext context, Service
service) throws MalformedObjectNameException {
StringBuilder buffer = new StringBuilder();
buffer.append(domainName).append(":");
- buffer.append(KEY_CONTEXT +
"=").append(getContextId(context)).append(",");
- buffer.append(KEY_TYPE + "=" + TYPE_SERVICE + ",");
- buffer.append(KEY_NAME +
"=").append(service.getClass().getSimpleName());
+
buffer.append(KEY_CONTEXT).append("=").append(getContextId(context)).append(",");
+ buffer.append(KEY_TYPE).append("=").append(TYPE_SERVICE).append(",");
+
buffer.append(KEY_NAME).append("=").append(service.getClass().getSimpleName());
if (!(service instanceof StaticService)) {
buffer.append("(").append(ObjectHelper.getIdentityHashCode(service)).append(")");
}
@@ -395,9 +395,9 @@ public class DefaultManagementObjectNameStrategy implements
ManagementObjectName
throws MalformedObjectNameException {
StringBuilder buffer = new StringBuilder();
buffer.append(domainName).append(":");
- buffer.append(KEY_CONTEXT +
"=").append(getContextId(context)).append(",");
- buffer.append(KEY_TYPE + "=" + TYPE_HA + ",");
- buffer.append(KEY_NAME +
"=").append(service.getClass().getSimpleName());
+
buffer.append(KEY_CONTEXT).append("=").append(getContextId(context)).append(",");
+ buffer.append(KEY_TYPE).append("=").append(TYPE_HA).append(",");
+
buffer.append(KEY_NAME).append("=").append(service.getClass().getSimpleName());
if (!(service instanceof StaticService)) {
buffer.append("(").append(ObjectHelper.getIdentityHashCode(service)).append(")");
}
@@ -410,15 +410,15 @@ public class DefaultManagementObjectNameStrategy
implements ManagementObjectName
throws MalformedObjectNameException {
StringBuilder buffer = new StringBuilder();
buffer.append(domainName).append(":");
- buffer.append(KEY_CONTEXT +
"=").append(getContextId(context)).append(",");
- buffer.append(KEY_TYPE + "=" + TYPE_THREAD_POOL + ",");
+
buffer.append(KEY_CONTEXT).append("=").append(getContextId(context)).append(",");
+
buffer.append(KEY_TYPE).append("=").append(TYPE_THREAD_POOL).append(",");
String name = id;
if (sourceId != null) {
// provide source id if we know it, this helps end user to know
where the pool is used
name = name + "(" + sourceId + ")";
}
- buffer.append(KEY_NAME + "=").append(ObjectName.quote(name));
+ buffer.append(KEY_NAME).append("=").append(ObjectName.quote(name));
return createObjectName(buffer);
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageModelMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageModelMojo.java
index e36eace2349..bcca5804dfc 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageModelMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageModelMojo.java
@@ -79,7 +79,7 @@ public class PackageModelMojo extends AbstractGeneratorMojo {
if (!models.isEmpty()) {
StringBuilder sb = new StringBuilder();
- sb.append("# " + GENERATED_MSG + NL);
+ sb.append("# ").append(GENERATED_MSG).append(NL);
for (String name : models) {
sb.append(name).append(NL);
}
