[camel-quarkus] 03/03: Temporary workaround for https://github.com/quarkusio/quarkus/issues/9103
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit af3dfb1959c27504ece6ad46d7e341667ab9cc0b
Author: Peter Palaga
AuthorDate: Wed May 6 09:27:44 2020 +0200
Temporary workaround for
https://github.com/quarkusio/quarkus/issues/9103
---
integration-tests/mongodb/pom.xml | 13 +
1 file changed, 13 insertions(+)
diff --git a/integration-tests/mongodb/pom.xml
b/integration-tests/mongodb/pom.xml
index a72d0f7..6f192cd 100644
--- a/integration-tests/mongodb/pom.xml
+++ b/integration-tests/mongodb/pom.xml
@@ -30,6 +30,8 @@
Integration tests for Camel Quarkus MongoDB
extension
+5.3.1
+
@@ -39,6 +41,17 @@
camel-quarkus-mongodb-deployment,camel-quarkus-support-policy-deployment
+
+
+
+
+net.java.dev.jna
+jna
+${jna.version}
+
+
+
+
org.apache.camel.quarkus
[camel-quarkus] 01/03: Register required AHC classes for runtime initialization
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 85b594aedd56b87ebb34515eb6f16813d375bdf5
Author: James Netherton
AuthorDate: Thu Apr 23 15:08:53 2020 +0100
Register required AHC classes for runtime initialization
Fixes #1126
---
.../support/ahc/deployment/SupportAhcProcessor.java | 15 +++
.../component/ahc/ws/deployment/AhcWsProcessor.java | 5 +
2 files changed, 20 insertions(+)
diff --git
a/extensions-support/ahc/deployment/src/main/java/org/apache/camel/quarkus/component/support/ahc/deployment/SupportAhcProcessor.java
b/extensions-support/ahc/deployment/src/main/java/org/apache/camel/quarkus/component/support/ahc/deployment/SupportAhcProcessor.java
index 9ae0aa8..dc1c53f 100644
---
a/extensions-support/ahc/deployment/src/main/java/org/apache/camel/quarkus/component/support/ahc/deployment/SupportAhcProcessor.java
+++
b/extensions-support/ahc/deployment/src/main/java/org/apache/camel/quarkus/component/support/ahc/deployment/SupportAhcProcessor.java
@@ -16,14 +16,22 @@
*/
package org.apache.camel.quarkus.component.support.ahc.deployment;
+import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import
io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
+import
io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
class SupportAhcProcessor {
private static final String FEATURE = "camel-support-ahc";
+private static final String[] RUNTIME_INITIALIZED_CLASSES = new String[] {
+"org.asynchttpclient.netty.channel.ChannelManager",
+"org.asynchttpclient.netty.request.NettyRequestSender",
+"org.asynchttpclient.RequestBuilderBase",
+"org.asynchttpclient.resolver.RequestHostnameResolver"
+};
@BuildStep
FeatureBuildItem feature() {
@@ -42,4 +50,11 @@ class SupportAhcProcessor {
return new ExtensionSslNativeSupportBuildItem(FEATURE);
}
+@BuildStep
+void
runtimeInitializedClasses(BuildProducer
runtimeInitializedClass) {
+for (String className : RUNTIME_INITIALIZED_CLASSES) {
+runtimeInitializedClass
+.produce(new RuntimeInitializedClassBuildItem(className));
+}
+}
}
diff --git
a/extensions/ahc-ws/deployment/src/main/java/org/apache/camel/quarkus/component/ahc/ws/deployment/AhcWsProcessor.java
b/extensions/ahc-ws/deployment/src/main/java/org/apache/camel/quarkus/component/ahc/ws/deployment/AhcWsProcessor.java
index 09d5671..5171ec1 100644
---
a/extensions/ahc-ws/deployment/src/main/java/org/apache/camel/quarkus/component/ahc/ws/deployment/AhcWsProcessor.java
+++
b/extensions/ahc-ws/deployment/src/main/java/org/apache/camel/quarkus/component/ahc/ws/deployment/AhcWsProcessor.java
@@ -18,6 +18,7 @@ package org.apache.camel.quarkus.component.ahc.ws.deployment;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
+import
io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
class AhcWsProcessor {
@@ -28,4 +29,8 @@ class AhcWsProcessor {
return new FeatureBuildItem(FEATURE);
}
+@BuildStep
+RuntimeInitializedClassBuildItem runtimeInitializedClasses() {
+return new
RuntimeInitializedClassBuildItem("org.asynchttpclient.netty.ws.NettyWebSocket");
+}
}
[camel-quarkus] branch quarkus-master updated (4971644 -> af3dfb1)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch quarkus-master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. discard 4971644 Temporary workaround for https://github.com/quarkusio/quarkus/issues/9103 discard b7ba2fa Fix CamelContextCustomizerTest compilation errors discard fd24041 Register required AHC classes for runtime initialization add cc8f5e2 Idiomatic Mustache test add 123a3b5 Merge pull request #1204 from ppalaga/200509-idiomatic-mustache-tests new 85b594a Register required AHC classes for runtime initialization new c79e512 Fix CamelContextCustomizerTest compilation errors new af3dfb1 Temporary workaround for https://github.com/quarkusio/quarkus/issues/9103 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 (4971644) \ N -- N -- N refs/heads/quarkus-master (af3dfb1) 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. 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: .../component/mustache/it/MustacheResource.java| 36 +-- .../component/mustache/it/MustacheTest.java| 72 +- 2 files changed, 61 insertions(+), 47 deletions(-)
[camel-quarkus] 02/03: Fix CamelContextCustomizerTest compilation errors
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit c79e5126c7d52d2d448854b670beb4fb4409c155
Author: James Netherton
AuthorDate: Mon Apr 27 08:15:05 2020 +0100
Fix CamelContextCustomizerTest compilation errors
---
.../camel/quarkus/core/deployment/CamelContextCustomizerTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java
b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java
index bb82a1b..20b1c52 100644
---
a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java
+++
b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java
@@ -50,7 +50,9 @@ public class CamelContextCustomizerTest {
builder.addBuildStep(new BuildStep() {
@Override
public void execute(BuildContext context) {
-BytecodeRecorderImpl bri = new
BytecodeRecorderImpl(true, getClass().getSimpleName(), "execute");
+String methodName = "execute";
+BytecodeRecorderImpl bri = new
BytecodeRecorderImpl(true, getClass().getSimpleName(), methodName,
+Integer.toString(methodName.hashCode()));
RuntimeValue value = bri
.newInstance(RestConfigurationCustomizer.class.getName());
context.produce(new
CamelContextCustomizerBuildItem(value));
[GitHub] [camel-quarkus] github-actions[bot] opened a new issue #1205: [CI] - Camel Master Branch Build Failure
github-actions[bot] opened a new issue #1205: URL: https://github.com/apache/camel-quarkus/issues/1205 The [camel-master](https://github.com/apache/camel-quarkus/tree/camel-master) branch build is failing: * Build ID: 100950694-2-7c494245-cf14-4390-93f8-b552baa65981 * Camel Quarkus Commit: 6520257652a7d99f7a5358a5012673daf828e7dd * Camel Master Commit: 123a3b54e40eae7dfea036efa0455fb4d5e2a2f5 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/100950694 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] onderson edited a comment on pull request #3777: CAMEL-2933 - resteasy component
onderson edited a comment on pull request #3777: URL: https://github.com/apache/camel/pull/3777#issuecomment-626411872 subtasks are created, considering enhancements. https://issues.apache.org/jira/browse/CAMEL-15038 https://issues.apache.org/jira/browse/CAMEL-15039 https://issues.apache.org/jira/browse/CAMEL-15040 https://issues.apache.org/jira/browse/CAMEL-15041 https://issues.apache.org/jira/browse/CAMEL-15042 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] onderson commented on pull request #3777: CAMEL-2933 - resteasy component
onderson commented on pull request #3777: URL: https://github.com/apache/camel/pull/3777#issuecomment-626411872 subtasks are created, considering enhancements. https://issues.apache.org/jira/browse/CAMEL-2983 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] onderson commented on pull request #3777: CAMEL-2933 - resteasy component
onderson commented on pull request #3777: URL: https://github.com/apache/camel/pull/3777#issuecomment-626410269 @davsclaus , i think camelProxy option could be renamed to `skipServletProcessing` and proxy option could be renamed to `setHttpResponseDuringProcessing`. WDYT? 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] valdar commented on issue #186: Avoid Thread.sleep in test, use Awaitility FTW
valdar commented on issue #186: URL: https://github.com/apache/camel-kafka-connector/issues/186#issuecomment-626389501 I preferred to get rid of sleep(...) as in #204. From a long run on my machine, they seem stable enough now. @fvaleri @orpiske @oscerd feel free to improve it in any way you see fit. 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] valdar commented on pull request #201: Fix CamelSourceTask flaky tests
valdar commented on pull request #201: URL: https://github.com/apache/camel-kafka-connector/pull/201#issuecomment-626389230 @fvaleri thanks for the PR, but I preferred to get rid of `sleep(...)` as in https://github.com/apache/camel-kafka-connector/pull/204 . 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-kafka-connector] branch master updated: Removed Thread.seep(...) in unit tests in order to avoid possible sources of flakiness fix #186
This is an automated email from the ASF dual-hosted git repository.
valdar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
The following commit(s) were added to refs/heads/master by this push:
new 597b576 Removed Thread.seep(...) in unit tests in order to avoid
possible sources of flakiness fix #186
new 1a65e00 Merge pull request #204 from valdar/flakeyTests
597b576 is described below
commit 597b576d486c864816ce3d9d24be1fd28b5493ec
Author: Andrea Tarocchi
AuthorDate: Sun May 10 22:39:04 2020 +0200
Removed Thread.seep(...) in unit tests in order to avoid possible sources
of flakiness fix #186
---
.../camel/kafkaconnector/CamelSourceTask.java | 2 +
.../kafkaconnector/utils/CamelMainSupport.java | 2 +-
.../camel/kafkaconnector/CamelSourceTaskTest.java | 178 +
core/testBurnInRun.sh | 15 ++
4 files changed, 96 insertions(+), 101 deletions(-)
diff --git
a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java
b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java
index ceecf94..c9123ed 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java
@@ -154,6 +154,8 @@ public class CamelSourceTask extends SourceTask {
} else {
return records;
}
+
+
}
@Override
diff --git
a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelMainSupport.java
b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelMainSupport.java
index d84a41e..6d47e10 100644
---
a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelMainSupport.java
+++
b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelMainSupport.java
@@ -74,7 +74,7 @@ public class CamelMainSupport {
camelMain.addMainListener(new CamelMainFinishedListener());
// reordering properties to place the one starting with "#class:" first
-Map orderedProps = new LinkedHashMap<>();
+LinkedHashMap orderedProps = new LinkedHashMap<>();
props.keySet().stream()
.filter(k -> props.get(k).startsWith("#class:"))
.forEach(k -> orderedProps.put(k, props.get(k)));
diff --git
a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java
b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java
index 2934a3b..9c40d40 100644
---
a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java
+++
b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java
@@ -17,14 +17,12 @@
package org.apache.camel.kafkaconnector;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.stream.Stream;
import org.apache.camel.ProducerTemplate;
import org.apache.kafka.connect.data.Schema;
-import org.apache.kafka.connect.header.Header;
-import org.apache.kafka.connect.header.Headers;
import org.apache.kafka.connect.source.SourceRecord;
import org.junit.jupiter.api.Test;
@@ -34,37 +32,27 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class CamelSourceTaskTest {
-private static final String TIMER_URI =
"timer:kafkaconnector?period=10=true=0";
-
@Test
-public void testSourcePolling() throws InterruptedException {
+public void testSourcePolling() {
Map props = new HashMap<>();
-props.put("camel.source.url", TIMER_URI);
+props.put("camel.source.url", "direct:start");
props.put("topics", "mytopic");
CamelSourceTask camelSourceTask = new CamelSourceTask();
camelSourceTask.start(props);
-Thread.sleep(11L);
-List poll = camelSourceTask.poll();
-assertEquals(2, poll.size());
+final ProducerTemplate template =
camelSourceTask.getCms().createProducerTemplate();
+template.sendBody("direct:start", "awesome!");
+
+List poll =
camelSourceTaskPollWithRetries(camelSourceTask, 5);
+assertEquals(1, poll.size());
assertEquals("mytopic", poll.get(0).topic());
-Headers headers = poll.get(0).headers();
-boolean containsHeader = false;
-for (Iterator iterator = headers.iterator(); iterator.hasNext();) {
-Header header = (Header)iterator.next();
-if
(header.key().equalsIgnoreCase("CamelPropertyCamelTimerPeriod")) {
-containsHeader = true;
-break;
-}
-}
camelSourceTask.stop();
-assertTrue(containsHeader);
}
@Test
-public void testSourcePollingWithKey() throws InterruptedException {
+public void testSourcePollingWithKey() {
Map props = new HashMap<>();
props.put("camel.source.url", "direct:start");
props.put("topics",
[GitHub] [camel-kafka-connector] valdar opened a new pull request #204: Removed Thread.seep(...) in unit tests in order to avoid possible sou…
valdar opened a new pull request #204: URL: https://github.com/apache/camel-kafka-connector/pull/204 …rces of flakiness fix #186 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch master updated: Idiomatic Mustache test
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new cc8f5e2 Idiomatic Mustache test
new 123a3b5 Merge pull request #1204 from
ppalaga/200509-idiomatic-mustache-tests
cc8f5e2 is described below
commit cc8f5e2d63d60ce22d82db90dbbee74a481c63c0
Author: Peter Palaga
AuthorDate: Sat May 9 10:11:39 2020 +0200
Idiomatic Mustache test
---
.../component/mustache/it/MustacheResource.java| 36 +--
.../component/mustache/it/MustacheTest.java| 72 +-
2 files changed, 61 insertions(+), 47 deletions(-)
diff --git
a/integration-tests/mustache/src/main/java/org/apache/camel/quarkus/component/mustache/it/MustacheResource.java
b/integration-tests/mustache/src/main/java/org/apache/camel/quarkus/component/mustache/it/MustacheResource.java
index d827943..71cdd26 100644
---
a/integration-tests/mustache/src/main/java/org/apache/camel/quarkus/component/mustache/it/MustacheResource.java
+++
b/integration-tests/mustache/src/main/java/org/apache/camel/quarkus/component/mustache/it/MustacheResource.java
@@ -38,59 +38,59 @@ public class MustacheResource {
@Inject
ProducerTemplate template;
-@Path("/applyMustacheTemplateFromClassPathResource")
+@Path("/templateFromClassPathResource")
@POST
@Consumes(MediaType.TEXT_PLAIN)
@Produces(MediaType.TEXT_PLAIN)
-public String applyMustacheTemplateFromClassPathResource(String message) {
-LOG.infof("Calling applyMustacheTemplateFromClassPathResource with
%s", message);
+public String templateFromClassPathResource(String message) {
+LOG.infof("Calling templateFromClassPathResource with %s", message);
return
template.requestBodyAndHeader("mustache://template/simple.mustache", message,
"header", "value", String.class);
}
-@Path("/applyMustacheTemplateFromHeader")
+@Path("/templateFromHeader")
@POST
@Consumes(MediaType.TEXT_PLAIN)
@Produces(MediaType.TEXT_PLAIN)
-public String applyMustacheTemplateFromHeader(String message) {
-LOG.infof("Calling applyMustacheTemplateFromHeader with %s", message);
+public String templateFromHeader(String message) {
+LOG.infof("Calling templateFromHeader with %s", message);
return
template.requestBodyAndHeader("mustache://template/simple.mustache", message,
MustacheConstants.MUSTACHE_TEMPLATE,
"Body='{{body}}'", String.class);
}
-@Path("/applyMustacheTemplateUriFromHeader")
+@Path("/templateUriFromHeader")
@POST
@Consumes(MediaType.TEXT_PLAIN)
@Produces(MediaType.TEXT_PLAIN)
-public String applyMustacheTemplateUriFromHeader(String message) {
-LOG.infof("Calling applyMustacheTemplateUriFromHeader with %s",
message);
+public String templateUriFromHeader(String message) {
+LOG.infof("Calling templateUriFromHeader with %s", message);
return
template.requestBodyAndHeader("mustache://template/simple.mustache", message,
MustacheConstants.MUSTACHE_RESOURCE_URI,
"/template/another.mustache", String.class);
}
-@Path("/applyMustacheTemplateWithInheritance")
+@Path("/templateWithInheritance")
@GET
@Produces(MediaType.TEXT_PLAIN)
-public String applyMustacheTemplateWithInheritance() {
-LOG.infof("Calling applyMustacheTemplateWithInheritance");
+public String templateWithInheritance() {
+LOG.infof("Calling templateWithInheritance");
return template.requestBody("mustache://template/child.mustache",
null, String.class);
}
-@Path("/applyMustacheTemplateWithPartials")
+@Path("/templateWithPartials")
@GET
@Produces(MediaType.TEXT_PLAIN)
-public String applyMustacheTemplateWithPartials() {
-LOG.infof("Calling applyMustacheTemplateWithPartials");
+public String templateWithPartials() {
+LOG.infof("Calling templateWithPartials");
return template.requestBody("mustache://template/includer.mustache",
null, String.class);
}
-@Path("/applyMustacheTemplateFromRegistry")
+@Path("/templateFromRegistry")
@POST
@Consumes(MediaType.TEXT_PLAIN)
@Produces(MediaType.TEXT_PLAIN)
-public String applyMustacheTemplateFromRegistry(String message) {
-LOG.infof("Calling applyMustacheTemplateFromRegistry with %s",
message);
+public String templateFromRegistry(String message) {
+LOG.infof("Calling templateFromRegistry with %s", message);
return template.requestBody("mustache://ref:templateFromRegistry",
message, String.class);
}
}
diff --git
a/integration-tests/mustache/src/test/java/org/apache/camel/quarkus/component/mustache/it/MustacheTest.java
[camel] annotated tag camel-3.3.0 created (now ac3792c)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to annotated tag camel-3.3.0 in repository https://gitbox.apache.org/repos/asf/camel.git. at ac3792c (tag) tagging 7f96e2e248cc52a8d3c5899e50bbfe71427c69d4 (commit) replaces camel-3.0.0 by Gregor Zurowski on Sun May 10 11:40:46 2020 -0700 - Log - [maven-release-plugin] copy for tag camel-3.3.0 --- No new revisions were added by this update.
[camel] branch release/3.3.0 created (now 7f96e2e)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/3.3.0 in repository https://gitbox.apache.org/repos/asf/camel.git. at 7f96e2e [maven-release-plugin] prepare release camel-3.3.0 This branch includes the following new commits: new 7f96e2e [maven-release-plugin] prepare release camel-3.3.0 The 1 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.
[camel] branch master updated: CAMEL-15035: SupervisingRouteController - JMX management
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new a2f6647 CAMEL-15035: SupervisingRouteController - JMX management
a2f6647 is described below
commit a2f664737775b8e627632a5e3456eb89cd59eafc
Author: Claus Ibsen
AuthorDate: Sun May 10 17:51:03 2020 +0200
CAMEL-15035: SupervisingRouteController - JMX management
---
.../camel/spi/SupervisingRouteController.java | 12 ++
.../engine/DefaultSupervisingRouteController.java | 7 ++
.../ManagedSupervisingRouteControllerMBean.java| 59 +
.../management/JmxManagementLifecycleStrategy.java | 4 +
.../mbean/ManagedSupervisingRouteController.java | 93 ++
.../ManagedSupervisingRouteControllerTest.java | 137 +
6 files changed, 312 insertions(+)
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/SupervisingRouteController.java
b/core/camel-api/src/main/java/org/apache/camel/spi/SupervisingRouteController.java
index 0e16f68..e0b6228 100644
---
a/core/camel-api/src/main/java/org/apache/camel/spi/SupervisingRouteController.java
+++
b/core/camel-api/src/main/java/org/apache/camel/spi/SupervisingRouteController.java
@@ -16,6 +16,10 @@
*/
package org.apache.camel.spi;
+import java.util.Collection;
+
+import org.apache.camel.Route;
+
/**
* A supervising capable {@link RouteController} that delays the startup
* of the routes after the camel context startup and takes control of starting
the routes in a safe manner.
@@ -111,4 +115,12 @@ public interface SupervisingRouteController extends
RouteController {
*/
void setBackOffMultiplier(double backOffMultiplier);
+/**
+ * Return the list of routes that are currently under restarting by this
controller.
+ *
+ * In other words the routes which has failed during startup and are know
managed
+ * to be restarted.
+ */
+Collection getRestartingRoutes();
+
}
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java
index 3725145..9b7ce52 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java
@@ -318,6 +318,13 @@ public class DefaultSupervisingRouteController extends
DefaultRouteController im
.collect(Collectors.toList());
}
+@Override
+public Collection getRestartingRoutes() {
+return routeManager.routes.keySet().stream()
+.map(RouteHolder::get)
+.collect(Collectors.toList());
+}
+
// *
// Helpers
// *
diff --git
a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedSupervisingRouteControllerMBean.java
b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedSupervisingRouteControllerMBean.java
new file mode 100644
index 000..a5ca7be
--- /dev/null
+++
b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedSupervisingRouteControllerMBean.java
@@ -0,0 +1,59 @@
+/*
+ * 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.api.management.mbean;
+
+import org.apache.camel.api.management.ManagedAttribute;
+
+public interface ManagedSupervisingRouteControllerMBean extends
ManagedServiceMBean {
+
+@ManagedAttribute(description = "Whether supervising is enabled")
+boolean isEnabled();
+
+@ManagedAttribute(description = "The number of threads used by the
scheduled thread pool that are used for restarting routes")
+int getThreadPoolSize();
+
+@ManagedAttribute(description = "Initial delay in milli seconds before the
route controller starts")
+long getInitialDelay();
+
+@ManagedAttribute(description = "Backoff delay in millis when restarting a
route
[camel] branch master updated: CAMEL-15037: Added unit test
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 5c6d63c CAMEL-15037: Added unit test
5c6d63c is described below
commit 5c6d63c7d5dab3e460e888448e967c7d75a0ac95
Author: Claus Ibsen
AuthorDate: Sun May 10 17:18:28 2020 +0200
CAMEL-15037: Added unit test
---
.../MockExpectedHeaderNoMessageSentTest.java | 52 ++
1 file changed, 52 insertions(+)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/issues/MockExpectedHeaderNoMessageSentTest.java
b/core/camel-core/src/test/java/org/apache/camel/issues/MockExpectedHeaderNoMessageSentTest.java
new file mode 100644
index 000..20ebde3
--- /dev/null
+++
b/core/camel-core/src/test/java/org/apache/camel/issues/MockExpectedHeaderNoMessageSentTest.java
@@ -0,0 +1,52 @@
+/*
+ * 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.issues;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
+
+public class MockExpectedHeaderNoMessageSentTest extends ContextTestSupport {
+
+@Test
+public void testHeaderExpectedNoMessageSent() throws Exception {
+MockEndpoint mock = getMockEndpoint("mock:result");
+mock.setResultWaitTime(100); // run test quick
+
+mock.expectedHeaderReceived("foo", "bar");
+
+try {
+mock.assertIsSatisfied();
+fail("Should fail");
+} catch (AssertionError e) {
+assertEquals("mock://result Received message count 0, expected at
least 1", e.getMessage());
+}
+}
+
+@Override
+protected RouteBuilder createRouteBuilder() {
+return new RouteBuilder() {
+@Override
+public void configure() {
+from("direct:foo")
+.routeId("myRoute")
+.to("mock:result");
+}
+};
+}
+}
[GitHub] [camel-kafka-connector] oscerd commented on issue #203: Add connector dependencies in distribution package
oscerd commented on issue #203: URL: https://github.com/apache/camel-kafka-connector/issues/203#issuecomment-626305209 This is already fixed on master. It was related to activemq client scope 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] fvaleri opened a new issue #203: Add connector dependencies in distribution package
fvaleri opened a new issue #203: URL: https://github.com/apache/camel-kafka-connector/issues/203 I see that most connectors out there include dependencies in the distribution package. With these it would be easier to automate deploy (just download and unzip). For example, to deploy the SJMS2 connector, I also need to grab: ``` mvn dependency:get -Ddest=$PLUGINS_HOME/camel-sjms2-kafka-connector -Dartifact=org.apache.activemq:activemq-client:5.15.11 mvn dependency:get -Ddest=$PLUGINS_HOME/camel-sjms2-kafka-connector -Dartifact=org.apache.geronimo.specs:geronimo-jms_2.0_spec:1.0-alpha-2 mvn dependency:get -Ddest=$PLUGINS_HOME/camel-sjms2-kafka-connector -Dartifact=org.apache.geronimo.specs:geronimo-annotation_1.0_spec:1.1.1 mvn dependency:get -Ddest=$PLUGINS_HOME/camel-sjms2-kafka-connector -Dartifact=javax.management.j2ee:management-api:1.1-rev-1 mvn dependency:get -Ddest=$PLUGINS_HOME/camel-sjms2-kafka-connector -Dartifact=org.fusesource.hawtbuf:hawtbuf:1.11 ``` 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] fvaleri edited a comment on issue #186: Avoid Thread.sleep in test, use Awaitility FTW
fvaleri edited a comment on issue #186: URL: https://github.com/apache/camel-kafka-connector/issues/186#issuecomment-626303483 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] fvaleri commented on issue #186: Avoid Thread.sleep in test, use Awaitility FTW
fvaleri commented on issue #186: URL: https://github.com/apache/camel-kafka-connector/issues/186#issuecomment-626303483 There is a proposed refactoring of `CamelSourceTaskTest` here: https://github.com/apache/camel-kafka-connector/pull/201 I'm not using Awaitility, but a shared method called `getTaskWithFixedNumberOfRecords`. All properties from `CamelSourceConnectorConfig` used inside it are tested in isolated methods, so I think it's fine to use them when testing source task behaviors that do not involve them. 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus edited a comment on pull request #3814: WIP resolves Camel 2.x issue 15033 generate index tables 2
davsclaus edited a comment on pull request #3814: URL: https://github.com/apache/camel/pull/3814#issuecomment-626292990 Its probably okay as the spring-even component is never really in use, and this is 2.x docs that will become irrelevant over time. 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus commented on pull request #3814: WIP resolves Camel 2.x issue 15033 generate index tables 2
davsclaus commented on pull request #3814: URL: https://github.com/apache/camel/pull/3814#issuecomment-626292990 Its probably okay as the spring-even component is never really in use. 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch master updated (5106129 -> cb5513d)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 5106129 Remove embedded goal in camel-maven-plugin. We use the run goal always anyway. add f8b4498 Added docs for route controller add cb5513d Polished No new revisions were added by this update. Summary of changes: .../engine/DefaultSupervisingRouteController.java | 1 - docs/user-manual/modules/ROOT/nav.adoc | 1 + docs/user-manual/modules/ROOT/pages/index.adoc | 1 + .../modules/ROOT/pages/route-controller.adoc | 164 + 4 files changed, 166 insertions(+), 1 deletion(-) create mode 100644 docs/user-manual/modules/ROOT/pages/route-controller.adoc
[camel] branch master updated: Remove embedded goal in camel-maven-plugin. We use the run goal always anyway.
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 5106129 Remove embedded goal in camel-maven-plugin. We use the run goal always anyway. 5106129 is described below commit 510612973ee1105ff4baec3519efa9bf551a2247 Author: Claus Ibsen AuthorDate: Sun May 10 09:50:56 2020 +0200 Remove embedded goal in camel-maven-plugin. We use the run goal always anyway. --- .../modules/ROOT/pages/camel-3x-upgrade-guide.adoc | 4 + .../ROOT/pages/camel-embedded-maven-goal.adoc | 14 -- .../modules/ROOT/pages/camel-maven-plugin.adoc | 7 - .../modules/ROOT/pages/camel-run-maven-goal.adoc | 5 +- .../java/org/apache/camel/maven/EmbeddedMojo.java | 196 - 5 files changed, 5 insertions(+), 221 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc index 4f5ea97..1612727 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc @@ -1165,6 +1165,10 @@ Camel K, Camel Quarkus, etc. The following components is no longer supported in OSGi and has been removed from the Camel Karaf features file: camel-undertow, camel-jgroups, camel-jgroups-raft, camel-infinspan. +=== camel-maven-plugin + +The `embedded` goal has been removed (was never really in use). Use `run` goal instead. + === API changes The dump model classes in package `org.apache.camel.support.dump` has been removed diff --git a/docs/user-manual/modules/ROOT/pages/camel-embedded-maven-goal.adoc b/docs/user-manual/modules/ROOT/pages/camel-embedded-maven-goal.adoc deleted file mode 100644 index d1eb44f..000 --- a/docs/user-manual/modules/ROOT/pages/camel-embedded-maven-goal.adoc +++ /dev/null @@ -1,14 +0,0 @@ -= camel:embedded - -The *camel:embedded* goal of the xref:camel-maven-plugin.adoc[Camel -Maven Plugin] is used to run your Camel xref:spring.adoc[Spring] -configurations in the same JVM as Maven, so it should startup a bit -faster than xref:camel-run-maven-goal.adoc[camel:run]. Though sometimes -we all get the odd classpath issue; so sometimes forking a new JVM can -work around any strange Maven classpath issues. - -[source,xml] - -cd examples/camel-example-spring -mvn camel:embedded - diff --git a/docs/user-manual/modules/ROOT/pages/camel-maven-plugin.adoc b/docs/user-manual/modules/ROOT/pages/camel-maven-plugin.adoc index 4ef4974..0678cb1 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-maven-plugin.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-maven-plugin.adoc @@ -19,13 +19,6 @@ runs your routing rules. From Camel 2.10 onwards also OSGi blueprint is supported to load from *OSGI-INF/blueprint/*.xml* (requires to configure the plugin to use blueprint). -|xref:camel-embedded-maven-goal.adoc[camel:embedded] |camel:embedded -|Boots up Camel using the xref:spring.adoc[Spring] configuration at -*META-INF/spring/*.xml* and runs your routing rules. From Camel 2.10 -onwards also OSGi blueprint is supported to load from -*OSGI-INF/blueprint/*.xml* (requires to configure the plugin to use -blueprint). - |=== == Adding the plugin to your pom.xml diff --git a/docs/user-manual/modules/ROOT/pages/camel-run-maven-goal.adoc b/docs/user-manual/modules/ROOT/pages/camel-run-maven-goal.adoc index 40e4845..d6a6062 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-run-maven-goal.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-run-maven-goal.adoc @@ -17,16 +17,13 @@ independently. How this works is that the plugin will compile the source code in the maven project, then boot up a Spring ApplicationContext using the XML -confiuration files on the classpath at +configuration files on the classpath at [source,syntaxhighlighter-pre] META-INF/spring/*.xml -If you want to boot up your Camel routes a little faster, you could try -the xref:camel-embedded-maven-goal.adoc[camel:embedded] instead. - == Running OSGi Blueprint From *Camel 2.10* onwards the `camel:run` plugin also supports running a diff --git a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java deleted file mode 100644 index 748209e..000 --- a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java +++ /dev/null @@ -1,196 +0,0 @@ -/* - * 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
[camel] branch master updated: Remove doc for feature that has been removed in Camel 3
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 8ad0f44 Remove doc for feature that has been removed in Camel 3 8ad0f44 is described below commit 8ad0f4468b3978c846cead9de3472e663689f32b Author: Claus Ibsen AuthorDate: Sun May 10 09:41:36 2020 +0200 Remove doc for feature that has been removed in Camel 3 --- docs/user-manual/modules/ROOT/nav.adoc | 1 - .../modules/ROOT/pages/endpoint-completer.adoc | 27 -- docs/user-manual/modules/ROOT/pages/index.adoc | 1 - 3 files changed, 29 deletions(-) diff --git a/docs/user-manual/modules/ROOT/nav.adoc b/docs/user-manual/modules/ROOT/nav.adoc index cc01a03..0a7a46e 100644 --- a/docs/user-manual/modules/ROOT/nav.adoc +++ b/docs/user-manual/modules/ROOT/nav.adoc @@ -54,7 +54,6 @@ ** xref:dependency-injection.adoc[Dependency Injection] ** xref:dozer-type-conversion.adoc[Dozer Type Conversion] ** xref:endpoint-annotations.adoc[Endpoint Annotations] -** xref:endpoint-completer.adoc[EndpointCompleter] ** xref:exception-clause.adoc[Exception Clause] ** xref:fluent-builders.adoc[Fluent Builders] ** xref:http-session-handling.adoc[HTTP-Session Handling] diff --git a/docs/user-manual/modules/ROOT/pages/endpoint-completer.adoc b/docs/user-manual/modules/ROOT/pages/endpoint-completer.adoc deleted file mode 100644 index f71996e..000 --- a/docs/user-manual/modules/ROOT/pages/endpoint-completer.adoc +++ /dev/null @@ -1,27 +0,0 @@ -[[EndpointCompleter-EndpointCompleter]] -= EndpointCompleter - -As of *Camel 2.12*. -This API is an optional SPI interface for xref:component.adoc[Component] -implementors. It provides a completion hook; rather like bash tab -completion, or the completion in the -http://karaf.apache.org/manual/latest/#_using_the_console[Karaf -shell] when typing commands. - -Nice behaving components should implement EndpointCompleter and its -completion method. The method is given a -ComponentConfiguration object which wraps up all the various configuration values (and can be -used to create a new Endpoint instance if required - or inject values -into an exemplar internal instance). - -The *completeEndpointPath()* method then returns a list of Strings of -the matching values available. - -For example here's the -https://github.com/apache/camel/blob/master/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java#L78[implementation -code in the FileComponent to implement completeEndpointPath()]. - -Some example implementations include: - -* xref:components::file-component.adoc[File] - diff --git a/docs/user-manual/modules/ROOT/pages/index.adoc b/docs/user-manual/modules/ROOT/pages/index.adoc index 88d326e..191ae1f 100644 --- a/docs/user-manual/modules/ROOT/pages/index.adoc +++ b/docs/user-manual/modules/ROOT/pages/index.adoc @@ -95,7 +95,6 @@ camel routes without them knowing * xref:dsl.adoc[DSL] * xref:endpoint.adoc[Endpoint] * xref:endpoint-annotations.adoc[Endpoint Annotations] -* xref:endpoint-completer.adoc[EndpointCompleter] * xref:error-handler.adoc[Error Handler] * xref:exchange.adoc[Exchange] * xref:exchange-pattern.adoc[Exchange Pattern]
