You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/01/08 20:08:13 UTC
[camel] branch main updated (a500b9d2db9 -> d86835cfd18)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from a500b9d2db9 Remove print stacktrace
new af969efce28 Fix potential NPE
new 5dbf54d8e16 Code smell
new 7389ef82964 Close stream
new 47a36c1980a Close resolver
new d86835cfd18 Regen
The 5 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:
.../apache/camel/component/aws2/ses/Ses2Endpoint.java | 3 +--
.../org/apache/camel/component/RepositoryFactory.java | 9 +++++++--
.../apache/camel/support/PropertyBindingSupport.java | 2 +-
.../org/apache/camel/dsl/jbang/core/commands/Bind.java | 18 +++++++++++++++---
.../org/apache/camel/dsl/jbang/core/commands/Run.java | 1 -
5 files changed, 24 insertions(+), 9 deletions(-)
[camel] 02/05: Code smell
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5dbf54d8e16cf778b321de0e3db5417fa7bb7e88
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Jan 8 20:57:22 2023 +0100
Code smell
---
.../src/main/java/org/apache/camel/support/PropertyBindingSupport.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
index 0af669f5a2a..620655afee1 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
@@ -760,7 +760,7 @@ public final class PropertyBindingSupport {
boolean ignoreCase) {
try {
- if (target != null && name != null) {
+ if (name != null) {
return doSetSimplePropertyViaReflection(camelContext, target, name, value, false, ignoreCase, fluentBuilder,
allowPrivateSetter, reference);
}
[camel] 01/05: Fix potential NPE
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit af969efce284e5f273c12436e20f8464e686ddbc
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Jan 8 20:54:22 2023 +0100
Fix potential NPE
---
.../main/java/org/apache/camel/component/aws2/ses/Ses2Endpoint.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Endpoint.java b/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Endpoint.java
index 9a800e5fb9e..8e0415a6c0b 100644
--- a/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Endpoint.java
+++ b/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Endpoint.java
@@ -62,9 +62,8 @@ public class Ses2Endpoint extends DefaultEndpoint {
if (healthCheckRepository != null) {
clientHealthCheck = new Ses2HealthCheck(this, getId());
+ healthCheckRepository.addHealthCheck(clientHealthCheck);
}
-
- healthCheckRepository.addHealthCheck(clientHealthCheck);
}
@Override
[camel] 04/05: Close resolver
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 47a36c1980a6ffefdb1ab2a9521cd36cc4913fbd
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Jan 8 21:07:41 2023 +0100
Close resolver
---
.../org/apache/camel/dsl/jbang/core/commands/Bind.java | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java
index 4f8d25739f5..6741b8019f9 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java
@@ -27,6 +27,7 @@ import java.util.Stack;
import org.apache.camel.github.GitHubResourceResolver;
import org.apache.camel.impl.engine.DefaultResourceResolvers;
import org.apache.camel.spi.Resource;
+import org.apache.camel.spi.ResourceResolver;
import org.apache.camel.util.FileUtil;
import org.apache.camel.util.IOHelper;
import org.snakeyaml.engine.v2.api.LoadSettings;
@@ -131,15 +132,26 @@ class Bind extends CamelCommand {
InputStream is;
String loc;
+ Resource res;
// try local disk first before github
- Resource res = new DefaultResourceResolvers.FileResolver().resolve("file:" + kamelet + ".kamelet.yaml");
+ ResourceResolver resolver = new DefaultResourceResolvers.FileResolver();
+ try {
+ res = resolver.resolve("file:" + kamelet + ".kamelet.yaml");
+ } finally {
+ resolver.close();
+ }
if (res.exists()) {
is = res.getInputStream();
loc = res.getLocation();
} else {
- res = new GitHubResourceResolver().resolve(
- "github:apache:camel-kamelets:main:kamelets/" + kamelet + ".kamelet.yaml");
+ resolver = new GitHubResourceResolver();
+ try {
+ res = resolver.resolve(
+ "github:apache:camel-kamelets:main:kamelets/" + kamelet + ".kamelet.yaml");
+ } finally {
+ resolver.close();
+ }
loc = res.getLocation();
URL u = new URL(loc);
is = u.openStream();
[camel] 03/05: Close stream
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7389ef82964130cd34e44da2a6e6f03b6d195ab5
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Jan 8 21:01:54 2023 +0100
Close stream
---
.../main/java/org/apache/camel/component/RepositoryFactory.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/components/camel-git/src/main/java/org/apache/camel/component/RepositoryFactory.java b/components/camel-git/src/main/java/org/apache/camel/component/RepositoryFactory.java
index 2950415e39a..83c94adfb7f 100644
--- a/components/camel-git/src/main/java/org/apache/camel/component/RepositoryFactory.java
+++ b/components/camel-git/src/main/java/org/apache/camel/component/RepositoryFactory.java
@@ -30,6 +30,7 @@ import java.util.List;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.git.GitEndpoint;
import org.apache.camel.support.ResourceHelper;
+import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
@@ -106,8 +107,12 @@ public abstract class RepositoryFactory {
private static File getTempFileFromHttp(String url) throws IOException {
Path tempFile = Files.createTempFile(null, null);
FileOutputStream outputStream = new FileOutputStream(tempFile.toString());
- ReadableByteChannel byteChannel = Channels.newChannel(new URL(url).openStream());
- outputStream.getChannel().transferFrom(byteChannel, 0, Long.MAX_VALUE);
+ try {
+ ReadableByteChannel byteChannel = Channels.newChannel(new URL(url).openStream());
+ outputStream.getChannel().transferFrom(byteChannel, 0, Long.MAX_VALUE);
+ } finally {
+ IOHelper.close(outputStream);
+ }
return tempFile.toFile();
}
[camel] 05/05: Regen
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d86835cfd18d681bfe1f25576623f6e6b55f181f
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Jan 8 21:08:05 2023 +0100
Regen
---
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 1 -
1 file changed, 1 deletion(-)
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 55a812c78b6..ef64b0ee290 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
@@ -49,7 +49,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import io.apicurio.datamodels.Library;
import io.apicurio.datamodels.openapi.models.OasDocument;
import org.apache.camel.CamelContext;
-import org.apache.camel.catalog.CamelCatalog;
import org.apache.camel.catalog.DefaultCamelCatalog;
import org.apache.camel.dsl.jbang.core.common.RuntimeUtil;
import org.apache.camel.generator.openapi.RestDslGenerator;