This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new d6e5f3f  (feat) CAMEL-13309: Use value attribute instead of uri on 
POJO annotations for produce/consume endpoints.
d6e5f3f is described below

commit d6e5f3ff82c226c56a40033d1fb692fd651050d4
Author: Claus Ibsen <[email protected]>
AuthorDate: Mon Mar 11 11:04:48 2019 +0100

    (feat) CAMEL-13309: Use value attribute instead of uri on POJO annotations 
for produce/consume endpoints.
---
 .../blueprint/handler/CamelNamespaceHandler.java   | 12 ++++---
 .../camel/cdi/CdiCamelBeanPostProcessor.java       |  6 ++--
 .../apache/camel/cdi/bean/ConsumeMethodBean.java   |  2 +-
 .../camel/cdi/bean/RecipientListMethodBean.java    |  2 +-
 .../src/main/java/org/apache/camel/Consume.java    |  8 +++++
 .../main/java/org/apache/camel/EndpointInject.java |  8 +++++
 .../src/main/java/org/apache/camel/Produce.java    |  8 +++++
 .../camel/impl/CamelPostProcessorHelper.java       |  3 +-
 .../camel/impl/DefaultCamelBeanPostProcessor.java  | 12 ++++---
 ...melPostProcessorHelperConsumePredicateTest.java |  4 +--
 ...ostProcessorHelperSedaConsumePredicateTest.java |  4 +--
 .../camel/impl/CamelPostProcessorHelperTest.java   | 40 +++++++++++-----------
 .../CamelProduceInterfaceEventNotifierTest.java    |  2 +-
 .../org/apache/camel/impl/DefaultInjectorTest.java |  2 +-
 .../src/test/java/org/apache/camel/impl/Echo.java  |  2 +-
 .../impl/PojoProduceInterceptEndpointTest.java     |  2 +-
 .../PojoProduceProxyInterceptEndpointTest.java     |  2 +-
 .../pojo_messaging/DistributeRecordsBean.java      |  2 +-
 .../pojo_messaging/SendFileRecordsToQueueBean.java |  4 +--
 .../src/main/java/sample/camel/NumberPojo.java     |  6 ++--
 20 files changed, 83 insertions(+), 48 deletions(-)

diff --git 
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
 
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
index 669099b..fa99b85 100644
--- 
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
+++ 
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
@@ -851,12 +851,14 @@ public class CamelNamespaceHandler implements 
NamespaceHandler {
 
                     EndpointInject endpointInject = 
field.getAnnotation(EndpointInject.class);
                     if (endpointInject != null && 
matchContext(endpointInject.context())) {
-                        injectField(field, endpointInject.uri(), 
endpointInject.property(), bean, beanName);
+                        String uri = endpointInject.value().isEmpty() ? 
endpointInject.uri() : endpointInject.value();
+                        injectField(field, uri, endpointInject.property(), 
bean, beanName);
                     }
 
                     Produce produce = field.getAnnotation(Produce.class);
                     if (produce != null && matchContext(produce.context())) {
-                        injectField(field, produce.uri(), produce.property(), 
bean, beanName);
+                        String uri = produce.value().isEmpty() ? produce.uri() 
: produce.value();
+                        injectField(field, uri, produce.property(), bean, 
beanName);
                     }
                 }
                 clazz = clazz.getSuperclass();
@@ -918,12 +920,14 @@ public class CamelNamespaceHandler implements 
NamespaceHandler {
 
             EndpointInject endpointInject = 
method.getAnnotation(EndpointInject.class);
             if (endpointInject != null && 
matchContext(endpointInject.context())) {
-                setterInjection(method, bean, beanName, endpointInject.uri(), 
endpointInject.property());
+                String uri = endpointInject.value().isEmpty() ? 
endpointInject.uri() : endpointInject.value();
+                setterInjection(method, bean, beanName, uri, 
endpointInject.property());
             }
 
             Produce produce = method.getAnnotation(Produce.class);
             if (produce != null && matchContext(produce.context())) {
-                setterInjection(method, bean, beanName, produce.uri(), 
produce.property());
+                String uri = produce.value().isEmpty() ? produce.uri() : 
produce.value();
+                setterInjection(method, bean, beanName, uri, 
produce.property());
             }
         }
 
diff --git 
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java
 
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java
index 8aabdb6..01d50cb 100644
--- 
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java
+++ 
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java
@@ -72,7 +72,8 @@ final class CdiCamelBeanPostProcessor extends 
DefaultCamelBeanPostProcessor {
             EndpointInject endpointInject = 
field.getAnnotation(EndpointInject.class);
             if (endpointInject != null) {
                 try {
-                    injectField(field, endpointInject.uri(), 
endpointInject.property(), endpointInject.context(), bean, beanName);
+                    String uri = endpointInject.value().isEmpty() ? 
endpointInject.uri() : endpointInject.value();
+                    injectField(field, uri, endpointInject.property(), 
endpointInject.context(), bean, beanName);
                 } catch (Exception cause) {
                     throw new InjectionException("Injection of [" + 
endpointInject + "] for field [" + field + "] failed!", cause);
                 }
@@ -81,7 +82,8 @@ final class CdiCamelBeanPostProcessor extends 
DefaultCamelBeanPostProcessor {
             Produce produce = field.getAnnotation(Produce.class);
             if (produce != null) {
                 try {
-                    injectField(field, produce.uri(), produce.property(), 
produce.context(), bean, beanName);
+                    String uri = produce.value().isEmpty() ? produce.uri() : 
produce.value();
+                    injectField(field, uri, produce.property(), 
produce.context(), bean, beanName);
                 } catch (Exception cause) {
                     throw new InjectionException("Injection of [" + produce + 
"] for field [" + field + "] failed!", cause);
                 }
diff --git 
a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ConsumeMethodBean.java
 
b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ConsumeMethodBean.java
index 728696b..6136a9a 100644
--- 
a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ConsumeMethodBean.java
+++ 
b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ConsumeMethodBean.java
@@ -31,7 +31,7 @@ public class ConsumeMethodBean {
     @Uri("mock:outbound")
     private ProducerTemplate producer;
 
-    @Consume(uri = "seda:inbound")
+    @Consume("seda:inbound")
     public void consume(@Body String body) {
         producer.sendBody(body);
     }
diff --git 
a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/RecipientListMethodBean.java
 
b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/RecipientListMethodBean.java
index 3e54e6a..f1bc70f 100644
--- 
a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/RecipientListMethodBean.java
+++ 
b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/RecipientListMethodBean.java
@@ -27,7 +27,7 @@ import org.apache.camel.RecipientList;
 public class RecipientListMethodBean {
 
     @RecipientList
-    @Consume(uri = "direct:inbound")
+    @Consume("direct:inbound")
     public List<String> route() {
         return Arrays.asList("mock:outbound1", "mock:outbound2");
     }
diff --git a/core/camel-api/src/main/java/org/apache/camel/Consume.java 
b/core/camel-api/src/main/java/org/apache/camel/Consume.java
index 2b166d6..4873f20 100644
--- a/core/camel-api/src/main/java/org/apache/camel/Consume.java
+++ b/core/camel-api/src/main/java/org/apache/camel/Consume.java
@@ -39,6 +39,14 @@ public @interface Consume {
     /**
      * The uri to consume from
      */
+    String value() default "";
+
+    /**
+     * The uri to consume from
+     *
+     * @deprecated use value instead
+     */
+    @Deprecated
     String uri() default "";
 
     /**
diff --git a/core/camel-api/src/main/java/org/apache/camel/EndpointInject.java 
b/core/camel-api/src/main/java/org/apache/camel/EndpointInject.java
index db31fc8..c24551e 100644
--- a/core/camel-api/src/main/java/org/apache/camel/EndpointInject.java
+++ b/core/camel-api/src/main/java/org/apache/camel/EndpointInject.java
@@ -40,6 +40,14 @@ public @interface EndpointInject {
     /**
      * The uri of the endpoint
      */
+    String value() default "";
+
+    /**
+     * The uri of the endpoint
+     *
+     * @deprecated use value instead
+     */
+    @Deprecated
     String uri() default "";
 
     /**
diff --git a/core/camel-api/src/main/java/org/apache/camel/Produce.java 
b/core/camel-api/src/main/java/org/apache/camel/Produce.java
index 3cee50c..d41c595 100644
--- a/core/camel-api/src/main/java/org/apache/camel/Produce.java
+++ b/core/camel-api/src/main/java/org/apache/camel/Produce.java
@@ -41,6 +41,14 @@ public @interface Produce {
     /**
      * The uri to produce to
      */
+    String value() default "";
+
+    /**
+     * The uri to produce to
+     *
+     * @deprecated use value instead
+     */
+    @Deprecated
     String uri() default "";
 
     /**
diff --git 
a/core/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java
 
b/core/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java
index 4434f4e..021dfe1 100644
--- 
a/core/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java
+++ 
b/core/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java
@@ -94,7 +94,8 @@ public class CamelPostProcessorHelper implements 
CamelContextAware {
         Consume consume = method.getAnnotation(Consume.class);
         if (consume != null && matchContext(consume.context())) {
             LOG.debug("Creating a consumer for: {}", consume);
-            subscribeMethod(method, bean, beanName, consume.uri(), 
consume.property(), consume.predicate());
+            String uri = consume.value().isEmpty() ? consume.uri() : 
consume.value();
+            subscribeMethod(method, bean, beanName, uri, consume.property(), 
consume.predicate());
         }
     }
 
diff --git 
a/core/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelBeanPostProcessor.java
 
b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelBeanPostProcessor.java
index 6d49db2..386b571 100644
--- 
a/core/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelBeanPostProcessor.java
+++ 
b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelBeanPostProcessor.java
@@ -170,12 +170,14 @@ public class DefaultCamelBeanPostProcessor implements 
CamelBeanPostProcessor {
 
                 EndpointInject endpointInject = 
field.getAnnotation(EndpointInject.class);
                 if (endpointInject != null && 
getPostProcessorHelper().matchContext(endpointInject.context())) {
-                    injectField(field, endpointInject.uri(), 
endpointInject.property(), bean, beanName);
+                    String uri = endpointInject.value().isEmpty() ? 
endpointInject.uri() : endpointInject.value();
+                    injectField(field, uri, endpointInject.property(), bean, 
beanName);
                 }
 
                 Produce produce = field.getAnnotation(Produce.class);
                 if (produce != null && 
getPostProcessorHelper().matchContext(produce.context())) {
-                    injectField(field, produce.uri(), produce.property(), 
bean, beanName, produce.binding());
+                    String uri = produce.value().isEmpty() ? produce.uri() : 
produce.value();
+                    injectField(field, uri, produce.property(), bean, 
beanName, produce.binding());
                 }
 
                 BindToRegistry bind = 
field.getAnnotation(BindToRegistry.class);
@@ -251,12 +253,14 @@ public class DefaultCamelBeanPostProcessor implements 
CamelBeanPostProcessor {
 
         EndpointInject endpointInject = 
method.getAnnotation(EndpointInject.class);
         if (endpointInject != null && 
getPostProcessorHelper().matchContext(endpointInject.context())) {
-            setterInjection(method, bean, beanName, endpointInject.uri(), 
endpointInject.property());
+            String uri = endpointInject.value().isEmpty() ? 
endpointInject.uri() : endpointInject.value();
+            setterInjection(method, bean, beanName, uri, 
endpointInject.property());
         }
 
         Produce produce = method.getAnnotation(Produce.class);
         if (produce != null && 
getPostProcessorHelper().matchContext(produce.context())) {
-            setterInjection(method, bean, beanName, produce.uri(), 
produce.property());
+            String uri = produce.value().isEmpty() ? produce.uri() : 
produce.value();
+            setterInjection(method, bean, beanName, uri, produce.property());
         }
 
         BindToRegistry bind = method.getAnnotation(BindToRegistry.class);
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/impl/CamelPostProcessorHelperConsumePredicateTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/impl/CamelPostProcessorHelperConsumePredicateTest.java
index d031221..067adb6 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/impl/CamelPostProcessorHelperConsumePredicateTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/impl/CamelPostProcessorHelperConsumePredicateTest.java
@@ -71,12 +71,12 @@ public class CamelPostProcessorHelperConsumePredicateTest 
extends ContextTestSup
 
     public class MyConsumeBean {
 
-        @Consume(uri = "direct:foo", predicate = "${body} >= 0 && ${body} < 
100")
+        @Consume(value = "direct:foo", predicate = "${body} >= 0 && ${body} < 
100")
         public void low(String body) {
             template.sendBody("mock:low", body);
         }
 
-        @Consume(uri = "direct:foo", predicate = "${body} >= 100")
+        @Consume(value = "direct:foo", predicate = "${body} >= 100")
         public void high(String body) {
             template.sendBody("mock:high", body);
         }
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/impl/CamelPostProcessorHelperSedaConsumePredicateTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/impl/CamelPostProcessorHelperSedaConsumePredicateTest.java
index 30b59c8..08968c9 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/impl/CamelPostProcessorHelperSedaConsumePredicateTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/impl/CamelPostProcessorHelperSedaConsumePredicateTest.java
@@ -71,12 +71,12 @@ public class 
CamelPostProcessorHelperSedaConsumePredicateTest extends ContextTes
 
     public class MyConsumeBean {
 
-        @Consume(uri = "seda:foo", predicate = "${body} >= 0 && ${body} < 100")
+        @Consume(value = "seda:foo", predicate = "${body} >= 0 && ${body} < 
100")
         public void low(String body) {
             template.sendBody("mock:low", body);
         }
 
-        @Consume(uri = "seda:foo", predicate = "${body} >= 100")
+        @Consume(value = "seda:foo", predicate = "${body} >= 100")
         public void high(String body) {
             template.sendBody("mock:high", body);
         }
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/impl/CamelPostProcessorHelperTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/impl/CamelPostProcessorHelperTest.java
index c2ab2e3..a712d28 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/impl/CamelPostProcessorHelperTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/impl/CamelPostProcessorHelperTest.java
@@ -171,7 +171,7 @@ public class CamelPostProcessorHelperTest extends 
ContextTestSupport {
         Class<?>[] parameterTypes = method.getParameterTypes();
         for (Class<?> type : parameterTypes) {
             String propertyName = 
org.apache.camel.util.ObjectHelper.getPropertyName(method);
-            Object value = helper.getInjectionValue(type, 
endpointInject.uri(), endpointInject.property(), propertyName, bean, "foo");
+            Object value = helper.getInjectionValue(type, 
endpointInject.value(), endpointInject.property(), propertyName, bean, "foo");
             ObjectHelper.invokeMethod(method, bean, value);
         }
 
@@ -195,7 +195,7 @@ public class CamelPostProcessorHelperTest extends 
ContextTestSupport {
         Class<?>[] parameterTypes = method.getParameterTypes();
         for (Class<?> type : parameterTypes) {
             String propertyName = 
org.apache.camel.util.ObjectHelper.getPropertyName(method);
-            Object value = helper.getInjectionValue(type, 
endpointInject.uri(), endpointInject.property(), propertyName, bean, "foo");
+            Object value = helper.getInjectionValue(type, 
endpointInject.value(), endpointInject.property(), propertyName, bean, "foo");
             ObjectHelper.invokeMethod(method, bean, value);
         }
 
@@ -223,7 +223,7 @@ public class CamelPostProcessorHelperTest extends 
ContextTestSupport {
         Class<?>[] parameterTypes = method.getParameterTypes();
         for (Class<?> type : parameterTypes) {
             String propertyName = 
org.apache.camel.util.ObjectHelper.getPropertyName(method);
-            Object value = helper.getInjectionValue(type, 
endpointInject.uri(), endpointInject.property(), propertyName, bean, "foo");
+            Object value = helper.getInjectionValue(type, 
endpointInject.value(), endpointInject.property(), propertyName, bean, "foo");
             ObjectHelper.invokeMethod(method, bean, value);
         }
 
@@ -250,7 +250,7 @@ public class CamelPostProcessorHelperTest extends 
ContextTestSupport {
         EndpointInject endpointInject = 
field.getAnnotation(EndpointInject.class);
         Class<?> type = field.getType();
         String propertyName = "producer";
-        Object value = helper.getInjectionValue(type, endpointInject.uri(), 
endpointInject.property(), propertyName, bean, "foo");
+        Object value = helper.getInjectionValue(type, endpointInject.value(), 
endpointInject.property(), propertyName, bean, "foo");
 
         field.set(bean, value);
 
@@ -275,7 +275,7 @@ public class CamelPostProcessorHelperTest extends 
ContextTestSupport {
         EndpointInject endpointInject = 
field.getAnnotation(EndpointInject.class);
         Class<?> type = field.getType();
         String propertyName = "producer";
-        Object value = helper.getInjectionValue(type, endpointInject.uri(), 
endpointInject.property(), propertyName, bean, "foo");
+        Object value = helper.getInjectionValue(type, endpointInject.value(), 
endpointInject.property(), propertyName, bean, "foo");
 
         field.set(bean, value);
 
@@ -300,7 +300,7 @@ public class CamelPostProcessorHelperTest extends 
ContextTestSupport {
         EndpointInject endpointInject = 
field.getAnnotation(EndpointInject.class);
         Class<?> type = field.getType();
         String propertyName = "producer";
-        Object value = helper.getInjectionValue(type, endpointInject.uri(), 
endpointInject.property(), propertyName, bean, "foo");
+        Object value = helper.getInjectionValue(type, endpointInject.value(), 
endpointInject.property(), propertyName, bean, "foo");
 
         field.set(bean, value);
 
@@ -327,7 +327,7 @@ public class CamelPostProcessorHelperTest extends 
ContextTestSupport {
         String propertyName = "producer";
 
         try {
-            helper.getInjectionValue(type, endpointInject.uri(), 
endpointInject.property(), propertyName, bean, "foo");
+            helper.getInjectionValue(type, endpointInject.value(), 
endpointInject.property(), propertyName, bean, "foo");
             fail("Should throw exception");
         } catch (ResolveEndpointFailedException e) {
             assertEquals("ref://unknown", e.getUri());
@@ -348,7 +348,7 @@ public class CamelPostProcessorHelperTest extends 
ContextTestSupport {
         String propertyName = "producer";
 
         try {
-            helper.getInjectionValue(type, endpointInject.uri(), 
endpointInject.property(), propertyName, bean, "foo");
+            helper.getInjectionValue(type, endpointInject.value(), 
endpointInject.property(), propertyName, bean, "foo");
             fail("Should throw exception");
         } catch (ResolveEndpointFailedException e) {
             assertEquals("Failed to resolve endpoint: xxx://foo due to: No 
component found with scheme: xxx", e.getMessage());
@@ -477,7 +477,7 @@ public class CamelPostProcessorHelperTest extends 
ContextTestSupport {
         EndpointInject inject = field.getAnnotation(EndpointInject.class);
         String propertyName = "fluent";
         Class<?> classType = field.getType();
-        Object value = helper.getInjectionValue(classType, inject.uri(), 
inject.property(), propertyName, myBean, "bla");
+        Object value = helper.getInjectionValue(classType, inject.value(), 
inject.property(), propertyName, myBean, "bla");
 
         field.set(myBean, value);
 
@@ -504,7 +504,7 @@ public class CamelPostProcessorHelperTest extends 
ContextTestSupport {
 
     public class MyConsumeBean {
 
-        @Consume(uri = "seda:foo")
+        @Consume("seda:foo")
         public void consumeSomething(String body) {
             assertEquals("Hello World", body);
             template.sendBody("mock:result", body);
@@ -513,7 +513,7 @@ public class CamelPostProcessorHelperTest extends 
ContextTestSupport {
 
     public class MyConsumeAndSynchronizationBean {
 
-        @Consume(uri = "seda:foo")
+        @Consume("seda:foo")
         public void consumeSomething(String body, Exchange exchange) {
             exchange.addOnCompletion(mySynchronization);
             assertEquals("Hello World", body);
@@ -523,7 +523,7 @@ public class CamelPostProcessorHelperTest extends 
ContextTestSupport {
 
     public class MyProduceAndSynchronizationBean {
 
-        @Produce(uri = "mock:result")
+        @Produce("mock:result")
         Producer producer;
 
         public void produceSomething(String body) throws Exception {
@@ -558,7 +558,7 @@ public class CamelPostProcessorHelperTest extends 
ContextTestSupport {
 
         private ProducerTemplate producer;
 
-        @EndpointInject(uri = "mock:result")
+        @EndpointInject("mock:result")
         public void setProducer(ProducerTemplate producer) {
             this.producer = producer;
         }
@@ -576,7 +576,7 @@ public class CamelPostProcessorHelperTest extends 
ContextTestSupport {
 
         private Producer producer;
 
-        @EndpointInject(uri = "mock:result")
+        @EndpointInject("mock:result")
         public void setProducer(Producer producer) {
             this.producer = producer;
         }
@@ -595,7 +595,7 @@ public class CamelPostProcessorHelperTest extends 
ContextTestSupport {
 
         private PollingConsumer consumer;
 
-        @EndpointInject(uri = "seda:foo")
+        @EndpointInject("seda:foo")
         public void setConsumer(PollingConsumer consumer) {
             this.consumer = consumer;
         }
@@ -612,7 +612,7 @@ public class CamelPostProcessorHelperTest extends 
ContextTestSupport {
 
     public class MyEndpointInjectProducerTemplate {
 
-        @EndpointInject(uri = "mock:result")
+        @EndpointInject("mock:result")
         public ProducerTemplate producer;
 
         public void send(Exchange exchange) throws Exception {
@@ -623,7 +623,7 @@ public class CamelPostProcessorHelperTest extends 
ContextTestSupport {
 
     public class MyEndpointInjectFluentProducerTemplate {
 
-        @EndpointInject(uri = "mock:result")
+        @EndpointInject("mock:result")
         public FluentProducerTemplate producer;
 
         public void send(Exchange exchange) throws Exception {
@@ -645,7 +645,7 @@ public class CamelPostProcessorHelperTest extends 
ContextTestSupport {
 
     public class MyEndpointInjectProducerTemplateNameUnknown {
 
-        @EndpointInject(uri = "ref:unknown")
+        @EndpointInject("ref:unknown")
         public ProducerTemplate producer;
 
         public void send(Exchange exchange) throws Exception {
@@ -656,7 +656,7 @@ public class CamelPostProcessorHelperTest extends 
ContextTestSupport {
 
     public class MyEndpointInjectProducerTemplateUrlUnknown {
 
-        @EndpointInject(uri = "xxx:foo")
+        @EndpointInject("xxx:foo")
         public ProducerTemplate producer;
 
         public void send(Exchange exchange) throws Exception {
@@ -667,7 +667,7 @@ public class CamelPostProcessorHelperTest extends 
ContextTestSupport {
 
     public class MyPrivateConsumeBean {
 
-        @Consume(uri = "seda:foo")
+        @Consume("seda:foo")
         private void consumeSomethingPrivate(String body) {
             assertEquals("Hello World", body);
             template.sendBody("mock:result", body);
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/impl/CamelProduceInterfaceEventNotifierTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/impl/CamelProduceInterfaceEventNotifierTest.java
index 4c27500..c505749 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/impl/CamelProduceInterfaceEventNotifierTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/impl/CamelProduceInterfaceEventNotifierTest.java
@@ -86,7 +86,7 @@ public class CamelProduceInterfaceEventNotifierTest extends 
ContextTestSupport {
 
     class MySender {
 
-        @Produce(uri = "mock:result")
+        @Produce("mock:result")
         FooService hello;
 
     }
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultInjectorTest.java 
b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultInjectorTest.java
index c8344bc..167a665 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultInjectorTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultInjectorTest.java
@@ -42,7 +42,7 @@ public class DefaultInjectorTest extends Assert {
 
     public static class MyBean {
 
-        @Produce(uri = "language:simple:${body}${body}")
+        @Produce("language:simple:${body}${body}")
         ProducerTemplate template;
 
         public Object doSomething(String body) {
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/Echo.java 
b/core/camel-core/src/test/java/org/apache/camel/impl/Echo.java
index e55aa62..f0dcd32 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/Echo.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/Echo.java
@@ -23,7 +23,7 @@ import org.apache.camel.Produce;
  */
 public interface Echo {
 
-    @Produce(uri = "direct:hello")
+    @Produce("direct:hello")
     String hello(String name);
 
 }
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/impl/PojoProduceInterceptEndpointTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/impl/PojoProduceInterceptEndpointTest.java
index 4482526..0c4860e 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/impl/PojoProduceInterceptEndpointTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/impl/PojoProduceInterceptEndpointTest.java
@@ -96,7 +96,7 @@ public class PojoProduceInterceptEndpointTest extends Assert {
 
     public static class MyBean {
 
-        @Produce(uri = "direct:start")
+        @Produce("direct:start")
         Producer producer;
 
         public Object doSomething(String body) throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/impl/PojoProduceProxyInterceptEndpointTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/impl/PojoProduceProxyInterceptEndpointTest.java
index 5a53080..f947aea 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/impl/PojoProduceProxyInterceptEndpointTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/impl/PojoProduceProxyInterceptEndpointTest.java
@@ -98,7 +98,7 @@ public class PojoProduceProxyInterceptEndpointTest extends 
Assert {
 
     public static class MyBean {
 
-        @Produce(uri = "direct:start")
+        @Produce("direct:start")
         private EchoService echo;
 
         public Object doSomething(String body) throws Exception {
diff --git 
a/examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo_messaging/DistributeRecordsBean.java
 
b/examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo_messaging/DistributeRecordsBean.java
index d8071e2..9a8ea2c 100644
--- 
a/examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo_messaging/DistributeRecordsBean.java
+++ 
b/examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo_messaging/DistributeRecordsBean.java
@@ -27,7 +27,7 @@ public class DistributeRecordsBean {
 
     private static final Logger LOG = 
LoggerFactory.getLogger(DistributeRecordsBean.class);
 
-    @Consume(uri = "activemq:personnel.records")
+    @Consume("activemq:personnel.records")
     @RecipientList
     public String[] route(@XPath("/person/city/text()") String city) {
         if (city.equals("London")) {
diff --git 
a/examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo_messaging/SendFileRecordsToQueueBean.java
 
b/examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo_messaging/SendFileRecordsToQueueBean.java
index 7eb935c..d41074e 100644
--- 
a/examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo_messaging/SendFileRecordsToQueueBean.java
+++ 
b/examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo_messaging/SendFileRecordsToQueueBean.java
@@ -28,10 +28,10 @@ public class SendFileRecordsToQueueBean {
 
     private static final Logger LOG = 
LoggerFactory.getLogger(SendFileRecordsToQueueBean.class);
 
-    @Produce(uri = "activemq:personnel.records")
+    @Produce("activemq:personnel.records")
     ProducerTemplate producer;
 
-    @Consume(uri = "file:src/data?noop=true")
+    @Consume("file:src/data?noop=true")
     public void onFileSendToQueue(String body, @Header("CamelFileName") String 
name) {
         LOG.info("Incoming file: {}", name);
         producer.sendBody(body);
diff --git 
a/examples/camel-example-spring-boot-pojo/src/main/java/sample/camel/NumberPojo.java
 
b/examples/camel-example-spring-boot-pojo/src/main/java/sample/camel/NumberPojo.java
index 081e09e..eb260e9 100644
--- 
a/examples/camel-example-spring-boot-pojo/src/main/java/sample/camel/NumberPojo.java
+++ 
b/examples/camel-example-spring-boot-pojo/src/main/java/sample/camel/NumberPojo.java
@@ -31,17 +31,17 @@ public class NumberPojo {
     // sends the message to the stream:out endpoint but hidden behind this 
interface
     // so the client java code below can use the interface method instead of 
Camel's
     // FluentProducerTemplate or ProducerTemplate APIs
-    @Produce(uri = "stream:out")
+    @Produce("stream:out")
     private MagicNumber magic;
 
     // only consume when the predicate matches, eg when the message body is 
lower than 100
-    @Consume(uri = "direct:numbers", predicate = "${body} < 100")
+    @Consume(value = "direct:numbers", predicate = "${body} < 100")
     public void lowNumber(int number) {
         magic.onMagicNumber("Got a low number " + number);
     }
 
     // only consume when the predicate matches, eg when the message body is 
higher or equal to 100
-    @Consume(uri = "direct:numbers", predicate = "${body} >= 100")
+    @Consume(value = "direct:numbers", predicate = "${body} >= 100")
     public void highNumber(int number) {
         magic.onMagicNumber("Got a high number " + number);
     }

Reply via email to