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 2024/02/01 10:39:33 UTC
(camel) branch main updated: (chores) minor code cleanups
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 b2d5d6cf654 (chores) minor code cleanups
b2d5d6cf654 is described below
commit b2d5d6cf65474275531f2289717393d0f83a6ddf
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Feb 1 10:14:51 2024 +0100
(chores) minor code cleanups
- Use platform-specific new line characters
- Use format-specifiers instead of concatenating strings
---
.../camel/language/joor/JavaJoorClassLoader.java | 4 ++--
.../jolokia/JolokiaHttpRequestHandlerSupport.java | 2 +-
.../openapi/RestOpenApiValidationException.java | 2 +-
.../org/apache/camel/component/ssh/SshUtils.java | 7 +++----
.../camel/impl/DefaultDumpRoutesStrategy.java | 2 +-
.../apache/camel/dsl/jbang/core/commands/Run.java | 22 +++++++++++-----------
6 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/components/camel-joor/src/main/java/org/apache/camel/language/joor/JavaJoorClassLoader.java b/components/camel-joor/src/main/java/org/apache/camel/language/joor/JavaJoorClassLoader.java
index 16ba5a91f1c..e1694f04a9d 100644
--- a/components/camel-joor/src/main/java/org/apache/camel/language/joor/JavaJoorClassLoader.java
+++ b/components/camel-joor/src/main/java/org/apache/camel/language/joor/JavaJoorClassLoader.java
@@ -91,8 +91,8 @@ public class JavaJoorClassLoader extends ClassLoader {
fos.write(byteCode);
IOHelper.close(fos);
} catch (Exception e) {
- LOG.warn("Error writing compiled class: " + name + " as bytecode to file: " + target + " due to "
- + e.getMessage() + ". This exception is ignored.");
+ LOG.warn("Error writing compiled class: {} as bytecode to file: {} due to {}. This exception is ignored.",
+ name, target, e.getMessage());
}
}
}
diff --git a/components/camel-platform-http-main/src/main/java/org/apache/camel/component/platform/http/main/jolokia/JolokiaHttpRequestHandlerSupport.java b/components/camel-platform-http-main/src/main/java/org/apache/camel/component/platform/http/main/jolokia/JolokiaHttpRequestHandlerSupport.java
index ade79a04ab9..6fd001ed030 100644
--- a/components/camel-platform-http-main/src/main/java/org/apache/camel/component/platform/http/main/jolokia/JolokiaHttpRequestHandlerSupport.java
+++ b/components/camel-platform-http-main/src/main/java/org/apache/camel/component/platform/http/main/jolokia/JolokiaHttpRequestHandlerSupport.java
@@ -58,7 +58,7 @@ public class JolokiaHttpRequestHandlerSupport extends ServiceSupport implements
serviceManager.addService(new JolokiaSerializer());
serviceManager.addService(new LocalRequestHandler(1));
- LOG.info("Creating JolokiaHttpRequestHandlerSupport with restrictor " + restrictor);
+ LOG.info("Creating JolokiaHttpRequestHandlerSupport with restrictor {}", restrictor);
}
@Override
diff --git a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiValidationException.java b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiValidationException.java
index 21a82502b35..c3a15529d75 100644
--- a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiValidationException.java
+++ b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiValidationException.java
@@ -31,7 +31,7 @@ public class RestOpenApiValidationException extends Exception {
@Override
public String getMessage() {
- return "Detected %d REST OpenAPI validation errors:\n%s"
+ return "Detected %d REST OpenAPI validation errors:%n%s"
.formatted(validationErrors.size(), String.join("\n", validationErrors));
}
}
diff --git a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshUtils.java b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshUtils.java
index ae44703674e..f85a1b89b84 100644
--- a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshUtils.java
+++ b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshUtils.java
@@ -57,7 +57,7 @@ public class SshUtils {
Class<S> type,
Collection<NamedFactory<S>> factories, String[] names) {
List<NamedFactory<S>> list = new ArrayList<>();
- LOGGER.trace("List of available " + type.getSimpleName().toLowerCase() + "algorithms : {}",
+ LOGGER.trace("List of available {} algorithms : {}", type.getSimpleName().toLowerCase(),
factories.stream().map(NamedResource::getName).collect(joining(",")));
for (String name : names) {
name = name.trim();
@@ -70,8 +70,7 @@ public class SshUtils {
}
}
if (!found) {
- LOGGER.warn("Configured " + type.getSimpleName().toLowerCase()
- + " '" + name + "' not available");
+ LOGGER.warn("Configured {} '{}' not available", type.getSimpleName().toLowerCase(), name);
}
}
return list;
@@ -93,7 +92,7 @@ public class SshUtils {
}
}
if (!found) {
- LOGGER.warn("Configured KeyExchangeFactory '" + name + "' not available");
+ LOGGER.warn("Configured KeyExchangeFactory '{}' not available", name);
}
}
return list;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultDumpRoutesStrategy.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultDumpRoutesStrategy.java
index 4f851c72810..3f02b800f80 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultDumpRoutesStrategy.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultDumpRoutesStrategy.java
@@ -591,7 +591,7 @@ public class DefaultDumpRoutesStrategy extends ServiceSupport implements DumpRou
loc = extractLocationName(resource.getLocation());
}
if (loc != null) {
- sbLog.append(String.format("\nSource: %s%n%s%n%s%n", loc, DIVIDER, dump));
+ sbLog.append(String.format("%nSource: %s%n%s%n%s%n", loc, DIVIDER, dump));
} else {
sbLog.append(String.format("%n%n%s%n", dump));
}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index e8c3fc9d8ce..6f7e77dc3bb 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -1000,27 +1000,27 @@ public class Run extends CamelCommand {
// use custom distribution of camel
StringBuilder sb = new StringBuilder();
- sb.append(String.format("//DEPS org.apache.camel:camel-bom:%s@pom\n", camelVersion));
- sb.append(String.format("//DEPS org.apache.camel:camel-core:%s\n", camelVersion));
- sb.append(String.format("//DEPS org.apache.camel:camel-core-engine:%s\n", camelVersion));
- sb.append(String.format("//DEPS org.apache.camel:camel-main:%s\n", camelVersion));
- sb.append(String.format("//DEPS org.apache.camel:camel-java-joor-dsl:%s\n", camelVersion));
- sb.append(String.format("//DEPS org.apache.camel:camel-kamelet:%s\n", camelVersion));
+ sb.append(String.format("//DEPS org.apache.camel:camel-bom:%s@pom%n", camelVersion));
+ sb.append(String.format("//DEPS org.apache.camel:camel-core:%s%n", camelVersion));
+ sb.append(String.format("//DEPS org.apache.camel:camel-core-engine:%s%n", camelVersion));
+ sb.append(String.format("//DEPS org.apache.camel:camel-main:%s%n", camelVersion));
+ sb.append(String.format("//DEPS org.apache.camel:camel-java-joor-dsl:%s%n", camelVersion));
+ sb.append(String.format("//DEPS org.apache.camel:camel-kamelet:%s%n", camelVersion));
content = content.replaceFirst("\\{\\{ \\.CamelDependencies }}", sb.toString());
// use apache distribution of camel-jbang
String v = camelVersion.substring(0, camelVersion.lastIndexOf('.'));
sb = new StringBuilder();
- sb.append(String.format("//DEPS org.apache.camel:camel-jbang-core:%s\n", v));
- sb.append(String.format("//DEPS org.apache.camel:camel-kamelet-main:%s\n", v));
- sb.append(String.format("//DEPS org.apache.camel:camel-resourceresolver-github:%s\n", v));
+ sb.append(String.format("//DEPS org.apache.camel:camel-jbang-core:%s%n", v));
+ sb.append(String.format("//DEPS org.apache.camel:camel-kamelet-main:%s%n", v));
+ sb.append(String.format("//DEPS org.apache.camel:camel-resourceresolver-github:%s%n", v));
if (VersionHelper.isGE(v, "3.19.0")) {
- sb.append(String.format("//DEPS org.apache.camel:camel-cli-connector:%s\n", v));
+ sb.append(String.format("//DEPS org.apache.camel:camel-cli-connector:%s%n", v));
}
content = content.replaceFirst("\\{\\{ \\.CamelJBangDependencies }}", sb.toString());
sb = new StringBuilder();
- sb.append(String.format("//DEPS org.apache.camel.kamelets:camel-kamelets:%s\n", kameletsVersion));
+ sb.append(String.format("//DEPS org.apache.camel.kamelets:camel-kamelets:%s%n", kameletsVersion));
content = content.replaceFirst("\\{\\{ \\.CamelKameletsDependencies }}", sb.toString());
String fn = CommandLineHelper.CAMEL_JBANG_WORK_DIR + "/CustomCamelJBang.java";