You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by as...@apache.org on 2016/04/25 11:57:46 UTC
camel git commit: CAMEL-9904: Fix CS
Repository: camel
Updated Branches:
refs/heads/camel-2.17.x b340d6990 -> 709b87d69
CAMEL-9904: Fix CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/709b87d6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/709b87d6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/709b87d6
Branch: refs/heads/camel-2.17.x
Commit: 709b87d69aa0cf93216c7279965fd95cce0db34c
Parents: b340d69
Author: Antonin Stefanutti <an...@stefanutti.fr>
Authored: Mon Apr 25 11:57:24 2016 +0200
Committer: Antonin Stefanutti <an...@stefanutti.fr>
Committed: Mon Apr 25 11:57:24 2016 +0200
----------------------------------------------------------------------
.../org/apache/camel/cdi/CdiCamelExtension.java | 13 +++-------
.../java/org/apache/camel/cdi/CdiSpiHelper.java | 25 ++++++++++++++++++++
2 files changed, 28 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/709b87d6/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
index dcb1e07..147df1c 100755
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
@@ -76,6 +76,7 @@ import org.slf4j.LoggerFactory;
import static org.apache.camel.cdi.CdiSpiHelper.getFirstElementOfType;
import static org.apache.camel.cdi.CdiSpiHelper.getRawType;
import static org.apache.camel.cdi.CdiSpiHelper.hasAnnotation;
+import static org.apache.camel.cdi.CdiSpiHelper.hasDefaultContext;
public class CdiCamelExtension implements Extension {
@@ -290,20 +291,12 @@ public class CdiCamelExtension implements Extension {
// Or a bean with Camel annotations?
for (AnnotatedType<?> type : camelBeans) {
for (Annotated field : type.getFields()) {
- if (field.isAnnotationPresent(Consume.class) && field.getAnnotation(Consume.class).context().isEmpty()
- || field.isAnnotationPresent(BeanInject.class) && field.getAnnotation(BeanInject.class).context().isEmpty()
- || field.isAnnotationPresent(EndpointInject.class) && field.getAnnotation(EndpointInject.class).context().isEmpty()
- || field.isAnnotationPresent(Produce.class) && field.getAnnotation(Produce.class).context().isEmpty()
- || field.isAnnotationPresent(PropertyInject.class) && field.getAnnotation(PropertyInject.class).context().isEmpty()) {
+ if (hasDefaultContext(field)) {
return true;
}
}
for (Annotated method : type.getMethods()) {
- if (method.isAnnotationPresent(Consume.class) && method.getAnnotation(Consume.class).context().isEmpty()
- || method.isAnnotationPresent(BeanInject.class) && method.getAnnotation(BeanInject.class).context().isEmpty()
- || method.isAnnotationPresent(EndpointInject.class) && method.getAnnotation(EndpointInject.class).context().isEmpty()
- || method.isAnnotationPresent(Produce.class) && method.getAnnotation(Produce.class).context().isEmpty()
- || method.isAnnotationPresent(PropertyInject.class) && method.getAnnotation(PropertyInject.class).context().isEmpty()) {
+ if (hasDefaultContext(method)) {
return true;
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/709b87d6/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiSpiHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiSpiHelper.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiSpiHelper.java
index 8a7c8c5..927d4df 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiSpiHelper.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiSpiHelper.java
@@ -34,6 +34,11 @@ import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.InjectionPoint;
+import org.apache.camel.BeanInject;
+import org.apache.camel.Consume;
+import org.apache.camel.EndpointInject;
+import org.apache.camel.Produce;
+import org.apache.camel.PropertyInject;
import org.apache.camel.util.ObjectHelper;
@Vetoed
@@ -144,4 +149,24 @@ final class CdiSpiHelper {
qualifiers.add(AnyLiteral.INSTANCE);
return qualifiers;
}
+
+ static boolean hasDefaultContext(Annotated annotated) {
+ if (annotated.isAnnotationPresent(Consume.class) && annotated.getAnnotation(Consume.class).context().isEmpty()) {
+ return true;
+ }
+ if (annotated.isAnnotationPresent(BeanInject.class) && annotated.getAnnotation(BeanInject.class).context().isEmpty()) {
+ return true;
+ }
+ if (annotated.isAnnotationPresent(EndpointInject.class) && annotated.getAnnotation(EndpointInject.class).context().isEmpty()) {
+ return true;
+ }
+ if (annotated.isAnnotationPresent(Produce.class) && annotated.getAnnotation(Produce.class).context().isEmpty()) {
+ return true;
+ }
+ if (annotated.isAnnotationPresent(PropertyInject.class) && annotated.getAnnotation(PropertyInject.class).context().isEmpty()) {
+ return true;
+ }
+
+ return false;
+ }
}
\ No newline at end of file