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 2022/06/16 08:25:18 UTC
[camel] 01/02: (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
commit 008c285d28e57a8982b04a6edc01bf16b57ed54f
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Jun 15 16:38:55 2022 +0200
(chores) minor code cleanups
- fixed unused log arguments
- use log markers
- use the more efficient entrySet where applicable
- avoid hard-coded path delimiters
---
.../aws2/kinesis/consumer/KinesisDefaultResumeAdapter.java | 2 +-
.../component/kafka/consumer/errorhandler/SeekUtil.java | 3 ++-
.../camel/impl/health/DefaultHealthChecksLoader.java | 4 ++--
.../camel/dsl/java/joor/ClassRoutesBuilderLoader.java | 2 +-
.../camel/dsl/java/joor/JavaRoutesBuilderLoader.java | 14 ++++++++------
5 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/consumer/KinesisDefaultResumeAdapter.java b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/consumer/KinesisDefaultResumeAdapter.java
index aee041eb9e5..2e57fd1ca7c 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/consumer/KinesisDefaultResumeAdapter.java
+++ b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/consumer/KinesisDefaultResumeAdapter.java
@@ -54,7 +54,7 @@ public class KinesisDefaultResumeAdapter implements KinesisResumeAdapter, Cachea
}
final String sequenceNumber = offset.getValue();
- LOG.info("Resuming from offset {} for key", sequenceNumber, streamName);
+ LOG.info("Resuming from offset {} for key {}", sequenceNumber, streamName);
resumable.shardIteratorType(ShardIteratorType.AFTER_SEQUENCE_NUMBER);
resumable.startingSequenceNumber(sequenceNumber);
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/errorhandler/SeekUtil.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/errorhandler/SeekUtil.java
index 495c1b0eb9e..b3c6e77adc1 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/errorhandler/SeekUtil.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/errorhandler/SeekUtil.java
@@ -50,7 +50,8 @@ final class SeekUtil {
for (TopicPartition tp : tps) {
long next = consumer.position(tp) + 1;
if (!logged) {
- LOG.info("Consumer seeking to next offset {} to continue polling next message from topic {} on partition",
+ LOG.info(
+ "Consumer seeking to next offset {} to continue polling next message from topic {} on partition {}",
next,
tp.topic(), tp.partition());
logged = true;
diff --git a/core/camel-health/src/main/java/org/apache/camel/impl/health/DefaultHealthChecksLoader.java b/core/camel-health/src/main/java/org/apache/camel/impl/health/DefaultHealthChecksLoader.java
index 069f838c1b4..b7864bece40 100644
--- a/core/camel-health/src/main/java/org/apache/camel/impl/health/DefaultHealthChecksLoader.java
+++ b/core/camel-health/src/main/java/org/apache/camel/impl/health/DefaultHealthChecksLoader.java
@@ -70,8 +70,8 @@ public class DefaultHealthChecksLoader {
}
}
} catch (Exception e) {
- LOG.warn("Error during scanning for custom health-checks on classpath due to: " + e.getMessage()
- + ". This exception is ignored.");
+ LOG.warn("Error during scanning for custom health-checks on classpath due to: {}. This exception is ignored.",
+ e.getMessage());
}
return answer;
diff --git a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/ClassRoutesBuilderLoader.java b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/ClassRoutesBuilderLoader.java
index 21d9479b978..7e783a0a3c7 100644
--- a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/ClassRoutesBuilderLoader.java
+++ b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/ClassRoutesBuilderLoader.java
@@ -76,7 +76,7 @@ public class ClassRoutesBuilderLoader extends ExtendedRouteBuilderLoaderSupport
// requires a default no-arg constructor otherwise we skip the class
obj = getCamelContext().getInjector().newInstance(clazz);
} catch (Exception e) {
- LOG.debug("Loaded class: " + className + " must have a default no-arg constructor. Skipping.");
+ LOG.debug("Loaded class {} must have a default no-arg constructor. Skipping.", className);
continue;
}
diff --git a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java
index bbd9898f372..413f7ec1759 100644
--- a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java
+++ b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java
@@ -167,13 +167,16 @@ public class JavaRoutesBuilderLoader extends ExtendedRouteBuilderLoaderSupport {
Collection<Resource> toBeCompiled = new ArrayList<>();
Collection<Resource> byteCodes = new ArrayList<>();
- for (String className : nameToResource.keySet()) {
- File source = new File(getCompileDirectory() + "/" + className + ".class");
+ for (var entry : nameToResource.entrySet()) {
+ final String className = entry.getKey();
+
+ File source = new File(getCompileDirectory(), className + ".class");
if (source.exists()) {
byte[] code = Files.readAllBytes(source.toPath());
byteCodes.add(ResourceHelper.fromBytes("class:" + className + ".class", code));
} else {
- toBeCompiled.add(nameToResource.get(className));
+ final Resource resource = entry.getValue();
+ toBeCompiled.add(resource);
}
}
if (!byteCodes.isEmpty()) {
@@ -190,7 +193,7 @@ public class JavaRoutesBuilderLoader extends ExtendedRouteBuilderLoaderSupport {
private static void saveByteCodeToDisk(String outputDirectory, String name, byte[] byteCode) {
// write to disk (can be triggered multiple times so only write once)
- File target = new File(outputDirectory + "/" + name + ".class");
+ File target = new File(outputDirectory, name + ".class");
if (!target.exists()) {
// create work-dir if needed
new File(outputDirectory).mkdirs();
@@ -200,8 +203,7 @@ public class JavaRoutesBuilderLoader extends ExtendedRouteBuilderLoaderSupport {
fos.write(byteCode);
IOHelper.close(fos);
} catch (Exception e) {
- LOG.warn("Error saving compiled class: " + name + " as bytecode to file: " + target + " due to "
- + e.getMessage());
+ LOG.warn("Error saving compiled class: {} as bytecode to file: {} due to {}", name, target, e.getMessage());
}
}
}