[
https://issues.apache.org/jira/browse/CAMEL-12442?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16453945#comment-16453945
]
ASF GitHub Bot commented on CAMEL-12442:
----------------------------------------
davsclaus closed pull request #2308: CAMEL-12442:rest-dsl - Rest producer
should use RestConfiguration
URL: https://github.com/apache/camel/pull/2308
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/camel-core/src/main/java/org/apache/camel/component/rest/RestEndpoint.java
b/camel-core/src/main/java/org/apache/camel/component/rest/RestEndpoint.java
index 83a11938698..70c6e8525e3 100644
--- a/camel-core/src/main/java/org/apache/camel/component/rest/RestEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/rest/RestEndpoint.java
@@ -363,16 +363,18 @@ public Producer createProducer() throws Exception {
if (factory != null) {
LOG.debug("Using RestProducerFactory: {}", factory);
+
+ RestConfiguration config =
getCamelContext().getRestConfiguration(cname, true);
Producer producer;
if (apiDocFactory != null) {
// wrap the factory using the api doc factory which will use
the factory
parameters.put("restProducerFactory", factory);
- producer = apiDocFactory.createProducer(getCamelContext(),
host, method, path, uriTemplate, queryParameters, consumes, produces,
parameters);
+ producer = apiDocFactory.createProducer(getCamelContext(),
host, method, path, uriTemplate, queryParameters, consumes, produces, config,
parameters);
} else {
- producer = factory.createProducer(getCamelContext(), host,
method, path, uriTemplate, queryParameters, consumes, produces, parameters);
+ producer = factory.createProducer(getCamelContext(), host,
method, path, uriTemplate, queryParameters, consumes, produces, config,
parameters);
}
- RestConfiguration config =
getCamelContext().getRestConfiguration(cname, true);
+
RestProducer answer = new RestProducer(this, producer, config);
answer.setOutType(outType);
answer.setType(inType);
diff --git
a/camel-core/src/main/java/org/apache/camel/spi/RestProducerFactory.java
b/camel-core/src/main/java/org/apache/camel/spi/RestProducerFactory.java
index 30bb0fade8f..5bd1c935715 100644
--- a/camel-core/src/main/java/org/apache/camel/spi/RestProducerFactory.java
+++ b/camel-core/src/main/java/org/apache/camel/spi/RestProducerFactory.java
@@ -38,11 +38,12 @@
* @param queryParameters uri query parameters
* @param consumes media-types for what the REST service
consume as input (accept-type), is <tt>null</tt> or <tt>*/*</tt> for
anything
* @param produces media-types for what the REST service
produces as output, can be <tt>null</tt>
+ * @param configuration REST configuration
* @param parameters additional parameters
* @return a newly created REST producer
* @throws Exception can be thrown
*/
Producer createProducer(CamelContext camelContext, String host,
String verb, String basePath, String uriTemplate,
String queryParameters,
- String consumes, String produces, Map<String,
Object> parameters) throws Exception;
+ String consumes, String produces,
RestConfiguration configuration, Map<String, Object> parameters) throws
Exception;
}
diff --git
a/camel-core/src/test/java/org/apache/camel/component/rest/RestComponentVerifierExtensionTest.java
b/camel-core/src/test/java/org/apache/camel/component/rest/RestComponentVerifierExtensionTest.java
index a5adc8c1a9d..25ae7093c59 100644
---
a/camel-core/src/test/java/org/apache/camel/component/rest/RestComponentVerifierExtensionTest.java
+++
b/camel-core/src/test/java/org/apache/camel/component/rest/RestComponentVerifierExtensionTest.java
@@ -118,6 +118,7 @@ public Producer createProducer(
String queryParameters,
String consumes,
String produces,
+ RestConfiguration configuration,
Map<String, Object> parameters)
throws Exception {
throw new UnsupportedOperationException();
diff --git
a/camel-core/src/test/java/org/apache/camel/component/rest/RestComponentVerifierTest.java
b/camel-core/src/test/java/org/apache/camel/component/rest/RestComponentVerifierTest.java
index ca8851ef3e5..cbd748ac2e9 100644
---
a/camel-core/src/test/java/org/apache/camel/component/rest/RestComponentVerifierTest.java
+++
b/camel-core/src/test/java/org/apache/camel/component/rest/RestComponentVerifierTest.java
@@ -118,6 +118,7 @@ public Producer createProducer(
String queryParameters,
String consumes,
String produces,
+ RestConfiguration configuration,
Map<String, Object> parameters)
throws Exception {
throw new UnsupportedOperationException();
diff --git
a/camel-core/src/test/java/org/apache/camel/component/rest/RestEndpointTest.java
b/camel-core/src/test/java/org/apache/camel/component/rest/RestEndpointTest.java
index 57f52ab6f57..3d8f1750272 100644
---
a/camel-core/src/test/java/org/apache/camel/component/rest/RestEndpointTest.java
+++
b/camel-core/src/test/java/org/apache/camel/component/rest/RestEndpointTest.java
@@ -25,6 +25,7 @@
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.DefaultComponent;
import org.apache.camel.model.rest.RestBindingMode;
+import org.apache.camel.spi.RestConfiguration;
import org.apache.camel.spi.RestProducerFactory;
import org.junit.Assert;
import org.junit.Test;
@@ -37,7 +38,7 @@
@Override
public Producer createProducer(final CamelContext camelContext, final
String host, final String verb,
final String basePath, final String uriTemplate, final String
queryParameters, final String consumes,
- final String produces, final Map<String, Object> parameters)
throws Exception {
+ final String produces, RestConfiguration configuration, final
Map<String, Object> parameters) throws Exception {
return null;
}
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 ccf8807941a..d0e93e2765f 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
@@ -38,6 +38,7 @@
import org.apache.camel.http.common.UrlRewrite;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.spi.Metadata;
+import org.apache.camel.spi.RestConfiguration;
import org.apache.camel.spi.RestProducerFactory;
import org.apache.camel.util.FileUtil;
import org.apache.camel.util.IntrospectionSupport;
@@ -297,7 +298,7 @@ protected HttpEndpoint createHttpEndpoint(String uri,
HttpComponent component, H
@Override
public Producer createProducer(CamelContext camelContext, String host,
String verb, String basePath, String
uriTemplate, String queryParameters,
- String consumes, String produces,
Map<String, Object> parameters) throws Exception {
+ String consumes, String produces,
RestConfiguration configuration, Map<String, Object> parameters) throws
Exception {
// avoid leading slash
basePath = FileUtil.stripLeadingSeparator(basePath);
diff --git
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
index d304507ea00..95bcb66041f 100644
---
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
+++
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
@@ -40,6 +40,7 @@
import org.apache.camel.http.common.UrlRewrite;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.spi.Metadata;
+import org.apache.camel.spi.RestConfiguration;
import org.apache.camel.spi.RestProducerFactory;
import org.apache.camel.util.FileUtil;
import org.apache.camel.util.IntrospectionSupport;
@@ -415,7 +416,7 @@ protected boolean useIntrospectionOnEndpoint() {
@Override
public Producer createProducer(CamelContext camelContext, String host,
String verb, String basePath, String
uriTemplate, String queryParameters,
- String consumes, String produces,
Map<String, Object> parameters) throws Exception {
+ String consumes, String produces,
RestConfiguration configuration, Map<String, Object> parameters) throws
Exception {
// avoid leading slash
basePath = FileUtil.stripLeadingSeparator(basePath);
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 2a0b87488e2..563ba8d7889 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
@@ -1239,7 +1239,7 @@ Consumer doCreateConsumer(CamelContext camelContext,
Processor processor, String
@Override
public Producer createProducer(CamelContext camelContext, String host,
String verb, String basePath, String
uriTemplate, String queryParameters,
- String consumes, String produces,
Map<String, Object> parameters) throws Exception {
+ String consumes, String produces,
RestConfiguration configuration, Map<String, Object> parameters) throws
Exception {
// avoid leading slash
basePath = FileUtil.stripLeadingSeparator(basePath);
diff --git
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
index e7f1a84a691..28db0ab073d 100644
---
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
+++
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
@@ -416,7 +416,7 @@ Consumer doCreateConsumer(CamelContext camelContext,
Processor processor, String
@Override
public Producer createProducer(CamelContext camelContext, String host,
String verb, String basePath, String
uriTemplate, String queryParameters,
- String consumes, String produces,
Map<String, Object> parameters) throws Exception {
+ String consumes, String produces,
RestConfiguration configuration, Map<String, Object> parameters) throws
Exception {
// avoid leading slash
basePath = FileUtil.stripLeadingSeparator(basePath);
diff --git
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java
index 53d6c437b3c..fe19fbae3b9 100644
---
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java
+++
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java
@@ -812,7 +812,7 @@ public Consumer createApiConsumer(CamelContext
camelContext, Processor processor
@Override
public Producer createProducer(CamelContext camelContext, String host,
String verb, String basePath, String
uriTemplate, String queryParameters,
- String consumes, String produces,
Map<String, Object> parameters) throws Exception {
+ String consumes, String produces,
RestConfiguration configuration, Map<String, Object> parameters) throws
Exception {
// avoid leading slash
basePath = FileUtil.stripLeadingSeparator(basePath);
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 8dd336e4666..6e49388b798 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
@@ -27,6 +27,7 @@
import io.swagger.parser.SwaggerParser;
import org.apache.camel.CamelContext;
import org.apache.camel.Producer;
+import org.apache.camel.spi.RestConfiguration;
import org.apache.camel.spi.RestProducerFactory;
import org.apache.camel.util.CollectionStringBuffer;
import org.apache.camel.util.IOHelper;
@@ -42,7 +43,7 @@
@Override
public Producer createProducer(CamelContext camelContext, String host,
String verb, String basePath, String
uriTemplate, String queryParameters,
- String consumes, String produces,
Map<String, Object> parameters) throws Exception {
+ String consumes, String produces,
RestConfiguration configuration, Map<String, Object> parameters) throws
Exception {
String apiDoc = (String) parameters.get("apiDoc");
// load json model
@@ -179,8 +180,8 @@ private Producer createHttpProducer(CamelContext
camelContext, Swagger swagger,
basePath = path;
uriTemplate = null;
}
-
- return factory.createProducer(camelContext, host, verb, basePath,
uriTemplate, queryParameters, consumes, produces, parameters);
+ RestConfiguration config =
camelContext.getRestConfiguration(componentName, true);
+ return factory.createProducer(camelContext, host, verb, basePath,
uriTemplate, queryParameters, consumes, produces, config, parameters);
} else {
throw new IllegalStateException("Cannot find RestProducerFactory
in Registry or as a Component to use");
diff --git
a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/DummyRestProducerFactory.java
b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/DummyRestProducerFactory.java
index eddcbd5fb3a..e402fb0e5ac 100644
---
a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/DummyRestProducerFactory.java
+++
b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/DummyRestProducerFactory.java
@@ -23,6 +23,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.impl.DefaultProducer;
+import org.apache.camel.spi.RestConfiguration;
import org.apache.camel.spi.RestProducerFactory;
import org.apache.camel.util.ObjectHelper;
@@ -31,7 +32,7 @@
@Override
public Producer createProducer(CamelContext camelContext, String host,
String verb, String basePath, final String
uriTemplate, String queryParameters,
- String consumes, String produces, Map<String,
Object> parameters) throws Exception {
+ String consumes, String produces,
RestConfiguration configuration, Map<String, Object> parameters) throws
Exception {
// use a dummy endpoint
Endpoint endpoint = camelContext.getEndpoint("stub:dummy");
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 bfd2351227d..9c4bdf0b8aa 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
@@ -263,7 +263,7 @@ Consumer doCreateConsumer(CamelContext camelContext,
Processor processor, String
@Override
public Producer createProducer(CamelContext camelContext, String host,
String verb, String basePath, String
uriTemplate, String queryParameters,
- String consumes, String produces,
Map<String, Object> parameters) throws Exception {
+ String consumes, String produces,
RestConfiguration configuration, Map<String, Object> parameters) throws
Exception {
// avoid leading slash
basePath = FileUtil.stripLeadingSeparator(basePath);
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> rest-dsl - Rest producer should use RestConfiguration
> -----------------------------------------------------
>
> Key: CAMEL-12442
> URL: https://issues.apache.org/jira/browse/CAMEL-12442
> Project: Camel
> Issue Type: Improvement
> Components: camel-core
> Reporter: Claus Ibsen
> Priority: Major
> Fix For: 2.22.0
>
>
> The RestConfiguration have additional configuration for component level,
> endpoint level which you may want to allow to configure for the rest-dsl
> producer side.
> Currently this is only supported on the consumer side.
> To introduce this, requires an API change in the RestProducerFactory method.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)