This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch extended
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 584209deaf92505f3f91b82138c4395d2e4b513e
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon May 20 13:08:45 2019 +0200
CAMEL-13456: CamelContext - Move API that are not related to end users to
an ExtendedCamelContext
---
.../src/main/java/org/apache/camel/component/bean/MethodInfo.java | 8 ++++----
.../main/java/org/apache/camel/component/bean/ProxyHelper.java | 3 ++-
.../camel/component/cxf/CxfGreeterCXFMessageRouterTest.java | 4 ++--
.../apache/camel/component/hystrix/processor/HystrixReifier.java | 3 ++-
.../main/java/org/apache/camel/component/seda/SedaEndpoint.java | 3 ++-
5 files changed, 12 insertions(+), 9 deletions(-)
diff --git
a/components/camel-bean/src/main/java/org/apache/camel/component/bean/MethodInfo.java
b/components/camel-bean/src/main/java/org/apache/camel/component/bean/MethodInfo.java
index 8a7a443..8296fe9 100644
---
a/components/camel-bean/src/main/java/org/apache/camel/component/bean/MethodInfo.java
+++
b/components/camel-bean/src/main/java/org/apache/camel/component/bean/MethodInfo.java
@@ -38,6 +38,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Expression;
import org.apache.camel.ExpressionEvaluationException;
+import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.Message;
import org.apache.camel.NoTypeConversionAvailableException;
import org.apache.camel.Pattern;
@@ -56,7 +57,6 @@ import org.slf4j.LoggerFactory;
import static org.apache.camel.util.ObjectHelper.asString;
-
/**
* Information about a method to be used for invocation.
*/
@@ -124,7 +124,7 @@ public class MethodInfo {
org.apache.camel.RoutingSlip routingSlipAnnotation =
(org.apache.camel.RoutingSlip)collectedMethodAnnotation.get(org.apache.camel.RoutingSlip.class);
if (routingSlipAnnotation != null &&
matchContext(routingSlipAnnotation.context())) {
- routingSlip =
camelContext.getAnnotationBasedProcessorFactory().createRoutingSlip(camelContext,
routingSlipAnnotation);
+ routingSlip =
camelContext.adapt(ExtendedCamelContext.class).getAnnotationBasedProcessorFactory().createRoutingSlip(camelContext,
routingSlipAnnotation);
// add created routingSlip as a service so we have its lifecycle
managed
try {
camelContext.addService(routingSlip);
@@ -137,7 +137,7 @@ public class MethodInfo {
(org.apache.camel.DynamicRouter)collectedMethodAnnotation.get(org.apache.camel.DynamicRouter.class);
if (dynamicRouterAnnotation != null
&& matchContext(dynamicRouterAnnotation.context())) {
- dynamicRouter =
camelContext.getAnnotationBasedProcessorFactory().createDynamicRouter(camelContext,
dynamicRouterAnnotation);
+ dynamicRouter =
camelContext.adapt(ExtendedCamelContext.class).getAnnotationBasedProcessorFactory().createDynamicRouter(camelContext,
dynamicRouterAnnotation);
// add created dynamicRouter as a service so we have its lifecycle
managed
try {
camelContext.addService(dynamicRouter);
@@ -150,7 +150,7 @@ public class MethodInfo {
(org.apache.camel.RecipientList)collectedMethodAnnotation.get(org.apache.camel.RecipientList.class);
if (recipientListAnnotation != null
&& matchContext(recipientListAnnotation.context())) {
- recipientList =
camelContext.getAnnotationBasedProcessorFactory().createRecipientList(camelContext,
recipientListAnnotation);
+ recipientList =
camelContext.adapt(ExtendedCamelContext.class).getAnnotationBasedProcessorFactory().createRecipientList(camelContext,
recipientListAnnotation);
// add created recipientList as a service so we have its lifecycle
managed
try {
camelContext.addService(recipientList);
diff --git
a/components/camel-bean/src/main/java/org/apache/camel/component/bean/ProxyHelper.java
b/components/camel-bean/src/main/java/org/apache/camel/component/bean/ProxyHelper.java
index 51b8848..0192c08 100644
---
a/components/camel-bean/src/main/java/org/apache/camel/component/bean/ProxyHelper.java
+++
b/components/camel-bean/src/main/java/org/apache/camel/component/bean/ProxyHelper.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.bean;
import java.lang.reflect.Proxy;
import org.apache.camel.Endpoint;
+import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.Producer;
/**
@@ -51,7 +52,7 @@ public final class ProxyHelper {
* Creates a Proxy which sends the exchange to the endpoint.
*/
public static <T> T createProxy(Endpoint endpoint, boolean binding,
ClassLoader cl, Class<T>[] interfaceClasses, MethodInfoCache methodCache)
throws Exception {
- Producer producer =
endpoint.getCamelContext().getDeferServiceFactory().createProducer(endpoint);
+ Producer producer =
endpoint.getCamelContext().adapt(ExtendedCamelContext.class).getDeferServiceFactory().createProducer(endpoint);
return createProxyObject(endpoint, binding, producer, cl,
interfaceClasses, methodCache);
}
diff --git
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterCXFMessageRouterTest.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterCXFMessageRouterTest.java
index bb78553..daeb941 100644
---
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterCXFMessageRouterTest.java
+++
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterCXFMessageRouterTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.cxf;
import javax.xml.ws.Endpoint;
-import org.apache.camel.builder.NoErrorHandlerBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.hello_world_soap_http.GreeterImpl;
import org.junit.AfterClass;
@@ -48,7 +47,8 @@ public class CxfGreeterCXFMessageRouterTest extends
AbstractCXFGreeterRouterTest
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- context.setErrorHandlerFactory(new NoErrorHandlerBuilder());
+ errorHandler(noErrorHandler());
+
from("cxf:bean:routerEndpoint?dataFormat=CXF_MESSAGE&publishedEndpointUrl=http://www.simple.com/services/test";)
.to("cxf:bean:serviceEndpoint?dataFormat=CXF_MESSAGE");
}
diff --git
a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixReifier.java
b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixReifier.java
index 5cb2a1d..a0d2981 100644
---
a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixReifier.java
+++
b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixReifier.java
@@ -27,6 +27,7 @@ import com.netflix.hystrix.HystrixCommandProperties;
import com.netflix.hystrix.HystrixThreadPoolKey;
import com.netflix.hystrix.HystrixThreadPoolProperties;
import org.apache.camel.CamelContext;
+import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.Processor;
import org.apache.camel.model.HystrixConfigurationDefinition;
import org.apache.camel.model.HystrixDefinition;
@@ -55,7 +56,7 @@ public class HystrixReifier extends
ProcessorReifier<HystrixDefinition> {
}
final HystrixConfigurationDefinition config =
buildHystrixConfiguration(routeContext.getCamelContext());
- final String id =
definition.idOrCreate(routeContext.getCamelContext().getNodeIdFactory());
+ final String id =
definition.idOrCreate(routeContext.getCamelContext().adapt(ExtendedCamelContext.class).getNodeIdFactory());
// group and thread pool keys to use they can be configured on
configRef and config, so look there first, and if none then use default
String groupKey = config.getGroupKey();
diff --git
a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
index 783f8f2..54507a2 100644
---
a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
+++
b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
@@ -29,6 +29,7 @@ import org.apache.camel.AsyncProcessor;
import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Exchange;
+import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.MultipleConsumersSupport;
import org.apache.camel.PollingConsumer;
import org.apache.camel.Processor;
@@ -235,7 +236,7 @@ public class SedaEndpoint extends DefaultEndpoint
implements AsyncEndpoint, Brow
}
// create multicast processor
multicastStarted = false;
- consumerMulticastProcessor =
getCamelContext().createMulticast(processors, multicastExecutor, false);
+ consumerMulticastProcessor =
getCamelContext().adapt(ExtendedCamelContext.class).createMulticast(processors,
multicastExecutor, false);
}
}
