Repository: camel Updated Branches: refs/heads/master 2aab2fb23 -> 109b8a436
CAMEL-9996: Use passed in Camel Context in org.apache.camel.spi.RestConsumerFactory#createConsumer implementations Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/109b8a43 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/109b8a43 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/109b8a43 Branch: refs/heads/master Commit: 109b8a436b828ac53690a50d5b5c80917df01b3a Parents: 2aab2fb Author: jpoth <[email protected]> Authored: Mon May 30 17:43:15 2016 +0200 Committer: Claus Ibsen <[email protected]> Committed: Tue May 31 09:17:27 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/camel/impl/DefaultComponent.java | 14 ++++++++++++-- .../camel/component/jetty/JettyHttpComponent.java | 6 +++--- .../component/netty/http/NettyHttpComponent.java | 6 +++--- .../component/netty4/http/NettyHttpComponent.java | 6 +++--- .../camel/component/restlet/RestletComponent.java | 6 +++--- .../camel/component/servlet/ServletComponent.java | 6 +++--- .../camel/component/sparkrest/SparkComponent.java | 6 +++--- .../camel/component/undertow/UndertowComponent.java | 6 +++--- 8 files changed, 33 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/109b8a43/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java index 1ac7d26..51ce352 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java +++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java @@ -250,9 +250,19 @@ public abstract class DefaultComponent extends ServiceSupport implements Compone * @param parameters properties to set */ protected void setProperties(Object bean, Map<String, Object> parameters) throws Exception { + setProperties(getCamelContext(), bean, parameters); + } + + /** + * Sets the bean properties on the given bean using the given {@link CamelContext} + * @param camelContext the {@link CamelContext} to use + * @param bean the bean + * @param parameters properties to set + */ + protected void setProperties(CamelContext camelContext, Object bean, Map<String, Object> parameters) throws Exception { // set reference properties first as they use # syntax that fools the regular properties setter - EndpointHelper.setReferenceProperties(getCamelContext(), bean, parameters); - EndpointHelper.setProperties(getCamelContext(), bean, parameters); + EndpointHelper.setReferenceProperties(camelContext, bean, parameters); + EndpointHelper.setProperties(camelContext, bean, parameters); } /** http://git-wip-us.apache.org/repos/asf/camel/blob/109b8a43/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java ---------------------------------------------------------------------- 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 5367479..30ef24e 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 @@ -1041,7 +1041,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent implements // if no explicit port/host configured, then use port from rest configuration RestConfiguration config = configuration; if (config == null) { - config = getCamelContext().getRestConfiguration("jetty", true); + config = camelContext.getRestConfiguration("jetty", true); } if (config.getScheme() != null) { scheme = config.getScheme(); @@ -1112,7 +1112,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent implements } JettyHttpEndpoint endpoint = camelContext.getEndpoint(url, JettyHttpEndpoint.class); - setProperties(endpoint, parameters); + setProperties(camelContext, endpoint, parameters); if (!map.containsKey("httpBindingRef")) { // use the rest binding, if not using a custom http binding @@ -1124,7 +1124,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent implements // configure consumer properties Consumer consumer = endpoint.createConsumer(processor); if (config.getConsumerProperties() != null && !config.getConsumerProperties().isEmpty()) { - setProperties(consumer, config.getConsumerProperties()); + setProperties(camelContext, consumer, config.getConsumerProperties()); } return consumer; http://git-wip-us.apache.org/repos/asf/camel/blob/109b8a43/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java ---------------------------------------------------------------------- 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 07324e6..87b2e54 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 @@ -292,7 +292,7 @@ public class NettyHttpComponent extends NettyComponent implements HeaderFilterSt // if no explicit port/host configured, then use port from rest configuration RestConfiguration config = configuration; if (config == null) { - config = getCamelContext().getRestConfiguration("netty-http", true); + config = camelContext.getRestConfiguration("netty-http", true); } if (config.getScheme() != null) { scheme = config.getScheme(); @@ -363,12 +363,12 @@ public class NettyHttpComponent extends NettyComponent implements HeaderFilterSt } NettyHttpEndpoint endpoint = camelContext.getEndpoint(url, NettyHttpEndpoint.class); - setProperties(endpoint, parameters); + setProperties(camelContext, endpoint, parameters); // configure consumer properties Consumer consumer = endpoint.createConsumer(processor); if (config.getConsumerProperties() != null && !config.getConsumerProperties().isEmpty()) { - setProperties(consumer, config.getConsumerProperties()); + setProperties(camelContext, consumer, config.getConsumerProperties()); } return consumer; http://git-wip-us.apache.org/repos/asf/camel/blob/109b8a43/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java ---------------------------------------------------------------------- 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 4f6de0d..339667a 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 @@ -299,7 +299,7 @@ public class NettyHttpComponent extends NettyComponent implements HeaderFilterSt // if no explicit port/host configured, then use port from rest configuration RestConfiguration config = configuration; if (config == null) { - config = getCamelContext().getRestConfiguration("netty4-http", true); + config = camelContext.getRestConfiguration("netty4-http", true); } if (config.getScheme() != null) { scheme = config.getScheme(); @@ -366,12 +366,12 @@ public class NettyHttpComponent extends NettyComponent implements HeaderFilterSt } NettyHttpEndpoint endpoint = camelContext.getEndpoint(url, NettyHttpEndpoint.class); - setProperties(endpoint, parameters); + setProperties(camelContext, endpoint, parameters); // configure consumer properties Consumer consumer = endpoint.createConsumer(processor); if (config.getConsumerProperties() != null && !config.getConsumerProperties().isEmpty()) { - setProperties(consumer, config.getConsumerProperties()); + setProperties(camelContext, consumer, config.getConsumerProperties()); } return consumer; http://git-wip-us.apache.org/repos/asf/camel/blob/109b8a43/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java ---------------------------------------------------------------------- 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 409c667..503e4e8 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 @@ -718,7 +718,7 @@ public class RestletComponent extends HeaderFilterStrategyComponent implements R // if no explicit port/host configured, then use port from rest configuration RestConfiguration config = configuration; if (config == null) { - config = getCamelContext().getRestConfiguration("restlet", true); + config = camelContext.getRestConfiguration("restlet", true); } if (config.getScheme() != null) { scheme = config.getScheme(); @@ -786,12 +786,12 @@ public class RestletComponent extends HeaderFilterStrategyComponent implements R } // get the endpoint RestletEndpoint endpoint = camelContext.getEndpoint(url, RestletEndpoint.class); - setProperties(endpoint, parameters); + setProperties(camelContext, endpoint, parameters); // configure consumer properties Consumer consumer = endpoint.createConsumer(processor); if (config.getConsumerProperties() != null && !config.getConsumerProperties().isEmpty()) { - setProperties(consumer, config.getConsumerProperties()); + setProperties(camelContext, consumer, config.getConsumerProperties()); } return consumer; http://git-wip-us.apache.org/repos/asf/camel/blob/109b8a43/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java ---------------------------------------------------------------------- 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 2332154..0ceee78 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 @@ -223,7 +223,7 @@ public class ServletComponent extends HttpCommonComponent implements RestConsume // if no explicit port/host configured, then use port from rest configuration RestConfiguration config = configuration; if (config == null) { - config = getCamelContext().getRestConfiguration("servlet", true); + config = camelContext.getRestConfiguration("servlet", true); } Map<String, Object> map = new HashMap<String, Object>(); @@ -265,7 +265,7 @@ public class ServletComponent extends HttpCommonComponent implements RestConsume } ServletEndpoint endpoint = camelContext.getEndpoint(url, ServletEndpoint.class); - setProperties(endpoint, parameters); + setProperties(camelContext, endpoint, parameters); if (!map.containsKey("httpBindingRef")) { // use the rest binding, if not using a custom http binding @@ -279,7 +279,7 @@ public class ServletComponent extends HttpCommonComponent implements RestConsume // configure consumer properties Consumer consumer = endpoint.createConsumer(processor); if (config.getConsumerProperties() != null && !config.getConsumerProperties().isEmpty()) { - setProperties(consumer, config.getConsumerProperties()); + setProperties(camelContext, consumer, config.getConsumerProperties()); } return consumer; http://git-wip-us.apache.org/repos/asf/camel/blob/109b8a43/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java index 186bd03..9c20221 100644 --- a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java +++ b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java @@ -284,7 +284,7 @@ public class SparkComponent extends UriEndpointComponent implements RestConsumer RestConfiguration config = configuration; if (config == null) { - config = getCamelContext().getRestConfiguration("spark-rest", true); + config = camelContext.getRestConfiguration("spark-rest", true); } Map<String, Object> map = new HashMap<String, Object>(); @@ -329,7 +329,7 @@ public class SparkComponent extends UriEndpointComponent implements RestConsumer // get the endpoint SparkEndpoint endpoint = camelContext.getEndpoint(url, SparkEndpoint.class); - setProperties(endpoint, parameters); + setProperties(camelContext, endpoint, parameters); // configure consumer properties Consumer consumer = endpoint.createConsumer(processor); @@ -341,7 +341,7 @@ public class SparkComponent extends UriEndpointComponent implements RestConsumer config.getConsumerProperties().put("enableCors", true); } if (config.getConsumerProperties() != null && !config.getConsumerProperties().isEmpty()) { - setProperties(consumer, config.getConsumerProperties()); + setProperties(camelContext, consumer, config.getConsumerProperties()); } return consumer; } http://git-wip-us.apache.org/repos/asf/camel/blob/109b8a43/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java ---------------------------------------------------------------------- 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 67f7107..1277b70 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 @@ -135,7 +135,7 @@ public class UndertowComponent extends UriEndpointComponent implements RestConsu RestConfiguration config = configuration; if (config == null) { - config = getCamelContext().getRestConfiguration("undertow", true); + config = camelContext.getRestConfiguration("undertow", true); } if (config.getScheme() != null) { scheme = config.getScheme(); @@ -206,7 +206,7 @@ public class UndertowComponent extends UriEndpointComponent implements RestConsu } UndertowEndpoint endpoint = camelContext.getEndpoint(url, UndertowEndpoint.class); - setProperties(endpoint, parameters); + setProperties(camelContext, endpoint, parameters); if (!map.containsKey("undertowHttpBinding")) { // use the rest binding, if not using a custom http binding @@ -216,7 +216,7 @@ public class UndertowComponent extends UriEndpointComponent implements RestConsu // configure consumer properties Consumer consumer = endpoint.createConsumer(processor); if (config.getConsumerProperties() != null && !config.getConsumerProperties().isEmpty()) { - setProperties(consumer, config.getConsumerProperties()); + setProperties(camelContext, consumer, config.getConsumerProperties()); } return consumer;
