Author: jstrachan
Date: Wed Sep 5 15:24:46 2012
New Revision: 1381224
URL: http://svn.apache.org/viewvc?rev=1381224&view=rev
Log:
lets go with the more DRY @ContextName("foo") for CAMEL-5566
Modified:
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/ContextName.java
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelExtension.java
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/MyConfig.java
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextA.java
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextB.java
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextC.java
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextD.java
Modified:
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/ContextName.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/ContextName.java?rev=1381224&r1=1381223&r2=1381224&view=diff
==============================================================================
---
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/ContextName.java
(original)
+++
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/ContextName.java
Wed Sep 5 15:24:46 2012
@@ -36,5 +36,5 @@ public @interface ContextName {
* Returns the name of the CamelContext to add the routes to.
* If no value is specified then the default CamelContext is used.
*/
- String contextName() default "";
+ String value() default "";
}
Modified:
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelExtension.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelExtension.java?rev=1381224&r1=1381223&r2=1381224&view=diff
==============================================================================
---
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelExtension.java
(original)
+++
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelExtension.java
Wed Sep 5 15:24:46 2012
@@ -69,11 +69,12 @@ public class CamelExtension implements E
}
/**
- * If no context name is specified then default it to the value from the
{@link org.apache.camel.cdi.ContextName} annotation
+ * If no context name is specified then default it to the value from
+ * the {@link org.apache.camel.cdi.ContextName} annotation
*/
public static String getCamelContextName(String context, ContextName
annotation) {
if (ObjectHelper.isEmpty(context) && annotation != null) {
- return annotation.contextName();
+ return annotation.value();
}
return context;
}
@@ -164,7 +165,7 @@ public class CamelExtension implements E
private void addRouteBuilderBean(Bean<?> bean, ContextName annotation) {
if (annotation != null) {
- String contextName = annotation.contextName();
+ String contextName = annotation.value();
CamelContextConfig config = camelContextConfigMap.get(contextName);
if (config == null) {
config = new CamelContextConfig();
Modified:
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/MyConfig.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/MyConfig.java?rev=1381224&r1=1381223&r2=1381224&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/MyConfig.java
(original)
+++
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/MyConfig.java
Wed Sep 5 15:24:46 2012
@@ -28,13 +28,13 @@ import org.apache.camel.cdi.ContextName;
public class MyConfig {
@Produces
- @ContextName(contextName = "contextE")
+ @ContextName("contextE")
public RouteBuilder createRouteA() {
return new MyRouteBuilder("seda:E.a", "mock:E.b");
}
@Produces
- @ContextName(contextName = "contextE")
+ @ContextName("contextE")
public RouteBuilder createRouteB() {
return new MyRouteBuilder("seda:E.c", "mock:E.d");
}
Modified:
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextA.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextA.java?rev=1381224&r1=1381223&r2=1381224&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextA.java
(original)
+++
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextA.java
Wed Sep 5 15:24:46 2012
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
/**
* Uses contextA with explicit context names on all Camel annotations
*/
-@ContextName(contextName = "contextA")
+@ContextName("contextA")
public class RoutesContextA extends RouteBuilder {
private static final transient Logger LOG =
LoggerFactory.getLogger(RoutesContextA.class);
Modified:
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextB.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextB.java?rev=1381224&r1=1381223&r2=1381224&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextB.java
(original)
+++
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextB.java
Wed Sep 5 15:24:46 2012
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
/**
* Uses contextB with explicit context names on all Camel annotations
*/
-@ContextName(contextName = "contextB")
+@ContextName("contextB")
public class RoutesContextB extends RouteBuilder {
private static final transient Logger LOG =
LoggerFactory.getLogger(RoutesContextB.class);
Modified:
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextC.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextC.java?rev=1381224&r1=1381223&r2=1381224&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextC.java
(original)
+++
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextC.java
Wed Sep 5 15:24:46 2012
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
* Uses contextC implicitly using that context for all injection points without
* having to mention them on each camel annotation
*/
-@ContextName(contextName = "contextC")
+@ContextName("contextC")
public class RoutesContextC extends RouteBuilder {
private static final transient Logger LOG =
LoggerFactory.getLogger(RoutesContextC.class);
Modified:
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextD.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextD.java?rev=1381224&r1=1381223&r2=1381224&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextD.java
(original)
+++
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextD.java
Wed Sep 5 15:24:46 2012
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
* Uses contextD implicitly using that context for all injection points without
* having to mention them on each camel annotation
*/
-@ContextName(contextName = "contextD")
+@ContextName("contextD")
public class RoutesContextD extends RouteBuilder {
private static final transient Logger LOG =
LoggerFactory.getLogger(RoutesContextD.class);
