svn commit: r1374331 - in /camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl: EndpointInjector.java ProduceInjector.java

[davsclaus]

Author: davsclaus
Date: Fri Aug 17 15:50:49 2012
New Revision: 1374331

URL: http://svn.apache.org/viewvc?rev=1374331&view=rev
Log:
CAMEL-5516: Annotations such as @Consume and @Produce now supports a new 
propert option to read a property on the bean to get the endpoint. They also 
has a convention over configuration in terms of defaulting property name to 
look for if not explicit configured.

Modified:
    
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/EndpointInjector.java
    
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ProduceInjector.java

Modified: 
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/EndpointInjector.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/EndpointInjector.java?rev=1374331&r1=1374330&r2=1374331&view=diff
==============================================================================
--- 
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/EndpointInjector.java
 (original)
+++ 
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/EndpointInjector.java
 Fri Aug 17 15:50:49 2012
@@ -46,8 +46,9 @@ public class EndpointInjector extends Ca
         String injectionPointName = field.getName();
         String uri = inject.uri();
         String endpointRef = inject.ref();
+        String property = inject.property();
 
-        return getInjectionValue(type, uri, endpointRef, injectionPointName, 
null, null);
+        return getInjectionValue(type, uri, endpointRef, property, 
injectionPointName, null, null);
     }
 
     public Object provide(EndpointInject inject, TypeLiteral<?> typeLiteral, 
Method method, Class<?> aClass, int index) {
@@ -56,8 +57,9 @@ public class EndpointInjector extends Ca
         String injectionPointName = ObjectHelper.getPropertyName(method);
         String endpointRef = inject.ref();
         String uri = inject.uri();
+        String property = inject.property();
 
-        return getInjectionValue(type, uri, endpointRef, injectionPointName, 
null, null);
+        return getInjectionValue(type, uri, endpointRef, property, 
injectionPointName, null, null);
     }
 
     public boolean isNullParameterAllowed(EndpointInject endpointInject, 
Method method, Class<?> aClass, int index) {

Modified: 
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ProduceInjector.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ProduceInjector.java?rev=1374331&r1=1374330&r2=1374331&view=diff
==============================================================================
--- 
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ProduceInjector.java
 (original)
+++ 
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ProduceInjector.java
 Fri Aug 17 15:50:49 2012
@@ -49,8 +49,9 @@ public class ProduceInjector extends Cam
         String injectionPointName = field.getName();
         String endpointRef = inject.ref();
         String uri = inject.uri();
+        String property = inject.property();
 
-        return getInjectionValue(type, uri, endpointRef, injectionPointName, 
null, null);
+        return getInjectionValue(type, uri, endpointRef, property, 
injectionPointName, null, null);
     }
 
     public Object provide(Produce inject, TypeLiteral<?> typeLiteral, Method 
method, Class<?> aClass, int index) {
@@ -59,8 +60,9 @@ public class ProduceInjector extends Cam
         String injectionPointName = ObjectHelper.getPropertyName(method);
         String endpointRef = inject.ref();
         String uri = inject.uri();
+        String property = inject.property();
 
-        return getInjectionValue(type, uri, endpointRef, injectionPointName, 
null, null);
+        return getInjectionValue(type, uri, endpointRef, property, 
injectionPointName, null, null);
     }
 
 }