Updated Branches: refs/heads/master 3244c1e53 -> 0474e37e2
CAMEL-6998: Fixed the failing itest 'org.apache.camel.itest.cdi.IntegrationTest' on the CI-Server by reverting back the commit c97601f546323279931ea9a0f1ff8df72b3d1b7e. See the ticket for details. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0474e37e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0474e37e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0474e37e Branch: refs/heads/master Commit: 0474e37e23ca24f6fafeeebe68f8627468d55cb4 Parents: 3244c1e Author: Babak Vahdat <bvah...@apache.org> Authored: Wed Nov 27 19:04:34 2013 +0100 Committer: Babak Vahdat <bvah...@apache.org> Committed: Wed Nov 27 19:04:34 2013 +0100 ---------------------------------------------------------------------- .../org/apache/camel/cdi/internal/BeanAdapter.java | 14 +++++--------- .../apache/camel/cdi/internal/CamelContextBean.java | 11 +---------- .../org/apache/camel/cdi/internal/CamelExtension.java | 14 +++++--------- 3 files changed, 11 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/0474e37e/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/BeanAdapter.java ---------------------------------------------------------------------- diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/BeanAdapter.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/BeanAdapter.java index 3e40803..08ee11a 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/BeanAdapter.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/BeanAdapter.java @@ -20,8 +20,6 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; -import javax.enterprise.inject.spi.BeanManager; -import javax.inject.Inject; import org.apache.camel.Consume; import org.apache.camel.EndpointInject; @@ -33,8 +31,6 @@ import org.apache.camel.impl.DefaultCamelBeanPostProcessor; * Contains the bean and the consume methods */ public class BeanAdapter { - @Inject - BeanManager beanManager; private final List<Method> consumeMethods = new ArrayList<Method>(); private final List<Method> produceMethods = new ArrayList<Method>(); @@ -85,7 +81,7 @@ public class BeanAdapter { if (annotation != null) { String contextName = CamelExtension.getCamelContextName(annotation.context(), startup); DefaultCamelBeanPostProcessor postProcessor = camelExtension.getPostProcessor( - contextName, beanManager); + contextName); if (postProcessor != null) { postProcessor.getPostProcessorHelper().consumerInjection(method, reference, beanName); } @@ -96,7 +92,7 @@ public class BeanAdapter { if (annotation != null) { String contextName = CamelExtension.getCamelContextName(annotation.context(), startup); DefaultCamelBeanPostProcessor postProcessor = camelExtension.getPostProcessor( - contextName, beanManager); + contextName); if (postProcessor != null && postProcessor.getPostProcessorHelper().matchContext(contextName)) { postProcessor.setterInjection(method, reference, beanName, annotation.uri(), annotation.ref(), annotation.property()); @@ -108,7 +104,7 @@ public class BeanAdapter { if (annotation != null) { String contextName = CamelExtension.getCamelContextName(annotation.context(), startup); DefaultCamelBeanPostProcessor postProcessor = camelExtension.getPostProcessor( - contextName, beanManager); + contextName); if (postProcessor != null && postProcessor.getPostProcessorHelper().matchContext(contextName)) { postProcessor.setterInjection(method, reference, beanName, annotation.uri(), annotation.ref(), annotation.property()); @@ -121,7 +117,7 @@ public class BeanAdapter { if (annotation != null) { String contextName = CamelExtension.getCamelContextName(annotation.context(), startup); DefaultCamelBeanPostProcessor postProcessor = camelExtension.getPostProcessor( - contextName, beanManager); + contextName); if (postProcessor != null && postProcessor.getPostProcessorHelper().matchContext(contextName)) { postProcessor.injectField(field, annotation.uri(), annotation.ref(), annotation.property(), reference, beanName); @@ -132,7 +128,7 @@ public class BeanAdapter { EndpointInject annotation = field.getAnnotation(EndpointInject.class); String contextName = CamelExtension.getCamelContextName(annotation.context(), startup); DefaultCamelBeanPostProcessor postProcessor = camelExtension.getPostProcessor( - contextName, beanManager); + contextName); if (postProcessor != null && postProcessor.getPostProcessorHelper().matchContext(contextName)) { postProcessor.injectField(field, annotation.uri(), annotation.ref(), annotation.property(), reference, beanName); http://git-wip-us.apache.org/repos/asf/camel/blob/0474e37e/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextBean.java ---------------------------------------------------------------------- diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextBean.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextBean.java index 11acfb2..439b175 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextBean.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextBean.java @@ -21,14 +21,12 @@ import java.lang.reflect.Type; import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import java.util.UUID; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.inject.spi.InjectionPoint; import javax.enterprise.inject.spi.InjectionTarget; -import javax.enterprise.inject.spi.PassivationCapable; import org.apache.camel.CamelContext; import org.apache.camel.cdi.CdiCamelContext; @@ -40,9 +38,7 @@ import org.apache.deltaspike.core.api.literal.DefaultLiteral; * Description of camel context bean. */ @SuppressWarnings("unchecked") -public class CamelContextBean implements Bean<CdiCamelContext>, PassivationCapable { - - private static final UUID UNIQUE_ID = UUID.randomUUID(); +public class CamelContextBean implements Bean<CdiCamelContext> { private final BeanManager beanManager; private final String name; @@ -133,9 +129,4 @@ public class CamelContextBean implements Bean<CdiCamelContext>, PassivationCapab public void configureCamelContext(CdiCamelContext camelContext) { config.configure(camelContext, beanManager); } - - @Override - public String getId() { - return UNIQUE_ID.toString(); - } } http://git-wip-us.apache.org/repos/asf/camel/blob/0474e37e/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java ---------------------------------------------------------------------- diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java index 44a44b5..9ff5f75 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java @@ -224,7 +224,7 @@ public class CamelExtension implements Extension { throws Exception { for (CamelContextBean bean : camelContextBeans) { String name = bean.getCamelContextName(); - CamelContext context = getCamelContext(name, beanManager); + CamelContext context = getCamelContext(name); if (context == null) { throw new IllegalStateException( "CamelContext '" + name + "' has not been injected into the CamelContextMap"); @@ -318,8 +318,8 @@ public class CamelExtension implements Extension { return adapter; } - protected DefaultCamelBeanPostProcessor getPostProcessor(String context, BeanManager beanManager) { - CamelContext camelContext = getCamelContext(context, beanManager); + protected DefaultCamelBeanPostProcessor getPostProcessor(String context) { + CamelContext camelContext = getCamelContext(context); if (camelContext != null) { return new DefaultCamelBeanPostProcessor(camelContext); } else { @@ -327,13 +327,9 @@ public class CamelExtension implements Extension { } } - protected CamelContext getCamelContext(String context, BeanManager beanManager) { + protected CamelContext getCamelContext(String context) { if (camelContextMap == null) { - //camelContextMap = BeanProvider.getContextualReference(CamelContextMap.class); - Set<Bean<?>> beans = beanManager.getBeans(CamelContextMap.class); - Bean<?> bean = beanManager.resolve(beans); - CreationalContext<?> creationalContext = beanManager.createCreationalContext(bean); - camelContextMap = (CamelContextMap) beanManager.getReference(bean, bean.getBeanClass(), creationalContext); + camelContextMap = BeanProvider.getContextualReference(CamelContextMap.class); ObjectHelper.notNull(camelContextMap, "Could not resolve CamelContextMap"); } return camelContextMap.getCamelContext(context);
