[GitHub] [camel] orpiske opened a new pull request, #11038: CAMEL-19724: reduce the incidence of dropped log messages
orpiske opened a new pull request, #11038: URL: https://github.com/apache/camel/pull/11038 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #11038: CAMEL-19724: reduce the incidence of dropped log messages
github-actions[bot] commented on PR #11038: URL: https://github.com/apache/camel/pull/11038#issuecomment-1669020086 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch release-2.0.x updated: chore(doc): 2.0 is not pre-release
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch release-2.0.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-2.0.x by this push: new a8f6b46e2 chore(doc): 2.0 is not pre-release a8f6b46e2 is described below commit a8f6b46e2ed3949ac1cb0a35ed3a48acc5fd6310 Author: Pasquale Congiusti AuthorDate: Tue Aug 8 09:06:14 2023 +0200 chore(doc): 2.0 is not pre-release --- docs/antora.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/antora.yml b/docs/antora.yml index 19c9ee92e..f74f80f11 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -27,7 +27,7 @@ nav: asciidoc: attributes: requires: "'util=camel-website-util,ck=xref:js/ck.js'" -prerelease: true +prerelease: false camel-kamelets-version: '3.20.1.1' camel-kamelets-docs-version: 3.20.x camel-k-runtime-version: 2.16.0
[GitHub] [camel-spring-boot] davsclaus closed pull request #903: [Github Actions] Periodic Sync Camel Spring Boot (Camel 4)
davsclaus closed pull request #903: [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) URL: https://github.com/apache/camel-spring-boot/pull/903 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch camel-main updated: fixed compilation of google tests
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/camel-main by this push:
new d0a2acb5e3 fixed compilation of google tests
d0a2acb5e3 is described below
commit d0a2acb5e3ed3b32b33cb5fc7b4374fcfc54d4b4
Author: JiriOndrusek
AuthorDate: Tue Aug 8 09:25:49 2023 +0200
fixed compilation of google tests
---
.../camel/quarkus/component/google/it/GoogleDriveResource.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/integration-tests/google/src/main/java/org/apache/camel/quarkus/component/google/it/GoogleDriveResource.java
b/integration-tests/google/src/main/java/org/apache/camel/quarkus/component/google/it/GoogleDriveResource.java
index 55cb72a1d8..2cdda8e308 100644
---
a/integration-tests/google/src/main/java/org/apache/camel/quarkus/component/google/it/GoogleDriveResource.java
+++
b/integration-tests/google/src/main/java/org/apache/camel/quarkus/component/google/it/GoogleDriveResource.java
@@ -48,9 +48,9 @@ public class GoogleDriveResource {
@POST
@Consumes(MediaType.TEXT_PLAIN)
@Produces(MediaType.TEXT_PLAIN)
-public Response createFile(String title) throws Exception {
+public Response createFile(String name) throws Exception {
File fileMetadata = new File();
-fileMetadata.setTitle(title);
+fileMetadata.setName(name);
HttpContent mediaContent = new ByteArrayContent("text/plain",
"Hello Camel Quarkus Google
Drive".getBytes(StandardCharsets.UTF_8));
@@ -71,7 +71,7 @@ public class GoogleDriveResource {
try {
File response =
producerTemplate.requestBody("google-drive://drive-files/get?inBody=fileId",
fileId, File.class);
if (response != null) {
-return Response.ok(response.getTitle()).build();
+return Response.ok(response.getName()).build();
} else {
return Response.status(Response.Status.NOT_FOUND).build();
}
[GitHub] [camel-k] gansheer commented on issue #4654: 404 in release page
gansheer commented on issue #4654: URL: https://github.com/apache/camel-k/issues/4654#issuecomment-1669063822 We are also missing the linux arm64 client. I think we need to see if we can have some parameters for the version AND the types, else we will be breaking old releases. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske merged pull request #11038: CAMEL-19724: reduce the incidence of dropped log messages
orpiske merged PR #11038: URL: https://github.com/apache/camel/pull/11038 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: CAMEL-19724: reduce the incidence of dropped log messages
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 eedaaf35cf3 CAMEL-19724: reduce the incidence of dropped log messages
eedaaf35cf3 is described below
commit eedaaf35cf314679dc004972770e61c64e441601
Author: Otavio Rodolfo Piske
AuthorDate: Tue Aug 8 08:49:45 2023 +0200
CAMEL-19724: reduce the incidence of dropped log messages
---
.../apache/camel/support/service/BaseService.java | 75 --
.../camel/impl/engine/BasePackageScanResolver.java | 31 ++---
.../impl/engine/DefaultCamelContextExtension.java | 31 ++---
.../engine/DefaultPackageScanClassResolver.java| 67 ++-
.../engine/DefaultPackageScanResourceResolver.java | 23 ---
.../engine/WebSpherePackageScanClassResolver.java | 6 +-
6 files changed, 136 insertions(+), 97 deletions(-)
diff --git
a/core/camel-api/src/main/java/org/apache/camel/support/service/BaseService.java
b/core/camel-api/src/main/java/org/apache/camel/support/service/BaseService.java
index 6ee434ced10..35513e39741 100644
---
a/core/camel-api/src/main/java/org/apache/camel/support/service/BaseService.java
+++
b/core/camel-api/src/main/java/org/apache/camel/support/service/BaseService.java
@@ -49,8 +49,6 @@ public abstract class BaseService {
protected static final byte SHUTDOWN = 11;
protected static final byte FAILED = 12;
-private static final Logger LOG =
LoggerFactory.getLogger(BaseService.class);
-
protected final Object lock = new Object();
protected volatile byte status = NEW;
@@ -58,14 +56,12 @@ public abstract class BaseService {
if (status == NEW) {
synchronized (lock) {
if (status == NEW) {
-LOG.trace("Building service: {}", this);
try (AutoCloseable ignored = doLifecycleChange()) {
doBuild();
} catch (Exception e) {
doFail(e);
}
status = BUILT;
-LOG.trace("Built service: {}", this);
}
}
}
@@ -77,14 +73,12 @@ public abstract class BaseService {
synchronized (lock) {
if (status <= BUILT || status >= STOPPED) {
build();
-LOG.trace("Initializing service: {}", this);
try (AutoCloseable ignored = doLifecycleChange()) {
status = INITIALIZING;
doInit();
status = INITIALIZED;
-LOG.trace("Initialized service: {}", this);
} catch (Exception e) {
-LOG.trace("Error while initializing service: {}",
this, e);
+logger().trace("Error while initializing service: {}",
this, e);
fail(e);
}
}
@@ -101,34 +95,34 @@ public abstract class BaseService {
public void start() {
synchronized (lock) {
if (status == STARTED) {
-LOG.trace("Service: {} already started", this);
+logger().trace("Service: {} already started", this);
return;
}
if (status == STARTING) {
-LOG.trace("Service: {} already starting", this);
+logger().trace("Service: {} already starting", this);
return;
}
init();
if (status == FAILED) {
-LOG.trace("Init failed");
+logger().trace("Init failed");
return;
}
try (AutoCloseable ignored = doLifecycleChange()) {
status = STARTING;
-LOG.trace("Starting service: {}", this);
+logger().trace("Starting service: {}", this);
doStart();
status = STARTED;
-LOG.trace("Started service: {}", this);
+logger().trace("Started service: {}", this);
} catch (Exception e) {
// need to stop as some resources may have been started during
startup
try {
stop();
} catch (Exception e2) {
// ignore
-LOG.trace("Error while stopping service after it failed to
start: {}. This exception is ignored",
+logger().trace("Error while stopping service after it
failed to start: {}. This exception is ignored",
this, e);
}
-LOG.trace("Error while starting service: {}", this, e);
+logger().trace("Error while starting service: {}", this, e);
fail(e);
}
[GitHub] [camel-k] squakez commented on issue #4654: 404 in release page
squakez commented on issue #4654: URL: https://github.com/apache/camel-k/issues/4654#issuecomment-1669102869 ARM64 arch is not supported ATM. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (b3180b12fc8 -> eedaaf35cf3)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from b3180b12fc8 CAMEL-12317: Added AWS StepFunctions Component (#11014) add eedaaf35cf3 CAMEL-19724: reduce the incidence of dropped log messages No new revisions were added by this update. Summary of changes: .../apache/camel/support/service/BaseService.java | 75 -- .../camel/impl/engine/BasePackageScanResolver.java | 31 ++--- .../impl/engine/DefaultCamelContextExtension.java | 31 ++--- .../engine/DefaultPackageScanClassResolver.java| 67 ++- .../engine/DefaultPackageScanResourceResolver.java | 23 --- .../engine/WebSpherePackageScanClassResolver.java | 6 +- 6 files changed, 136 insertions(+), 97 deletions(-)
[GitHub] [camel] github-actions[bot] commented on pull request #11039: (chores) camel-arangodb: added a way to disable ArangoDB tests
github-actions[bot] commented on PR #11039: URL: https://github.com/apache/camel/pull/11039#issuecomment-1669190324 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske opened a new pull request, #11039: (chores) camel-arangodb: added a way to disable ArangoDB tests
orpiske opened a new pull request, #11039: URL: https://github.com/apache/camel/pull/11039 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] gansheer commented on issue #4639: Provide build time external resource
gansheer commented on issue #4639:
URL: https://github.com/apache/camel-k/issues/4639#issuecomment-1669228153
After some discussions with @claudio4j and some experiments with the xslt
components I think we can this feature can be done.
What I did was the following:
* 1/ read the file content from the configmap
* 2/ create a file in the appropriate folder /tmp/kit-/src/main/resources
* 3/ ensure it is added in the result of the build (what is injected in the
resulting kit container image) and usable
Why this process:
* For 1/ : since we are talking about build time external resource we can't
mount the configmap on the operator, that would be difficult to do and would
result on unwanted respins of operator/builder pod. Reading content from a
secret/configmap without volume mount is already a thing we do for user
provided settings.xml, so there is nothing new for us. The user should be
mindful of the quantity of configmaps added, but there is low risk as the data
stored in a ConfigMap cannot exceed 1 MiB.
* For 2/: the advantage of using /tmp/kit-/src/main/resource are:
* this folder should be in the workdir of the operator/builder pod so we
have writing permissions and it will be deleted at the end of the build
* this folder will be added automaticly in the
camel-k-integration-.jar, therefor available after build
* For 3/: that would need more tests but from what my experiments the files
in the camel-k-integration-.jar are available with
`.to("xslt:example.xslt")`
This would allow to add files as resources, but build property would still
use the `--build-property` flag as it needs to be added to
application.properties.
I feel what we really need is to start with defining use cases/example that
could be used to understand if it works of this proposal or if it needs some
adaptation.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel] orpiske merged pull request #11039: (chores) camel-arangodb: added a way to disable ArangoDB tests
orpiske merged PR #11039: URL: https://github.com/apache/camel/pull/11039 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus commented on pull request #11006: [CAMEL-19709] yaml dsl: include additional information such as description and title in the jscon schema
davsclaus commented on PR #11006: URL: https://github.com/apache/camel/pull/11006#issuecomment-1669328662 LGTM @lburgazzoli we need to merge this today so it has time to get into 4.0 GA -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: (chores) camel-arangodb: added a way to disable ArangoDB tests (#11039)
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 f277406da00 (chores) camel-arangodb: added a way to disable ArangoDB
tests (#11039)
f277406da00 is described below
commit f277406da00dcf96ed9fd938fba0756366d01783
Author: Otavio Rodolfo Piske
AuthorDate: Tue Aug 8 12:12:49 2023 +0200
(chores) camel-arangodb: added a way to disable ArangoDB tests (#11039)
Some systems may require additional configuration which may not be
available. This allows the tests to be skipped in those cases
---
.../component/arangodb/integration/ArangoCollectionDeleteIT.java | 9 +++--
.../arangodb/integration/ArangoCollectionFindByKeyIT.java| 9 +++--
.../component/arangodb/integration/ArangoCollectionQueryIT.java | 9 +++--
.../component/arangodb/integration/ArangoCollectionSaveIT.java | 9 +++--
.../component/arangodb/integration/ArangoCollectionUpdateIT.java | 9 +++--
.../camel/component/arangodb/integration/ArangoGraphEdgeIT.java | 9 +++--
.../component/arangodb/integration/ArangoGraphQueriesIT.java | 9 +++--
.../component/arangodb/integration/ArangoGraphVertexIT.java | 9 +++--
.../camel/component/arangodb/integration/BaseArangoDb.java | 4
9 files changed, 60 insertions(+), 16 deletions(-)
diff --git
a/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/integration/ArangoCollectionDeleteIT.java
b/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/integration/ArangoCollectionDeleteIT.java
index b33ccd82ab7..512e4565d37 100644
---
a/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/integration/ArangoCollectionDeleteIT.java
+++
b/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/integration/ArangoCollectionDeleteIT.java
@@ -21,6 +21,7 @@ import java.util.Arrays;
import com.arangodb.entity.BaseDocument;
import org.apache.camel.builder.RouteBuilder;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperties;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import static
org.apache.camel.component.arangodb.ArangoDbConstants.MULTI_DELETE;
@@ -28,8 +29,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = "apache.org",
- disabledReason = "Apache CI nodes are too resource
constrained for this test")
+@DisabledIfSystemProperties({
+@DisabledIfSystemProperty(named = "ci.env.name", matches =
"apache.org",
+ disabledReason = "Apache CI nodes are too
resource constrained for this test"),
+@DisabledIfSystemProperty(named = "arangodb.tests.disable", matches =
"true",
+ disabledReason = "Manually disabled tests")
+})
public class ArangoCollectionDeleteIT extends BaseArangoDb {
@Override
diff --git
a/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/integration/ArangoCollectionFindByKeyIT.java
b/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/integration/ArangoCollectionFindByKeyIT.java
index 51357f41b23..1b206e9c619 100644
---
a/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/integration/ArangoCollectionFindByKeyIT.java
+++
b/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/integration/ArangoCollectionFindByKeyIT.java
@@ -25,6 +25,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.infra.core.annotations.ContextFixture;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperties;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import static
org.apache.camel.component.arangodb.ArangoDbConstants.RESULT_CLASS_TYPE;
@@ -32,8 +33,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-@DisabledIfSystemProperty(named = "ci.env.name", matches = "apache.org",
- disabledReason = "Apache CI nodes are too resource
constrained for this test")
+@DisabledIfSystemProperties({
+@DisabledIfSystemProperty(named = "ci.env.name", matches =
"apache.org",
+ disabledReason = "Apache CI nodes are too
resource constrained for this test"),
+@DisabledIfSystemProperty(named = "arangodb.tests.disable", matches =
"true",
+ disabledR
[GitHub] [camel] orpiske opened a new pull request, #11040: (chores) camel-aws2-sqs: fixed flaky test SqsBatchConsumerConcurrentConsumersIT
orpiske opened a new pull request, #11040: URL: https://github.com/apache/camel/pull/11040 On some systems, there's a chance that the concurrent consumers will round-robin and, as such, consume all messages sent. Nonetheless, they would still be consumed in batches. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #11040: (chores) camel-aws2-sqs: fixed flaky test SqsBatchConsumerConcurrentConsumersIT
github-actions[bot] commented on PR #11040: URL: https://github.com/apache/camel/pull/11040#issuecomment-1669345978 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (eedaaf35cf3 -> f277406da00)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from eedaaf35cf3 CAMEL-19724: reduce the incidence of dropped log messages add f277406da00 (chores) camel-arangodb: added a way to disable ArangoDB tests (#11039) No new revisions were added by this update. Summary of changes: .../component/arangodb/integration/ArangoCollectionDeleteIT.java | 9 +++-- .../arangodb/integration/ArangoCollectionFindByKeyIT.java| 9 +++-- .../component/arangodb/integration/ArangoCollectionQueryIT.java | 9 +++-- .../component/arangodb/integration/ArangoCollectionSaveIT.java | 9 +++-- .../component/arangodb/integration/ArangoCollectionUpdateIT.java | 9 +++-- .../camel/component/arangodb/integration/ArangoGraphEdgeIT.java | 9 +++-- .../component/arangodb/integration/ArangoGraphQueriesIT.java | 9 +++-- .../component/arangodb/integration/ArangoGraphVertexIT.java | 9 +++-- .../camel/component/arangodb/integration/BaseArangoDb.java | 4 9 files changed, 60 insertions(+), 16 deletions(-)
[GitHub] [camel] lburgazzoli merged pull request #11006: [CAMEL-19709] yaml dsl: include additional information such as description and title in the jscon schema
lburgazzoli merged PR #11006: URL: https://github.com/apache/camel/pull/11006 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch yaml-schema-improvements deleted (was 1a75cb18944)
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a change to branch yaml-schema-improvements in repository https://gitbox.apache.org/repos/asf/camel.git was 1a75cb18944 [CAMEL-19709] yaml dsl: include additional information such as description and title in the jscon schema The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[GitHub] [camel-quarkus] ppalaga commented on a diff in pull request #5152: Manage test container versions in the root project pom.xml
ppalaga commented on code in PR #5152:
URL: https://github.com/apache/camel-quarkus/pull/5152#discussion_r1286946239
##
tooling/scripts/generate-test-containers-config-properties.groovy:
##
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Writes all Maven properties suffixed with 'container.image' to
target/test-classes/META-INF/microprofile-config.properties
+ */
+def fileContent = project.properties.findAll { key, value ->
+key.endsWith('container.image')
+}.collect { key, value ->
+"${key}=${value}"
+}.join(System.lineSeparator())
+
+File testClasses = new File("${project.build.testOutputDirectory}")
+if (testClasses.exists()) {
+File metaInfDir = new File("${testClasses.absolutePath}/META-INF")
+metaInfDir.mkdir()
+
+File file = new
File("${metaInfDir.absolutePath}/microprofile-config.properties")
+file.write(fileContent)
Review Comment:
Ups, sorry, I meant something like `file.write(fileContent, 'UTF-8')` IIRC,
Groovy has this kind of override.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel-quarkus] ppalaga commented on pull request #5117: Onboard Camel K Runtime
ppalaga commented on PR #5117: URL: https://github.com/apache/camel-quarkus/pull/5117#issuecomment-1669388263  looks scarry, but I will have a look later today -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (f277406da00 -> a5206295029)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from f277406da00 (chores) camel-arangodb: added a way to disable ArangoDB tests (#11039) add a5206295029 [CAMEL-19709] yaml dsl: include additional information such as description and title in the jscon schema No new revisions were added by this update. Summary of changes: .../apache/camel/spi/annotations/YamlProperty.java |4 + .../org/apache/camel/spi/annotations/YamlType.java |6 + .../dsl/yaml/deserializers/ModelDeserializers.java | 3521 +++- .../dsl/yaml/GenerateYamlDeserializersMojo.java| 483 +- .../maven/dsl/yaml/GenerateYamlSchemaMojo.java | 212 +- .../camel/maven/dsl/yaml/support/Schema.java | 59 + .../maven/dsl/yaml/support/YamlProperties.java | 189 + dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml |5 + .../generated/resources/schema/camel-yaml-dsl.json | 5978 +++- .../generated/resources/schema/camelYamlDsl.json | 5978 +++- .../apache/camel/spi/annotations/YamlProperty.java |4 + .../org/apache/camel/spi/annotations/YamlType.java |6 + 12 files changed, 12179 insertions(+), 4266 deletions(-) create mode 100644 dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/support/Schema.java create mode 100644 dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/support/YamlProperties.java
[GitHub] [camel-quarkus] jamesnetherton opened a new pull request, #5157: Set encoding to UTF-8 when writing microprofile-config.properties
jamesnetherton opened a new pull request, #5157: URL: https://github.com/apache/camel-quarkus/pull/5157 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton commented on a diff in pull request #5152: Manage test container versions in the root project pom.xml
jamesnetherton commented on code in PR #5152:
URL: https://github.com/apache/camel-quarkus/pull/5152#discussion_r1286963135
##
tooling/scripts/generate-test-containers-config-properties.groovy:
##
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Writes all Maven properties suffixed with 'container.image' to
target/test-classes/META-INF/microprofile-config.properties
+ */
+def fileContent = project.properties.findAll { key, value ->
+key.endsWith('container.image')
+}.collect { key, value ->
+"${key}=${value}"
+}.join(System.lineSeparator())
+
+File testClasses = new File("${project.build.testOutputDirectory}")
+if (testClasses.exists()) {
+File metaInfDir = new File("${testClasses.absolutePath}/META-INF")
+metaInfDir.mkdir()
+
+File file = new
File("${metaInfDir.absolutePath}/microprofile-config.properties")
+file.write(fileContent)
Review Comment:
https://github.com/apache/camel-quarkus/pull/5157
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel] orpiske opened a new pull request, #11041: (chores) camel-opensearch: opensearch tests should run fine with reusing forks
orpiske opened a new pull request, #11041: URL: https://github.com/apache/camel/pull/11041 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #11041: (chores) camel-opensearch: opensearch tests should run fine with reusing forks
github-actions[bot] commented on PR #11041: URL: https://github.com/apache/camel/pull/11041#issuecomment-1669447648 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-spring-boot] orpiske opened a new pull request, #905: (chores) Use log markers for log messages
orpiske opened a new pull request, #905: URL: https://github.com/apache/camel-spring-boot/pull/905 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske opened a new pull request, #11042: (chores) camel-core: use log markers for logging
orpiske opened a new pull request, #11042: URL: https://github.com/apache/camel/pull/11042 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #11042: (chores) camel-core: use log markers for logging
github-actions[bot] commented on PR #11042: URL: https://github.com/apache/camel/pull/11042#issuecomment-1669489712 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske merged pull request #11040: (chores) camel-aws2-sqs: fixed flaky test SqsBatchConsumerConcurrentConsumersIT
orpiske merged PR #11040: URL: https://github.com/apache/camel/pull/11040 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: (chores) camel-aws2-sqs: fixed flaky test SqsBatchConsumerConcurrentConsumersIT (#11040)
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 8f9ec3f05bc (chores) camel-aws2-sqs: fixed flaky test
SqsBatchConsumerConcurrentConsumersIT (#11040)
8f9ec3f05bc is described below
commit 8f9ec3f05bcf0223bb79c9579ae3039308b4a8cf
Author: Otavio Rodolfo Piske
AuthorDate: Tue Aug 8 14:09:39 2023 +0200
(chores) camel-aws2-sqs: fixed flaky test
SqsBatchConsumerConcurrentConsumersIT (#11040)
On some systems, there's a chance that the concurrent consumers will
round-robin and, as such, consume all messages sent. Nonetheless, they would
still be consumed in batches.
---
.../camel/component/aws2/sqs/SqsBatchConsumerConcurrentConsumersIT.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerConcurrentConsumersIT.java
b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerConcurrentConsumersIT.java
index 4e8604f242e..ab5b308a46a 100644
---
a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerConcurrentConsumersIT.java
+++
b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerConcurrentConsumersIT.java
@@ -31,7 +31,7 @@ public class SqsBatchConsumerConcurrentConsumersIT extends
CamelTestSupport {
@Test
public void receiveBatch() throws Exception {
-mock.expectedMessageCount(5);
+mock.expectedMinimumMessageCount(5);
MockEndpoint.assertIsSatisfied(context);
}
[GitHub] [camel] orpiske merged pull request #11041: (chores) camel-opensearch: opensearch tests should run fine with reusing forks
orpiske merged PR #11041: URL: https://github.com/apache/camel/pull/11041 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: (chores) camel-opensearch: opensearch tests should run fine with reusing forks (#11041)
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 f3aec06e4a6 (chores) camel-opensearch: opensearch tests should run fine with reusing forks (#11041) f3aec06e4a6 is described below commit f3aec06e4a6eaa46dc2a907927c927596e154f7a Author: Otavio Rodolfo Piske AuthorDate: Tue Aug 8 14:09:55 2023 +0200 (chores) camel-opensearch: opensearch tests should run fine with reusing forks (#11041) --- components/camel-opensearch/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/camel-opensearch/pom.xml b/components/camel-opensearch/pom.xml index 76018ac4eea..2d4935aefef 100644 --- a/components/camel-opensearch/pom.xml +++ b/components/camel-opensearch/pom.xml @@ -37,7 +37,7 @@ true true -false +true
[camel] branch main updated: CAMEL-19719: camel-vertx-http - Infinite loop when maximumRedeliveries > 0
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
The following commit(s) were added to refs/heads/main by this push:
new b7df62c3fde CAMEL-19719: camel-vertx-http - Infinite loop when
maximumRedeliveries > 0
b7df62c3fde is described below
commit b7df62c3fdeb0d68775fef7f1586eb924c04fa58
Author: Claus Ibsen
AuthorDate: Tue Aug 8 14:11:39 2023 +0200
CAMEL-19719: camel-vertx-http - Infinite loop when maximumRedeliveries > 0
---
.../vertx/http/DefaultVertxHttpBinding.java| 49 ++
.../http/VertxHttpMaximumRedeliveriesTest.java | 60 ++
.../http/VertxHttpThrowExceptionOnFailureTest.java | 2 +-
3 files changed, 90 insertions(+), 21 deletions(-)
diff --git
a/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/DefaultVertxHttpBinding.java
b/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/DefaultVertxHttpBinding.java
index 8a8bb1ffc06..fba375ee805 100644
---
a/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/DefaultVertxHttpBinding.java
+++
b/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/DefaultVertxHttpBinding.java
@@ -37,7 +37,6 @@ import org.apache.camel.TypeConverter;
import org.apache.camel.http.base.HttpHelper;
import org.apache.camel.http.base.HttpOperationFailedException;
import org.apache.camel.spi.HeaderFilterStrategy;
-import org.apache.camel.support.DefaultMessage;
import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
@@ -147,8 +146,8 @@ public class DefaultVertxHttpBinding implements
VertxHttpBinding {
@Override
public void handleResponse(VertxHttpEndpoint endpoint, Exchange exchange,
AsyncResult> response)
throws Exception {
-Message message = new DefaultMessage(exchange);
-exchange.setMessage(message);
+
+Message message = exchange.getMessage();
HttpResponse result = response.result();
if (response.succeeded()) {
@@ -172,24 +171,34 @@ public class DefaultVertxHttpBinding implements
VertxHttpBinding {
message.setHeader(VertxHttpConstants.HTTP_RESPONSE_TEXT,
response.statusMessage());
MultiMap headers = response.headers();
-headers.forEach(new Consumer>() {
-boolean found;
-
-@Override
-public void accept(Map.Entry entry) {
-String name = entry.getKey();
-String value = entry.getValue();
-if (!found && name.equalsIgnoreCase("content-type")) {
-found = true;
-name = VertxHttpConstants.CONTENT_TYPE;
-exchange.setProperty(ExchangePropertyKey.CHARSET_NAME,
IOHelper.getCharsetNameFromContentType(value));
-}
-Object extracted = HttpHelper.extractHttpParameterValue(value);
-if (strategy != null &&
!strategy.applyFilterToExternalHeaders(name, extracted, exchange)) {
-HttpHelper.appendHeader(message.getHeaders(), name,
extracted);
+if (headers != null && !headers.isEmpty()) {
+
+// avoid duplicate headers by keeping copy of old headers
+Map copy = new
HashMap<>(exchange.getMessage().getHeaders());
+exchange.getMessage().getHeaders().clear();
+
+headers.forEach(new Consumer>() {
+boolean found;
+
+@Override
+public void accept(Map.Entry entry) {
+String name = entry.getKey();
+String value = entry.getValue();
+if (!found && name.equalsIgnoreCase("content-type")) {
+found = true;
+name = VertxHttpConstants.CONTENT_TYPE;
+exchange.setProperty(ExchangePropertyKey.CHARSET_NAME,
IOHelper.getCharsetNameFromContentType(value));
+}
+Object extracted =
HttpHelper.extractHttpParameterValue(value);
+if (strategy != null &&
!strategy.applyFilterToExternalHeaders(name, extracted, exchange)) {
+HttpHelper.appendHeader(message.getHeaders(), name,
extracted);
+}
}
-}
-});
+});
+
+// and only add back old headers if they are not in the HTTP
response
+copy.forEach((k, v) ->
exchange.getMessage().getHeaders().putIfAbsent(k, v));
+}
}
@Override
diff --git
a/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpMaximumRedeliveriesTest.java
b/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/c
[camel] branch camel-3.x updated: CAMEL-19719: camel-vertx-http - Infinite loop when maximumRedeliveries > 0
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.x by this push:
new 3305910901f CAMEL-19719: camel-vertx-http - Infinite loop when
maximumRedeliveries > 0
3305910901f is described below
commit 3305910901f75eb9a1845616bd50131c89aaeddd
Author: Claus Ibsen
AuthorDate: Tue Aug 8 14:11:39 2023 +0200
CAMEL-19719: camel-vertx-http - Infinite loop when maximumRedeliveries > 0
---
.../vertx/http/DefaultVertxHttpBinding.java| 49 ++
.../http/VertxHttpMaximumRedeliveriesTest.java | 60 ++
.../http/VertxHttpThrowExceptionOnFailureTest.java | 2 +-
3 files changed, 90 insertions(+), 21 deletions(-)
diff --git
a/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/DefaultVertxHttpBinding.java
b/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/DefaultVertxHttpBinding.java
index 8a8bb1ffc06..fba375ee805 100644
---
a/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/DefaultVertxHttpBinding.java
+++
b/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/DefaultVertxHttpBinding.java
@@ -37,7 +37,6 @@ import org.apache.camel.TypeConverter;
import org.apache.camel.http.base.HttpHelper;
import org.apache.camel.http.base.HttpOperationFailedException;
import org.apache.camel.spi.HeaderFilterStrategy;
-import org.apache.camel.support.DefaultMessage;
import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
@@ -147,8 +146,8 @@ public class DefaultVertxHttpBinding implements
VertxHttpBinding {
@Override
public void handleResponse(VertxHttpEndpoint endpoint, Exchange exchange,
AsyncResult> response)
throws Exception {
-Message message = new DefaultMessage(exchange);
-exchange.setMessage(message);
+
+Message message = exchange.getMessage();
HttpResponse result = response.result();
if (response.succeeded()) {
@@ -172,24 +171,34 @@ public class DefaultVertxHttpBinding implements
VertxHttpBinding {
message.setHeader(VertxHttpConstants.HTTP_RESPONSE_TEXT,
response.statusMessage());
MultiMap headers = response.headers();
-headers.forEach(new Consumer>() {
-boolean found;
-
-@Override
-public void accept(Map.Entry entry) {
-String name = entry.getKey();
-String value = entry.getValue();
-if (!found && name.equalsIgnoreCase("content-type")) {
-found = true;
-name = VertxHttpConstants.CONTENT_TYPE;
-exchange.setProperty(ExchangePropertyKey.CHARSET_NAME,
IOHelper.getCharsetNameFromContentType(value));
-}
-Object extracted = HttpHelper.extractHttpParameterValue(value);
-if (strategy != null &&
!strategy.applyFilterToExternalHeaders(name, extracted, exchange)) {
-HttpHelper.appendHeader(message.getHeaders(), name,
extracted);
+if (headers != null && !headers.isEmpty()) {
+
+// avoid duplicate headers by keeping copy of old headers
+Map copy = new
HashMap<>(exchange.getMessage().getHeaders());
+exchange.getMessage().getHeaders().clear();
+
+headers.forEach(new Consumer>() {
+boolean found;
+
+@Override
+public void accept(Map.Entry entry) {
+String name = entry.getKey();
+String value = entry.getValue();
+if (!found && name.equalsIgnoreCase("content-type")) {
+found = true;
+name = VertxHttpConstants.CONTENT_TYPE;
+exchange.setProperty(ExchangePropertyKey.CHARSET_NAME,
IOHelper.getCharsetNameFromContentType(value));
+}
+Object extracted =
HttpHelper.extractHttpParameterValue(value);
+if (strategy != null &&
!strategy.applyFilterToExternalHeaders(name, extracted, exchange)) {
+HttpHelper.appendHeader(message.getHeaders(), name,
extracted);
+}
}
-}
-});
+});
+
+// and only add back old headers if they are not in the HTTP
response
+copy.forEach((k, v) ->
exchange.getMessage().getHeaders().putIfAbsent(k, v));
+}
}
@Override
diff --git
a/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpMaximumRedeliveriesTest.java
b/components/camel-vertx/camel-vertx-http/src/test/java/or
[camel] branch camel-3.21.x updated: CAMEL-19719: camel-vertx-http - Infinite loop when maximumRedeliveries > 0
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.21.x by this push:
new ba2678fd792 CAMEL-19719: camel-vertx-http - Infinite loop when
maximumRedeliveries > 0
ba2678fd792 is described below
commit ba2678fd7922e7426031e2403b51cd0062beab0b
Author: Claus Ibsen
AuthorDate: Tue Aug 8 14:11:39 2023 +0200
CAMEL-19719: camel-vertx-http - Infinite loop when maximumRedeliveries > 0
---
.../vertx/http/DefaultVertxHttpBinding.java| 49 ++
.../http/VertxHttpMaximumRedeliveriesTest.java | 60 ++
.../http/VertxHttpThrowExceptionOnFailureTest.java | 2 +-
3 files changed, 90 insertions(+), 21 deletions(-)
diff --git
a/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/DefaultVertxHttpBinding.java
b/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/DefaultVertxHttpBinding.java
index 8a8bb1ffc06..fba375ee805 100644
---
a/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/DefaultVertxHttpBinding.java
+++
b/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/DefaultVertxHttpBinding.java
@@ -37,7 +37,6 @@ import org.apache.camel.TypeConverter;
import org.apache.camel.http.base.HttpHelper;
import org.apache.camel.http.base.HttpOperationFailedException;
import org.apache.camel.spi.HeaderFilterStrategy;
-import org.apache.camel.support.DefaultMessage;
import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
@@ -147,8 +146,8 @@ public class DefaultVertxHttpBinding implements
VertxHttpBinding {
@Override
public void handleResponse(VertxHttpEndpoint endpoint, Exchange exchange,
AsyncResult> response)
throws Exception {
-Message message = new DefaultMessage(exchange);
-exchange.setMessage(message);
+
+Message message = exchange.getMessage();
HttpResponse result = response.result();
if (response.succeeded()) {
@@ -172,24 +171,34 @@ public class DefaultVertxHttpBinding implements
VertxHttpBinding {
message.setHeader(VertxHttpConstants.HTTP_RESPONSE_TEXT,
response.statusMessage());
MultiMap headers = response.headers();
-headers.forEach(new Consumer>() {
-boolean found;
-
-@Override
-public void accept(Map.Entry entry) {
-String name = entry.getKey();
-String value = entry.getValue();
-if (!found && name.equalsIgnoreCase("content-type")) {
-found = true;
-name = VertxHttpConstants.CONTENT_TYPE;
-exchange.setProperty(ExchangePropertyKey.CHARSET_NAME,
IOHelper.getCharsetNameFromContentType(value));
-}
-Object extracted = HttpHelper.extractHttpParameterValue(value);
-if (strategy != null &&
!strategy.applyFilterToExternalHeaders(name, extracted, exchange)) {
-HttpHelper.appendHeader(message.getHeaders(), name,
extracted);
+if (headers != null && !headers.isEmpty()) {
+
+// avoid duplicate headers by keeping copy of old headers
+Map copy = new
HashMap<>(exchange.getMessage().getHeaders());
+exchange.getMessage().getHeaders().clear();
+
+headers.forEach(new Consumer>() {
+boolean found;
+
+@Override
+public void accept(Map.Entry entry) {
+String name = entry.getKey();
+String value = entry.getValue();
+if (!found && name.equalsIgnoreCase("content-type")) {
+found = true;
+name = VertxHttpConstants.CONTENT_TYPE;
+exchange.setProperty(ExchangePropertyKey.CHARSET_NAME,
IOHelper.getCharsetNameFromContentType(value));
+}
+Object extracted =
HttpHelper.extractHttpParameterValue(value);
+if (strategy != null &&
!strategy.applyFilterToExternalHeaders(name, extracted, exchange)) {
+HttpHelper.appendHeader(message.getHeaders(), name,
extracted);
+}
}
-}
-});
+});
+
+// and only add back old headers if they are not in the HTTP
response
+copy.forEach((k, v) ->
exchange.getMessage().getHeaders().putIfAbsent(k, v));
+}
}
@Override
diff --git
a/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpMaximumRedeliveriesTest.java
b/components/camel-vertx/camel-vertx-http/src/test/j
[camel] branch camel-3.20.x updated: CAMEL-19719: camel-vertx-http - Infinite loop when maximumRedeliveries > 0
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.20.x by this push:
new 6f8393d9b68 CAMEL-19719: camel-vertx-http - Infinite loop when
maximumRedeliveries > 0
6f8393d9b68 is described below
commit 6f8393d9b6828ae1ddbe57e1bf4b6949534c6c8c
Author: Claus Ibsen
AuthorDate: Tue Aug 8 14:11:39 2023 +0200
CAMEL-19719: camel-vertx-http - Infinite loop when maximumRedeliveries > 0
---
.../vertx/http/DefaultVertxHttpBinding.java| 49 ++
.../http/VertxHttpMaximumRedeliveriesTest.java | 60 ++
.../http/VertxHttpThrowExceptionOnFailureTest.java | 2 +-
3 files changed, 90 insertions(+), 21 deletions(-)
diff --git
a/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/DefaultVertxHttpBinding.java
b/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/DefaultVertxHttpBinding.java
index 8a8bb1ffc06..fba375ee805 100644
---
a/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/DefaultVertxHttpBinding.java
+++
b/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/DefaultVertxHttpBinding.java
@@ -37,7 +37,6 @@ import org.apache.camel.TypeConverter;
import org.apache.camel.http.base.HttpHelper;
import org.apache.camel.http.base.HttpOperationFailedException;
import org.apache.camel.spi.HeaderFilterStrategy;
-import org.apache.camel.support.DefaultMessage;
import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
@@ -147,8 +146,8 @@ public class DefaultVertxHttpBinding implements
VertxHttpBinding {
@Override
public void handleResponse(VertxHttpEndpoint endpoint, Exchange exchange,
AsyncResult> response)
throws Exception {
-Message message = new DefaultMessage(exchange);
-exchange.setMessage(message);
+
+Message message = exchange.getMessage();
HttpResponse result = response.result();
if (response.succeeded()) {
@@ -172,24 +171,34 @@ public class DefaultVertxHttpBinding implements
VertxHttpBinding {
message.setHeader(VertxHttpConstants.HTTP_RESPONSE_TEXT,
response.statusMessage());
MultiMap headers = response.headers();
-headers.forEach(new Consumer>() {
-boolean found;
-
-@Override
-public void accept(Map.Entry entry) {
-String name = entry.getKey();
-String value = entry.getValue();
-if (!found && name.equalsIgnoreCase("content-type")) {
-found = true;
-name = VertxHttpConstants.CONTENT_TYPE;
-exchange.setProperty(ExchangePropertyKey.CHARSET_NAME,
IOHelper.getCharsetNameFromContentType(value));
-}
-Object extracted = HttpHelper.extractHttpParameterValue(value);
-if (strategy != null &&
!strategy.applyFilterToExternalHeaders(name, extracted, exchange)) {
-HttpHelper.appendHeader(message.getHeaders(), name,
extracted);
+if (headers != null && !headers.isEmpty()) {
+
+// avoid duplicate headers by keeping copy of old headers
+Map copy = new
HashMap<>(exchange.getMessage().getHeaders());
+exchange.getMessage().getHeaders().clear();
+
+headers.forEach(new Consumer>() {
+boolean found;
+
+@Override
+public void accept(Map.Entry entry) {
+String name = entry.getKey();
+String value = entry.getValue();
+if (!found && name.equalsIgnoreCase("content-type")) {
+found = true;
+name = VertxHttpConstants.CONTENT_TYPE;
+exchange.setProperty(ExchangePropertyKey.CHARSET_NAME,
IOHelper.getCharsetNameFromContentType(value));
+}
+Object extracted =
HttpHelper.extractHttpParameterValue(value);
+if (strategy != null &&
!strategy.applyFilterToExternalHeaders(name, extracted, exchange)) {
+HttpHelper.appendHeader(message.getHeaders(), name,
extracted);
+}
}
-}
-});
+});
+
+// and only add back old headers if they are not in the HTTP
response
+copy.forEach((k, v) ->
exchange.getMessage().getHeaders().putIfAbsent(k, v));
+}
}
@Override
diff --git
a/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpMaximumRedeliveriesTest.java
b/components/camel-vertx/camel-vertx-http/src/test/j
[GitHub] [camel-spring-boot] davsclaus merged pull request #904: CAMEL-19724: adjusted the code to align with the changes from Camel Core
davsclaus merged PR #904: URL: https://github.com/apache/camel-spring-boot/pull/904 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-spring-boot] branch main updated: CAMEL-19724: adjusted the code to align with the changes from Camel Core (#904)
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-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 2294861b34d CAMEL-19724: adjusted the code to align with the changes
from Camel Core (#904)
2294861b34d is described below
commit 2294861b34d68f1f822fff627f26e658cb394a02
Author: Otavio Rodolfo Piske
AuthorDate: Tue Aug 8 14:14:21 2023 +0200
CAMEL-19724: adjusted the code to align with the changes from Camel Core
(#904)
---
.../apache/camel/spring/boot/FatJarPackageScanClassResolver.java | 9 ++---
.../camel/spring/boot/FatJarPackageScanResourceResolver.java | 9 ++---
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanClassResolver.java
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanClassResolver.java
index 070eb50eefc..0fcede943e3 100644
---
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanClassResolver.java
+++
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanClassResolver.java
@@ -25,12 +25,15 @@ import java.util.jar.JarInputStream;
import org.apache.camel.impl.engine.DefaultPackageScanClassResolver;
import org.apache.camel.util.IOHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* An implementation of the {@code
org.apache.camel.spi.PackageScanClassResolver} that is able to
* scan spring-boot fat jars to find classes contained also in nested jars.
*/
public class FatJarPackageScanClassResolver extends
DefaultPackageScanClassResolver {
+private static final Logger LOG =
LoggerFactory.getLogger(FatJarPackageScanClassResolver.class);
private static final String SPRING_BOOT_CLASSIC_LIB_ROOT = "lib/";
private static final String SPRING_BOOT_BOOT_INF_LIB_ROOT =
"BOOT-INF/lib/";
@@ -59,18 +62,18 @@ public class FatJarPackageScanClassResolver extends
DefaultPackageScanClassResol
entries.add(cleanupSpringBootClassName(name));
} else if (inspectNestedJars && !entry.isDirectory() &&
isSpringBootNestedJar(name)) {
String nestedUrl = urlPath + "!/" + name;
-log.trace("Inspecting nested jar: {}", nestedUrl);
+LOG.trace("Inspecting nested jar: {}", nestedUrl);
List nestedEntries =
doLoadJarClassEntries(jarStream, nestedUrl, false, false);
entries.addAll(nestedEntries);
}
}
} catch (IOException ioe) {
-log.warn("Cannot search jar file '" + urlPath + " due to an
IOException: " + ioe.getMessage() + ". This exception is ignored.", ioe);
+LOG.warn("Cannot search jar file '" + urlPath + " due to an
IOException: " + ioe.getMessage() + ". This exception is ignored.", ioe);
} finally {
if (closeStream) {
// stream is left open when scanning nested jars, otherwise
the fat jar stream gets closed
-IOHelper.close(jarStream, urlPath, log);
+IOHelper.close(jarStream, urlPath, LOG);
}
}
diff --git
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanResourceResolver.java
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanResourceResolver.java
index 249d2947d46..3d68a356a42 100644
---
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanResourceResolver.java
+++
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanResourceResolver.java
@@ -18,6 +18,8 @@ package org.apache.camel.spring.boot;
import org.apache.camel.impl.engine.DefaultPackageScanResourceResolver;
import org.apache.camel.util.IOHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.InputStream;
@@ -31,6 +33,7 @@ import java.util.jar.JarInputStream;
* scan spring-boot fat jars to find resources contained also in nested jars.
*/
public class FatJarPackageScanResourceResolver extends
DefaultPackageScanResourceResolver {
+private static final Logger LOG =
LoggerFactory.getLogger(FatJarPackageScanResourceResolver.class);
private static final String SPRING_BOOT_CLASSIC_LIB_ROOT = "lib/";
private static final String SPRING_BOOT_BOOT_INF_LIB_ROOT =
"BOOT-INF/lib/";
@@ -56,7 +59,7 @@ public class FatJarPackageScanResourceResolver extends
DefaultPackageScanResourc
String name = entry.getName().trim();
if (inspectNestedJars && !entry.isDirectory() &&
isSpringBootNestedJar(name)) {
String nestedUrl = urlPath + "!/" + name;
-log.trace("Inspecting ne
[camel-spring-boot] branch main updated: Regen
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-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new dfa1ac2f7c3 Regen
dfa1ac2f7c3 is described below
commit dfa1ac2f7c351923e1c357796e9f75834a2f78c7
Author: Claus Ibsen
AuthorDate: Tue Aug 8 14:16:00 2023 +0200
Regen
---
.../camel/springboot/catalog/components/box.json | 12 +++---
.../catalog/components/google-drive.json | 44 +-
.../catalog/components/google-sheets.json | 2 +-
tooling/camel-spring-boot-dependencies/pom.xml | 5 +++
4 files changed, 30 insertions(+), 33 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/box.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/box.json
index 577cdfb445c..6c209fe517e 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/box.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/box.json
@@ -70,11 +70,11 @@
"apis": {
"collaborations": { "consumerOnly": false, "producerOnly": true,
"description": "Provides operations to manage Box collaborations", "aliases": [
"addFolderCollaboration=add", "addFolderCollaborationByEmail=addByEmail",
"deleteCollaboration=delete", "getFolderCollaborations=collaborations",
"getPendingCollaborations=pendingCollaborations", "getCollaborationInfo=info",
"updateCollaborationInfo=updateInfo" ], "methods": { "addFolderCollaboration":
{ "description": "Add a collaboration t [...]
"comments": { "consumerOnly": false, "producerOnly": true, "description":
"Provides operations to manage Box comments", "aliases": [
"addFileComment=add", "changeCommentMessage=updateMessage",
"deleteComment=delete", "getCommentInfo=info", "getFileComments=comments",
"replyToComment=reply" ], "methods": { "addFileComment": { "description": "Add
comment to file", "signatures": [ "com.box.sdk.BoxFile addFileComment(String
fileId, String message)" ] }, "changeCommentMessage": { "descrip [...]
-"event-logs": { "consumerOnly": false, "producerOnly": true,
"description": "Provides operations to read Box enterprise (admin) event logs",
"aliases": [ "getEnterpriseEvents=events" ], "methods": {
"getEnterpriseEvents": { "description": "Create an event stream with optional
starting initial position and add listener that will be notified when an event
is received", "signatures": [ "java.util.List
getEnterpriseEvents(String position, java.util.Date after, java. [...]
+"event-logs": { "consumerOnly": false, "producerOnly": true,
"description": "Provides operations to read Box enterprise (admin) event logs",
"aliases": [ "getEnterpriseEvents=events" ], "methods": {
"getEnterpriseEvents": { "description": "Create an event stream with optional
starting initial position and add listener that will be notified when an event
is received", "signatures": [ "java.util.List
getEnterpriseEvents(String position, java.util.Date after, java. [...]
"events": { "consumerOnly": true, "producerOnly": false, "description":
"Provides operations to manage Box events", "methods": { "listen": {
"description": "Create an event stream with optional starting initial position
and add listener that will be notified when an event is received",
"signatures": [ "void listen(com.box.sdk.EventListener listener, Long
startingPosition)" ] } } },
-"files": { "consumerOnly": false, "producerOnly": true, "description":
"Provides operations to manage Box files", "aliases": [ "uploadFile=upload",
"downloadFile=download", "copyFile=copy", "moveFile=move", "renameFile=rename",
"createFileSharedLink=link", "deleteFile=delete",
"uploadNewFileVersion=uploadVersion", "promoteFileVersion=promoteVersion",
"getFileVersions=versions", "downloadPreviousFileVersion=downloadVersion",
"deleteFileVersion=deleteVersion", "getFileInfo=info", "upda [...]
+"files": { "consumerOnly": false, "producerOnly": true, "description":
"Provides operations to manage Box files", "aliases": [ "uploadFile=upload",
"downloadFile=download", "copyFile=copy", "moveFile=move", "renameFile=rename",
"createFileSharedLink=link", "deleteFile=delete",
"uploadNewFileVersion=uploadVersion", "promoteFileVersion=promoteVersion",
"getFileVersions=versions", "downloadPreviousFileVersion=downloadVersion",
"deleteFileVersion=deleteVersion", "getFileInfo=info", "upda [...]
"folders": { "consumerOnly": false, "producerOnly": true, "description":
"Provides operations to manage Box folders", "aliases": [ "getRootFolder=root",
"createFolder=create", "copyFolder=copy", "moveFolder=move",
"renameFolder=rename", "createFolderSharedLink=link", "deleteFol
[camel] branch regen_bot updated (a5206295029 -> 8f9ec3f05bc)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from a5206295029 [CAMEL-19709] yaml dsl: include additional information such as description and title in the jscon schema add 8f9ec3f05bc (chores) camel-aws2-sqs: fixed flaky test SqsBatchConsumerConcurrentConsumersIT (#11040) No new revisions were added by this update. Summary of changes: .../camel/component/aws2/sqs/SqsBatchConsumerConcurrentConsumersIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel] branch regen_bot updated (8f9ec3f05bc -> f3aec06e4a6)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 8f9ec3f05bc (chores) camel-aws2-sqs: fixed flaky test SqsBatchConsumerConcurrentConsumersIT (#11040) add f3aec06e4a6 (chores) camel-opensearch: opensearch tests should run fine with reusing forks (#11041) No new revisions were added by this update. Summary of changes: components/camel-opensearch/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel-spring-boot] branch main updated (dfa1ac2f7c3 -> 17652060739)
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-spring-boot.git
from dfa1ac2f7c3 Regen
new c15ad08a194 Make starter-create script to run
new 17652060739 CAMEL-12317: Added AWS StepFunctions Component
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:
.../camel/springboot/catalog/components.properties | 1 +
.../catalog/components/aws2-step-functions.json| 85 +++
.../pom.xml| 6 +-
.../src/main/docs/aws2-step-functions.json | 158
.../StepFunctions2ComponentAutoConfiguration.java} | 22 +--
.../StepFunctions2ComponentConfiguration.java} | 165 +++--
.../StepFunctions2ComponentConverter.java} | 12 +-
.../src/main/resources/META-INF/LICENSE.txt| 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../src/main/resources/META-INF/spring.provides| 2 +-
...rk.boot.autoconfigure.AutoConfiguration.imports | 4 +-
components-starter/pom.xml | 1 +
starter-create | 2 +-
tooling/camel-spring-boot-bom/pom.xml | 5 +
tooling/camel-spring-boot-dependencies/pom.xml | 5 +
15 files changed, 362 insertions(+), 106 deletions(-)
create mode 100644
catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-step-functions.json
copy components-starter/{camel-aws-cloudtrail-starter =>
camel-aws2-step-functions-starter}/pom.xml (92%)
create mode 100644
components-starter/camel-aws2-step-functions-starter/src/main/docs/aws2-step-functions.json
copy
components-starter/{camel-stringtemplate-starter/src/main/java/org/apache/camel/component/stringtemplate/springboot/StringTemplateComponentAutoConfiguration.java
=>
camel-aws2-step-functions-starter/src/main/java/org/apache/camel/component/aws2/stepfunctions/springboot/StepFunctions2ComponentAutoConfiguration.java}
(82%)
copy
components-starter/{camel-aws2-lambda-starter/src/main/java/org/apache/camel/component/aws2/lambda/springboot/Lambda2ComponentConfiguration.java
=>
camel-aws2-step-functions-starter/src/main/java/org/apache/camel/component/aws2/stepfunctions/springboot/StepFunctions2ComponentConfiguration.java}
(79%)
copy
components-starter/{camel-aws2-ecs-starter/src/main/java/org/apache/camel/component/aws2/ecs/springboot/ECS2ComponentConverter.java
=>
camel-aws2-step-functions-starter/src/main/java/org/apache/camel/component/aws2/stepfunctions/springboot/StepFunctions2ComponentConverter.java}
(82%)
copy {archetypes/camel-archetype-spring-boot =>
components-starter/camel-aws2-step-functions-starter}/src/main/resources/META-INF/LICENSE.txt
(100%)
copy {archetypes/camel-archetype-spring-boot =>
components-starter/camel-aws2-step-functions-starter}/src/main/resources/META-INF/NOTICE.txt
(100%)
copy components-starter/{camel-activemq-starter =>
camel-aws2-step-functions-starter}/src/main/resources/META-INF/spring.provides
(96%)
copy components-starter/{camel-activemq-starter =>
camel-aws2-step-functions-starter}/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
(83%)
[camel-spring-boot] 01/02: Make starter-create script to run
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-spring-boot.git commit c15ad08a194b9fa3d5ccf7fce8f307d27e4ab337 Author: Claus Ibsen AuthorDate: Tue Aug 8 14:20:06 2023 +0200 Make starter-create script to run --- starter-create | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/starter-create b/starter-create index d3f2aa450ca..3be6d385073 100755 --- a/starter-create +++ b/starter-create @@ -20,4 +20,4 @@ name=$1 shift -mvnw --file tooling/camel-spring-boot-starter-generator org.apache.camel.springboot:camel-spring-boot-generator-maven-plugin:generate-starter -Daction=create -DcomponentName=$name $@ \ No newline at end of file +./mvnw --file tooling/camel-spring-boot-starter-generator org.apache.camel.springboot:camel-spring-boot-generator-maven-plugin:generate-starter -Daction=create -DcomponentName=$name $@ \ No newline at end of file
[camel-spring-boot] 02/02: CAMEL-12317: Added AWS StepFunctions Component
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-spring-boot.git
commit 176520607394624dcdf4cf1b5543c18d405c59ac
Author: Claus Ibsen
AuthorDate: Tue Aug 8 14:25:03 2023 +0200
CAMEL-12317: Added AWS StepFunctions Component
---
.../camel/springboot/catalog/components.properties | 1 +
.../catalog/components/aws2-step-functions.json| 85 ++
.../camel-aws2-step-functions-starter/pom.xml | 56
.../src/main/docs/aws2-step-functions.json | 158 +++
.../StepFunctions2ComponentAutoConfiguration.java | 77 +
.../StepFunctions2ComponentConfiguration.java | 312 +
.../StepFunctions2ComponentConverter.java | 65 +
.../src/main/resources/META-INF/LICENSE.txt| 203 ++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../src/main/resources/META-INF/spring.provides| 17 ++
...rk.boot.autoconfigure.AutoConfiguration.imports | 19 ++
components-starter/pom.xml | 1 +
tooling/camel-spring-boot-bom/pom.xml | 5 +
tooling/camel-spring-boot-dependencies/pom.xml | 5 +
14 files changed, 1015 insertions(+)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
index fda217994e3..0f75255c798 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
@@ -29,6 +29,7 @@ aws2-s3
aws2-ses
aws2-sns
aws2-sqs
+aws2-step-functions
aws2-sts
aws2-translate
azure-cosmosdb
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-step-functions.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-step-functions.json
new file mode 100644
index 000..b4c71cd5302
--- /dev/null
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-step-functions.json
@@ -0,0 +1,85 @@
+{
+ "component": {
+"kind": "component",
+"name": "aws2-step-functions",
+"title": "AWS StepFunctions",
+"description": "Manage and invoke AWS Step functions using AWS SDK version
2.x.",
+"deprecated": false,
+"firstVersion": "4.0.0",
+"label": "cloud,serverless",
+"javaType":
"org.apache.camel.component.aws2.stepfunctions.StepFunctions2Component",
+"supportLevel": "Preview",
+"groupId": "org.apache.camel.springboot",
+"artifactId": "camel-aws2-step-functions-starter",
+"version": "4.0.0-SNAPSHOT",
+"scheme": "aws2-step-functions",
+"extendsScheme": "",
+"syntax": "aws2-step-functions:label",
+"async": false,
+"api": false,
+"consumerOnly": false,
+"producerOnly": true,
+"lenientProperties": false
+ },
+ "componentProperties": {
+"configuration": { "index": 0, "kind": "property", "displayName":
"Configuration", "group": "producer", "label": "", "required": false, "type":
"object", "javaType":
"org.apache.camel.component.aws2.stepfunctions.StepFunctions2Configuration",
"deprecated": false, "autowired": false, "secret": false, "description":
"Component configuration" },
+"lazyStartProducer": { "index": 1, "kind": "property", "displayName":
"Lazy Start Producer", "group": "producer", "label": "producer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether the producer should be started lazy (on the first message). By
starting lazy you can use this to allow CamelContext and routes to startup in
situations where a producer may otherwise fail [...]
+"operation": { "index": 2, "kind": "property", "displayName": "Operation",
"group": "producer", "label": "", "required": true, "type": "object",
"javaType":
"org.apache.camel.component.aws2.stepfunctions.StepFunctions2Operations",
"enum": [ "createStateMachine", "deleteStateMachine", "updateStateMachine",
"describeStateMachine", "listStateMachines", "createActivity",
"deleteActivity", "describeActivity", "getActivityTask", "listActivities",
"startExecution", "startSyncExecution", "st [...]
+"overrideEndpoint": { "index": 3, "kind": "property", "displayName":
"Override Endpoint", "group": "producer", "label": "", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.stepfunctions.
[camel-spring-boot] branch main updated: (chores) Use log markers for log messages (#905)
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-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 98c4e5d351e (chores) Use log markers for log messages (#905)
98c4e5d351e is described below
commit 98c4e5d351e106421a8d5c601d32c4bbfc5f6fcf
Author: Otavio Rodolfo Piske
AuthorDate: Tue Aug 8 14:28:06 2023 +0200
(chores) Use log markers for log messages (#905)
---
.../camel/component/fhir/FhirCapabilitiesIT.java | 4 ++--
.../org/apache/camel/component/fhir/FhirCreateIT.java | 6 +++---
.../org/apache/camel/component/fhir/FhirDeleteIT.java | 10 +-
.../camel/component/fhir/FhirExtraParametersIT.java| 2 +-
.../org/apache/camel/component/fhir/FhirHistoryIT.java | 8
.../apache/camel/component/fhir/FhirLoadPageIT.java| 8
.../org/apache/camel/component/fhir/FhirMetaIT.java| 12 ++--
.../apache/camel/component/fhir/FhirOperationIT.java | 8
.../org/apache/camel/component/fhir/FhirPatchIT.java | 4 ++--
.../org/apache/camel/component/fhir/FhirReadIT.java| 2 +-
.../org/apache/camel/component/fhir/FhirSearchIT.java | 2 +-
.../apache/camel/component/fhir/FhirTransactionIT.java | 8
.../org/apache/camel/component/fhir/FhirUpdateIT.java | 14 +++---
.../apache/camel/component/fhir/FhirValidateIT.java| 4 ++--
.../file/FileChangedReadLockMarkerFileFalseTest.java | 2 +-
.../integration/BaseEmbeddedKafkaTestSupport.java | 2 +-
.../springboot/openapi/OpenApiAutoConfiguration.java | 3 ++-
.../springboot/SpringBootPlatformHttpConsumer.java | 2 +-
.../quartz/springboot/StatefulQuartzRouteTest.java | 2 +-
.../xquery/springboot/BeanWithXQueryInjectionTest.java | 2 +-
.../springboot/XPathSplitChoicePerformanceTest.java| 18 +-
.../JdbcAggregateSerializedHeadersTest.java| 4 ++--
.../ValidatorEndpointClearCachedSchemaTest.java| 2 +-
.../boot/CamelSpringBootApplicationListener.java | 3 ++-
24 files changed, 67 insertions(+), 65 deletions(-)
diff --git
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCapabilitiesIT.java
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCapabilitiesIT.java
index 0a3bbce5ac8..c39943d233a 100644
---
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCapabilitiesIT.java
+++
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCapabilitiesIT.java
@@ -62,7 +62,7 @@ public class FhirCapabilitiesIT extends
AbstractFhirTestSupport {
public void testOfType() throws Exception {
org.hl7.fhir.instance.model.api.IBaseConformance result =
requestBody("direct://OF_TYPE", CapabilityStatement.class);
-LOG.debug("ofType: " + result);
+LOG.debug("ofType: {}", result);
assertNotNull(result, "ofType result");
assertEquals(Enumerations.PublicationStatus.ACTIVE,
((CapabilityStatement) result).getStatus());
}
@@ -75,7 +75,7 @@ public class FhirCapabilitiesIT extends
AbstractFhirTestSupport {
org.hl7.fhir.instance.model.api.IBaseConformance result
= requestBodyAndHeaders("direct://OF_TYPE",
CapabilityStatement.class, headers);
-LOG.debug("ofType: " + result);
+LOG.debug("ofType: {}", result);
assertNotNull(result, "ofType result");
assertEquals(Enumerations.PublicationStatus.ACTIVE,
((CapabilityStatement) result).getStatus());
}
diff --git
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCreateIT.java
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCreateIT.java
index aba81bd053e..593fdbb0dec 100644
---
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCreateIT.java
+++
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCreateIT.java
@@ -64,7 +64,7 @@ public class FhirCreateIT extends AbstractFhirTestSupport {
MethodOutcome result = requestBody("direct://RESOURCE", patient);
-LOG.debug("resource: " + result);
+LOG.debug("resource: {}", result);
assertNotNull(result, "resource result");
assertTrue(result.getCreated());
}
@@ -76,7 +76,7 @@ public class FhirCreateIT extends AbstractFhirTestSupport {
MethodOutcome result = requestBody("direct://RESOURCE_STRING",
patientString);
-LOG.debug("resource: " + result);
+LOG.debug("resource: {}", result);
assertNotNull(result, "resource result");
assertTrue(result.getCreated());
}
@@ -89,7 +89,7 @@ public class FhirCreateIT extends AbstractFhirTestSupport {
headers.put(Extra
[GitHub] [camel-spring-boot] davsclaus merged pull request #905: (chores) Use log markers for log messages
davsclaus merged PR #905: URL: https://github.com/apache/camel-spring-boot/pull/905 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot_3x updated (1e9d2fc833f -> 3305910901f)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch regen_bot_3x
in repository https://gitbox.apache.org/repos/asf/camel.git
from 1e9d2fc833f (chores) camel-jcr: avoid recreating the repository for
every single test (#11011)
add 3305910901f CAMEL-19719: camel-vertx-http - Infinite loop when
maximumRedeliveries > 0
No new revisions were added by this update.
Summary of changes:
.../vertx/http/DefaultVertxHttpBinding.java| 49 +-
.../http/VertxHttpMaximumRedeliveriesTest.java}| 38 +
.../http/VertxHttpThrowExceptionOnFailureTest.java | 2 +-
3 files changed, 51 insertions(+), 38 deletions(-)
copy
components/{camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowError500Test.java
=>
camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpMaximumRedeliveriesTest.java}
(53%)
[GitHub] [camel] orpiske merged pull request #11042: (chores) camel-core: use log markers for logging
orpiske merged PR #11042: URL: https://github.com/apache/camel/pull/11042 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: (chores) camel-core: use log markers for logging (#11042)
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 a4639655102 (chores) camel-core: use log markers for logging (#11042)
a4639655102 is described below
commit a46396551022a973c049c752fc305c6556655e4b
Author: Otavio Rodolfo Piske
AuthorDate: Tue Aug 8 15:00:56 2023 +0200
(chores) camel-core: use log markers for logging (#11042)
---
.../org/apache/camel/impl/engine/CamelInternalProcessor.java | 8 +++-
.../camel/impl/engine/DefaultAsyncProcessorAwaitManager.java | 4 ++--
.../camel/impl/engine/DefaultPackageScanResourceResolver.java | 2 +-
.../org/apache/camel/impl/engine/DefaultShutdownStrategy.java | 8
.../src/main/docs/modules/eips/pages/split-eip.adoc| 8
.../java/org/apache/camel/processor/MulticastProcessor.java| 2 +-
.../src/main/java/org/apache/camel/processor/Resequencer.java | 2 +-
.../java/org/apache/camel/processor/SendDynamicProcessor.java | 7 +++
.../src/main/java/org/apache/camel/main/MainHelper.java| 5 ++---
.../src/main/java/org/apache/camel/main/MainSupport.java | 2 +-
.../camel/management/JmxManagementLifecycleStrategy.java | 10 +-
.../issues/DynamicRouterConvertBodyToIssueManualTest.java | 6 +++---
.../camel/management/JmxNotificationEventNotifierTest.java | 2 +-
.../ReduceStacksNeededDuringRoutingSendProcessorTest.java | 2 +-
.../camel/processor/ReduceStacksNeededDuringRoutingTest.java | 2 +-
.../org/apache/camel/support/DefaultContextReloadStrategy.java | 2 +-
.../src/main/java/org/apache/camel/support/EventHelper.java| 2 +-
.../camel/support/FileWatcherResourceReloadStrategy.java | 5 ++---
.../org/apache/camel/support/RouteOnDemandReloadStrategy.java | 4 +---
.../java/org/apache/camel/support/RouteTemplateHelper.java | 4 +---
.../camel/support/cluster/RebalancingCamelClusterService.java | 6 +++---
.../src/main/java/org/apache/camel/util/IOHelper.java | 8
22 files changed, 46 insertions(+), 55 deletions(-)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
index 8c4291246af..79229d7fbd6 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
@@ -508,8 +508,7 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor implements In
policy.onExchangeBegin(route, exchange);
}
} catch (Exception e) {
-log.warn("Error occurred during onExchangeBegin on
RoutePolicy: " + policy
- + ". This exception will be ignored",
+log.warn("Error occurred during onExchangeBegin on
RoutePolicy: {}. This exception will be ignored", policy,
e);
}
}
@@ -530,9 +529,8 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor implements In
policy.onExchangeDone(route, exchange);
}
} catch (Exception e) {
-log.warn("Error occurred during onExchangeDone on
RoutePolicy: " + policy
- + ". This exception will be ignored",
-e);
+log.warn("Error occurred during onExchangeDone on
RoutePolicy: {}. This exception will be ignored",
+policy, e);
}
}
}
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultAsyncProcessorAwaitManager.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultAsyncProcessorAwaitManager.java
index 0acfe260d03..c62abeb7551 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultAsyncProcessorAwaitManager.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultAsyncProcessorAwaitManager.java
@@ -237,8 +237,8 @@ public class DefaultAsyncProcessorAwaitManager extends
ServiceSupport implements
try {
interrupt(entry.getExchange());
} catch (Throwable e) {
-LOG.warn("Error while interrupting thread: " +
entry.getBlockedThread().getName()
- + ". This exception is ignored.",
+LOG.warn("Error while interrupting thread: {}. This
exception is ignored.",
+entry.getBlockedThread().getName(),
[GitHub] [camel] jono-morris opened a new pull request, #11043: Camel-19627: paho-mqtt5 allow optional password when username provided
jono-morris opened a new pull request, #11043: URL: https://github.com/apache/camel/pull/11043 Allow a username without password for the paho-mqtt5 component. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #11043: Camel-19627: paho-mqtt5 allow optional password when username provided
github-actions[bot] commented on PR #11043: URL: https://github.com/apache/camel/pull/11043#issuecomment-1669578680 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (f3aec06e4a6 -> a4639655102)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch regen_bot
in repository https://gitbox.apache.org/repos/asf/camel.git
from f3aec06e4a6 (chores) camel-opensearch: opensearch tests should run
fine with reusing forks (#11041)
add b7df62c3fde CAMEL-19719: camel-vertx-http - Infinite loop when
maximumRedeliveries > 0
add a4639655102 (chores) camel-core: use log markers for logging (#11042)
No new revisions were added by this update.
Summary of changes:
.../vertx/http/DefaultVertxHttpBinding.java| 49 +-
.../http/VertxHttpMaximumRedeliveriesTest.java}| 38 +
.../http/VertxHttpThrowExceptionOnFailureTest.java | 2 +-
.../camel/impl/engine/CamelInternalProcessor.java | 8 ++--
.../engine/DefaultAsyncProcessorAwaitManager.java | 4 +-
.../engine/DefaultPackageScanResourceResolver.java | 2 +-
.../camel/impl/engine/DefaultShutdownStrategy.java | 8 ++--
.../main/docs/modules/eips/pages/split-eip.adoc| 8 ++--
.../apache/camel/processor/MulticastProcessor.java | 2 +-
.../org/apache/camel/processor/Resequencer.java| 2 +-
.../camel/processor/SendDynamicProcessor.java | 7 ++--
.../java/org/apache/camel/main/MainHelper.java | 5 +--
.../java/org/apache/camel/main/MainSupport.java| 2 +-
.../management/JmxManagementLifecycleStrategy.java | 10 ++---
.../DynamicRouterConvertBodyToIssueManualTest.java | 6 +--
.../JmxNotificationEventNotifierTest.java | 2 +-
...StacksNeededDuringRoutingSendProcessorTest.java | 2 +-
.../ReduceStacksNeededDuringRoutingTest.java | 2 +-
.../support/DefaultContextReloadStrategy.java | 2 +-
.../java/org/apache/camel/support/EventHelper.java | 2 +-
.../support/FileWatcherResourceReloadStrategy.java | 5 +--
.../camel/support/RouteOnDemandReloadStrategy.java | 4 +-
.../apache/camel/support/RouteTemplateHelper.java | 4 +-
.../cluster/RebalancingCamelClusterService.java| 6 +--
.../main/java/org/apache/camel/util/IOHelper.java | 8 ++--
25 files changed, 97 insertions(+), 93 deletions(-)
copy
components/{camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowError500Test.java
=>
camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpMaximumRedeliveriesTest.java}
(53%)
[GitHub] [camel] github-actions[bot] opened a new pull request, #11044: Generated sources regen
github-actions[bot] opened a new pull request, #11044: URL: https://github.com/apache/camel/pull/11044 Regen bot :robot: found some uncommitted changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (a4639655102 -> 3e08a1ec162)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from a4639655102 (chores) camel-core: use log markers for logging (#11042) add 3e08a1ec162 Regen for commit 6f8393d9b6828ae1ddbe57e1bf4b6949534c6c8c No new revisions were added by this update. Summary of changes: .../apache/camel/catalog/schemas/camel-spring.xsd | 10421 +++ .../camel/component/kafka/KafkaConfiguration.java |11 - .../org/apache/camel/main/BaseMainSupport.java | 3 - .../org/apache/camel/xml/in/ModelParserTest.java |10 +- 4 files changed, 6154 insertions(+), 4291 deletions(-)
[GitHub] [camel-k] github-actions[bot] commented on pull request #4649: feat(trait): Fail IntegrationKit when custom task defined with build strategy routine
github-actions[bot] commented on PR #4649: URL: https://github.com/apache/camel-k/pull/4649#issuecomment-1669633818 :camel: **Thank you for contributing!** Code Coverage Report :heavy_check_mark: - Coverage changed: 39.1% --> 39.2% (Coverage difference: **+.1%**) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske opened a new pull request, #11045: (chores) Adjusted components A to F to use log markers
orpiske opened a new pull request, #11045: URL: https://github.com/apache/camel/pull/11045 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #11045: (chores) Adjusted components A to F to use log markers
github-actions[bot] commented on PR #11045: URL: https://github.com/apache/camel/pull/11045#issuecomment-1669679784 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton merged pull request #5157: Set encoding to UTF-8 when writing microprofile-config.properties
jamesnetherton merged PR #5157: URL: https://github.com/apache/camel-quarkus/pull/5157 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch main updated: Set encoding to UTF-8 when writing microprofile-config.properties
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 4e422d1936 Set encoding to UTF-8 when writing
microprofile-config.properties
4e422d1936 is described below
commit 4e422d1936e9540481327e97cbf4cb3e3efd6b05
Author: James Netherton
AuthorDate: Tue Aug 8 12:01:35 2023 +0100
Set encoding to UTF-8 when writing microprofile-config.properties
---
tooling/scripts/generate-test-containers-config-properties.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tooling/scripts/generate-test-containers-config-properties.groovy
b/tooling/scripts/generate-test-containers-config-properties.groovy
index cc2532e881..aedf0c2ca3 100644
--- a/tooling/scripts/generate-test-containers-config-properties.groovy
+++ b/tooling/scripts/generate-test-containers-config-properties.groovy
@@ -30,5 +30,5 @@ if (testClasses.exists()) {
metaInfDir.mkdir()
File file = new
File("${metaInfDir.absolutePath}/microprofile-config.properties")
-file.write(fileContent)
+file.write(fileContent, 'UTF-8')
}
[GitHub] [camel-k] claudio4j commented on issue #4639: Provide build time external resource
claudio4j commented on issue #4639: URL: https://github.com/apache/camel-k/issues/4639#issuecomment-1669700993 Looks good Gaëlle ! Is the configmap resource to be deleted after the build ? The use case scenarios are important to be able to test the different types of files, for example files with different encodings and not plain text files. One relevant aspect is the context are to be copied two times, so the task should ensure the final file is the same as the original. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: Polish docs
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 The following commit(s) were added to refs/heads/main by this push: new ec8c6b16750 Polish docs ec8c6b16750 is described below commit ec8c6b1675095d67006d5b7a4f08efeb8b7d0fcc Author: Claus Ibsen AuthorDate: Tue Aug 8 16:17:16 2023 +0200 Polish docs --- docs/user-manual/modules/ROOT/pages/camel-jbang.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc index 20e09814b9a..f589de71d4a 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc @@ -1583,8 +1583,8 @@ based dependency injection in Java classes. You can use the following Camel annotations on Camel standalone: -- `@org.apache.camel.BindToRegistry` on class level to create an instance of the class and register in the xref:registry.adoc[Registry]. -- `@org.apache.camel.Configuration` on class level to create an instance of the class and register in the xref:registry.adoc[Registry]. +- `@org.apache.camel.BindToRegistry` on class level (for custom beans, processors, etc.) to create an instance of the class and register in the xref:registry.adoc[Registry]. +- `@org.apache.camel.Configuration` on class level for `CamelConfiguation` classes, which is used during Camel startup (only Camel Main runtime) to allow custom setup that requires some coding. And these annotations should work on all runtimes (if target runtime is either Quarkus or Spring Boot then favour using their annotations):
[GitHub] [camel-karavan] mgubaidullin merged pull request #846: fix windows test compatibility #843
mgubaidullin merged PR #846: URL: https://github.com/apache/camel-karavan/pull/846 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-karavan] branch main updated: fix windows test compatibility #843 (#846)
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new d2616094 fix windows test compatibility #843 (#846)
d2616094 is described below
commit d2616094a580aa43c98165a04ea5fed21956e0fa
Author: Stefan Huber
AuthorDate: Tue Aug 8 16:18:34 2023 +0200
fix windows test compatibility #843 (#846)
Co-authored-by: Stefan Huber
---
karavan-core/test/errorHandler.spec.ts | 3 ++-
karavan-core/test/findStep.spec.ts | 2 +-
karavan-core/test/plain.spec.ts| 2 +-
karavan-core/test/routes.spec.ts | 4 ++--
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/karavan-core/test/errorHandler.spec.ts
b/karavan-core/test/errorHandler.spec.ts
index ee605f86..c2da1c2f 100644
--- a/karavan-core/test/errorHandler.spec.ts
+++ b/karavan-core/test/errorHandler.spec.ts
@@ -16,6 +16,7 @@
*/
import {expect} from 'chai';
import * as fs from 'fs';
+import * as jsYaml from 'js-yaml';
import 'mocha';
import {CamelDefinitionYaml} from "../src/core/api/CamelDefinitionYaml";
@@ -32,6 +33,6 @@ describe('Global Error Handler', () => {
expect(i.spec.flows?.[1].errorHandler.deadLetterChannel.useOriginalMessage).to.equal(true);
expect(i.spec.flows?.[1].errorHandler.deadLetterChannel.level).to.equal('TRACE');
const yaml2 = CamelDefinitionYaml.integrationToYaml(i);
-expect(yaml).to.equal(yaml2);
+expect(yaml.replaceAll("\r\n", "\n")).to.equal(yaml2); // replace for
Windows compatibility
});
});
diff --git a/karavan-core/test/findStep.spec.ts
b/karavan-core/test/findStep.spec.ts
index b1a98fc0..fada15e3 100644
--- a/karavan-core/test/findStep.spec.ts
+++ b/karavan-core/test/findStep.spec.ts
@@ -101,7 +101,7 @@ describe('Find Step', () => {
const yaml = fs.readFileSync('test/findStep.yaml',{encoding:'utf8',
flag:'r'});
const i = CamelDefinitionYaml.yamlToIntegration("demo.yaml", yaml);
const yaml2 = CamelDefinitionYaml.integrationToYaml(i);
-expect(yaml2).to.equal(yaml);
+expect(yaml.replaceAll("\r\n", "\n")).to.equal(yaml2); // replace for
Windows compatibility
const res1 = CamelDefinitionApiExt.hasElementWithId(i, 'to-6a8b');
const res2 = CamelDefinitionApiExt.hasElementWithId(i, 'to-6a81');
diff --git a/karavan-core/test/plain.spec.ts b/karavan-core/test/plain.spec.ts
index 7d6fcca5..627a6a77 100644
--- a/karavan-core/test/plain.spec.ts
+++ b/karavan-core/test/plain.spec.ts
@@ -59,7 +59,7 @@ describe('Plain YAML to integration', () => {
expect(i.spec.flows?.length).to.equal(1);
expect(i.type).to.equal('plain');
const yaml2 = CamelDefinitionYaml.integrationToYaml(i);
-expect(yaml).to.equal(yaml2);
+expect(yaml.replaceAll("\r\n", "\n")).to.equal(yaml2); // replace for
Windows compatibility
});
});
diff --git a/karavan-core/test/routes.spec.ts b/karavan-core/test/routes.spec.ts
index a8b3be02..a1fb9a9a 100644
--- a/karavan-core/test/routes.spec.ts
+++ b/karavan-core/test/routes.spec.ts
@@ -31,8 +31,8 @@ describe('Plain YAML with route to integration', () => {
expect(i.type).to.equal('plain');
if (i.spec.flows) expect(i.spec.flows[0].from.uri).to.equal('timer');
if (i.spec.flows)
expect(i.spec.flows[0].from.parameters.name).to.equal('info');
-const y = CamelDefinitionYaml.integrationToYaml(i);
-expect(y).to.equal(yaml);
+const yaml2 = CamelDefinitionYaml.integrationToYaml(i);
+expect(yaml.replaceAll("\r\n", "\n")).to.equal(yaml2); // replace for
Windows compatibility
});
});
[GitHub] [camel-karavan] mgubaidullin commented on pull request #846: fix windows test compatibility #843
mgubaidullin commented on PR #846: URL: https://github.com/apache/camel-karavan/pull/846#issuecomment-1669712214 Thanks @stefanhuber and welcome to the Apache Camel Karavan contributors! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus merged pull request #11043: Camel-19627: paho-mqtt5 allow optional password when username provided
davsclaus merged PR #11043: URL: https://github.com/apache/camel/pull/11043 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: Camel-19627: paho-mqtt5 allow optional password when username provided (#11043)
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
The following commit(s) were added to refs/heads/main by this push:
new 892ea477407 Camel-19627: paho-mqtt5 allow optional password when
username provided (#11043)
892ea477407 is described below
commit 892ea477407b719a3dc78ddf77e95b25cb53a428
Author: Jono Morris
AuthorDate: Wed Aug 9 02:21:49 2023 +1200
Camel-19627: paho-mqtt5 allow optional password when username provided
(#11043)
* CAMEL-19627 allow optional password when username provided
* CAMEL-19627 remove experimental code
* CAMEL-19627 concatenate url strings
---
.../component/paho/mqtt5/PahoMqtt5Endpoint.java | 6 --
.../paho/mqtt5/PahoMqtt5ComponentMqtt5Test.java | 20
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git
a/components/camel-paho-mqtt5/src/main/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5Endpoint.java
b/components/camel-paho-mqtt5/src/main/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5Endpoint.java
index 33361d06012..13852be4ec3 100644
---
a/components/camel-paho-mqtt5/src/main/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5Endpoint.java
+++
b/components/camel-paho-mqtt5/src/main/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5Endpoint.java
@@ -85,9 +85,11 @@ public class PahoMqtt5Endpoint extends DefaultEndpoint {
protected MqttConnectionOptions createMqttConnectionOptions() {
PahoMqtt5Configuration config = getConfiguration();
MqttConnectionOptions options = new MqttConnectionOptions();
-if (ObjectHelper.isNotEmpty(config.getUserName()) &&
ObjectHelper.isNotEmpty(config.getPassword())) {
+if (ObjectHelper.isNotEmpty(config.getUserName())) {
options.setUserName(config.getUserName());
-options.setPassword(config.getPassword().getBytes());
+if (ObjectHelper.isNotEmpty(config.getPassword())) {
+options.setPassword(config.getPassword().getBytes());
+}
}
options.setAutomaticReconnect(config.isAutomaticReconnect());
options.setCleanStart(config.isCleanStart());
diff --git
a/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ComponentMqtt5Test.java
b/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ComponentMqtt5Test.java
index 4491c97e7b2..c2f62bd2b31 100644
---
a/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ComponentMqtt5Test.java
+++
b/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ComponentMqtt5Test.java
@@ -75,6 +75,26 @@ public class PahoMqtt5ComponentMqtt5Test extends
PahoMqtt5TestSupport {
assertEquals(PahoMqtt5Persistence.FILE,
endpoint.getConfiguration().getPersistence());
}
+@Test
+public void checkUserNameOnly() {
+String uri = "paho-mqtt5:/test/topic?brokerUrl=tcp://localhost:" +
mqttPort + "&userName=test";
+
+PahoMqtt5Endpoint endpoint = getMandatoryEndpoint(uri,
PahoMqtt5Endpoint.class);
+
+assertEquals("test", endpoint.getConfiguration().getUserName());
+}
+
+@Test
+public void checkUserNameAndPassword() {
+String uri = "paho-mqtt5:/test/topic?brokerUrl=tcp://localhost:" +
mqttPort
+ + "&userName=test&password=testpass";
+
+PahoMqtt5Endpoint endpoint = getMandatoryEndpoint(uri,
PahoMqtt5Endpoint.class);
+
+assertEquals("test", endpoint.getConfiguration().getUserName());
+assertEquals("testpass", endpoint.getConfiguration().getPassword());
+}
+
@Test
public void shouldReadMessageFromMqtt() throws InterruptedException {
// Given
[GitHub] [camel] davsclaus closed pull request #11044: Generated sources regen
davsclaus closed pull request #11044: Generated sources regen URL: https://github.com/apache/camel/pull/11044 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch camel-3.x updated: Camel-19627: paho-mqtt5 allow optional password when username provided (#11043)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.x by this push:
new f303ee7e7cb Camel-19627: paho-mqtt5 allow optional password when
username provided (#11043)
f303ee7e7cb is described below
commit f303ee7e7cb14129c501cc3d1a5a6721b624290e
Author: Jono Morris
AuthorDate: Wed Aug 9 02:21:49 2023 +1200
Camel-19627: paho-mqtt5 allow optional password when username provided
(#11043)
* CAMEL-19627 allow optional password when username provided
* CAMEL-19627 remove experimental code
* CAMEL-19627 concatenate url strings
---
.../component/paho/mqtt5/PahoMqtt5Endpoint.java | 6 --
.../paho/mqtt5/PahoMqtt5ComponentMqtt5Test.java | 20
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git
a/components/camel-paho-mqtt5/src/main/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5Endpoint.java
b/components/camel-paho-mqtt5/src/main/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5Endpoint.java
index 33361d06012..13852be4ec3 100644
---
a/components/camel-paho-mqtt5/src/main/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5Endpoint.java
+++
b/components/camel-paho-mqtt5/src/main/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5Endpoint.java
@@ -85,9 +85,11 @@ public class PahoMqtt5Endpoint extends DefaultEndpoint {
protected MqttConnectionOptions createMqttConnectionOptions() {
PahoMqtt5Configuration config = getConfiguration();
MqttConnectionOptions options = new MqttConnectionOptions();
-if (ObjectHelper.isNotEmpty(config.getUserName()) &&
ObjectHelper.isNotEmpty(config.getPassword())) {
+if (ObjectHelper.isNotEmpty(config.getUserName())) {
options.setUserName(config.getUserName());
-options.setPassword(config.getPassword().getBytes());
+if (ObjectHelper.isNotEmpty(config.getPassword())) {
+options.setPassword(config.getPassword().getBytes());
+}
}
options.setAutomaticReconnect(config.isAutomaticReconnect());
options.setCleanStart(config.isCleanStart());
diff --git
a/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ComponentMqtt5Test.java
b/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ComponentMqtt5Test.java
index 4491c97e7b2..c2f62bd2b31 100644
---
a/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ComponentMqtt5Test.java
+++
b/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ComponentMqtt5Test.java
@@ -75,6 +75,26 @@ public class PahoMqtt5ComponentMqtt5Test extends
PahoMqtt5TestSupport {
assertEquals(PahoMqtt5Persistence.FILE,
endpoint.getConfiguration().getPersistence());
}
+@Test
+public void checkUserNameOnly() {
+String uri = "paho-mqtt5:/test/topic?brokerUrl=tcp://localhost:" +
mqttPort + "&userName=test";
+
+PahoMqtt5Endpoint endpoint = getMandatoryEndpoint(uri,
PahoMqtt5Endpoint.class);
+
+assertEquals("test", endpoint.getConfiguration().getUserName());
+}
+
+@Test
+public void checkUserNameAndPassword() {
+String uri = "paho-mqtt5:/test/topic?brokerUrl=tcp://localhost:" +
mqttPort
+ + "&userName=test&password=testpass";
+
+PahoMqtt5Endpoint endpoint = getMandatoryEndpoint(uri,
PahoMqtt5Endpoint.class);
+
+assertEquals("test", endpoint.getConfiguration().getUserName());
+assertEquals("testpass", endpoint.getConfiguration().getPassword());
+}
+
@Test
public void shouldReadMessageFromMqtt() throws InterruptedException {
// Given
[camel] branch camel-3.21.x updated: Camel-19627: paho-mqtt5 allow optional password when username provided (#11043)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.21.x by this push:
new 520a259fd75 Camel-19627: paho-mqtt5 allow optional password when
username provided (#11043)
520a259fd75 is described below
commit 520a259fd7583b4bd66ffc8a8f3b52c8bf423038
Author: Jono Morris
AuthorDate: Wed Aug 9 02:21:49 2023 +1200
Camel-19627: paho-mqtt5 allow optional password when username provided
(#11043)
* CAMEL-19627 allow optional password when username provided
* CAMEL-19627 remove experimental code
* CAMEL-19627 concatenate url strings
---
.../component/paho/mqtt5/PahoMqtt5Endpoint.java | 6 --
.../paho/mqtt5/PahoMqtt5ComponentMqtt5Test.java | 20
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git
a/components/camel-paho-mqtt5/src/main/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5Endpoint.java
b/components/camel-paho-mqtt5/src/main/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5Endpoint.java
index 33361d06012..13852be4ec3 100644
---
a/components/camel-paho-mqtt5/src/main/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5Endpoint.java
+++
b/components/camel-paho-mqtt5/src/main/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5Endpoint.java
@@ -85,9 +85,11 @@ public class PahoMqtt5Endpoint extends DefaultEndpoint {
protected MqttConnectionOptions createMqttConnectionOptions() {
PahoMqtt5Configuration config = getConfiguration();
MqttConnectionOptions options = new MqttConnectionOptions();
-if (ObjectHelper.isNotEmpty(config.getUserName()) &&
ObjectHelper.isNotEmpty(config.getPassword())) {
+if (ObjectHelper.isNotEmpty(config.getUserName())) {
options.setUserName(config.getUserName());
-options.setPassword(config.getPassword().getBytes());
+if (ObjectHelper.isNotEmpty(config.getPassword())) {
+options.setPassword(config.getPassword().getBytes());
+}
}
options.setAutomaticReconnect(config.isAutomaticReconnect());
options.setCleanStart(config.isCleanStart());
diff --git
a/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ComponentMqtt5Test.java
b/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ComponentMqtt5Test.java
index 4491c97e7b2..c2f62bd2b31 100644
---
a/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ComponentMqtt5Test.java
+++
b/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ComponentMqtt5Test.java
@@ -75,6 +75,26 @@ public class PahoMqtt5ComponentMqtt5Test extends
PahoMqtt5TestSupport {
assertEquals(PahoMqtt5Persistence.FILE,
endpoint.getConfiguration().getPersistence());
}
+@Test
+public void checkUserNameOnly() {
+String uri = "paho-mqtt5:/test/topic?brokerUrl=tcp://localhost:" +
mqttPort + "&userName=test";
+
+PahoMqtt5Endpoint endpoint = getMandatoryEndpoint(uri,
PahoMqtt5Endpoint.class);
+
+assertEquals("test", endpoint.getConfiguration().getUserName());
+}
+
+@Test
+public void checkUserNameAndPassword() {
+String uri = "paho-mqtt5:/test/topic?brokerUrl=tcp://localhost:" +
mqttPort
+ + "&userName=test&password=testpass";
+
+PahoMqtt5Endpoint endpoint = getMandatoryEndpoint(uri,
PahoMqtt5Endpoint.class);
+
+assertEquals("test", endpoint.getConfiguration().getUserName());
+assertEquals("testpass", endpoint.getConfiguration().getPassword());
+}
+
@Test
public void shouldReadMessageFromMqtt() throws InterruptedException {
// Given
[camel] branch camel-3.20.x updated: Camel-19627: paho-mqtt5 allow optional password when username provided (#11043)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.20.x by this push:
new dec9726aed5 Camel-19627: paho-mqtt5 allow optional password when
username provided (#11043)
dec9726aed5 is described below
commit dec9726aed5068d1418f181c331ff42828412409
Author: Jono Morris
AuthorDate: Wed Aug 9 02:21:49 2023 +1200
Camel-19627: paho-mqtt5 allow optional password when username provided
(#11043)
* CAMEL-19627 allow optional password when username provided
* CAMEL-19627 remove experimental code
* CAMEL-19627 concatenate url strings
---
.../component/paho/mqtt5/PahoMqtt5Endpoint.java | 6 --
.../paho/mqtt5/PahoMqtt5ComponentMqtt5Test.java | 20
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git
a/components/camel-paho-mqtt5/src/main/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5Endpoint.java
b/components/camel-paho-mqtt5/src/main/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5Endpoint.java
index 33361d06012..13852be4ec3 100644
---
a/components/camel-paho-mqtt5/src/main/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5Endpoint.java
+++
b/components/camel-paho-mqtt5/src/main/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5Endpoint.java
@@ -85,9 +85,11 @@ public class PahoMqtt5Endpoint extends DefaultEndpoint {
protected MqttConnectionOptions createMqttConnectionOptions() {
PahoMqtt5Configuration config = getConfiguration();
MqttConnectionOptions options = new MqttConnectionOptions();
-if (ObjectHelper.isNotEmpty(config.getUserName()) &&
ObjectHelper.isNotEmpty(config.getPassword())) {
+if (ObjectHelper.isNotEmpty(config.getUserName())) {
options.setUserName(config.getUserName());
-options.setPassword(config.getPassword().getBytes());
+if (ObjectHelper.isNotEmpty(config.getPassword())) {
+options.setPassword(config.getPassword().getBytes());
+}
}
options.setAutomaticReconnect(config.isAutomaticReconnect());
options.setCleanStart(config.isCleanStart());
diff --git
a/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ComponentMqtt5Test.java
b/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ComponentMqtt5Test.java
index 4491c97e7b2..c2f62bd2b31 100644
---
a/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ComponentMqtt5Test.java
+++
b/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ComponentMqtt5Test.java
@@ -75,6 +75,26 @@ public class PahoMqtt5ComponentMqtt5Test extends
PahoMqtt5TestSupport {
assertEquals(PahoMqtt5Persistence.FILE,
endpoint.getConfiguration().getPersistence());
}
+@Test
+public void checkUserNameOnly() {
+String uri = "paho-mqtt5:/test/topic?brokerUrl=tcp://localhost:" +
mqttPort + "&userName=test";
+
+PahoMqtt5Endpoint endpoint = getMandatoryEndpoint(uri,
PahoMqtt5Endpoint.class);
+
+assertEquals("test", endpoint.getConfiguration().getUserName());
+}
+
+@Test
+public void checkUserNameAndPassword() {
+String uri = "paho-mqtt5:/test/topic?brokerUrl=tcp://localhost:" +
mqttPort
+ + "&userName=test&password=testpass";
+
+PahoMqtt5Endpoint endpoint = getMandatoryEndpoint(uri,
PahoMqtt5Endpoint.class);
+
+assertEquals("test", endpoint.getConfiguration().getUserName());
+assertEquals("testpass", endpoint.getConfiguration().getPassword());
+}
+
@Test
public void shouldReadMessageFromMqtt() throws InterruptedException {
// Given
[GitHub] [camel-karavan] mgubaidullin closed issue #593: Extend Karavan Operator to support Dependent Resource properties
mgubaidullin closed issue #593: Extend Karavan Operator to support Dependent Resource properties URL: https://github.com/apache/camel-karavan/issues/593 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-karavan] 01/03: Fix #845
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit a2f5e150a5cafb3ace5069b55cf2a042c3746bf7
Author: Marat Gubaidullin
AuthorDate: Tue Aug 8 10:18:22 2023 -0400
Fix #845
---
karavan-designer/src/designer/route/RouteDesigner.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/karavan-designer/src/designer/route/RouteDesigner.tsx
b/karavan-designer/src/designer/route/RouteDesigner.tsx
index e174831d..db2662e0 100644
--- a/karavan-designer/src/designer/route/RouteDesigner.tsx
+++ b/karavan-designer/src/designer/route/RouteDesigner.tsx
@@ -146,7 +146,7 @@ export class RouteDesigner extends React.Component {
getPropertiesPanel() {
return (
- this.setState({key:
Math.random().toString(1)})}
+ this.setState({key:
Math.random().toString()})}
style={{transform: "initial"}} isResizable
hasNoBorder defaultSize={'400px'}
maxSize={'800px'} minSize={'300px'}>
[camel-karavan] 02/03: Icons for #484
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit 26af65411d544662eb86b76b0702ad649e6e8c4f
Author: Marat Gubaidullin
AuthorDate: Tue Aug 8 10:24:13 2023 -0400
Icons for #484
---
karavan-designer/src/designer/utils/CamelUi.tsx| 5 +-
.../src/designer/utils/KaravanIcons.tsx| 287 +
2 files changed, 291 insertions(+), 1 deletion(-)
diff --git a/karavan-designer/src/designer/utils/CamelUi.tsx
b/karavan-designer/src/designer/utils/CamelUi.tsx
index 8974019e..cb3e988d 100644
--- a/karavan-designer/src/designer/utils/CamelUi.tsx
+++ b/karavan-designer/src/designer/utils/CamelUi.tsx
@@ -30,6 +30,7 @@ import {
} from "karavan-core/lib/model/CamelDefinition";
import {CamelElement, Integration} from
"karavan-core/lib/model/IntegrationDefinition";
import {
+ActivemqIcon,
AggregateIcon,
ApiIcon,
AwsIcon,
@@ -554,7 +555,7 @@ export class CamelUi {
return GoogleCloudIcon();
} else if (title.startsWith("Spring")) {
return SpringIcon();
-} else if (title.startsWith("Kubernetes")) {
+} else if (title.startsWith("Kubernetes") ||
title.startsWith("Knative")) {
return KubernetesIcon();
} else if (title.startsWith("SAP")) {
return SapIcon();
@@ -576,6 +577,8 @@ export class CamelUi {
return IgniteIcon();
} else if (title.startsWith("Kafka")) {
return KafkaIcon();
+} else if (title.startsWith("ActiveMQ")) {
+return ActivemqIcon();
} else if (title.startsWith("GitHub")) {
return GithubIcon();
} else if (title.startsWith("Git")) {
diff --git a/karavan-designer/src/designer/utils/KaravanIcons.tsx
b/karavan-designer/src/designer/utils/KaravanIcons.tsx
index 0e9b6d82..3e0b6953 100644
--- a/karavan-designer/src/designer/utils/KaravanIcons.tsx
+++ b/karavan-designer/src/designer/utils/KaravanIcons.tsx
@@ -937,6 +937,293 @@ export function GithubIcon() {
);
}
+export function ActivemqIcon() {
+return (
+http://www.w3.org/2000/svg";
+width={116.42}
+height={167.526}
+viewBox="0 0 30.803 44.324"
+className="icon">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+);
+}
export function KafkaIcon() {
return (
[GitHub] [camel-karavan] mgubaidullin closed issue #845: Error: toString() radix argument must be between 2 and 36
mgubaidullin closed issue #845: Error: toString() radix argument must be between 2 and 36 URL: https://github.com/apache/camel-karavan/issues/845 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-karavan] branch main updated (d2616094 -> 7144594f)
This is an automated email from the ASF dual-hosted git repository. marat pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git from d2616094 fix windows test compatibility #843 (#846) new a2f5e150 Fix #845 new 26af6541 Icons for #484 new 7144594f First attempt for #484 The 3 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: .../src/designer/route/RouteDesigner.tsx | 2 +- karavan-designer/src/designer/utils/CamelUi.tsx| 5 +- .../src/designer/utils/KaravanIcons.tsx| 287 ++ .../org/apache/camel/karavan/cli/CommandUtils.java | 59 ++- .../org/apache/camel/karavan/cli/Constants.java| 4 + .../apache/camel/karavan/cli/InstallCommand.java | 109 -- .../apache/camel/karavan/cli/KaravanCommand.java | 357 +- .../apache/camel/karavan/cli/KaravanConfig.java| 304 --- .../apache/camel/karavan/cli/ResourceUtils.java| 4 +- .../apache/camel/karavan/cli/UpgradeCommand.java | 20 - .../karavan/cli/resources/KaravanConfigMap.java| 6 +- .../karavan/cli/resources/KaravanDeployment.java | 4 +- .../camel/karavan/cli/resources/KaravanPvc.java| 8 +- .../camel/karavan/cli/resources/KaravanRole.java | 12 +- .../camel/karavan/cli/resources/KaravanSecret.java | 4 +- .../karavan/cli/resources/KaravanService.java | 6 +- .../cli/resources/KaravanServiceAccount.java | 6 +- .../camel/karavan/cli/resources/KaravanTekton.java | 8 +- .../apache/camel/karavan/cli/resources/Nexus.java | 6 +- .../src/main/resources/infinispan-secrets.yaml | 11 - .../src/main/resources/infinispan-values.yaml | 14 - .../karavan-cli/src/main/resources/infinispan.yaml | 414 + 22 files changed, 1150 insertions(+), 500 deletions(-) delete mode 100644 karavan-web/karavan-cli/src/main/java/org/apache/camel/karavan/cli/InstallCommand.java delete mode 100644 karavan-web/karavan-cli/src/main/java/org/apache/camel/karavan/cli/KaravanConfig.java delete mode 100644 karavan-web/karavan-cli/src/main/java/org/apache/camel/karavan/cli/UpgradeCommand.java delete mode 100644 karavan-web/karavan-cli/src/main/resources/infinispan-secrets.yaml delete mode 100644 karavan-web/karavan-cli/src/main/resources/infinispan-values.yaml create mode 100644 karavan-web/karavan-cli/src/main/resources/infinispan.yaml
[camel-karavan] 03/03: First attempt for #484
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit 7144594f250ba6c6e70d179f58c832c12b30ffe9
Author: Marat Gubaidullin
AuthorDate: Tue Aug 8 10:27:08 2023 -0400
First attempt for #484
---
.../org/apache/camel/karavan/cli/CommandUtils.java | 59 ++-
.../org/apache/camel/karavan/cli/Constants.java| 4 +
.../apache/camel/karavan/cli/InstallCommand.java | 109 --
.../apache/camel/karavan/cli/KaravanCommand.java | 357 +-
.../apache/camel/karavan/cli/KaravanConfig.java| 304 ---
.../apache/camel/karavan/cli/ResourceUtils.java| 4 +-
.../apache/camel/karavan/cli/UpgradeCommand.java | 20 -
.../karavan/cli/resources/KaravanConfigMap.java| 6 +-
.../karavan/cli/resources/KaravanDeployment.java | 4 +-
.../camel/karavan/cli/resources/KaravanPvc.java| 8 +-
.../camel/karavan/cli/resources/KaravanRole.java | 12 +-
.../camel/karavan/cli/resources/KaravanSecret.java | 4 +-
.../karavan/cli/resources/KaravanService.java | 6 +-
.../cli/resources/KaravanServiceAccount.java | 6 +-
.../camel/karavan/cli/resources/KaravanTekton.java | 8 +-
.../apache/camel/karavan/cli/resources/Nexus.java | 6 +-
.../src/main/resources/infinispan-secrets.yaml | 11 -
.../src/main/resources/infinispan-values.yaml | 14 -
.../karavan-cli/src/main/resources/infinispan.yaml | 414 +
19 files changed, 858 insertions(+), 498 deletions(-)
diff --git
a/karavan-web/karavan-cli/src/main/java/org/apache/camel/karavan/cli/CommandUtils.java
b/karavan-web/karavan-cli/src/main/java/org/apache/camel/karavan/cli/CommandUtils.java
index 53b10eef..4b170f69 100644
---
a/karavan-web/karavan-cli/src/main/java/org/apache/camel/karavan/cli/CommandUtils.java
+++
b/karavan-web/karavan-cli/src/main/java/org/apache/camel/karavan/cli/CommandUtils.java
@@ -19,6 +19,7 @@ package org.apache.camel.karavan.cli;
import io.fabric8.kubernetes.api.model.*;
import io.fabric8.kubernetes.api.model.apps.Deployment;
import io.fabric8.kubernetes.api.model.apps.DeploymentCondition;
+import io.fabric8.kubernetes.api.model.apps.StatefulSet;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClientBuilder;
import io.fabric8.openshift.api.model.operatorhub.v1.Operator;
@@ -27,16 +28,20 @@ import io.fabric8.tekton.pipeline.v1beta1.Pipeline;
import io.fabric8.tekton.pipeline.v1beta1.Task;
import org.apache.camel.karavan.cli.resources.*;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.util.Arrays;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
+import java.util.stream.Collectors;
public class CommandUtils {
private static final Pipeline pipeline = new Pipeline();
private static final Task task = new Task();
-public static void installKaravan(KaravanConfig config) {
+public static void installKaravan(KaravanCommand config) {
try (KubernetesClient client = new KubernetesClientBuilder().build()) {
OpenShiftClient oClient = client.adapt(OpenShiftClient.class);
if (oClient.isSupported()) {
@@ -50,7 +55,7 @@ public class CommandUtils {
}
}
-private static void install(KaravanConfig config, KubernetesClient client)
{
+private static void install(KaravanCommand config, KubernetesClient
client) {
// Check and install Tekton
if (!isTektonInstalled(client)) {
log("Tekton is not installed");
@@ -72,6 +77,17 @@ public class CommandUtils {
log("Namespace " + config.getNamespace() + " already exists");
}
+// Check and install Infinispan
+if (!isInfinispanInstalled(client)) {
+log("Infinispan is not installed");
+if (isOpenShift(client)) {
+logPoint("Please install Infinispan first");
+System.exit(0);
+}
+installInfinispan(config, client);
+}
+log("Infinispan is installed");
+
// Check secrets
if (!checkKaravanSecrets(config, client)) {
logError("Karavan secrets not found");
@@ -134,12 +150,12 @@ public class CommandUtils {
log("Karavan is ready");
}
-public static boolean checkKaravanSecrets(KaravanConfig config,
KubernetesClient client) {
+public static boolean checkKaravanSecrets(KaravanCommand config,
KubernetesClient client) {
Secret secret =
client.secrets().inNamespace(config.getNamespace()).withName(Constants.NAME).get();
return secret != null;
}
-public static boolean tryToCreateKaravanSecrets(KaravanConfig config,
KubernetesClient client) {
+public static boolean tryToCreateKaravanSecrets(KaravanCommand config,
KubernetesClient client) {
[camel] branch regen_bot updated (3e08a1ec162 -> ec8c6b16750)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git omit 3e08a1ec162 Regen for commit 6f8393d9b6828ae1ddbe57e1bf4b6949534c6c8c add ec8c6b16750 Polish docs This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (3e08a1ec162) \ N -- N -- N refs/heads/regen_bot (ec8c6b16750) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../apache/camel/catalog/schemas/camel-spring.xsd | 10627 --- .../camel/component/kafka/KafkaConfiguration.java |11 + .../org/apache/camel/main/BaseMainSupport.java | 3 + .../org/apache/camel/xml/in/ModelParserTest.java |10 +- .../modules/ROOT/pages/camel-jbang.adoc| 4 +- 5 files changed, 4396 insertions(+), 6259 deletions(-)
[GitHub] [camel] orpiske merged pull request #11045: (chores) Adjusted components A to F to use log markers
orpiske merged PR #11045: URL: https://github.com/apache/camel/pull/11045 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: (chores) Adjusted components A to F to use log markers (#11045)
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 11c33fb292d (chores) Adjusted components A to F to use log markers (#11045) 11c33fb292d is described below commit 11c33fb292d66eaab9880c22b12aa543b51bbe09 Author: Otavio Rodolfo Piske AuthorDate: Tue Aug 8 16:29:21 2023 +0200 (chores) Adjusted components A to F to use log markers (#11045) --- .../camel/component/as2/api/util/MicUtilsTest.java | 4 +-- .../as2/internal/AS2ConnectionHelper.java | 5 ++- .../camel/component/as2/AS2ClientManagerIT.java| 14 .../camel/component/as2/AS2ServerManagerIT.java| 10 +++--- .../camel/component/as2/MendelsonCertLoader.java | 8 ++--- .../component/asterisk/AsteriskConsumerTest.java | 2 +- .../websocket/CamelWebSocketServlet.java | 2 +- .../vault/CloudTrailReloadTriggerTask.java | 5 ++- .../camel/component/aws/xray/FakeAWSDaemon.java| 4 +-- .../camel/component/file/azure/FilesConsumer.java | 3 +- .../src/main/docs/bindy-dataformat.adoc| 4 +-- .../BindySimpleCsvUnmarshallBadIntegerTest.java| 2 +- .../BindyComplexKeyValuePairStandaloneTest.java| 4 +-- .../component/box/BoxCollaborationsManagerIT.java | 12 +++ .../camel/component/box/BoxCommentsManagerIT.java | 10 +++--- .../camel/component/box/BoxEventLogsManagerIT.java | 2 +- .../camel/component/box/BoxEventsManagerIT.java| 2 +- .../camel/component/box/BoxFilesManagerIT.java | 38 +++--- .../camel/component/box/BoxFoldersManagerIT.java | 20 ++-- .../camel/component/box/BoxGroupsManagerIT.java| 16 - .../camel/component/box/BoxSearchManagerIT.java| 2 +- .../camel/component/box/BoxTasksManagerIT.java | 14 .../camel/component/box/BoxUsersManagerIT.java | 16 - .../camel/component/braintree/AddOnGatewayIT.java | 2 +- .../braintree/CreditCardVerificationGatewayIT.java | 4 +-- .../component/braintree/DiscountGatewayIT.java | 2 +- .../braintree/PaymentMethodNonceGatewayIT.java | 4 +-- .../camel/component/braintree/PlanGatewayIT.java | 2 +- .../camel/component/braintree/ReportGatewayIT.java | 2 +- .../braintree/SettlementBatchSummaryGatewayIT.java | 4 +-- .../component/braintree/SubscriptionGatewayIT.java | 16 - .../component/braintree/TransactionGatewayIT.java | 14 .../camel/component/crypto/ECDSASignatureTest.java | 2 +- .../apache/camel/dataformat/csv/CsvRouteTest.java | 6 ++-- .../language/datasonnet/DatasonnetExpression.java | 2 +- .../src/main/docs/debezium-db2-component.adoc | 8 ++--- .../src/main/docs/debezium-mysql-component.adoc| 8 ++--- .../src/main/docs/debezium-oracle-component.adoc | 8 ++--- .../src/main/docs/debezium-postgres-component.adoc | 8 ++--- .../main/docs/debezium-sqlserver-component.adoc| 8 ++--- .../camel/component/debug/JmxConnectorService.java | 2 +- .../DirectRequestReplyAndDisruptorInOnlyTest.java | 2 +- .../component/disruptor/DisruptorRouteTest.java| 4 +-- .../apache/camel/component/exec/ExecTestUtils.java | 2 +- .../camel/component/fhir/FhirCapabilitiesIT.java | 4 +-- .../apache/camel/component/fhir/FhirCreateIT.java | 6 ++-- .../apache/camel/component/fhir/FhirDeleteIT.java | 10 +++--- .../component/fhir/FhirExtraParametersIT.java | 2 +- .../apache/camel/component/fhir/FhirHistoryIT.java | 8 ++--- .../camel/component/fhir/FhirLoadPageIT.java | 8 ++--- .../apache/camel/component/fhir/FhirMetaIT.java| 12 +++ .../camel/component/fhir/FhirOperationIT.java | 8 ++--- .../apache/camel/component/fhir/FhirPatchIT.java | 4 +-- .../apache/camel/component/fhir/FhirReadIT.java| 2 +- .../apache/camel/component/fhir/FhirSearchIT.java | 2 +- .../camel/component/fhir/FhirTransactionIT.java| 8 ++--- .../apache/camel/component/fhir/FhirUpdateIT.java | 14 .../camel/component/fhir/FhirValidateIT.java | 4 +-- ...dempotentChangedRepositoryReadLockStrategy.java | 2 +- ...IdempotentRenameRepositoryReadLockStrategy.java | 2 +- .../FileIdempotentRepositoryReadLockStrategy.java | 2 +- .../camel/component/flatpack/CharsetTest.java | 2 +- .../component/flatpack/DelimitedAllowLongTest.java | 2 +- .../flatpack/DelimitedAllowShortAndLongTest.java | 2 +- .../flatpack/DelimitedAllowShortTest.java | 2 +- .../camel/component/flatpack/DelimitedTest.java| 2 +- .../flatpack/DelimitedWithNoDescriptorTest.java| 2 +- .../flatpack/DelimitedWithUnmarshalTest.java | 2 +- .../flatpack/FixedLengthAllowLongTest.java | 2 +- .../flatpack/FixedLengthAllowShortAndLongTest.java | 2 +- .../flatpack/FixedLengthAllowShortTest.java| 2 +- .../camel/component/flatpack/FixedLengthTest.
[camel] branch regen_bot updated (ec8c6b16750 -> 892ea477407)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from ec8c6b16750 Polish docs add 892ea477407 Camel-19627: paho-mqtt5 allow optional password when username provided (#11043) No new revisions were added by this update. Summary of changes: .../component/paho/mqtt5/PahoMqtt5Endpoint.java | 6 -- .../paho/mqtt5/PahoMqtt5ComponentMqtt5Test.java | 20 2 files changed, 24 insertions(+), 2 deletions(-)
[GitHub] [camel-k] gansheer commented on issue #4639: Provide build time external resource
gansheer commented on issue #4639: URL: https://github.com/apache/camel-k/issues/4639#issuecomment-1669752083 > Is the configmap resource to be deleted after the build ? As we are not in charge of its creation it is like for other external configmap/secret used we do not take care of its lifecycle. We would still need it if we need to re-create the integration kit for any reason. The management of the configmap's lifecycle by the operator is an old issue : https://github.com/apache/camel-k/issues/1235. If a user want to ensure a configmap is not modified it could be declared as [immutable](https://kubernetes.io/docs/concepts/configuration/configmap/#configmap-immutable) but it doesn't avoid any change if it is deleted then recreated. > The use case scenarios are important to be able to test the different types of files, for example files with different encodings and not plain text files. One relevant aspect is the context are to be copied two times, so the task should ensure the final file is the same as the original. It depends on the code's ability to can manage configmap's data and binaryData. I don't know if binaryData works. And to check if two copies of a same context has the same result there is always digests compute. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske opened a new pull request, #11046: (chores) Adjusted components G to R to use log markers
orpiske opened a new pull request, #11046: URL: https://github.com/apache/camel/pull/11046 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #11046: (chores) Adjusted components G to R to use log markers
github-actions[bot] commented on PR #11046: URL: https://github.com/apache/camel/pull/11046#issuecomment-1669752650 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] vignesh-manel commented on pull request #11014: CAMEL-12317: Added AWS StepFunctions Component
vignesh-manel commented on PR #11014: URL: https://github.com/apache/camel/pull/11014#issuecomment-1669763602 @davsclaus I see you have already added it, thanks -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] squakez commented on issue #4118: Camel K could go offline
squakez commented on issue #4118: URL: https://github.com/apache/camel-k/issues/4118#issuecomment-1669775422 I'm trying to refine the experiment script mentioned in the issue description, but I'm hitting the Maven issue https://issues.apache.org/jira/browse/MDEP-82 when we try to run the integration: I'm using a base Camel K runtime project in order to try to go offline, but the maven procedure is not really getting all the dependencies expected: ``` $ mvn org.apache.maven.plugins:maven-dependency-plugin:2.8:go-offline -Dmaven.repo.local=repo ... $ mvn verify -o -Dmaven.repo.local=repo [INFO] Scanning for projects... [INFO] [INFO] -< org.apache.camel.k.integration:camel-k-integration >- [INFO] Building camel-k-integration 2.0.0 [INFO] [ jar ]- [INFO] [INFO] --- maven-resources-plugin:3.3.0:resources (default-resources) @ camel-k-integration --- [WARNING] The POM for org.codehaus.plexus:plexus-interpolation:jar:1.26 is missing, no dependency information available [WARNING] The POM for org.apache.maven.shared:maven-filtering:jar:3.3.0 is missing, no dependency information available [WARNING] The POM for commons-io:commons-io:jar:2.11.0 is missing, no dependency information available [WARNING] The POM for org.apache.commons:commons-lang3:jar:3.12.0 is missing, no dependency information available [INFO] [INFO] BUILD FAILURE [INFO] [INFO] Total time: 1.101 s [INFO] Finished at: 2023-08-08T16:45:48+02:00 [INFO] [ERROR] Failed to execute goal org.apache.maven.plugins:maven-resources-plugin:3.3.0:resources (default-resources) on project camel-k-integration: Execution default-resources of goal org.apache.maven.plugins:maven-resources-plugin:3.3.0:resources failed: Plugin org.apache.maven.plugins:maven-resources-plugin:3.3.0 or one of its dependencies could not be resolved: Cannot access central (https://repo.maven.apache.org/maven2) in offline mode and the artifact org.codehaus.plexus:plexus-utils:jar:1.1 has not been downloaded from it before. -> [Help 1] [ERROR] [ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch. [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/PluginResolutionException ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot_3x updated (3305910901f -> f303ee7e7cb)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_3x in repository https://gitbox.apache.org/repos/asf/camel.git from 3305910901f CAMEL-19719: camel-vertx-http - Infinite loop when maximumRedeliveries > 0 add f303ee7e7cb Camel-19627: paho-mqtt5 allow optional password when username provided (#11043) No new revisions were added by this update. Summary of changes: .../component/paho/mqtt5/PahoMqtt5Endpoint.java | 6 -- .../paho/mqtt5/PahoMqtt5ComponentMqtt5Test.java | 20 2 files changed, 24 insertions(+), 2 deletions(-)
[camel] branch regen_bot updated (892ea477407 -> 36b577db4d1)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 892ea477407 Camel-19627: paho-mqtt5 allow optional password when username provided (#11043) add 11c33fb292d (chores) Adjusted components A to F to use log markers (#11045) add 36b577db4d1 Regen for commit dec9726aed5068d1418f181c331ff42828412409 No new revisions were added by this update. Summary of changes: .../apache/camel/catalog/schemas/camel-spring.xsd | 10421 +++ .../camel/component/as2/api/util/MicUtilsTest.java | 4 +- .../as2/internal/AS2ConnectionHelper.java | 5 +- .../camel/component/as2/AS2ClientManagerIT.java|14 +- .../camel/component/as2/AS2ServerManagerIT.java|10 +- .../camel/component/as2/MendelsonCertLoader.java | 8 +- .../component/asterisk/AsteriskConsumerTest.java | 2 +- .../websocket/CamelWebSocketServlet.java | 2 +- .../vault/CloudTrailReloadTriggerTask.java | 5 +- .../camel/component/aws/xray/FakeAWSDaemon.java| 4 +- .../camel/component/file/azure/FilesConsumer.java | 3 +- .../src/main/docs/bindy-dataformat.adoc| 4 +- .../BindySimpleCsvUnmarshallBadIntegerTest.java| 2 +- .../BindyComplexKeyValuePairStandaloneTest.java| 4 +- .../component/box/BoxCollaborationsManagerIT.java |12 +- .../camel/component/box/BoxCommentsManagerIT.java |10 +- .../camel/component/box/BoxEventLogsManagerIT.java | 2 +- .../camel/component/box/BoxEventsManagerIT.java| 2 +- .../camel/component/box/BoxFilesManagerIT.java |38 +- .../camel/component/box/BoxFoldersManagerIT.java |20 +- .../camel/component/box/BoxGroupsManagerIT.java|16 +- .../camel/component/box/BoxSearchManagerIT.java| 2 +- .../camel/component/box/BoxTasksManagerIT.java |14 +- .../camel/component/box/BoxUsersManagerIT.java |16 +- .../camel/component/braintree/AddOnGatewayIT.java | 2 +- .../braintree/CreditCardVerificationGatewayIT.java | 4 +- .../component/braintree/DiscountGatewayIT.java | 2 +- .../braintree/PaymentMethodNonceGatewayIT.java | 4 +- .../camel/component/braintree/PlanGatewayIT.java | 2 +- .../camel/component/braintree/ReportGatewayIT.java | 2 +- .../braintree/SettlementBatchSummaryGatewayIT.java | 4 +- .../component/braintree/SubscriptionGatewayIT.java |16 +- .../component/braintree/TransactionGatewayIT.java |14 +- .../camel/component/crypto/ECDSASignatureTest.java | 2 +- .../apache/camel/dataformat/csv/CsvRouteTest.java | 6 +- .../language/datasonnet/DatasonnetExpression.java | 2 +- .../src/main/docs/debezium-db2-component.adoc | 8 +- .../src/main/docs/debezium-mysql-component.adoc| 8 +- .../src/main/docs/debezium-oracle-component.adoc | 8 +- .../src/main/docs/debezium-postgres-component.adoc | 8 +- .../main/docs/debezium-sqlserver-component.adoc| 8 +- .../camel/component/debug/JmxConnectorService.java | 2 +- .../DirectRequestReplyAndDisruptorInOnlyTest.java | 2 +- .../component/disruptor/DisruptorRouteTest.java| 4 +- .../apache/camel/component/exec/ExecTestUtils.java | 2 +- .../camel/component/fhir/FhirCapabilitiesIT.java | 4 +- .../apache/camel/component/fhir/FhirCreateIT.java | 6 +- .../apache/camel/component/fhir/FhirDeleteIT.java |10 +- .../component/fhir/FhirExtraParametersIT.java | 2 +- .../apache/camel/component/fhir/FhirHistoryIT.java | 8 +- .../camel/component/fhir/FhirLoadPageIT.java | 8 +- .../apache/camel/component/fhir/FhirMetaIT.java|12 +- .../camel/component/fhir/FhirOperationIT.java | 8 +- .../apache/camel/component/fhir/FhirPatchIT.java | 4 +- .../apache/camel/component/fhir/FhirReadIT.java| 2 +- .../apache/camel/component/fhir/FhirSearchIT.java | 2 +- .../camel/component/fhir/FhirTransactionIT.java| 8 +- .../apache/camel/component/fhir/FhirUpdateIT.java |14 +- .../camel/component/fhir/FhirValidateIT.java | 4 +- ...dempotentChangedRepositoryReadLockStrategy.java | 2 +- ...IdempotentRenameRepositoryReadLockStrategy.java | 2 +- .../FileIdempotentRepositoryReadLockStrategy.java | 2 +- .../camel/component/flatpack/CharsetTest.java | 2 +- .../component/flatpack/DelimitedAllowLongTest.java | 2 +- .../flatpack/DelimitedAllowShortAndLongTest.java | 2 +- .../flatpack/DelimitedAllowShortTest.java | 2 +- .../camel/component/flatpack/DelimitedTest.java| 2 +- .../flatpack/DelimitedWithNoDescriptorTest.java| 2 +- .../flatpack/DelimitedWithUnmarshalTest.java | 2 +- .../flatpack/FixedLengthAllowLongTest.java | 2 +- .../flatpack/FixedLengthAllowShortAndLongTest.java | 2 +
[GitHub] [camel] github-actions[bot] opened a new pull request, #11047: Generated sources regen
github-actions[bot] opened a new pull request, #11047: URL: https://github.com/apache/camel/pull/11047 Regen bot :robot: found some uncommitted changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske opened a new pull request, #11048: (chores) Adjusted components S to Z to use log markers
orpiske opened a new pull request, #11048: URL: https://github.com/apache/camel/pull/11048 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #11048: (chores) Adjusted components S to Z to use log markers
github-actions[bot] commented on PR #11048: URL: https://github.com/apache/camel/pull/11048#issuecomment-1669843233 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske commented on pull request #11047: Generated sources regen
orpiske commented on PR #11047: URL: https://github.com/apache/camel/pull/11047#issuecomment-1669843542 Broken -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske closed pull request #11047: Generated sources regen
orpiske closed pull request #11047: Generated sources regen URL: https://github.com/apache/camel/pull/11047 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske commented on a diff in pull request #11047: Generated sources regen
orpiske commented on code in PR #11047:
URL: https://github.com/apache/camel/pull/11047#discussion_r1287296699
##
core/camel-xml-io/src/test/java/org/apache/camel/xml/in/ModelParserTest.java:
##
@@ -66,13 +66,11 @@ public class ModelParserTest {
public static final String NAMESPACE =
"http://camel.apache.org/schema/spring";;
private static final List REST_XMLS
-= List.of("barRest.xml", "simpleRest.xml", "simpleRestToD.xml",
"restAllowedValues.xml");
-private static final List TEMPLATE_XMLS =
List.of("barTemplate.xml");
-private static final List TEMPLATED_ROUTE_XMLS =
List.of("barTemplatedRoute.xml");
-private static final List BEANS_XMLS
-= List.of("beansEmpty.xml", "beansWithProperties.xml",
"beansWithSpringNS.xml");
+= Arrays.asList("barRest.xml", "simpleRest.xml",
"simpleRestToD.xml", "restAllowedValues.xml");
+private static final List TEMPLATE_XMLS =
Arrays.asList("barTemplate.xml");
+private static final List TEMPLATED_ROUTE_XMLS =
Arrays.asList("barTemplatedRoute.xml");
private static final List ROUTE_CONFIGURATION_XMLS
-= List.of("errorHandlerConfiguration.xml",
"errorHandlerConfigurationRedeliveryPolicyRef.xml");
+= Arrays.asList("errorHandlerConfiguration.xml",
"errorHandlerConfigurationRedeliveryPolicyRef.xml");
Review Comment:
Regen bot keeps doing this non-sense.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[camel-karavan] branch main updated (7144594f -> f6f77ea8)
This is an automated email from the ASF dual-hosted git repository. marat pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git from 7144594f First attempt for #484 new c72e1bef Fix connectors and icons for #484 new 58fbce59 Fix #750 new f6f77ea8 Sync last designer changes with app and space The 3 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: .../src/designer/route/DslConnections.tsx | 7 +- .../src/designer/route/DslProperties.tsx | 2 +- .../src/designer/route/DslSelector.tsx | 2 +- .../src/designer/route/RouteDesignerLogic.tsx | 7 +- .../route/property/ComponentParameterField.tsx | 10 +- .../designer/route/property/DslPropertyField.tsx | 2 +- karavan-designer/src/designer/utils/CamelUi.tsx| 176 +- .../src/designer/utils/KaravanIcons.tsx| 89 + .../src/knowledgebase/components/ComponentsTab.tsx | 6 +- .../src/designer/route/DslConnections.tsx | 7 +- karavan-space/src/designer/route/DslProperties.tsx | 2 +- karavan-space/src/designer/route/DslSelector.tsx | 2 +- karavan-space/src/designer/route/RouteDesigner.tsx | 2 +- .../src/designer/route/RouteDesignerLogic.tsx | 7 +- .../route/property/ComponentParameterField.tsx | 10 +- .../designer/route/property/DslPropertyField.tsx | 2 +- karavan-space/src/designer/utils/CamelUi.tsx | 181 +- karavan-space/src/designer/utils/KaravanIcons.tsx | 376 + .../src/knowledgebase/components/ComponentsTab.tsx | 6 +- .../webui/src/designer/route/DslConnections.tsx| 7 +- .../webui/src/designer/route/DslProperties.tsx | 2 +- .../main/webui/src/designer/route/DslSelector.tsx | 2 +- .../webui/src/designer/route/RouteDesigner.tsx | 2 +- .../src/designer/route/RouteDesignerLogic.tsx | 7 +- .../route/property/ComponentParameterField.tsx | 10 +- .../designer/route/property/DslPropertyField.tsx | 2 +- .../src/main/webui/src/designer/utils/CamelUi.tsx | 181 +- .../main/webui/src/designer/utils/KaravanIcons.tsx | 376 + .../src/knowledgebase/components/ComponentsTab.tsx | 6 +- 29 files changed, 1217 insertions(+), 274 deletions(-)
[GitHub] [camel-karavan] mgubaidullin closed issue #750: Karavan Space - Adding a new route and adding source does not auto select it
mgubaidullin closed issue #750: Karavan Space - Adding a new route and adding source does not auto select it URL: https://github.com/apache/camel-karavan/issues/750 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-karavan] 01/03: Fix connectors and icons for #484
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit c72e1bef0111977b09051e78f89e213bb225eb37
Author: Marat Gubaidullin
AuthorDate: Tue Aug 8 11:42:56 2023 -0400
Fix connectors and icons for #484
---
.../src/designer/route/DslConnections.tsx | 7 +-
.../src/designer/route/DslProperties.tsx | 2 +-
.../src/designer/route/DslSelector.tsx | 2 +-
.../src/designer/route/RouteDesignerLogic.tsx | 2 +-
.../route/property/ComponentParameterField.tsx | 10 +-
.../designer/route/property/DslPropertyField.tsx | 2 +-
karavan-designer/src/designer/utils/CamelUi.tsx| 172 -
.../src/designer/utils/KaravanIcons.tsx| 89 +++
.../src/knowledgebase/components/ComponentsTab.tsx | 6 +-
9 files changed, 206 insertions(+), 86 deletions(-)
diff --git a/karavan-designer/src/designer/route/DslConnections.tsx
b/karavan-designer/src/designer/route/DslConnections.tsx
index 4e4f9f53..5280bc12 100644
--- a/karavan-designer/src/designer/route/DslConnections.tsx
+++ b/karavan-designer/src/designer/route/DslConnections.tsx
@@ -60,7 +60,10 @@ export class DslConnections extends React.Component {
this.setState(prevState => ({steps:
prevState.steps.set(evt.step.uuid, evt)}));
}
else if (evt.command === "delete") this.setState(prevState => {
-// prevState.steps.clear();
+prevState.steps.clear();
+Array.from(prevState.steps.entries())
+.filter(value => value[1]?.parent?.uuid !== evt.step.uuid)
+.forEach(value => prevState.steps.set(value[0], value[1]));
prevState.steps.delete(evt.step.uuid);
return {steps: prevState.steps};
});
@@ -456,7 +459,7 @@ export class DslConnections extends React.Component {
{steps.map(pos => this.getArrow(pos))}
{this.getIncomings().map(p => this.getIncoming(p))}
{this.getOutgoings().map(p => this.getOutgoing(p))}
-{this.getInternals().map((p) =>
this.getInternalLines(p)).flat()}
+{/*{this.getInternals().map((p) =>
this.getInternalLines(p)).flat()}*/}
)
}
diff --git a/karavan-designer/src/designer/route/DslProperties.tsx
b/karavan-designer/src/designer/route/DslProperties.tsx
index 53ae4bde..435480de 100644
--- a/karavan-designer/src/designer/route/DslProperties.tsx
+++ b/karavan-designer/src/designer/route/DslProperties.tsx
@@ -93,7 +93,7 @@ export class DslProperties extends React.Component {
parameters[parameter] = value;
(clone as any).parameters = parameters;
this.setStep(clone);
-this.props.onPropertyUpdate?.call(this, clone);
+this.props.onPropertyUpdate?.call(this, clone, newRoute);
}
}
diff --git a/karavan-designer/src/designer/route/DslSelector.tsx
b/karavan-designer/src/designer/route/DslSelector.tsx
index 64dc73a7..8c6d741a 100644
--- a/karavan-designer/src/designer/route/DslSelector.tsx
+++ b/karavan-designer/src/designer/route/DslSelector.tsx
@@ -121,7 +121,7 @@ export class DslSelector extends React.Component {
render() {
const {parentDsl, isOpen} = this.props;
-const title = parentDsl === undefined ? "Select source/from" : "Select
step";
+const title = parentDsl === undefined ? "Select source" : "Select
step";
const labelText: string = this.state.tabIndex ?
this.state.tabIndex.toString() : "";
return (
{
if (newRoute) {
let i =
CamelDefinitionApiExt.updateIntegrationRouteElement(this.routeDesigner.state.integration,
element);
-const f = CamelDefinitionApi.createFromDefinition({uri:
newRoute.componentName + ":" + newRoute.name})
+const f = CamelDefinitionApi.createFromDefinition({uri:
newRoute.componentName, parameters: {name: newRoute.name}});
const r = CamelDefinitionApi.createRouteDefinition({from: f, id:
newRoute.name})
i = CamelDefinitionApiExt.addStepToIntegration(i, r, '');
const clone = CamelUtil.cloneIntegration(i);
diff --git
a/karavan-designer/src/designer/route/property/ComponentParameterField.tsx
b/karavan-designer/src/designer/route/property/ComponentParameterField.tsx
index e0a6f99f..2a7996df 100644
--- a/karavan-designer/src/designer/route/property/ComponentParameterField.tsx
+++ b/karavan-designer/src/designer/route/property/ComponentParameterField.tsx
@@ -144,7 +144,7 @@ export class ComponentParameterField extends
React.Component {
}
if (uris && uris.length > 0) {
selectOptions.push(...uris.map((value: string) =>
-));
+));
}
return
{
{selectOptions}
[camel-karavan] 03/03: Sync last designer changes with app and space
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit f6f77ea88b364b6ba7e479327964e1092b4804fc
Author: Marat Gubaidullin
AuthorDate: Tue Aug 8 11:58:34 2023 -0400
Sync last designer changes with app and space
---
.../src/designer/route/DslConnections.tsx | 7 +-
karavan-space/src/designer/route/DslProperties.tsx | 2 +-
karavan-space/src/designer/route/DslSelector.tsx | 2 +-
karavan-space/src/designer/route/RouteDesigner.tsx | 2 +-
.../src/designer/route/RouteDesignerLogic.tsx | 7 +-
.../route/property/ComponentParameterField.tsx | 10 +-
.../designer/route/property/DslPropertyField.tsx | 2 +-
karavan-space/src/designer/utils/CamelUi.tsx | 181 +-
karavan-space/src/designer/utils/KaravanIcons.tsx | 376 +
.../src/knowledgebase/components/ComponentsTab.tsx | 6 +-
.../webui/src/designer/route/DslConnections.tsx| 7 +-
.../webui/src/designer/route/DslProperties.tsx | 2 +-
.../main/webui/src/designer/route/DslSelector.tsx | 2 +-
.../webui/src/designer/route/RouteDesigner.tsx | 2 +-
.../src/designer/route/RouteDesignerLogic.tsx | 7 +-
.../route/property/ComponentParameterField.tsx | 10 +-
.../designer/route/property/DslPropertyField.tsx | 2 +-
.../src/main/webui/src/designer/utils/CamelUi.tsx | 181 +-
.../main/webui/src/designer/utils/KaravanIcons.tsx | 376 +
.../src/knowledgebase/components/ComponentsTab.tsx | 6 +-
20 files changed, 1006 insertions(+), 184 deletions(-)
diff --git a/karavan-space/src/designer/route/DslConnections.tsx
b/karavan-space/src/designer/route/DslConnections.tsx
index 4e4f9f53..5280bc12 100644
--- a/karavan-space/src/designer/route/DslConnections.tsx
+++ b/karavan-space/src/designer/route/DslConnections.tsx
@@ -60,7 +60,10 @@ export class DslConnections extends React.Component {
this.setState(prevState => ({steps:
prevState.steps.set(evt.step.uuid, evt)}));
}
else if (evt.command === "delete") this.setState(prevState => {
-// prevState.steps.clear();
+prevState.steps.clear();
+Array.from(prevState.steps.entries())
+.filter(value => value[1]?.parent?.uuid !== evt.step.uuid)
+.forEach(value => prevState.steps.set(value[0], value[1]));
prevState.steps.delete(evt.step.uuid);
return {steps: prevState.steps};
});
@@ -456,7 +459,7 @@ export class DslConnections extends React.Component {
{steps.map(pos => this.getArrow(pos))}
{this.getIncomings().map(p => this.getIncoming(p))}
{this.getOutgoings().map(p => this.getOutgoing(p))}
-{this.getInternals().map((p) =>
this.getInternalLines(p)).flat()}
+{/*{this.getInternals().map((p) =>
this.getInternalLines(p)).flat()}*/}
)
}
diff --git a/karavan-space/src/designer/route/DslProperties.tsx
b/karavan-space/src/designer/route/DslProperties.tsx
index 53ae4bde..435480de 100644
--- a/karavan-space/src/designer/route/DslProperties.tsx
+++ b/karavan-space/src/designer/route/DslProperties.tsx
@@ -93,7 +93,7 @@ export class DslProperties extends React.Component {
parameters[parameter] = value;
(clone as any).parameters = parameters;
this.setStep(clone);
-this.props.onPropertyUpdate?.call(this, clone);
+this.props.onPropertyUpdate?.call(this, clone, newRoute);
}
}
diff --git a/karavan-space/src/designer/route/DslSelector.tsx
b/karavan-space/src/designer/route/DslSelector.tsx
index 64dc73a7..8c6d741a 100644
--- a/karavan-space/src/designer/route/DslSelector.tsx
+++ b/karavan-space/src/designer/route/DslSelector.tsx
@@ -121,7 +121,7 @@ export class DslSelector extends React.Component {
render() {
const {parentDsl, isOpen} = this.props;
-const title = parentDsl === undefined ? "Select source/from" : "Select
step";
+const title = parentDsl === undefined ? "Select source" : "Select
step";
const labelText: string = this.state.tabIndex ?
this.state.tabIndex.toString() : "";
return (
{
getPropertiesPanel() {
return (
- this.setState({key:
Math.random().toString(1)})}
+ this.setState({key:
Math.random().toString()})}
style={{transform: "initial"}} isResizable
hasNoBorder defaultSize={'400px'}
maxSize={'800px'} minSize={'300px'}>
{
if (newRoute) {
let i =
CamelDefinitionApiExt.updateIntegrationRouteElement(this.routeDesigner.state.integration,
element);
-const f = CamelDefinitionApi.createFromDefinition({uri:
newRoute.componentName + ":"
