You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2021/10/08 05:17:34 UTC
[camel] branch camel-3.11.x updated (24d5c80 -> cc6be7e)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch camel-3.11.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 24d5c80 new spring-boot-partial coordinates in docs copies
new dae0c34 CAMEL-17049 Changed camelContext.getEndpoint() variant in createProducer (#6226)
new cc6be7e CAMEL-17049 Changed camelContext.getEndpoint() variant in createConsumer
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:
.../src/main/java/org/apache/camel/coap/CoAPComponent.java | 3 +--
.../main/java/org/apache/camel/component/http/HttpComponent.java | 4 ++--
.../org/apache/camel/component/jetty/JettyHttpComponent.java | 3 +--
.../apache/camel/component/netty/http/NettyHttpComponent.java | 6 ++----
.../camel/component/platform/http/PlatformHttpComponent.java | 3 +--
.../apache/camel/component/rest/swagger/RestSwaggerEndpoint.java | 9 +++++++--
.../org/apache/camel/component/resteasy/ResteasyComponent.java | 3 +--
.../org/apache/camel/component/servlet/ServletComponent.java | 3 +--
.../org/apache/camel/component/undertow/UndertowComponent.java | 6 ++----
.../apache/camel/component/vertx/http/VertxHttpComponent.java | 3 +--
10 files changed, 19 insertions(+), 24 deletions(-)
[camel] 01/02: CAMEL-17049 Changed camelContext.getEndpoint()
variant in createProducer (#6226)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.11.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit dae0c3427f3a30c665dadb45cacf104d1eb7ac8f
Author: henka-rl <67...@users.noreply.github.com>
AuthorDate: Fri Oct 8 07:14:35 2021 +0200
CAMEL-17049 Changed camelContext.getEndpoint() variant in createProducer (#6226)
* CAMEL-17049 Changed camelContext.getEndpoint() variant in createProducer
* CAMEL-17049 Changed camelContext.getEndpoint() variant in createProducer
* CAMEL-17049 Fixed format issue
* CAMEL-17049 Changed camelContext.getEndpoint() variant in createConsumer
* CAMEL-17049 Formatting issue
---
.../src/main/java/org/apache/camel/coap/CoAPComponent.java | 3 +--
.../main/java/org/apache/camel/component/http/HttpComponent.java | 4 ++--
.../org/apache/camel/component/jetty/JettyHttpComponent.java | 3 +--
.../apache/camel/component/netty/http/NettyHttpComponent.java | 6 ++----
.../camel/component/platform/http/PlatformHttpComponent.java | 3 +--
.../apache/camel/component/rest/swagger/RestSwaggerEndpoint.java | 9 +++++++--
.../org/apache/camel/component/resteasy/ResteasyComponent.java | 3 +--
.../org/apache/camel/component/servlet/ServletComponent.java | 3 +--
.../org/apache/camel/component/undertow/UndertowComponent.java | 6 ++----
.../apache/camel/component/vertx/http/VertxHttpComponent.java | 2 +-
10 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPComponent.java b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPComponent.java
index 826e837..5c08a65 100644
--- a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPComponent.java
+++ b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPComponent.java
@@ -190,8 +190,7 @@ public class CoAPComponent extends DefaultComponent implements RestConsumerFacto
url += "&" + query;
}
- CoAPEndpoint endpoint = camelContext.getEndpoint(url, CoAPEndpoint.class);
- setProperties(endpoint, parameters);
+ CoAPEndpoint endpoint = (CoAPEndpoint) camelContext.getEndpoint(url, parameters);
// configure consumer properties
Consumer consumer = endpoint.createConsumer(processor);
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
index 1b2834a..c9baeb0 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
@@ -573,8 +573,8 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa
// the component, one such case is when we switch from "http" to "https" component name
RestProducerFactoryHelper.setupComponentFor(url, camelContext, (Map<String, Object>) parameters.remove("component"));
- HttpEndpoint endpoint = camelContext.getEndpoint(url, HttpEndpoint.class);
- setProperties(endpoint, parameters);
+ HttpEndpoint endpoint = (HttpEndpoint) camelContext.getEndpoint(url, parameters);
+
String path = uriTemplate != null ? uriTemplate : basePath;
endpoint.setHeaderFilterStrategy(new HttpRestHeaderFilterStrategy(path, queryParameters));
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index c3589cc..1edcbc8 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -1132,8 +1132,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent
String url = RestComponentHelper.createRestConsumerUrl("jetty", scheme, host, port, path, map);
- JettyHttpEndpoint endpoint = camelContext.getEndpoint(url, JettyHttpEndpoint.class);
- setProperties(endpoint, parameters);
+ JettyHttpEndpoint endpoint = (JettyHttpEndpoint) camelContext.getEndpoint(url, parameters);
if (!map.containsKey("httpBindingRef")) {
// use the rest binding, if not using a custom http binding
diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
index eff96ae..d25d1f2 100644
--- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
@@ -417,8 +417,7 @@ public class NettyHttpComponent extends NettyComponent
String url = RestComponentHelper.createRestConsumerUrl("netty-http", scheme, host, port, path, map);
- NettyHttpEndpoint endpoint = camelContext.getEndpoint(url, NettyHttpEndpoint.class);
- setProperties(endpoint, parameters);
+ NettyHttpEndpoint endpoint = (NettyHttpEndpoint) camelContext.getEndpoint(url, parameters);
// configure consumer properties
Consumer consumer = endpoint.createConsumer(processor);
@@ -478,8 +477,7 @@ public class NettyHttpComponent extends NettyComponent
// the component
RestProducerFactoryHelper.setupComponentFor(url, camelContext, (Map<String, Object>) parameters.remove("component"));
- NettyHttpEndpoint endpoint = camelContext.getEndpoint(url, NettyHttpEndpoint.class);
- setProperties(endpoint, parameters);
+ NettyHttpEndpoint endpoint = (NettyHttpEndpoint) camelContext.getEndpoint(url, parameters);
String path = uriTemplate != null ? uriTemplate : basePath;
endpoint.setHeaderFilterStrategy(new NettyHttpRestHeaderFilterStrategy(path, queryParameters));
diff --git a/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpComponent.java b/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpComponent.java
index 0e3a5096..ead93d6 100644
--- a/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpComponent.java
+++ b/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpComponent.java
@@ -165,8 +165,7 @@ public class PlatformHttpComponent extends DefaultComponent implements RestConsu
String url = RestComponentHelper.createRestConsumerUrl("platform-http", path, map);
- PlatformHttpEndpoint endpoint = camelContext.getEndpoint(url, PlatformHttpEndpoint.class);
- setProperties(endpoint, parameters);
+ PlatformHttpEndpoint endpoint = (PlatformHttpEndpoint) camelContext.getEndpoint(url, parameters);
endpoint.setConsumes(consumes);
endpoint.setProduces(produces);
diff --git a/components/camel-rest-swagger/src/main/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpoint.java b/components/camel-rest-swagger/src/main/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpoint.java
index 09730e4..880be95 100644
--- a/components/camel-rest-swagger/src/main/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpoint.java
+++ b/components/camel-rest-swagger/src/main/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpoint.java
@@ -402,11 +402,16 @@ public final class RestSwaggerEndpoint extends DefaultEndpoint {
componentParameters.put("sslContextParameters", component.getSslContextParameters());
}
+ final Map<Object, Object> nestedParameters = new HashMap<>();
if (!componentParameters.isEmpty()) {
- final Map<Object, Object> nestedParameters = new HashMap<>();
+ // we're trying to set RestEndpoint.parameters['component']
nestedParameters.put("component", componentParameters);
+ }
- // we're trying to set RestEndpoint.parameters['component']
+ // Add rest endpoint parameters
+ nestedParameters.putAll(this.parameters);
+
+ if (!nestedParameters.isEmpty()) {
parameters.put("parameters", nestedParameters);
}
diff --git a/components/camel-resteasy/src/main/java/org/apache/camel/component/resteasy/ResteasyComponent.java b/components/camel-resteasy/src/main/java/org/apache/camel/component/resteasy/ResteasyComponent.java
index 05dc016..6a90d14 100644
--- a/components/camel-resteasy/src/main/java/org/apache/camel/component/resteasy/ResteasyComponent.java
+++ b/components/camel-resteasy/src/main/java/org/apache/camel/component/resteasy/ResteasyComponent.java
@@ -205,8 +205,7 @@ public class ResteasyComponent extends HttpComponent implements RestConsumerFact
// get the endpoint
url = String.format(url, path, restrict);
- ResteasyEndpoint endpoint = camelContext.getEndpoint(url, ResteasyEndpoint.class);
- setProperties(endpoint, parameters);
+ ResteasyEndpoint endpoint = (ResteasyEndpoint) camelContext.getEndpoint(url, parameters);
Consumer consumer = endpoint.createConsumer(processor);
if (config.getConsumerProperties() != null && !config.getConsumerProperties().isEmpty()) {
diff --git a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
index b681859..4faf971 100644
--- a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
+++ b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
@@ -314,8 +314,7 @@ public class ServletComponent extends HttpCommonComponent implements RestConsume
String url = RestComponentHelper.createRestConsumerUrl("servlet", path, map);
- ServletEndpoint endpoint = camelContext.getEndpoint(url, ServletEndpoint.class);
- setProperties(endpoint, parameters);
+ ServletEndpoint endpoint = (ServletEndpoint) camelContext.getEndpoint(url, parameters);
if (!map.containsKey("httpBinding")) {
// use the rest binding, if not using a custom http binding
diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
index 28641b0..7bbb59d 100644
--- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
+++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
@@ -269,8 +269,7 @@ public class UndertowComponent extends DefaultComponent
String url = RestComponentHelper.createRestConsumerUrl(getComponentName(), scheme, host, port, path, map);
- UndertowEndpoint endpoint = camelContext.getEndpoint(url, UndertowEndpoint.class);
- setProperties(endpoint, parameters);
+ UndertowEndpoint endpoint = (UndertowEndpoint) camelContext.getEndpoint(url, parameters);
if (!map.containsKey("undertowHttpBinding")) {
// use the rest binding, if not using a custom http binding
@@ -334,8 +333,7 @@ public class UndertowComponent extends DefaultComponent
// the component
RestProducerFactoryHelper.setupComponentFor(url, camelContext, (Map<String, Object>) parameters.remove("component"));
- UndertowEndpoint endpoint = camelContext.getEndpoint(url, UndertowEndpoint.class);
- setProperties(endpoint, parameters);
+ UndertowEndpoint endpoint = (UndertowEndpoint) camelContext.getEndpoint(url, parameters);
String path = uriTemplate != null ? uriTemplate : basePath;
endpoint.setHeaderFilterStrategy(new UndertowRestHeaderFilterStrategy(path, queryParameters));
diff --git a/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/VertxHttpComponent.java b/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/VertxHttpComponent.java
index 4b6e2f1..c2aa81f 100644
--- a/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/VertxHttpComponent.java
+++ b/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/VertxHttpComponent.java
@@ -191,7 +191,7 @@ public class VertxHttpComponent extends HeaderFilterStrategyComponent
// the component, one such case is when we switch from "http" to "https" component name
RestProducerFactoryHelper.setupComponentFor(url, camelContext, (Map<String, Object>) parameters.remove("component"));
- VertxHttpEndpoint endpoint = camelContext.getEndpoint(url, VertxHttpEndpoint.class);
+ VertxHttpEndpoint endpoint = (VertxHttpEndpoint) camelContext.getEndpoint(url, parameters);
setProperties(endpoint, parameters);
String path = uriTemplate != null ? uriTemplate : basePath;
endpoint.getConfiguration().setHeaderFilterStrategy(new VertxHttpRestHeaderFilterStrategy(path, queryParameters));
[camel] 02/02: CAMEL-17049 Changed camelContext.getEndpoint()
variant in createConsumer
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.11.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit cc6be7e939c059af2c2bb2caef2c6badd521de37
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Oct 8 07:15:46 2021 +0200
CAMEL-17049 Changed camelContext.getEndpoint() variant in createConsumer
---
.../java/org/apache/camel/component/vertx/http/VertxHttpComponent.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/VertxHttpComponent.java b/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/VertxHttpComponent.java
index c2aa81f..9efae33 100644
--- a/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/VertxHttpComponent.java
+++ b/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/VertxHttpComponent.java
@@ -192,7 +192,6 @@ public class VertxHttpComponent extends HeaderFilterStrategyComponent
RestProducerFactoryHelper.setupComponentFor(url, camelContext, (Map<String, Object>) parameters.remove("component"));
VertxHttpEndpoint endpoint = (VertxHttpEndpoint) camelContext.getEndpoint(url, parameters);
- setProperties(endpoint, parameters);
String path = uriTemplate != null ? uriTemplate : basePath;
endpoint.getConfiguration().setHeaderFilterStrategy(new VertxHttpRestHeaderFilterStrategy(path, queryParameters));