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:17 UTC
[camel] branch main updated (e0b0d549a17 -> 575bbc3e777)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from e0b0d549a17 camel-jbang - Ensure slf4j-api is correct version defined by Camel
new 008c285d28e (chores) minor code cleanups
new 575bbc3e777 Removed unused exceptions
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../aws2/kinesis/consumer/KinesisDefaultResumeAdapter.java | 2 +-
.../camel/component/azure/key/vault/KeyVaultProducer.java | 6 +++---
.../component/hashicorp/vault/HashicorpVaultProducer.java | 7 +++----
.../component/kafka/consumer/errorhandler/SeekUtil.java | 3 ++-
.../zookeeper/cluster/ZooKeeperClusterService.java | 2 +-
.../camel/support/jsse/AliasedX509ExtendedKeyManager.java | 3 +--
.../camel/impl/health/DefaultHealthChecksLoader.java | 4 ++--
.../camel/dsl/java/joor/ClassRoutesBuilderLoader.java | 2 +-
.../camel/dsl/java/joor/JavaRoutesBuilderLoader.java | 14 ++++++++------
.../apache/camel/dsl/jbang/core/common/GitHubHelper.java | 2 +-
10 files changed, 23 insertions(+), 22 deletions(-)
[camel] 01/02: (chores) minor code cleanups
Posted by or...@apache.org.
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());
}
}
}
[camel] 02/02: Removed unused exceptions
Posted by or...@apache.org.
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 575bbc3e777b4b12862bb39e1b3ba379718aaf77
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Jun 15 17:19:38 2022 +0200
Removed unused exceptions
---
.../apache/camel/component/azure/key/vault/KeyVaultProducer.java | 6 +++---
.../camel/component/hashicorp/vault/HashicorpVaultProducer.java | 7 +++----
.../camel/component/zookeeper/cluster/ZooKeeperClusterService.java | 2 +-
.../apache/camel/support/jsse/AliasedX509ExtendedKeyManager.java | 3 +--
.../java/org/apache/camel/dsl/jbang/core/common/GitHubHelper.java | 2 +-
5 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultProducer.java b/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultProducer.java
index b1cc086514d..55458d85770 100644
--- a/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultProducer.java
+++ b/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultProducer.java
@@ -78,7 +78,7 @@ public class KeyVaultProducer extends DefaultProducer {
message.setBody(p);
}
- private void getSecret(Exchange exchange) throws InvalidPayloadException {
+ private void getSecret(Exchange exchange) {
final String secretName = exchange.getMessage().getHeader(KeyVaultConstants.SECRET_NAME, String.class);
if (ObjectHelper.isEmpty(secretName)) {
throw new IllegalArgumentException("Secret Name must be specified for createSecret Operation");
@@ -89,7 +89,7 @@ public class KeyVaultProducer extends DefaultProducer {
message.setBody(p.getValue());
}
- private void deleteSecret(Exchange exchange) throws InvalidPayloadException {
+ private void deleteSecret(Exchange exchange) {
final String secretName = exchange.getMessage().getHeader(KeyVaultConstants.SECRET_NAME, String.class);
if (ObjectHelper.isEmpty(secretName)) {
throw new IllegalArgumentException("Secret Name must be specified for createSecret Operation");
@@ -101,7 +101,7 @@ public class KeyVaultProducer extends DefaultProducer {
message.setBody(p.getFinalResult());
}
- private void purgeDeletedSecret(Exchange exchange) throws InvalidPayloadException {
+ private void purgeDeletedSecret(Exchange exchange) {
final String secretName = exchange.getMessage().getHeader(KeyVaultConstants.SECRET_NAME, String.class);
if (ObjectHelper.isEmpty(secretName)) {
throw new IllegalArgumentException("Secret Name must be specified for createSecret Operation");
diff --git a/components/camel-hashicorp-vault/src/main/java/org/apache/camel/component/hashicorp/vault/HashicorpVaultProducer.java b/components/camel-hashicorp-vault/src/main/java/org/apache/camel/component/hashicorp/vault/HashicorpVaultProducer.java
index a880d9c3437..9c54918f19b 100644
--- a/components/camel-hashicorp-vault/src/main/java/org/apache/camel/component/hashicorp/vault/HashicorpVaultProducer.java
+++ b/components/camel-hashicorp-vault/src/main/java/org/apache/camel/component/hashicorp/vault/HashicorpVaultProducer.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.hashicorp.vault;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
-import org.apache.camel.InvalidPayloadException;
import org.apache.camel.Message;
import org.apache.camel.support.DefaultProducer;
import org.apache.camel.util.ObjectHelper;
@@ -64,14 +63,14 @@ public class HashicorpVaultProducer extends DefaultProducer {
}
}
- private void createSecret(Exchange exchange) throws InvalidPayloadException {
+ private void createSecret(Exchange exchange) {
VaultKeyValueOperations keyValue
= getEndpoint().getVaultTemplate().opsForKeyValue(getEndpoint().getConfiguration().getSecretsEngine(),
VaultKeyValueOperationsSupport.KeyValueBackend.versioned());
keyValue.put(getEndpoint().getConfiguration().getSecretPath(), exchange.getMessage().getBody());
}
- private void getSecret(Exchange exchange) throws InvalidPayloadException {
+ private void getSecret(Exchange exchange) {
String secretPath;
if (ObjectHelper.isNotEmpty(exchange.getMessage().getHeader(HashicorpVaultConstants.SECRET_PATH))) {
secretPath = exchange.getMessage().getHeader(HashicorpVaultConstants.SECRET_PATH, String.class);
@@ -83,7 +82,7 @@ public class HashicorpVaultProducer extends DefaultProducer {
exchange.getMessage().setBody(rawSecret.getData());
}
- private void deleteSecret(Exchange exchange) throws InvalidPayloadException {
+ private void deleteSecret(Exchange exchange) {
VaultKeyValueOperations keyValue
= getEndpoint().getVaultTemplate().opsForKeyValue(getEndpoint().getConfiguration().getSecretsEngine(),
VaultKeyValueOperationsSupport.KeyValueBackend.versioned());
diff --git a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusterService.java b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusterService.java
index 3f327dc845d..b82105dd705 100644
--- a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusterService.java
+++ b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusterService.java
@@ -225,7 +225,7 @@ public class ZooKeeperClusterService extends AbstractCamelClusterService<ZooKeep
}
}
- private CuratorFramework getOrCreateCurator() throws Exception {
+ private CuratorFramework getOrCreateCurator() {
if (curator == null) {
curator = configuration.getCuratorFramework();
diff --git a/core/camel-api/src/main/java/org/apache/camel/support/jsse/AliasedX509ExtendedKeyManager.java b/core/camel-api/src/main/java/org/apache/camel/support/jsse/AliasedX509ExtendedKeyManager.java
index 185e7402d0f..cef0910004a 100644
--- a/core/camel-api/src/main/java/org/apache/camel/support/jsse/AliasedX509ExtendedKeyManager.java
+++ b/core/camel-api/src/main/java/org/apache/camel/support/jsse/AliasedX509ExtendedKeyManager.java
@@ -38,9 +38,8 @@ public class AliasedX509ExtendedKeyManager extends X509ExtendedKeyManager {
*
* @param keyAlias Alias of the key to be selected
* @param keyManager Instance of KeyManager to be wrapped
- * @throws Exception
*/
- public AliasedX509ExtendedKeyManager(String keyAlias, X509KeyManager keyManager) throws Exception {
+ public AliasedX509ExtendedKeyManager(String keyAlias, X509KeyManager keyManager) {
this.keyAlias = keyAlias;
this.keyManager = keyManager;
}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/GitHubHelper.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/GitHubHelper.java
index d7d7fb09c50..b6e456234e2 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/GitHubHelper.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/GitHubHelper.java
@@ -33,7 +33,7 @@ public final class GitHubHelper {
private GitHubHelper() {
}
- public static String asGithubSingleUrl(String url) throws Exception {
+ public static String asGithubSingleUrl(String url) {
// strip https://github.com/
url = url.substring(19);
// https://github.com/apache/camel-k/blob/main/examples/languages/routes.kts