[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2927: [CI] - Camel Main Branch Build Failure
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-1214280352 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 2853853708-739-1fb802fa-a0d6-4021-af8e-00361e051493 * Camel Quarkus Commit: b45cae2e71e5b3061ecf345f6528e4760f1598e1 * Camel Main Commit: 31259a720fbe813c24c2e551beb18d6483da38c9 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/2853853708 -- 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] halmakidon opened a new pull request, #3546: Feat(trait): Knative service visibility support
halmakidon opened a new pull request, #3546: URL: https://github.com/apache/camel-k/pull/3546 I'd like take up this issue.(#1712) I also need this feature. I'm not familiar with the manners, so please let me know if I am wrong. **Modifications** * Add visibilitys option https://knative.dev/docs/serving/services/private-services/ **Release Note** ```release-note Feat(trait): Knative service visibility support ``` -- 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-karaf] branch automatic-periodic-sync updated (e3ab34b1 -> a1335009)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch automatic-periodic-sync in repository https://gitbox.apache.org/repos/asf/camel-karaf.git omit e3ab34b1 [create-pull-request] automated change add a1335009 [create-pull-request] automated change (#179) 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 (e3ab34b1) \ N -- N -- N refs/heads/automatic-periodic-sync (a1335009) 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:
[GitHub] [camel-spring-boot] github-actions[bot] opened a new pull request, #607: [Github Actions] Periodic Sync Camel Spring Boot Main Branch
github-actions[bot] opened a new pull request, #607: URL: https://github.com/apache/camel-spring-boot/pull/607 Periodic Sync of Camel Spring Boot Main Branch with main Camel Main. see https://github.com/apache/camel-spring-boot/blob/main/.github/workflows/automatic-sync-main.yml -- 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 automatic-periodic-sync updated (31cd1d30a19 -> b14c38a9fd3)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch automatic-periodic-sync in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git omit 31cd1d30a19 [create-pull-request] automated change add fd5ff33a174 [create-pull-request] automated change (#606) add b14c38a9fd3 [create-pull-request] automated change 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 (31cd1d30a19) \ N -- N -- N refs/heads/automatic-periodic-sync (b14c38a9fd3) 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: .../springboot/catalog/components/pulsar.json | 4 +++ .../camel-pulsar-starter/src/main/docs/pulsar.json | 12 + .../springboot/PulsarComponentConfiguration.java | 29 ++ .../springboot/PulsarComponentConverter.java | 2 ++ 4 files changed, 47 insertions(+)
[camel] branch regen_bot updated (03bad9d0ccc -> 6bd1b79fd22)
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 03bad9d0ccc CAMEL-18390: [camel-hyperledger-aries] Component should not maintain websocket connection(s) (#8159) add aaa692c7a38 HttpSendDynamicAware not optimizing for http:hostname[:port][/resourceUri][?options] add 240ae8d94ce Merge branch 'main' of https://github.com/jeroenbellen/camel into jeroenbellen-main add 0366ebf6aea HttpSendDynamicAware not optimizing for http:hostname\[:port\]\[/resourceUri\]\[\?options\] add 4766731eb75 Merge branch 'jeroenbellen-main' add 6bd1b79fd22 Regen for commit 4766731eb75c27249bf790a61056d08156f865a5 No new revisions were added by this update. Summary of changes: .../camel/http/base/HttpSendDynamicAware.java | 10 ++ .../HttpSendDynamicAwareUriWithoutSlashTest.java | 113 + 2 files changed, 123 insertions(+) create mode 100644 components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareUriWithoutSlashTest.java
[GitHub] [camel] github-actions[bot] opened a new pull request, #8160: Generated sources regen
github-actions[bot] opened a new pull request, #8160: URL: https://github.com/apache/camel/pull/8160 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] davsclaus commented on pull request #8156: HttpSendDynamicAware not optimizing for http:hostname[:port][/resourc…
davsclaus commented on PR #8156: URL: https://github.com/apache/camel/pull/8156#issuecomment-1214206803 Thanks for the test - I found the bug and backported to 3.18.x too -- 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] 02/02: HttpSendDynamicAware not optimizing for http:hostname\[:port\]\[/resourceUri\]\[\?options\]
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 59ef5950a1720c5b45587da689205605c7eb385d
Author: Claus Ibsen
AuthorDate: Sat Aug 13 20:51:42 2022 +0200
HttpSendDynamicAware not optimizing for
http:hostname\[:port\]\[/resourceUri\]\[\?options\]
---
.../camel/http/base/HttpSendDynamicAware.java | 10
.../HttpSendDynamicAwareUriWithoutSlashTest.java | 29 ++
2 files changed, 29 insertions(+), 10 deletions(-)
diff --git
a/components/camel-http-base/src/main/java/org/apache/camel/http/base/HttpSendDynamicAware.java
b/components/camel-http-base/src/main/java/org/apache/camel/http/base/HttpSendDynamicAware.java
index b9675cc0287..e476bc923c7 100644
---
a/components/camel-http-base/src/main/java/org/apache/camel/http/base/HttpSendDynamicAware.java
+++
b/components/camel-http-base/src/main/java/org/apache/camel/http/base/HttpSendDynamicAware.java
@@ -153,6 +153,16 @@ public class HttpSendDynamicAware extends
SendDynamicAwareSupport {
}
}
+// must include :// in scheme to be parsable via java.net.URI
+int colon = u.indexOf(':');
+if (colon != -1) {
+String before = StringHelper.before(u, ":");
+String after = StringHelper.after(u, ":");
+if (!after.startsWith("//")) {
+u = before + "://" + after;
+}
+}
+
// favour using java.net.URI for parsing into host, context-path and
authority
try {
URI parse = new URI(u);
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareUriWithoutSlashTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareUriWithoutSlashTest.java
index be8bd1a3906..bfb3e9c9e12 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareUriWithoutSlashTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareUriWithoutSlashTest.java
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
package org.apache.camel.component.http;
import java.util.Map;
@@ -82,18 +98,11 @@ public class HttpSendDynamicAwareUriWithoutSlashTest
extends BaseHttpTest {
out =
fluentTemplate.to("direct:usersDrinkWithoutSlash").withExchange(ExchangeBuilder.anExchange(context).withProperty("user",
"moes").build()).send();
assertEquals("a user", out.getMessage().getBody(String.class));
-/*
-Using http:hostname[:port][/resourceUri][?options] as documented
https://camel.apache.org/components/3.18.x/http-component.html stops the
optimization
-
-org.apache.camel.http.base.HttpSendDynamicAware Line 158 breaks
the logic
-
-URI parse = new URI(u);
- */
+// and there should only be one http endpoint as they are both on same
host
Map endpointMap = context.getEndpointMap();
-assertTrue(endpointMap.containsKey("http://localhost:; +
localServer.getLocalPort() + "/users/joes"), "Not optimized");
-assertTrue(endpointMap.containsKey("http://localhost:; +
localServer.getLocalPort() + "/users/moes"), "Not optimized");
+assertTrue(endpointMap.containsKey("http://localhost:; +
localServer.getLocalPort()), "Should find static uri");
assertTrue(endpointMap.containsKey("direct://usersDrink"), "Should
find direct");
assertTrue(endpointMap.containsKey("direct://usersDrinkWithoutSlash"),
"Should find direct");
-assertEquals(4, endpointMap.size());
+assertEquals(3, endpointMap.size());
}
}
[camel] 01/02: HttpSendDynamicAware not optimizing for http:hostname[:port][/resourceUri][?options]
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5dcf4a1d3854d6065463ebe0eb559555ed0d6c26
Author: Jeroen Bellen
AuthorDate: Fri Aug 12 12:32:07 2022 +0200
HttpSendDynamicAware not optimizing for
http:hostname[:port][/resourceUri][?options]
---
.../HttpSendDynamicAwareUriWithoutSlashTest.java | 99 ++
1 file changed, 99 insertions(+)
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareUriWithoutSlashTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareUriWithoutSlashTest.java
new file mode 100644
index 000..be8bd1a3906
--- /dev/null
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareUriWithoutSlashTest.java
@@ -0,0 +1,99 @@
+package org.apache.camel.component.http;
+
+import java.util.Map;
+import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
+import org.apache.camel.RoutesBuilder;
+import org.apache.camel.builder.ExchangeBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.http.handler.BasicValidationHandler;
+import org.apache.http.impl.bootstrap.HttpServer;
+import org.apache.http.impl.bootstrap.ServerBootstrap;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class HttpSendDynamicAwareUriWithoutSlashTest extends BaseHttpTest {
+
+private HttpServer localServer;
+
+@BeforeEach
+@Override
+public void setUp() throws Exception {
+localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
+
.setExpectationVerifier(getHttpExpectationVerifier()).setSslContext(getSSLContext())
+.registerHandler("/users/*", new BasicValidationHandler("GET",
null, null, "a user")).create();
+localServer.start();
+
+super.setUp();
+}
+
+@AfterEach
+@Override
+public void tearDown() throws Exception {
+super.tearDown();
+
+if (localServer != null) {
+localServer.stop();
+}
+}
+
+@Override
+protected RoutesBuilder createRouteBuilder() throws Exception {
+return new RouteBuilder() {
+@Override
+public void configure() throws Exception {
+from("direct:usersDrink")
+.toD("http://localhost:; + localServer.getLocalPort()
++ "/users/${exchangeProperty.user}");
+
+from("direct:usersDrinkWithoutSlash")
+.toD("http:localhost:" + localServer.getLocalPort()
++ "/users/${exchangeProperty.user}");
+}
+};
+}
+
+@Test
+public void testDynamicAware() throws Exception {
+Exchange out =
fluentTemplate.to("direct:usersDrink").withExchange(ExchangeBuilder.anExchange(context).withProperty("user",
"joes").build()).send();
+assertEquals("a user", out.getMessage().getBody(String.class));
+
+out =
fluentTemplate.to("direct:usersDrink").withExchange(ExchangeBuilder.anExchange(context).withProperty("user",
"moes").build()).send();
+assertEquals("a user", out.getMessage().getBody(String.class));
+
+// and there should only be one http endpoint as they are both on same
host
+Map endpointMap = context.getEndpointMap();
+assertTrue(endpointMap.containsKey("http://localhost:; +
localServer.getLocalPort()), "Should find static uri");
+assertTrue(endpointMap.containsKey("direct://usersDrink"), "Should
find direct");
+assertTrue(endpointMap.containsKey("direct://usersDrinkWithoutSlash"),
"Should find direct");
+assertEquals(3, endpointMap.size());
+}
+
+@Test
+public void testDynamicAwareWithoutSlash() throws Exception {
+Exchange out =
fluentTemplate.to("direct:usersDrinkWithoutSlash").withExchange(ExchangeBuilder.anExchange(context).withProperty("user",
"joes").build()).send();
+assertEquals("a user", out.getMessage().getBody(String.class));
+
+out =
fluentTemplate.to("direct:usersDrinkWithoutSlash").withExchange(ExchangeBuilder.anExchange(context).withProperty("user",
"moes").build()).send();
+assertEquals("a user", out.getMessage().getBody(String.class));
+
+/*
+Using http:hostname[:port][/resourceUri][?options] as documented
https://camel.apache.org/components/3.18.x/http-component.html stops the
optimization
+
+org.apache.camel.http.base.HttpSendDynamicAware Line
[camel] branch camel-3.18.x updated (c91ff359a14 -> 59ef5950a17)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch camel-3.18.x in repository https://gitbox.apache.org/repos/asf/camel.git from c91ff359a14 CAMEL-18388: camel-jbang - add directory option to init to save to this folder new 5dcf4a1d385 HttpSendDynamicAware not optimizing for http:hostname[:port][/resourceUri][?options] new 59ef5950a17 HttpSendDynamicAware not optimizing for http:hostname\[:port\]\[/resourceUri\]\[\?options\] 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/http/base/HttpSendDynamicAware.java | 10 ++ .../HttpSendDynamicAwareUriWithoutSlashTest.java | 108 + 2 files changed, 118 insertions(+) create mode 100644 components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareUriWithoutSlashTest.java
[camel] branch main updated (03bad9d0ccc -> 4766731eb75)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 03bad9d0ccc CAMEL-18390: [camel-hyperledger-aries] Component should not maintain websocket connection(s) (#8159) add aaa692c7a38 HttpSendDynamicAware not optimizing for http:hostname[:port][/resourceUri][?options] new 240ae8d94ce Merge branch 'main' of https://github.com/jeroenbellen/camel into jeroenbellen-main new 0366ebf6aea HttpSendDynamicAware not optimizing for http:hostname\[:port\]\[/resourceUri\]\[\?options\] new 4766731eb75 Merge branch 'jeroenbellen-main' 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: .../camel/http/base/HttpSendDynamicAware.java | 10 ++ .../HttpSendDynamicAwareUriWithoutSlashTest.java | 108 + 2 files changed, 118 insertions(+) create mode 100644 components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareUriWithoutSlashTest.java
[camel] 02/03: HttpSendDynamicAware not optimizing for http:hostname\[:port\]\[/resourceUri\]\[\?options\]
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0366ebf6aea7e37a6215834b4fd0f1e753e28333
Author: Claus Ibsen
AuthorDate: Sat Aug 13 20:51:42 2022 +0200
HttpSendDynamicAware not optimizing for
http:hostname\[:port\]\[/resourceUri\]\[\?options\]
---
.../camel/http/base/HttpSendDynamicAware.java | 10
.../HttpSendDynamicAwareUriWithoutSlashTest.java | 29 ++
2 files changed, 29 insertions(+), 10 deletions(-)
diff --git
a/components/camel-http-base/src/main/java/org/apache/camel/http/base/HttpSendDynamicAware.java
b/components/camel-http-base/src/main/java/org/apache/camel/http/base/HttpSendDynamicAware.java
index b9675cc0287..e476bc923c7 100644
---
a/components/camel-http-base/src/main/java/org/apache/camel/http/base/HttpSendDynamicAware.java
+++
b/components/camel-http-base/src/main/java/org/apache/camel/http/base/HttpSendDynamicAware.java
@@ -153,6 +153,16 @@ public class HttpSendDynamicAware extends
SendDynamicAwareSupport {
}
}
+// must include :// in scheme to be parsable via java.net.URI
+int colon = u.indexOf(':');
+if (colon != -1) {
+String before = StringHelper.before(u, ":");
+String after = StringHelper.after(u, ":");
+if (!after.startsWith("//")) {
+u = before + "://" + after;
+}
+}
+
// favour using java.net.URI for parsing into host, context-path and
authority
try {
URI parse = new URI(u);
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareUriWithoutSlashTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareUriWithoutSlashTest.java
index be8bd1a3906..bfb3e9c9e12 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareUriWithoutSlashTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareUriWithoutSlashTest.java
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
package org.apache.camel.component.http;
import java.util.Map;
@@ -82,18 +98,11 @@ public class HttpSendDynamicAwareUriWithoutSlashTest
extends BaseHttpTest {
out =
fluentTemplate.to("direct:usersDrinkWithoutSlash").withExchange(ExchangeBuilder.anExchange(context).withProperty("user",
"moes").build()).send();
assertEquals("a user", out.getMessage().getBody(String.class));
-/*
-Using http:hostname[:port][/resourceUri][?options] as documented
https://camel.apache.org/components/3.18.x/http-component.html stops the
optimization
-
-org.apache.camel.http.base.HttpSendDynamicAware Line 158 breaks
the logic
-
-URI parse = new URI(u);
- */
+// and there should only be one http endpoint as they are both on same
host
Map endpointMap = context.getEndpointMap();
-assertTrue(endpointMap.containsKey("http://localhost:; +
localServer.getLocalPort() + "/users/joes"), "Not optimized");
-assertTrue(endpointMap.containsKey("http://localhost:; +
localServer.getLocalPort() + "/users/moes"), "Not optimized");
+assertTrue(endpointMap.containsKey("http://localhost:; +
localServer.getLocalPort()), "Should find static uri");
assertTrue(endpointMap.containsKey("direct://usersDrink"), "Should
find direct");
assertTrue(endpointMap.containsKey("direct://usersDrinkWithoutSlash"),
"Should find direct");
-assertEquals(4, endpointMap.size());
+assertEquals(3, endpointMap.size());
}
}
[camel] 03/03: Merge branch 'jeroenbellen-main'
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 4766731eb75c27249bf790a61056d08156f865a5 Merge: 03bad9d0ccc 0366ebf6aea Author: Claus Ibsen AuthorDate: Sat Aug 13 20:51:52 2022 +0200 Merge branch 'jeroenbellen-main' .../camel/http/base/HttpSendDynamicAware.java | 10 ++ .../HttpSendDynamicAwareUriWithoutSlashTest.java | 108 + 2 files changed, 118 insertions(+)
[camel] 01/03: Merge branch 'main' of https://github.com/jeroenbellen/camel into jeroenbellen-main
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 240ae8d94ce27e0e24989a9d834b5a8de343efd6 Merge: 03bad9d0ccc aaa692c7a38 Author: Claus Ibsen AuthorDate: Sat Aug 13 20:36:08 2022 +0200 Merge branch 'main' of https://github.com/jeroenbellen/camel into jeroenbellen-main .../HttpSendDynamicAwareUriWithoutSlashTest.java | 99 ++ 1 file changed, 99 insertions(+)
[GitHub] [camel] davsclaus merged pull request #8156: HttpSendDynamicAware not optimizing for http:hostname[:port][/resourc…
davsclaus merged PR #8156: URL: https://github.com/apache/camel/pull/8156 -- 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 (a025e39b383 -> 03bad9d0ccc)
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 a025e39b383 Regen add 3df846a3ee4 Regen for commit 27bb3ca7b045221168e9e6c6bd3e61419c25b915 (#8158) add 03bad9d0ccc CAMEL-18390: [camel-hyperledger-aries] Component should not maintain websocket connection(s) (#8159) No new revisions were added by this update. Summary of changes: .../camel/component/aries/HyperledgerAriesComponent.java | 15 +-- 1 file changed, 5 insertions(+), 10 deletions(-)
[camel] branch main updated: CAMEL-18390: [camel-hyperledger-aries] Component should not maintain websocket connection(s) (#8159)
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 03bad9d0ccc CAMEL-18390: [camel-hyperledger-aries] Component should
not maintain websocket connection(s) (#8159)
03bad9d0ccc is described below
commit 03bad9d0cccea14744959cc24ff52d19116543dc
Author: Thomas Diesler
AuthorDate: Sat Aug 13 16:51:36 2022 +0200
CAMEL-18390: [camel-hyperledger-aries] Component should not maintain
websocket connection(s) (#8159)
---
.../camel/component/aries/HyperledgerAriesComponent.java | 15 +--
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git
a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/HyperledgerAriesComponent.java
b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/HyperledgerAriesComponent.java
index ff6f2c30256..2908dfebd0a 100644
---
a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/HyperledgerAriesComponent.java
+++
b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/HyperledgerAriesComponent.java
@@ -45,7 +45,6 @@ public class HyperledgerAriesComponent extends
DefaultComponent {
private boolean removeWalletsOnShutdown;
private AriesClient adminClient;
-private WebSocketClient adminWebSocketClient;
@Override
protected Endpoint createEndpoint(String uri, String remaining,
Map parameters) throws Exception {
@@ -68,9 +67,6 @@ public class HyperledgerAriesComponent extends
DefaultComponent {
@Override
protected void doShutdown() throws Exception {
-if (adminWebSocketClient != null) {
-adminWebSocketClient.close();
-}
if (removeWalletsOnShutdown) {
for (NessusWallet wallet : walletRegistry.getWallets()) {
wallet.closeAndRemove();
@@ -126,12 +122,11 @@ public class HyperledgerAriesComponent extends
DefaultComponent {
return AriesClientFactory.createClient(agentConfig, wallet);
}
-public WebSocketClient adminWebSocketClient(WebSocketListener wslistener) {
-if (adminWebSocketClient == null) {
-adminWebSocketClient = new WebSocketClient(agentConfig, null);
-adminWebSocketClient.openWebSocket(wslistener);
-}
-return adminWebSocketClient;
+public WebSocketClient createAdminWebSocketClient(WebSocketListener
wslistener) {
+AgentConfiguration agentConfig = getAgentConfiguration();
+WebSocketClient wsclient = new WebSocketClient(agentConfig, null);
+wsclient.openWebSocket(wslistener);
+return wsclient;
}
public WebSocketClient createWebSocketClient(String walletName,
WebSocketListener wslistener) {
[GitHub] [camel] davsclaus merged pull request #8159: CAMEL-18390: [camel-hyperledger-aries] Component should not maintain …
davsclaus merged PR #8159: URL: https://github.com/apache/camel/pull/8159 -- 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 #8159: CAMEL-18390: [camel-hyperledger-aries] Component should not maintain …
github-actions[bot] commented on PR #8159: URL: https://github.com/apache/camel/pull/8159#issuecomment-1214161545 :heavy_check_mark: Finished component verification: 0 component(s) test failed out of **1 component(s) tested** -- 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 #8159: CAMEL-18390: [camel-hyperledger-aries] Component should not maintain …
github-actions[bot] commented on PR #8159: URL: https://github.com/apache/camel/pull/8159#issuecomment-1214150482 :warning: This PR changes Camel components and will be tested automatically. -- 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] tdiesler opened a new pull request, #8159: CAMEL-18390: [camel-hyperledger-aries] Component should not maintain …
tdiesler opened a new pull request, #8159: URL: https://github.com/apache/camel/pull/8159 …websocket connection(s) -- 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 (fe03a360e08 -> a025e39b383)
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 fe03a360e08 Regen for commit 27bb3ca7b045221168e9e6c6bd3e61419c25b915 add a025e39b383 Regen 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 (fe03a360e08) \ N -- N -- N refs/heads/regen_bot (a025e39b383) 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: .../endpoint/dsl/PulsarEndpointBuilderFactory.java | 64 ++ 1 file changed, 64 insertions(+)
[camel] branch main updated: Regen for commit 27bb3ca7b045221168e9e6c6bd3e61419c25b915 (#8158)
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 3df846a3ee4 Regen for commit 27bb3ca7b045221168e9e6c6bd3e61419c25b915 (#8158) 3df846a3ee4 is described below commit 3df846a3ee45892b465dd4ef45e4d3bf2ead8bfb Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Aug 13 11:17:29 2022 +0200 Regen for commit 27bb3ca7b045221168e9e6c6bd3e61419c25b915 (#8158) Signed-off-by: GitHub Signed-off-by: GitHub Co-authored-by: davsclaus
[GitHub] [camel] davsclaus merged pull request #8158: Generated sources regen
davsclaus merged PR #8158: URL: https://github.com/apache/camel/pull/8158 -- 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 (0338b342349 -> fe03a360e08)
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 0338b342349 CAMEL-18388: camel-jbang - add directory option to init to
save to this folder
add 6e1bdb2955f CAMEL-18376: camel-pulsar: add redelivery backoff for ack
timeout, nack (#8147)
add 27bb3ca7b04 Polished
add fe03a360e08 Regen for commit 27bb3ca7b045221168e9e6c6bd3e61419c25b915
No new revisions were added by this update.
Summary of changes:
.../apache/camel/catalog/components/pulsar.json| 4 +++
.../pulsar/PulsarComponentConfigurer.java | 12 +++
.../component/pulsar/PulsarEndpointConfigurer.java | 12 +++
.../component/pulsar/PulsarEndpointUriFactory.java | 4 ++-
.../org/apache/camel/component/pulsar/pulsar.json | 4 +++
.../component/pulsar/PulsarConfiguration.java | 27 +++
.../consumers/CommonCreationStrategyImpl.java | 10 ++
.../PulsarConsumerDeadLetterPolicyIT.java | 6 ++--
...> PulsarConsumerNegativeAcknowledgementIT.java} | 38 +++---
.../PulsarConsumerNoAcknowledgementIT.java | 29 +++--
.../dsl/PulsarComponentBuilderFactory.java | 34 +++
.../apache/camel/dsl/jbang/core/commands/Bind.java | 6 ++--
12 files changed, 165 insertions(+), 21 deletions(-)
copy
components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/integration/{PulsarConsumerNoAcknowledgementIT.java
=> PulsarConsumerNegativeAcknowledgementIT.java} (67%)
[GitHub] [camel] github-actions[bot] opened a new pull request, #8158: Generated sources regen
github-actions[bot] opened a new pull request, #8158: URL: https://github.com/apache/camel/pull/8158 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 (459fec2b243 -> 0338b342349)
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 459fec2b243 camel-jbang - Upgrade to Camel 3.18.1
add 964bbbee69c CAMEL-18388: camel-jbang - add directory option to init to
save to this folder
add 0338b342349 CAMEL-18388: camel-jbang - add directory option to init to
save to this folder
No new revisions were added by this update.
Summary of changes:
.../modules/ROOT/pages/camel-jbang.adoc| 37 ++-
.../{CamelCommand.java => CommandHelper.java} | 31
.../dsl/jbang/core/commands/ExportQuarkus.java | 12 +-
.../apache/camel/dsl/jbang/core/commands/Init.java | 43 ++
4 files changed, 88 insertions(+), 35 deletions(-)
copy
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/{CamelCommand.java
=> CommandHelper.java} (60%)
[camel] 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.git
The following commit(s) were added to refs/heads/main by this push:
new a025e39b383 Regen
a025e39b383 is described below
commit a025e39b3839766aa28f95821783910cd23e04d6
Author: Claus Ibsen
AuthorDate: Sat Aug 13 11:01:13 2022 +0200
Regen
---
.../apache/camel/catalog/components/pulsar.json| 4 ++
.../dsl/PulsarComponentBuilderFactory.java | 34
.../endpoint/dsl/PulsarEndpointBuilderFactory.java | 64 ++
3 files changed, 102 insertions(+)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pulsar.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pulsar.json
index c28d2bb37a1..d2302601763 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pulsar.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pulsar.json
@@ -28,6 +28,7 @@
"serviceUrl": { "kind": "property", "displayName": "Service Url", "group":
"common", "label": "common", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.pulsar.PulsarConfiguration",
"configurationField": "configuration", "description": "The Pulsar Service URL
to point while creating the client from URI" },
"ackGroupTimeMillis": { "kind": "property", "displayName": "Ack Group Time
Millis", "group": "consumer", "label": "consumer", "required": false, "type":
"integer", "javaType": "long", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 100, "configurationClass":
"org.apache.camel.component.pulsar.PulsarConfiguration", "configurationField":
"configuration", "description": "Group the consumer acknowledgments for the
specified time in milliseconds - defaults to 100" },
"ackTimeoutMillis": { "kind": "property", "displayName": "Ack Timeout
Millis", "group": "consumer", "label": "consumer", "required": false, "type":
"integer", "javaType": "long", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 1, "configurationClass":
"org.apache.camel.component.pulsar.PulsarConfiguration", "configurationField":
"configuration", "description": "Timeout for unacknowledged messages in
milliseconds - defaults to 1" },
+"ackTimeoutRedeliveryBackoff": { "kind": "property", "displayName": "Ack
Timeout Redelivery Backoff", "group": "consumer", "label": "consumer",
"required": false, "type": "object", "javaType":
"org.apache.pulsar.client.api.RedeliveryBackoff", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.pulsar.PulsarConfiguration", "configurationField":
"configuration", "description": "RedeliveryBackoff to use for ack timeout
redelivery b [...]
"allowManualAcknowledgement": { "kind": "property", "displayName": "Allow
Manual Acknowledgement", "group": "consumer", "label": "consumer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.pulsar.PulsarConfiguration",
"configurationField": "configuration", "description": "Whether to allow manual
message acknowledgements. If this option is ena [...]
"bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Allows for bridging the
consumer to the Camel routing Error Handler, which mean any exceptions occurred
while the consumer is trying to pickup incoming messages, or the likes, will
now be processed as a me [...]
"consumerName": { "kind": "property", "displayName": "Consumer Name",
"group": "consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "sole-consumer", "configurationClass":
"org.apache.camel.component.pulsar.PulsarConfiguration", "configurationField":
"configuration", "description": "Name of the consumer when subscription is
EXCLUSIVE" },
@@ -36,6 +37,7 @@
"deadLetterTopic": { "kind": "property", "displayName": "Dead Letter
Topic", "group": "consumer", "label": "consumer", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.pulsar.PulsarConfiguration", "configurationField":
"configuration", "description": "Name of the topic where the
[camel] branch main updated: CAMEL-18376: camel-pulsar: add redelivery backoff for ack timeout, nack (#8147)
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 6e1bdb2955f CAMEL-18376: camel-pulsar: add redelivery backoff for ack timeout, nack (#8147) 6e1bdb2955f is described below commit 6e1bdb2955fb6de483d5ef95042ac33377865600 Author: Anthony Sam Wu <55711988+anthonywu-to...@users.noreply.github.com> AuthorDate: Sat Aug 13 04:33:22 2022 -0400 CAMEL-18376: camel-pulsar: add redelivery backoff for ack timeout, nack (#8147) * CAMEL-18376: camel-pulsar; add redelivery backoff for ack timeout, negative ack * Fix import order/linebreak * Apply formatting * Provide ack timeout in negative ack test * Rebind in test * Set backoff not in endpoint query param * Fix import * Fix tests --- .../pulsar/PulsarComponentConfigurer.java | 12 +++ .../component/pulsar/PulsarEndpointConfigurer.java | 12 +++ .../component/pulsar/PulsarEndpointUriFactory.java | 4 ++- .../org/apache/camel/component/pulsar/pulsar.json | 4 +++ .../component/pulsar/PulsarConfiguration.java | 27 +++ .../consumers/CommonCreationStrategyImpl.java | 10 ++ .../PulsarConsumerDeadLetterPolicyIT.java | 6 ++-- ...> PulsarConsumerNegativeAcknowledgementIT.java} | 38 +++--- .../PulsarConsumerNoAcknowledgementIT.java | 29 +++-- 9 files changed, 124 insertions(+), 18 deletions(-) diff --git a/components/camel-pulsar/src/generated/java/org/apache/camel/component/pulsar/PulsarComponentConfigurer.java b/components/camel-pulsar/src/generated/java/org/apache/camel/component/pulsar/PulsarComponentConfigurer.java index 86afa21c75a..97dab737df9 100644 --- a/components/camel-pulsar/src/generated/java/org/apache/camel/component/pulsar/PulsarComponentConfigurer.java +++ b/components/camel-pulsar/src/generated/java/org/apache/camel/component/pulsar/PulsarComponentConfigurer.java @@ -32,6 +32,8 @@ public class PulsarComponentConfigurer extends PropertyConfigurerSupport impleme case "ackGroupTimeMillis": getOrCreateConfiguration(target).setAckGroupTimeMillis(property(camelContext, long.class, value)); return true; case "acktimeoutmillis": case "ackTimeoutMillis": getOrCreateConfiguration(target).setAckTimeoutMillis(property(camelContext, long.class, value)); return true; +case "acktimeoutredeliverybackoff": +case "ackTimeoutRedeliveryBackoff": getOrCreateConfiguration(target).setAckTimeoutRedeliveryBackoff(property(camelContext, org.apache.pulsar.client.api.RedeliveryBackoff.class, value)); return true; case "allowmanualacknowledgement": case "allowManualAcknowledgement": getOrCreateConfiguration(target).setAllowManualAcknowledgement(property(camelContext, boolean.class, value)); return true; case "authenticationclass": @@ -81,6 +83,8 @@ public class PulsarComponentConfigurer extends PropertyConfigurerSupport impleme case "messageRouter": getOrCreateConfiguration(target).setMessageRouter(property(camelContext, org.apache.pulsar.client.api.MessageRouter.class, value)); return true; case "messageroutingmode": case "messageRoutingMode": getOrCreateConfiguration(target).setMessageRoutingMode(property(camelContext, org.apache.pulsar.client.api.MessageRoutingMode.class, value)); return true; +case "negativeackredeliverybackoff": +case "negativeAckRedeliveryBackoff": getOrCreateConfiguration(target).setNegativeAckRedeliveryBackoff(property(camelContext, org.apache.pulsar.client.api.RedeliveryBackoff.class, value)); return true; case "negativeackredeliverydelaymicros": case "negativeAckRedeliveryDelayMicros": getOrCreateConfiguration(target).setNegativeAckRedeliveryDelayMicros(property(camelContext, long.class, value)); return true; case "numberofconsumerthreads": @@ -125,6 +129,8 @@ public class PulsarComponentConfigurer extends PropertyConfigurerSupport impleme case "ackGroupTimeMillis": return long.class; case "acktimeoutmillis": case "ackTimeoutMillis": return long.class; +case "acktimeoutredeliverybackoff": +case "ackTimeoutRedeliveryBackoff": return org.apache.pulsar.client.api.RedeliveryBackoff.class; case "allowmanualacknowledgement": case "allowManualAcknowledgement": return boolean.class; case "authenticationclass": @@ -174,6 +180,8 @@ public class PulsarComponentConfigurer extends PropertyConfigurerSupport impleme case "messageRouter": return org.apache.pulsar.client.api.MessageRouter.class; case "messageroutingmode": case "messageRoutingMode": return org.apache.pulsar.client.api.MessageRoutingMode.class; +case
[camel] branch main updated: Polished
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 27bb3ca7b04 Polished
27bb3ca7b04 is described below
commit 27bb3ca7b045221168e9e6c6bd3e61419c25b915
Author: Claus Ibsen
AuthorDate: Sat Aug 13 10:31:51 2022 +0200
Polished
---
.../main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java| 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java
index 1542381e664..63841173d84 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java
@@ -50,7 +50,7 @@ class Bind extends CamelCommand {
@CommandLine.Parameters(description = "Sink such as a Kamelet or Camel
endpoint uri", arity = "1")
private String sink;
-@CommandLine.Parameters(description = "Name of binding file", arity = "1")
+@CommandLine.Parameters(description = "Name of binding file to be saved",
arity = "1")
private String file;
public Bind(CamelJBangMain main) {
@@ -94,8 +94,8 @@ class Bind extends CamelCommand {
protected String kameletProperties(String kamelet) throws Exception {
StringBuilder sb = new StringBuilder();
-InputStream is = null;
-String loc = null;
+InputStream is;
+String loc;
// try local disk first before github
Resource res = new
DefaultResourceResolvers.FileResolver().resolve("file:" + kamelet +
".kamelet.yaml");
[GitHub] [camel] davsclaus merged pull request #8147: CAMEL-18376: camel-pulsar: add redelivery backoff for ack timeout, nack
davsclaus merged PR #8147: URL: https://github.com/apache/camel/pull/8147 -- 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 #8147: CAMEL-18376: camel-pulsar: add redelivery backoff for ack timeout, nack
davsclaus commented on PR #8147: URL: https://github.com/apache/camel/pull/8147#issuecomment-1214008543 Yeah it works now, thanks for contributing to Camel. You are welcome to keep improving ;) -- 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.18.x updated: CAMEL-18388: camel-jbang - add directory option to init to save to this folder
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-3.18.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-3.18.x by this push: new c91ff359a14 CAMEL-18388: camel-jbang - add directory option to init to save to this folder c91ff359a14 is described below commit c91ff359a14847dcda21d58024ac94173ed02e42 Author: Claus Ibsen AuthorDate: Sat Aug 13 10:28:09 2022 +0200 CAMEL-18388: camel-jbang - add directory option to init to save to this folder --- .../modules/ROOT/pages/camel-jbang.adoc| 132 + 1 file changed, 111 insertions(+), 21 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc index b19b7a259bc..a7e9748d293 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc @@ -4,42 +4,40 @@ A JBang-based Camel app for easily running Camel routes. == Installation -It is not necessary to install Camel JBang. However, if you prefer to do so, JBang makes it easy for us by providing an installation feature that works with GitHub. If you have JBang installed on your system, then you can run the following command to install Camel JBang: +First you must install https://www.jbang.dev/[JBang] which is used for launching Camel. +See instructions on https://www.jbang.dev/download/[JBang] how to download and install. + +After JBang is installed you can verify JBang is working by executing the following command from a command shell: [source,bash] -jbang app install camel@apache/camel +jbang version -== Using Camel JBang +Which should output the version of JBang. -The Camel JBang supports multiple commands. Running the command below, will print all of them: +To make it easier to use Camel JBang then install the following: [source,bash] -jbang camel@apache/camel --help +jbang app install camel@apache/camel -TIP: The first time you run this command, it may cause dependencies to be cached, therefore taking a few extra seconds to run. - -All the commands support the `--help` and will display the appropriate help if that flag is provided. +This will install Apache Camel as the `camel` command within JBang, meaning that you can run Camel from the command line +by just executing `camel` (see more next). +== Using Camel JBang -=== Using a specific Camel version - -You can specify which Camel version to run as shown: +The Camel JBang supports multiple commands. Running the command below, will print all of them: [source,bash] -jbang run -Dcamel.jbang.version=3.17.0 camel@apache/camel [command] +camel --help -And you can also try bleeding edge development by using SNAPSHOT such as: +TIP: The first time you run this command, it may cause dependencies to be cached, therefore taking a few extra seconds to run. -[source,bash] - -jbang run -Dcamel.jbang.version=3.18.0-SNAPSHOT camel@apache/camel [command] - +All the commands support the `--help` and will display the appropriate help if that flag is provided. == Creating and running Camel routes @@ -52,7 +50,7 @@ For example to create an XML route you do: camel init cheese.xml -Which creates the file `cheese.xml` with a sample route. +Which creates the file `cheese.xml` (in the current directory) with a sample route. To run the file, you simply do: @@ -70,6 +68,17 @@ To create a new .java route, you simply do: camel init foo.java +When using the init command then Camel will by default create the file in the current directory. However, you can use +the `--directory` option to create the file in the specified directory. For example to create in a folder +named _foobar_ you can do: + +[source,bash] + +camel init foo.java --directory=foobar + + +IMPORTANT: When using `--directory` then Camel will automatically clean this directory if already exists. + === Running Routes from multiple files You can run more than 1 file, for example to run two YAML files you can do: @@ -107,7 +116,7 @@ And to run everything camel run * -TIP: The run goal can also detect files that are `properties`. +TIP: The run goal can also detect files that are `properties`, such as `application.properties`. === Dev mode with live reload @@ -131,6 +140,39 @@ camel run hello.java --dev NOTE: The live reload is meant for development purposes, and if you encounter problems with reloading such as JVM class loading issues, then you may need to restart the application. +=== Developer Console + +You can enable the developer console, which presents a variety of information to the developer. + +[source,bash] + +camel run hello.java --console + + +The console is then accessible from a web browser at: http://localhost:8080/q/dev (by default). +The link is also
[camel] branch main updated: CAMEL-18388: camel-jbang - add directory option to init to save to this folder
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 0338b342349 CAMEL-18388: camel-jbang - add directory option to init to save to this folder 0338b342349 is described below commit 0338b3423495e3049628fd96c3c017f2b6afebfd Author: Claus Ibsen AuthorDate: Sat Aug 13 10:28:09 2022 +0200 CAMEL-18388: camel-jbang - add directory option to init to save to this folder --- .../modules/ROOT/pages/camel-jbang.adoc| 37 -- 1 file changed, 35 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 b85179421df..da896f15d95 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc @@ -50,7 +50,7 @@ For example to create an XML route you do: camel init cheese.xml -Which creates the file `cheese.xml` with a sample route. +Which creates the file `cheese.xml` (in the current directory) with a sample route. To run the file, you simply do: @@ -68,6 +68,17 @@ To create a new .java route, you simply do: camel init foo.java +When using the init command then Camel will by default create the file in the current directory. However, you can use +the `--directory` option to create the file in the specified directory. For example to create in a folder +named _foobar_ you can do: + +[source,bash] + +camel init foo.java --directory=foobar + + +IMPORTANT: When using `--directory` then Camel will automatically clean this directory if already exists. + === Running Routes from multiple files You can run more than 1 file, for example to run two YAML files you can do: @@ -105,7 +116,7 @@ And to run everything camel run * -TIP: The run goal can also detect files that are `properties`. +TIP: The run goal can also detect files that are `properties`, such as `application.properties`. === Dev mode with live reload @@ -363,6 +374,16 @@ The example can then be run locally with: camel run * +You can also download to a new folder using the `--directory` option, for example to download to a folder named _myproject_, +you would do: + +[source,bash] + +camel init https://github.com/apache/camel-kamelets-examples/tree/main/jbang/dependency-injection --directory=myproject + + +IMPORTANT: When using `--directory` then Camel will automatically clean this directory if already exists. + You can also run in dev mode, to hot-deploy on source code changes. [source,bash] @@ -400,6 +421,17 @@ This will then download the files to local disk, which you can run afterwards: camel run * +You can also download to a new folder using the `--directory` option, for example to download to a folder named _foobar_, +you would do: + +[source,bash] + +camel init https://gist.github.com/davsclaus/477ddff5cdeb1ae03619aa544ce47e92 --directory=foobar + + +IMPORTANT: When using `--directory` then Camel will automatically clean this directory if already exists. + + === Using a specific Camel version You can specify which Camel version to run as shown: @@ -416,6 +448,7 @@ And you can also try bleeding edge development by using SNAPSHOT such as: jbang run -Dcamel.jbang.version=3.19.0-SNAPSHOT camel@apache/camel [command] + === Running Camel K integrations or bindings Camel also supports running Camel K integrations and binding files, which are in CRD format (Kubernetes Custom Resource Definitions).
[camel] branch camel-3.18.x updated: CAMEL-18388: camel-jbang - add directory option to init to save to this folder
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.18.x by this push:
new d612c6132d8 CAMEL-18388: camel-jbang - add directory option to init to
save to this folder
d612c6132d8 is described below
commit d612c6132d826147e684f7e653df76d00693b9f9
Author: Claus Ibsen
AuthorDate: Sat Aug 13 10:09:25 2022 +0200
CAMEL-18388: camel-jbang - add directory option to init to save to this
folder
---
.../dsl/jbang/core/commands/CommandHelper.java | 41 +
.../dsl/jbang/core/commands/ExportQuarkus.java | 12 +-
.../apache/camel/dsl/jbang/core/commands/Init.java | 43 ++
3 files changed, 78 insertions(+), 18 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CommandHelper.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CommandHelper.java
new file mode 100644
index 000..1ce40f1a4f8
--- /dev/null
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CommandHelper.java
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+package org.apache.camel.dsl.jbang.core.commands;
+
+import java.io.File;
+
+import org.apache.camel.util.FileUtil;
+
+public final class CommandHelper {
+
+private CommandHelper() {
+}
+
+public static void cleanExportDir(String dir) {
+File target = new File(dir);
+File[] files = target.listFiles();
+if (files != null) {
+for (File f : files) {
+if (!f.isHidden() && f.isDirectory()) {
+FileUtil.removeDir(f);
+} else if (!f.isHidden() && f.isFile()) {
+FileUtil.deleteFile(f);
+}
+}
+}
+}
+}
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
index 98dd6eaed79..eaffe07dcb7 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
@@ -113,16 +113,8 @@ class ExportQuarkus extends Export {
copyMavenWrapper();
}
-if (exportDir.equals(".")) {
-// we export to current dir so prepare for this by cleaning up
existing files
-File target = new File(exportDir);
-for (File f : target.listFiles()) {
-if (!f.isHidden() && f.isDirectory()) {
-FileUtil.removeDir(f);
-} else if (!f.isHidden() && f.isFile()) {
-f.delete();
-}
-}
+if (!exportDir.equals(".")) {
+CommandHelper.cleanExportDir(exportDir);
}
// copy to export dir and remove work dir
FileUtils.copyDirectory(new File(BUILD_DIR), new File(exportDir));
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
index c002c9db9c4..17d4313445a 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.dsl.jbang.core.commands;
+import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.util.StringJoiner;
@@ -40,13 +41,18 @@ import static
org.apache.camel.dsl.jbang.core.common.GitHubHelper.fetchGithubUrl
@Command(name = "init", description = "Initialize empty Camel integration")
class Init extends CamelCommand {
-@CommandLine.Parameters(description = "Name of integration
[camel] branch main updated: CAMEL-18388: camel-jbang - add directory option to init to save to this folder
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 964bbbee69c CAMEL-18388: camel-jbang - add directory option to init to
save to this folder
964bbbee69c is described below
commit 964bbbee69cda631def5f1ac432e5f786db9ef0f
Author: Claus Ibsen
AuthorDate: Sat Aug 13 10:09:25 2022 +0200
CAMEL-18388: camel-jbang - add directory option to init to save to this
folder
---
.../dsl/jbang/core/commands/CommandHelper.java | 41 +
.../dsl/jbang/core/commands/ExportQuarkus.java | 12 +-
.../apache/camel/dsl/jbang/core/commands/Init.java | 43 ++
3 files changed, 78 insertions(+), 18 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CommandHelper.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CommandHelper.java
new file mode 100644
index 000..1ce40f1a4f8
--- /dev/null
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CommandHelper.java
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+package org.apache.camel.dsl.jbang.core.commands;
+
+import java.io.File;
+
+import org.apache.camel.util.FileUtil;
+
+public final class CommandHelper {
+
+private CommandHelper() {
+}
+
+public static void cleanExportDir(String dir) {
+File target = new File(dir);
+File[] files = target.listFiles();
+if (files != null) {
+for (File f : files) {
+if (!f.isHidden() && f.isDirectory()) {
+FileUtil.removeDir(f);
+} else if (!f.isHidden() && f.isFile()) {
+FileUtil.deleteFile(f);
+}
+}
+}
+}
+}
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
index 025e6e706f2..d0df64322e7 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
@@ -113,16 +113,8 @@ class ExportQuarkus extends Export {
copyMavenWrapper();
}
-if (exportDir.equals(".")) {
-// we export to current dir so prepare for this by cleaning up
existing files
-File target = new File(exportDir);
-for (File f : target.listFiles()) {
-if (!f.isHidden() && f.isDirectory()) {
-FileUtil.removeDir(f);
-} else if (!f.isHidden() && f.isFile()) {
-f.delete();
-}
-}
+if (!exportDir.equals(".")) {
+CommandHelper.cleanExportDir(exportDir);
}
// copy to export dir and remove work dir
FileUtils.copyDirectory(new File(BUILD_DIR), new File(exportDir));
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
index c002c9db9c4..17d4313445a 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.dsl.jbang.core.commands;
+import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.util.StringJoiner;
@@ -40,13 +41,18 @@ import static
org.apache.camel.dsl.jbang.core.common.GitHubHelper.fetchGithubUrl
@Command(name = "init", description = "Initialize empty Camel integration")
class Init extends CamelCommand {
-@CommandLine.Parameters(description = "Name of integration file", arity =
"1")
[GitHub] [camel] github-actions[bot] commented on pull request #8147: CAMEL-18376: camel-pulsar: add redelivery backoff for ack timeout, nack
github-actions[bot] commented on PR #8147: URL: https://github.com/apache/camel/pull/8147#issuecomment-1213963737 :heavy_check_mark: Finished component verification: 0 component(s) test failed out of **5 component(s) tested** -- 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-karaf] branch main updated: [create-pull-request] automated change (#179)
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-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new a1335009 [create-pull-request] automated change (#179)
a1335009 is described below
commit a13350090edb9f32b0350ac276d6e8018f7b95be
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Sat Aug 13 09:37:35 2022 +0200
[create-pull-request] automated change (#179)
Co-authored-by: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
---
.../resources/org/apache/camel/catalog/karaf/components/consul.json | 6 --
.../resources/org/apache/camel/catalog/karaf/components/stream.json | 4 +++-
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/consul.json
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/consul.json
index 106b59dc..a07a8caf 100644
---
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/consul.json
+++
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/consul.json
@@ -23,16 +23,13 @@
},
"componentProperties": {
"connectTimeout": { "kind": "property", "displayName": "Connect Timeout",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "java.time.Duration", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.consul.ConsulConfiguration", "configurationField":
"configuration", "description": "Connect timeout for OkHttpClient" },
-"connectTimeoutMillis": { "kind": "property", "displayName": "Connect
Timeout Millis", "group": "common", "label": "", "required": false, "type":
"integer", "javaType": "java.lang.Long", "deprecated": true, "deprecationNote":
"Use connectTimeout instead", "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.consul.ConsulConfiguration",
"configurationField": "configuration", "description": "Connect timeout for
OkHttpClient. Deprecation note: Use conne [...]
"consulClient": { "kind": "property", "displayName": "Consul Client",
"group": "common", "label": "common", "required": false, "type": "object",
"javaType": "com.orbitz.consul.Consul", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.consul.ConsulConfiguration", "configurationField":
"configuration", "description": "Reference to a com.orbitz.consul.Consul in the
registry." },
"key": { "kind": "property", "displayName": "Key", "group": "common",
"label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.consul.ConsulConfiguration",
"configurationField": "configuration", "description": "The default key. Can be
overridden by CamelConsulKey" },
"pingInstance": { "kind": "property", "displayName": "Ping Instance",
"group": "common", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.consul.ConsulConfiguration", "configurationField":
"configuration", "description": "Configure if the AgentClient should attempt a
ping before returning the Consul instance" },
"readTimeout": { "kind": "property", "displayName": "Read Timeout",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "java.time.Duration", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.consul.ConsulConfiguration", "configurationField":
"configuration", "description": "Read timeout for OkHttpClient" },
-"readTimeoutMillis": { "kind": "property", "displayName": "Read Timeout
Millis", "group": "common", "label": "", "required": false, "type": "integer",
"javaType": "java.lang.Long", "deprecated": true, "deprecationNote": "Use
readTimeout instead", "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.consul.ConsulConfiguration",
"configurationField": "configuration", "description": "Read timeout for
OkHttpClient. Deprecation note: Use readTimeout instead" },
"tags": { "kind": "property", "displayName": "Tags", "group": "common",
"label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.consul.ConsulConfiguration",
"configurationField": "configuration", "description": "Set tags. You can
separate
[GitHub] [camel-karaf] davsclaus merged pull request #179: [Github Actions] Periodic Sync Camel Karaf Main Branch
davsclaus merged PR #179: URL: https://github.com/apache/camel-karaf/pull/179 -- 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: [create-pull-request] automated change (#606)
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 fd5ff33a174 [create-pull-request] automated change (#606)
fd5ff33a174 is described below
commit fd5ff33a1749ed1441de574ffcb0a4a33f0a5611
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Sat Aug 13 09:37:15 2022 +0200
[create-pull-request] automated change (#606)
Co-authored-by: oscerd
---
.../springboot/catalog/components/consul.json | 6 ---
.../springboot/catalog/components/stream.json | 4 +-
.../camel/springboot/catalog/others/console.json | 2 +-
.../springboot/catalog/others/management.json | 1 +
.../camel-consul-starter/src/main/docs/consul.json | 60 --
.../springboot/ConsulComponentConfiguration.java | 51 --
6 files changed, 5 insertions(+), 119 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/consul.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/consul.json
index 4a323f2a0af..c2e1b330cd2 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/consul.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/consul.json
@@ -23,16 +23,13 @@
},
"componentProperties": {
"connectTimeout": { "kind": "property", "displayName": "Connect Timeout",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "java.time.Duration", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.consul.ConsulConfiguration", "configurationField":
"configuration", "description": "Connect timeout for OkHttpClient" },
-"connectTimeoutMillis": { "kind": "property", "displayName": "Connect
Timeout Millis", "group": "common", "label": "", "required": false, "type":
"integer", "javaType": "java.lang.Long", "deprecated": true, "deprecationNote":
"Use connectTimeout instead", "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.consul.ConsulConfiguration",
"configurationField": "configuration", "description": "Connect timeout for
OkHttpClient. Deprecation note: Use conne [...]
"consulClient": { "kind": "property", "displayName": "Consul Client",
"group": "common", "label": "common", "required": false, "type": "object",
"javaType": "com.orbitz.consul.Consul", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.consul.ConsulConfiguration", "configurationField":
"configuration", "description": "Reference to a com.orbitz.consul.Consul in the
registry." },
"key": { "kind": "property", "displayName": "Key", "group": "common",
"label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.consul.ConsulConfiguration",
"configurationField": "configuration", "description": "The default key. Can be
overridden by CamelConsulKey" },
"pingInstance": { "kind": "property", "displayName": "Ping Instance",
"group": "common", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.consul.ConsulConfiguration", "configurationField":
"configuration", "description": "Configure if the AgentClient should attempt a
ping before returning the Consul instance" },
"readTimeout": { "kind": "property", "displayName": "Read Timeout",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "java.time.Duration", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.consul.ConsulConfiguration", "configurationField":
"configuration", "description": "Read timeout for OkHttpClient" },
-"readTimeoutMillis": { "kind": "property", "displayName": "Read Timeout
Millis", "group": "common", "label": "", "required": false, "type": "integer",
"javaType": "java.lang.Long", "deprecated": true, "deprecationNote": "Use
readTimeout instead", "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.consul.ConsulConfiguration",
"configurationField": "configuration", "description": "Read timeout for
OkHttpClient. Deprecation note: Use readTimeout instead" },
"tags": { "kind": "property", "displayName": "Tags", "group": "common",
"label": "", "required": false, "type": "string", "javaType":
[GitHub] [camel-spring-boot] davsclaus merged pull request #606: [Github Actions] Periodic Sync Camel Spring Boot Main Branch
davsclaus merged PR #606: URL: https://github.com/apache/camel-spring-boot/pull/606 -- 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
