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 a56a4df RestProducerFactory: match RestConfiguration by producer
component (#3953)
a56a4df is described below
commit a56a4df7dc5c39a80c8c3b6498214c7fc8aff797
Author: Luca Burgazzoli <[email protected]>
AuthorDate: Sun Jun 28 11:16:18 2020 +0200
RestProducerFactory: match RestConfiguration by producer component (#3953)
---
.../src/main/java/org/apache/camel/component/http/HttpComponent.java | 2 +-
.../org/apache/camel/component/netty/http/NettyHttpComponent.java | 4 ++--
.../java/org/apache/camel/openapi/OpenApiRestProducerFactory.java | 2 +-
.../java/org/apache/camel/swagger/SwaggerRestProducerFactory.java | 2 +-
.../java/org/apache/camel/component/undertow/UndertowComponent.java | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
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 df1db14..28255bd 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
@@ -429,7 +429,7 @@ public class HttpComponent extends HttpCommonComponent
implements RestProducerFa
RestConfiguration config = configuration;
if (config == null) {
- config =
CamelContextHelper.getRestConfiguration(getCamelContext(), "http");
+ config =
CamelContextHelper.getRestConfiguration(getCamelContext(), null, "http");
}
Map<String, Object> map = new HashMap<>();
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 87fa6f9..4dc213a 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
@@ -428,11 +428,11 @@ public class NettyHttpComponent extends NettyComponent
implements HeaderFilterSt
url += "/" + uriTemplate;
}
- RestConfiguration config =
CamelContextHelper.getRestConfiguration(getCamelContext(), "netty-http");
+ RestConfiguration config =
CamelContextHelper.getRestConfiguration(getCamelContext(), null, "netty-http");
Map<String, Object> map = new HashMap<>();
// build query string, and append any endpoint configuration properties
- if (config.getComponent() == null ||
config.getComponent().equals("netty-http")) {
+ if (config.getProducerComponent() == null ||
config.getProducerComponent().equals("netty-http")) {
// setup endpoint options
if (config.getEndpointProperties() != null &&
!config.getEndpointProperties().isEmpty()) {
map.putAll(config.getEndpointProperties());
diff --git
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/OpenApiRestProducerFactory.java
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/OpenApiRestProducerFactory.java
index 9047db1..2c43e58 100644
---
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/OpenApiRestProducerFactory.java
+++
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/OpenApiRestProducerFactory.java
@@ -224,7 +224,7 @@ public class OpenApiRestProducerFactory implements
RestProducerFactory {
uriTemplate = null;
}
- RestConfiguration config =
CamelContextHelper.getRestConfiguration(camelContext, componentName);
+ RestConfiguration config =
CamelContextHelper.getRestConfiguration(camelContext, null, componentName);
return factory.createProducer(camelContext, host, verb, basePath,
uriTemplate, queryParameters, consumes, produces, config, parameters);
} else {
diff --git
a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/SwaggerRestProducerFactory.java
b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/SwaggerRestProducerFactory.java
index 69838c8..49a651a 100644
---
a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/SwaggerRestProducerFactory.java
+++
b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/SwaggerRestProducerFactory.java
@@ -182,7 +182,7 @@ public class SwaggerRestProducerFactory implements
RestProducerFactory {
uriTemplate = null;
}
- RestConfiguration config =
CamelContextHelper.getRestConfiguration(camelContext, componentName);
+ RestConfiguration config =
CamelContextHelper.getRestConfiguration(camelContext, null, componentName);
return factory.createProducer(
camelContext, host, verb, basePath, uriTemplate,
queryParameters, consumes, produces, config, parameters);
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 7a412ae..2e913d5 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
@@ -300,11 +300,11 @@ public class UndertowComponent extends DefaultComponent
implements RestConsumerF
url += "/" + uriTemplate;
}
- RestConfiguration config =
CamelContextHelper.getRestConfiguration(camelContext, getComponentName());
+ RestConfiguration config =
CamelContextHelper.getRestConfiguration(camelContext, null, getComponentName());
Map<String, Object> map = new HashMap<>();
// build query string, and append any endpoint configuration properties
- if (config.getComponent() == null ||
config.getComponent().equals(getComponentName())) {
+ if (config.getProducerComponent() == null ||
config.getProducerComponent().equals(getComponentName())) {
// setup endpoint options
if (config.getEndpointProperties() != null &&
!config.getEndpointProperties().isEmpty()) {
map.putAll(config.getEndpointProperties());
