Remove the @mock qualifier and rely on the @uri only

astefanutti · Aug 27, 2014 · 87e0bf6 · 87e0bf6
1 parent 99dd927
commit 87e0bf6
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 67 deletions.
diff --git a/pom.xml b/pom.xml
@@ -313,13 +313,6 @@
                 <type>pom</type>
             </dependency>
 
-            <dependency>
-                <groupId>org.jboss.weld</groupId>
-                <artifactId>weld-core-impl</artifactId>
-                <version>${weld.version}</version>
-                <scope>test</scope>
-            </dependency>
-
             <!-- OpenWebBeans -->
 
             <dependency>

diff --git a/src/main/java/io/astefanutti/camel/cdi/CdiCamelFactory.java b/src/main/java/io/astefanutti/camel/cdi/CdiCamelFactory.java
@@ -16,6 +16,7 @@
 package io.astefanutti.camel.cdi;
 
 import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.Typed;
 import javax.enterprise.inject.spi.InjectionPoint;
 
 import org.apache.camel.CamelContext;
@@ -32,17 +33,25 @@
 class CdiCamelFactory {
 
     @Produces
-    private static TypeConverter createTypeConverter(CamelContext camelContext) {
+    private static TypeConverter typeConverter(CamelContext camelContext) {
         return camelContext.getTypeConverter();
     }
 
-    @Mock
     @Produces
-    private static MockEndpoint createMockEndpoint(InjectionPoint point, CamelContext camelContext) {
-        String uri = getMandatoryFirstElementOfType(point.getQualifiers(), Mock.class).value();
-        if (ObjectHelper.isEmpty(uri))
-            uri = "mock:" + point.getMember().getName();
+    private static MockEndpoint mockEndpointFromMember(InjectionPoint point, CamelContext camelContext) {
+        String uri = "mock:" + point.getMember().getName();
+        MockEndpoint endpoint = camelContext.getEndpoint(uri, MockEndpoint.class);
+        if (endpoint == null)
+            throw new NoSuchEndpointException(uri);
+
+        return endpoint;
+    }
 
+    @Uri("")
+    @Produces
+    @Typed(MockEndpoint.class)
+    private static MockEndpoint mockEndpointFromUri(InjectionPoint point, CamelContext camelContext) {
+        String uri = getFirstElementOfType(point.getQualifiers(), Uri.class).value();
         MockEndpoint endpoint = camelContext.getEndpoint(uri, MockEndpoint.class);
         if (endpoint == null)
             throw new NoSuchEndpointException(uri);
@@ -52,31 +61,26 @@ private static MockEndpoint createMockEndpoint(InjectionPoint point, CamelContex
 
     @Uri("")
     @Produces
-    private static Endpoint createEndpoint(InjectionPoint point, CamelContext camelContext) {
-        String uri = getMandatoryFirstElementOfType(point.getQualifiers(), Uri.class).value();
+    private static Endpoint endpoint(InjectionPoint point, CamelContext camelContext) {
+        String uri = getFirstElementOfType(point.getQualifiers(), Uri.class).value();
         return CamelContextHelper.getMandatoryEndpoint(camelContext, uri);
     }
 
     @Uri("")
     @Produces
-    private static ProducerTemplate createProducerTemplate(InjectionPoint point, CamelContext camelContext) {
-        Uri uri = getMandatoryFirstElementOfType(point.getQualifiers(), Uri.class);
+    private static ProducerTemplate producerTemplate(InjectionPoint point, CamelContext camelContext) {
+        Uri uri = getFirstElementOfType(point.getQualifiers(), Uri.class);
         ProducerTemplate producerTemplate = camelContext.createProducerTemplate();
         Endpoint endpoint = CamelContextHelper.getMandatoryEndpoint(camelContext, uri.value());
         producerTemplate.setDefaultEndpoint(endpoint);
         return producerTemplate;
     }
 
-    private static <E, T extends E> T getMandatoryFirstElementOfType(Collection<E> collection, Class<T> type) {
+    private static <E, T extends E> T getFirstElementOfType(Collection<E> collection, Class<T> type) {
         for (E item : collection)
             if ((item != null) && type.isAssignableFrom(item.getClass()))
-                return uncheckedCast(item);
+                return ObjectHelper.cast(type, item);
 
         throw new IllegalArgumentException("No element of type [" + type.getName() + "] in [" + collection + "]");
     }
-
-    @SuppressWarnings("unchecked")
-    private static <T> T uncheckedCast(Object object) {
-        return (T) object;
-    }
 }
diff --git a/src/main/java/io/astefanutti/camel/cdi/Mock.java b/src/main/java/io/astefanutti/camel/cdi/Mock.java
diff --git a/src/test/java/io/astefanutti/camel/cdi/InjectedEndpointRouteTest.java b/src/test/java/io/astefanutti/camel/cdi/InjectedEndpointRouteTest.java
@@ -43,7 +43,6 @@ public class InjectedEndpointRouteTest {
     private ProducerTemplate inbound;
 
     @Inject
-    @Mock("mock:outbound")
     private MockEndpoint outbound;
 
     @Inject

diff --git a/...stefanutti/camel/cdi/SimpleRouteTest.java → ...nutti/camel/cdi/UriEndpointRouteTest.java b/...stefanutti/camel/cdi/SimpleRouteTest.java → ...nutti/camel/cdi/UriEndpointRouteTest.java
@@ -15,7 +15,7 @@
  */
 package io.astefanutti.camel.cdi;
 
-import io.astefanutti.camel.cdi.bean.SimpleRoute;
+import io.astefanutti.camel.cdi.bean.UriEndpointRoute;
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.component.mock.MockEndpoint;
@@ -36,14 +36,14 @@
 import static org.apache.camel.component.mock.MockEndpoint.assertIsSatisfied;
 
 @RunWith(Arquillian.class)
-public class SimpleRouteTest {
+public class UriEndpointRouteTest {
 
     @Inject
     @Uri("direct:inbound")
     private ProducerTemplate inbound;
 
     @Inject
-    @Mock("mock:outbound")
+    @Uri("mock:outbound")
     private MockEndpoint outbound;
 
     @Inject
@@ -55,7 +55,7 @@ public static Archive<?> deployment() {
             // Camel CDI
             .addPackages(false, Filters.exclude(".*Test.*"), CdiCamelExtension.class.getPackage())
             // Test class
-            .addClass(SimpleRoute.class)
+            .addClass(UriEndpointRoute.class)
             // Bean archive deployment descriptor
             .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
     }

diff --git a/...tefanutti/camel/cdi/bean/SimpleRoute.java → ...utti/camel/cdi/bean/UriEndpointRoute.java b/...tefanutti/camel/cdi/bean/SimpleRoute.java → ...utti/camel/cdi/bean/UriEndpointRoute.java
@@ -18,7 +18,7 @@
 
 import org.apache.camel.builder.RouteBuilder;
 
-public class SimpleRoute extends RouteBuilder {
+public class UriEndpointRoute extends RouteBuilder {
 
     @Override
     public void configure() {