Updated Branches: refs/heads/master 5d632903f -> a13d98cc7
Fixed the CS errors of camel-cdi Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f7fe0cc4 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f7fe0cc4 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f7fe0cc4 Branch: refs/heads/master Commit: f7fe0cc4cf7dd4aca66a0eecafb8c2596b5e9a3c Parents: 5d63290 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Thu Nov 14 10:57:47 2013 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Thu Nov 14 10:57:47 2013 +0800 ---------------------------------------------------------------------- .../main/java/org/apache/camel/cdi/internal/BeanAdapter.java | 5 +++-- .../java/org/apache/camel/cdi/internal/CamelContextBean.java | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f7fe0cc4/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 504ac11..3e40803 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 @@ -33,6 +33,9 @@ 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>(); private final List<Method> endpointMethods = new ArrayList<Method>(); @@ -40,8 +43,6 @@ public class BeanAdapter { private final List<Field> endpointFields = new ArrayList<Field>(); private final ContextName startup; - @Inject BeanManager beanManager; - public BeanAdapter(ContextName startup) { this.startup = startup; } http://git-wip-us.apache.org/repos/asf/camel/blob/f7fe0cc4/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 f94d371..11acfb2 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 @@ -42,7 +42,7 @@ import org.apache.deltaspike.core.api.literal.DefaultLiteral; @SuppressWarnings("unchecked") public class CamelContextBean implements Bean<CdiCamelContext>, PassivationCapable { - private static final UUID uniqueId = UUID.randomUUID(); + private static final UUID UNIQUE_ID = UUID.randomUUID(); private final BeanManager beanManager; private final String name; @@ -134,7 +134,8 @@ public class CamelContextBean implements Bean<CdiCamelContext>, PassivationCapab config.configure(camelContext, beanManager); } - @Override public String getId() { - return uniqueId.toString(); + @Override + public String getId() { + return UNIQUE_ID.toString(); } }
