You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gi...@apache.org on 2020/09/23 03:04:15 UTC
[camel-quarkus] branch camel-master updated (40a171f -> 707ce26)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
discard 40a171f Upgrade to Camel 3.6.0
discard fddc822 Remove createEndpoint method override in QuarkusVertxWebsocketComponent
discard c80718e Remove QuarkusVertxHttpBinding
add 200b5d6 Updated CHANGELOG.md
add 3fd8d6c fix(mongodb): support for named clients
add d64ec11 doc(mongodb): adding named connection
add 4e46470 feat(mongodb): add test for named client connection
add 1e938d8 Camel quarkus disable auto route discovery not working #1816
new ee36109 Remove QuarkusVertxHttpBinding
new ff92b28 Remove createEndpoint method override in QuarkusVertxWebsocketComponent
new 707ce26 Upgrade to Camel 3.6.0
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 (40a171f)
\
N -- N -- N refs/heads/camel-master (707ce26)
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:
CHANGELOG.md | 5 +-
.../ROOT/pages/reference/extensions/mongodb.adoc | 23 +++++
.../core/deployment/CamelContextProcessor.java | 8 +-
.../apache/camel/quarkus/core/CamelRecorder.java | 4 +
.../main/deployment/CamelMainProcessor.java | 13 +--
.../camel/quarkus/main/CamelMainRecorder.java | 14 ++-
.../quarkus/main/CamelMainRoutesCollector.java | 99 +---------------------
.../deployment/SupportMongoDBProcessor.java | 23 ++---
.../runtime/src/main/doc/configuration.adoc | 23 +++++
.../main/resources/META-INF/quarkus-extension.yaml | 3 +-
.../{core => core-discovery-disabled}/pom.xml | 30 ++-----
.../core/CoreDiscoveryDisabledResource.java} | 24 ++++--
.../quarkus/core/CoreDiscoveryDisabledRoutes.java} | 12 +--
.../core/CoreDiscoveryDisabledRoutesCDI.java} | 14 +--
.../src/main/resources/application.properties | 4 +-
.../quarkus/core/CoreDiscoveryDisabledIT.java} | 5 +-
.../quarkus/core/CoreDiscoveryDisabledTest.java} | 19 +++--
.../pom.xml | 23 +++--
.../main/MainDiscoveryDisabledResource.java} | 22 +++--
.../quarkus/main/MainDiscoveryDisabledRoutes.java} | 10 +--
.../main/MainDiscoveryDisabledRoutesCDI.java} | 13 +--
.../src/main/resources/application.properties | 4 +-
.../quarkus/main/MainDiscoveryDisabledIT.java} | 2 +-
.../quarkus/main/MainDiscoveryDisabledTest.java} | 19 +++--
.../camel/quarkus/main/CoreMainXmlIoResource.java | 2 +-
.../quarkus/main/CoreMainXmlJaxbResource.java | 2 +-
.../camel/quarkus/main/CoreMainResource.java | 2 +-
.../component/mongodb/it/MongoDbResource.java | 25 ++++--
.../mongodb/it/MongodbGridfsResource.java | 29 +++++--
.../quarkus/component/mongodb/it/MongoDbTest.java | 19 +++--
.../component/mongodb/it/MongoDbTestResource.java | 2 +
.../component/mongodb/it/MongodbGridfsTest.java | 23 +++--
integration-tests/pom.xml | 2 +
integration-tests/univocity-parsers/pom.xml | 15 ++++
tooling/scripts/test-categories.yaml | 4 +-
35 files changed, 293 insertions(+), 248 deletions(-)
copy integration-tests/{core => core-discovery-disabled}/pom.xml (85%)
copy integration-tests/{main-devmode/src/test/java/org/apache/camel/quarkus/main/CamelSupportResource.java => core-discovery-disabled/src/main/java/org/apache/camel/quarkus/core/CoreDiscoveryDisabledResource.java} (67%)
copy integration-tests/{main/src/main/java/org/apache/camel/quarkus/main/CamelRouteFiltered.java => core-discovery-disabled/src/main/java/org/apache/camel/quarkus/core/CoreDiscoveryDisabledRoutes.java} (82%)
copy integration-tests/{core/src/main/java/org/apache/camel/quarkus/core/CoreRoutes.java => core-discovery-disabled/src/main/java/org/apache/camel/quarkus/core/CoreDiscoveryDisabledRoutesCDI.java} (80%)
copy integration-tests/{main-caffeine-lrucache => core-discovery-disabled}/src/main/resources/application.properties (93%)
copy integration-tests/{amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/AmqpIT.java => core-discovery-disabled/src/test/java/org/apache/camel/quarkus/core/CoreDiscoveryDisabledIT.java} (88%)
copy integration-tests/{exec/src/test/java/org/apache/camel/quarkus/component/exec/it/ExecTest.java => core-discovery-disabled/src/test/java/org/apache/camel/quarkus/core/CoreDiscoveryDisabledTest.java} (70%)
copy integration-tests/{reactive-streams => main-discovery-disabled}/pom.xml (91%)
copy integration-tests/{main-devmode/src/test/java/org/apache/camel/quarkus/main/CamelSupportResource.java => main-discovery-disabled/src/main/java/org/apache/camel/quarkus/main/MainDiscoveryDisabledResource.java} (69%)
copy integration-tests/{main/src/main/java/org/apache/camel/quarkus/main/CamelRouteFiltered.java => main-discovery-disabled/src/main/java/org/apache/camel/quarkus/main/MainDiscoveryDisabledRoutes.java} (85%)
copy integration-tests/{main/src/main/java/org/apache/camel/quarkus/main/CamelRouteFiltered.java => main-discovery-disabled/src/main/java/org/apache/camel/quarkus/main/MainDiscoveryDisabledRoutesCDI.java} (80%)
copy integration-tests/{main-caffeine-lrucache => main-discovery-disabled}/src/main/resources/application.properties (93%)
copy integration-tests/{main-xml-io/src/test/java/org/apache/camel/quarkus/main/CoreMainXmlIoIT.java => main-discovery-disabled/src/test/java/org/apache/camel/quarkus/main/MainDiscoveryDisabledIT.java} (92%)
copy integration-tests/{exec/src/test/java/org/apache/camel/quarkus/component/exec/it/ExecTest.java => main-discovery-disabled/src/test/java/org/apache/camel/quarkus/main/MainDiscoveryDisabledTest.java} (70%)
[camel-quarkus] 01/03: Remove QuarkusVertxHttpBinding
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit ee36109d15357c7efa9dc8f5fa9f195f33fc899b
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Sep 9 07:39:13 2020 +0100
Remove QuarkusVertxHttpBinding
Fixes #1675
---
.../vertx/http/CamelVertxHttpRecorder.java | 21 ---------------------
1 file changed, 21 deletions(-)
diff --git a/extensions/vertx-http/runtime/src/main/java/org/apache/camel/quarkus/component/vertx/http/CamelVertxHttpRecorder.java b/extensions/vertx-http/runtime/src/main/java/org/apache/camel/quarkus/component/vertx/http/CamelVertxHttpRecorder.java
index e59be03..2315134 100644
--- a/extensions/vertx-http/runtime/src/main/java/org/apache/camel/quarkus/component/vertx/http/CamelVertxHttpRecorder.java
+++ b/extensions/vertx-http/runtime/src/main/java/org/apache/camel/quarkus/component/vertx/http/CamelVertxHttpRecorder.java
@@ -19,14 +19,7 @@ package org.apache.camel.quarkus.component.vertx.http;
import io.quarkus.runtime.RuntimeValue;
import io.quarkus.runtime.annotations.Recorder;
import io.vertx.core.Vertx;
-import io.vertx.core.buffer.Buffer;
-import io.vertx.ext.web.client.HttpRequest;
-import org.apache.camel.Exchange;
-import org.apache.camel.component.vertx.http.DefaultVertxHttpBinding;
import org.apache.camel.component.vertx.http.VertxHttpComponent;
-import org.apache.camel.spi.HeaderFilterStrategy;
-import org.apache.camel.support.ExchangeHelper;
-import org.apache.camel.util.ObjectHelper;
@Recorder
public class CamelVertxHttpRecorder {
@@ -34,20 +27,6 @@ public class CamelVertxHttpRecorder {
public RuntimeValue<?> createVertxHttpComponent(RuntimeValue<Vertx> vertx) {
VertxHttpComponent component = new VertxHttpComponent();
component.setVertx(vertx.getValue());
- component.setVertxHttpBinding(new QuarkusVertxHttpBinding());
return new RuntimeValue<>(component);
}
-
- // TODO: Remove when https://issues.apache.org/jira/browse/CAMEL-15495 is resolved
- static class QuarkusVertxHttpBinding extends DefaultVertxHttpBinding {
- @Override
- public void populateRequestHeaders(Exchange exchange, HttpRequest<Buffer> request, HeaderFilterStrategy strategy) {
- super.populateRequestHeaders(exchange, request, strategy);
-
- String contentType = ExchangeHelper.getContentType(exchange);
- if (ObjectHelper.isNotEmpty(contentType)) {
- request.putHeader(Exchange.CONTENT_TYPE, contentType);
- }
- }
- }
}
[camel-quarkus] 03/03: Upgrade to Camel 3.6.0
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 707ce2615ad4abb21f340db66e0ed01bbd9efaf2
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Sep 7 09:30:51 2020 +0100
Upgrade to Camel 3.6.0
---
docs/modules/ROOT/pages/reference/components/atmos.adoc | 2 +-
.../modules/ROOT/pages/reference/components/vertx-http.adoc | 2 +-
.../ROOT/pages/reference/components/vertx-websocket.adoc | 2 +-
.../ROOT/pages/reference/extensions/azure-storage-blob.adoc | 2 +-
.../pages/reference/extensions/azure-storage-queue.adoc | 2 +-
.../resources/org/apache/camel/component/qute/qute.json | 4 +++-
.../quarkus/component/caffeine/it/CaffeineResource.java | 13 ++-----------
pom.xml | 2 +-
8 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/docs/modules/ROOT/pages/reference/components/atmos.adoc b/docs/modules/ROOT/pages/reference/components/atmos.adoc
index fff2add..b9c5c12 100644
--- a/docs/modules/ROOT/pages/reference/components/atmos.adoc
+++ b/docs/modules/ROOT/pages/reference/components/atmos.adoc
@@ -11,5 +11,5 @@
:cq-native-since: n/a
:cq-camel-part-name: atmos
:cq-camel-part-title: Atmos
-:cq-camel-part-description: Integract with EMC's ViPR object data services using the Atmos Client.
+:cq-camel-part-description: Integrate with EMC's ViPR object data services using the Atmos Client.
:cq-extension-page-title: Atmos
diff --git a/docs/modules/ROOT/pages/reference/components/vertx-http.adoc b/docs/modules/ROOT/pages/reference/components/vertx-http.adoc
index 04d087b..eea440c 100644
--- a/docs/modules/ROOT/pages/reference/components/vertx-http.adoc
+++ b/docs/modules/ROOT/pages/reference/components/vertx-http.adoc
@@ -11,5 +11,5 @@
:cq-native-since: 1.1.0
:cq-camel-part-name: vertx-http
:cq-camel-part-title: Vert.x HTTP Client
-:cq-camel-part-description: Camel HTTP client support with Vert.x
+:cq-camel-part-description: Send requests to external HTTP servers using Vert.x
:cq-extension-page-title: Vert.x HTTP Client
diff --git a/docs/modules/ROOT/pages/reference/components/vertx-websocket.adoc b/docs/modules/ROOT/pages/reference/components/vertx-websocket.adoc
index 58801bf..16b28b1 100644
--- a/docs/modules/ROOT/pages/reference/components/vertx-websocket.adoc
+++ b/docs/modules/ROOT/pages/reference/components/vertx-websocket.adoc
@@ -11,5 +11,5 @@
:cq-native-since: 1.1.0
:cq-camel-part-name: vertx-websocket
:cq-camel-part-title: Vert.x WebSocket
-:cq-camel-part-description: Camel WebSocket support with Vert.x
+:cq-camel-part-description: Expose WebSocket endpoints and connect to remote WebSocket servers using Vert.x
:cq-extension-page-title: Vert.x WebSocket
diff --git a/docs/modules/ROOT/pages/reference/extensions/azure-storage-blob.adoc b/docs/modules/ROOT/pages/reference/extensions/azure-storage-blob.adoc
index 0f63da3..31559cd 100644
--- a/docs/modules/ROOT/pages/reference/extensions/azure-storage-blob.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/azure-storage-blob.adoc
@@ -17,7 +17,7 @@ Store and retrieve blobs from Azure Storage Blob Service using SDK v12.
== What's inside
-* https://camel.apache.org/components/latest/azure-storage-blob-component.html[Azure Storage Blob Service component], URI syntax: `azure-storage-blob:containerName`
+* https://camel.apache.org/components/latest/azure-storage-blob-component.html[Azure Storage Blob Service component], URI syntax: `azure-storage-blob:accountName/containerName`
Please refer to the above link for usage and configuration details.
diff --git a/docs/modules/ROOT/pages/reference/extensions/azure-storage-queue.adoc b/docs/modules/ROOT/pages/reference/extensions/azure-storage-queue.adoc
index 95c0b8d..a97d5d5 100644
--- a/docs/modules/ROOT/pages/reference/extensions/azure-storage-queue.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/azure-storage-queue.adoc
@@ -17,7 +17,7 @@ The azure-storage-queue component is used for storing and retrieving the message
== What's inside
-* https://camel.apache.org/components/latest/azure-storage-queue-component.html[Azure Storage Queue Service component], URI syntax: `azure-storage-queue:queueName`
+* https://camel.apache.org/components/latest/azure-storage-queue-component.html[Azure Storage Queue Service component], URI syntax: `azure-storage-queue:accountName/queueName`
Please refer to the above link for usage and configuration details.
diff --git a/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json b/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json
index c39fc40..6479427 100644
--- a/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json
+++ b/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json
@@ -16,6 +16,8 @@
"extendsScheme": "",
"syntax": "qute:resourceUri",
"async": false,
+ "api": false,
+ "apiPropertyQualifier": "",
"consumerOnly": false,
"producerOnly": true,
"lenientProperties": false
@@ -23,7 +25,7 @@
"componentProperties": {
"allowTemplateFromHeader": { "kind": "property", "displayName": "Allow Template From Header", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the he [...]
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the r [...]
- "basicPropertyBinding": { "kind": "property", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
+ "basicPropertyBinding": { "kind": "property", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": true, "secret": false, "defaultValue": false, "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
"quteEngine": { "kind": "property", "displayName": "Qute Engine", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "io.quarkus.qute.Engine", "deprecated": false, "secret": false, "description": "To use the Engine otherwise a new engine is created" }
},
"properties": {
diff --git a/integration-tests/caffeine/src/main/java/org/apache/camel/quarkus/component/caffeine/it/CaffeineResource.java b/integration-tests/caffeine/src/main/java/org/apache/camel/quarkus/component/caffeine/it/CaffeineResource.java
index 889e345..27e7e95 100644
--- a/integration-tests/caffeine/src/main/java/org/apache/camel/quarkus/component/caffeine/it/CaffeineResource.java
+++ b/integration-tests/caffeine/src/main/java/org/apache/camel/quarkus/component/caffeine/it/CaffeineResource.java
@@ -27,7 +27,6 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import com.github.benmanes.caffeine.cache.Cache;
import org.apache.camel.CamelContext;
import org.apache.camel.FluentProducerTemplate;
import org.apache.camel.component.caffeine.CaffeineConstants;
@@ -59,11 +58,7 @@ public class CaffeineResource {
@PathParam("key") String key,
String value) {
- // This won't be needed after https://issues.apache.org/jira/browse/CAMEL-15524
- FluentProducerTemplate t = context.getRegistry().lookupByNameAndType(cacheName, Cache.class) != null
- ? template.toF("%s://%s?cache=#%s", componentName, cacheName, cacheName)
- : template.toF("%s://%s", componentName, cacheName);
-
+ FluentProducerTemplate t = template.toF("%s://%s", componentName, cacheName);
t.withHeader(CaffeineConstants.ACTION, CaffeineConstants.ACTION_PUT);
t.withHeader(CaffeineConstants.KEY, key);
t.withBody(value);
@@ -79,11 +74,7 @@ public class CaffeineResource {
@PathParam("cacheName") String cacheName,
@PathParam("key") String key) {
- // This won't be needed after https://issues.apache.org/jira/browse/CAMEL-15524
- FluentProducerTemplate t = context.getRegistry().lookupByNameAndType(cacheName, Cache.class) != null
- ? template.toF("%s://%s?cache=#%s", componentName, cacheName, cacheName)
- : template.toF("%s://%s", componentName, cacheName);
-
+ FluentProducerTemplate t = template.toF("%s://%s", componentName, cacheName);
t.withHeader(CaffeineConstants.ACTION, CaffeineConstants.ACTION_GET);
t.withHeader(CaffeineConstants.KEY, key);
diff --git a/pom.xml b/pom.xml
index 2895bf6..4e838f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
<awssdk1-swf-libs.version>1.11.22</awssdk1-swf-libs.version>
<awssdk2.version>2.14.3</awssdk2.version>
<bouncycastle.version>1.66</bouncycastle.version>
- <camel.version>3.5.0</camel.version>
+ <camel.version>3.6.0-SNAPSHOT</camel.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version><!-- keep in sync with Camel -->
<commons-cli.version>1.4</commons-cli.version><!-- keep in sync with Quarkus, via quarkus-bootstrap-core -->
<debezium.version>1.2.1.Final</debezium.version>
[camel-quarkus] 02/03: Remove createEndpoint method override in
QuarkusVertxWebsocketComponent
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit ff92b28f5b3bf7be241b29057b4c98c2d67c0e27
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Sep 9 07:39:50 2020 +0100
Remove createEndpoint method override in QuarkusVertxWebsocketComponent
Fixes #1737
---
.../vertx/websocket/VertxWebsocketRecorder.java | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/extensions/vertx-websocket/runtime/src/main/java/org/apache/camel/quarkus/component/vertx/websocket/VertxWebsocketRecorder.java b/extensions/vertx-websocket/runtime/src/main/java/org/apache/camel/quarkus/component/vertx/websocket/VertxWebsocketRecorder.java
index fc40cc3..b93011b 100644
--- a/extensions/vertx-websocket/runtime/src/main/java/org/apache/camel/quarkus/component/vertx/websocket/VertxWebsocketRecorder.java
+++ b/extensions/vertx-websocket/runtime/src/main/java/org/apache/camel/quarkus/component/vertx/websocket/VertxWebsocketRecorder.java
@@ -16,16 +16,13 @@
*/
package org.apache.camel.quarkus.component.vertx.websocket;
-import java.util.Map;
import java.util.concurrent.ExecutionException;
import io.quarkus.runtime.RuntimeValue;
import io.quarkus.runtime.annotations.Recorder;
import io.vertx.core.Vertx;
import io.vertx.ext.web.Router;
-import org.apache.camel.Endpoint;
import org.apache.camel.component.vertx.websocket.VertxWebsocketComponent;
-import org.apache.camel.component.vertx.websocket.VertxWebsocketEndpoint;
import org.apache.camel.component.vertx.websocket.VertxWebsocketHost;
import org.apache.camel.component.vertx.websocket.VertxWebsocketHostConfiguration;
import org.apache.camel.component.vertx.websocket.VertxWebsocketHostKey;
@@ -35,25 +32,13 @@ public class VertxWebsocketRecorder {
public RuntimeValue<VertxWebsocketComponent> createVertxWebsocketComponent(RuntimeValue<Vertx> vertx,
RuntimeValue<Router> router) {
- QuarkusVertxWebsocketComponent component = new QuarkusVertxWebsocketComponent(router.getValue());
+ QuarkusVertxWebsocketComponent component = new QuarkusVertxWebsocketComponent();
component.setVertx(vertx.getValue());
+ component.setRouter(router.getValue());
return new RuntimeValue<>(component);
}
static final class QuarkusVertxWebsocketComponent extends VertxWebsocketComponent {
- private final Router router;
-
- public QuarkusVertxWebsocketComponent(Router router) {
- this.router = router;
- }
-
- @Override
- protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
- VertxWebsocketEndpoint endpoint = (VertxWebsocketEndpoint) super.createEndpoint(uri, remaining, parameters);
- endpoint.getConfiguration().setRouter(router);
- return endpoint;
- }
-
@Override
protected VertxWebsocketHost createVertxWebsocketHost(VertxWebsocketHostConfiguration hostConfiguration,
VertxWebsocketHostKey hostKey) {