You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/03/08 08:49:39 UTC
[3/7] camel git commit: CAMEL-8459: Java DSL - Align beanRef as bean
to be similar to xml dsl
CAMEL-8459: Java DSL - Align beanRef as bean to be similar to xml dsl
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ee8af5e8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ee8af5e8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ee8af5e8
Branch: refs/heads/master
Commit: ee8af5e8157e7595b031b83500cc9c02b7f5c679
Parents: e29267f
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Mar 7 15:34:01 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Mar 8 07:18:15 2015 +0100
----------------------------------------------------------------------
.../apache/camel/model/ProcessorDefinition.java | 88 +++++++++++++++++---
...ethodWithMatchingTypeAndSkipSettersTest.java | 2 +-
.../bean/BeanExplicitMethodAmbiguousTest.java | 6 +-
.../component/bean/BeanExplicitMethodTest.java | 2 +-
.../bean/BeanInfoSelectMethodTest.java | 4 +-
.../BeanLookupUsingJndiRegistryIssueTest.java | 2 +-
.../camel/component/bean/BeanMapPutTest.java | 2 +-
.../bean/BeanRefMethodNotFoundTest.java | 4 +-
.../component/bean/BeanRefNoCacheTest.java | 2 +-
.../component/bean/BeanRefNotFoundTest.java | 4 +-
...BeanWithExchangeExceptionAnnotationTest.java | 4 +-
...eanWithExpressionInjectionPredicateTest.java | 2 +-
.../bean/BeanWithExpressionInjectionTest.java | 2 +-
.../bean/BeanWithMethodHeaderTest.java | 10 +--
...ropertiesAndHeadersAndBodyInjectionTest.java | 2 +-
...anWithPropertiesAndHeadersInjectionTest.java | 2 +-
...BodyAnnotationToDisambiguateMethodsTest.java | 2 +-
.../CustomParameterMappingStrategyTest.java | 2 +-
.../DefaultParameterMappingStrategyTest.java | 12 +--
...sionAnnotationToDisambiguateMethodsTest.java | 4 +-
.../camel/component/bean/NewInstanceTest.java | 2 +-
.../issues/BeanVsProcessorPerformanceTest.java | 2 +-
.../camel/component/file/ToFileRouteTest.java | 2 +-
.../camel/component/mock/MockAsBeanTest.java | 2 +-
.../XsltFromHeaderOverrideEndpointUriTest.java | 2 +-
.../component/xslt/XsltRouteAllowStAXTest.java | 2 +-
.../camel/component/xslt/XsltRouteFileTest.java | 2 +-
.../camel/component/xslt/XsltRouteTest.java | 2 +-
.../java/org/apache/camel/main/MainExample.java | 2 +-
.../model/ProcessorTypeConfigurationTest.java | 2 +-
.../model/StartingRoutesErrorReportedTest.java | 2 +-
.../BeanRecipientListNoMethodNameTest.java | 2 +-
.../camel/processor/BeanRecipientListTest.java | 2 +-
.../processor/BeanRecipientListTimeoutTest.java | 2 +-
.../apache/camel/processor/BeanRouteTest.java | 2 +-
.../camel/processor/BeanWithExceptionTest.java | 2 +-
.../processor/BeanWithXPathInjectionTest.java | 2 +-
...DefaultErrorHandlerOnExceptionTraceTest.java | 2 +-
.../processor/OnCompletionGlobalTraceTest.java | 2 +-
.../processor/RecipientListReturnValueTest.java | 2 +-
...regateForceCompletionOnStopParallelTest.java | 4 +-
.../AggregateForceCompletionOnStopTest.java | 4 +-
.../AsyncEndpointRecipientListBean3Test.java | 2 +-
.../AsyncEndpointRecipientListBean4Test.java | 2 +-
.../AsyncEndpointRecipientListBeanTest.java | 2 +-
.../AsyncEndpointRoutingSlipBean2Test.java | 2 +-
.../AsyncEndpointRoutingSlipBean3Test.java | 2 +-
.../async/AsyncEndpointRoutingSlipBeanTest.java | 2 +-
.../java/org/apache/camel/view/DotViewTest.java | 2 +-
49 files changed, 144 insertions(+), 76 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
index 7d440f8..997b604 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
@@ -2456,6 +2456,24 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @return the builder
*/
@SuppressWarnings("unchecked")
+ public Type process(String ref) {
+ ProcessDefinition answer = new ProcessDefinition();
+ answer.setRef(ref);
+ addOutput(answer);
+ return (Type) this;
+ }
+
+ /**
+ * <a href="http://camel.apache.org/message-translator.html">Message Translator EIP:</a>
+ * Adds the custom processor reference to this destination which could be a final
+ * destination, or could be a transformation in a pipeline
+ *
+ * @param ref reference to a {@link Processor} to lookup in the registry
+ * @return the builder
+ * @deprecated use {@link #process(String)}
+ */
+ @SuppressWarnings("unchecked")
+ @Deprecated
public Type processRef(String ref) {
ProcessDefinition answer = new ProcessDefinition();
answer.setRef(ref);
@@ -2467,13 +2485,17 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* <a href="http://camel.apache.org/message-translator.html">Message Translator EIP:</a>
* Adds a bean which is invoked which could be a final destination, or could be a transformation in a pipeline
*
- * @param bean the bean to invoke
+ * @param bean the bean to invoke, or a reference to a bean if the type is a String
* @return the builder
*/
@SuppressWarnings("unchecked")
public Type bean(Object bean) {
BeanDefinition answer = new BeanDefinition();
- answer.setBean(bean);
+ if (bean instanceof String) {
+ answer.setRef((String) bean);
+ } else {
+ answer.setBean(bean);
+ }
addOutput(answer);
return (Type) this;
}
@@ -2482,14 +2504,18 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* <a href="http://camel.apache.org/message-translator.html">Message Translator EIP:</a>
* Adds a bean which is invoked which could be a final destination, or could be a transformation in a pipeline
*
- * @param bean the bean to invoke
+ * @param bean the bean to invoke, or a reference to a bean if the type is a String
* @param method the method name to invoke on the bean (can be used to avoid ambiguity)
* @return the builder
*/
@SuppressWarnings("unchecked")
public Type bean(Object bean, String method) {
BeanDefinition answer = new BeanDefinition();
- answer.setBean(bean);
+ if (bean instanceof String) {
+ answer.setRef((String) bean);
+ } else {
+ answer.setBean(bean);
+ }
answer.setMethod(method);
addOutput(answer);
return (Type) this;
@@ -2499,18 +2525,46 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* <a href="http://camel.apache.org/message-translator.html">Message Translator EIP:</a>
* Adds a bean which is invoked which could be a final destination, or could be a transformation in a pipeline
*
- * @param bean the bean to invoke
+ * @param bean the bean to invoke, or a reference to a bean if the type is a String
+ * @param cache if enabled, Camel will cache the result of the first Registry look-up.
+ * Cache can be enabled if the bean in the Registry is defined as a singleton scope.
+ * the multi parameter
+ * @return the builder
+ */
+ @SuppressWarnings("unchecked")
+ public Type bean(Object bean, boolean cache) {
+ BeanDefinition answer = new BeanDefinition();
+ if (bean instanceof String) {
+ answer.setRef((String) bean);
+ } else {
+ answer.setBean(bean);
+ }
+ answer.setCache(cache);
+ addOutput(answer);
+ return (Type) this;
+ }
+
+ /**
+ * <a href="http://camel.apache.org/message-translator.html">Message Translator EIP:</a>
+ * Adds a bean which is invoked which could be a final destination, or could be a transformation in a pipeline
+ *
+ * @param bean the bean to invoke, or a reference to a bean if the type is a String
* @param method the method name to invoke on the bean (can be used to avoid ambiguity)
- * @param multiParameterArray if it is true, camel will treat the message body as an object array which holds
- * the multi parameter
+ * @param cache if enabled, Camel will cache the result of the first Registry look-up.
+ * Cache can be enabled if the bean in the Registry is defined as a singleton scope.
+ * the multi parameter
* @return the builder
*/
@SuppressWarnings("unchecked")
- public Type bean(Object bean, String method, boolean multiParameterArray) {
+ public Type bean(Object bean, String method, boolean cache) {
BeanDefinition answer = new BeanDefinition();
- answer.setBean(bean);
+ if (bean instanceof String) {
+ answer.setRef((String) bean);
+ } else {
+ answer.setBean(bean);
+ }
answer.setMethod(method);
- answer.setMultiParameterArray(multiParameterArray);
+ answer.setCache(cache);
addOutput(answer);
return (Type) this;
}
@@ -2556,8 +2610,10 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @param multiParameterArray if it is true, camel will treat the message body as an object array which holds
* the multi parameter
* @return the builder
+ * @deprecated the option multiParameterArray is deprecated
*/
@SuppressWarnings("unchecked")
+ @Deprecated
public Type bean(Class<?> beanType, String method, boolean multiParameterArray) {
BeanDefinition answer = new BeanDefinition();
answer.setBeanType(beanType);
@@ -2578,8 +2634,10 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @param cache if enabled, Camel will cache the result of the first Registry look-up.
* Cache can be enabled if the bean in the Registry is defined as a singleton scope.
* @return the builder
+ * @deprecated the option multiParameterArray is deprecated
*/
@SuppressWarnings("unchecked")
+ @Deprecated
public Type bean(Class<?> beanType, String method, boolean multiParameterArray, boolean cache) {
BeanDefinition answer = new BeanDefinition();
answer.setBeanType(beanType);
@@ -2596,8 +2654,10 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
*
* @param ref reference to a bean to lookup in the registry
* @return the builder
+ * @deprecated use {@link #bean(Object)}
*/
@SuppressWarnings("unchecked")
+ @Deprecated
public Type beanRef(String ref) {
BeanDefinition answer = new BeanDefinition(ref);
addOutput(answer);
@@ -2611,8 +2671,10 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @param ref reference to a bean to lookup in the registry
* @param method the method name to invoke on the bean (can be used to avoid ambiguity)
* @return the builder
+ * @deprecated use {@link #bean(Object, String)}
*/
@SuppressWarnings("unchecked")
+ @Deprecated
public Type beanRef(String ref, String method) {
BeanDefinition answer = new BeanDefinition(ref, method);
addOutput(answer);
@@ -2627,8 +2689,10 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @param cache if enabled, Camel will cache the result of the first Registry look-up.
* Cache can be enabled if the bean in the Registry is defined as a singleton scope.
* @return the builder
+ * @deprecated use {@link #bean(Object, String, boolean)}
*/
@SuppressWarnings("unchecked")
+ @Deprecated
public Type beanRef(String ref, boolean cache) {
BeanDefinition answer = new BeanDefinition(ref);
answer.setCache(cache);
@@ -2645,8 +2709,10 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @param cache if enabled, Camel will cache the result of the first Registry look-up.
* Cache can be enabled if the bean in the Registry is defined as a singleton scope.
* @return the builder
+ * @deprecated use {@link #bean(Object, String, boolean)}
*/
@SuppressWarnings("unchecked")
+ @Deprecated
public Type beanRef(String ref, String method, boolean cache) {
BeanDefinition answer = new BeanDefinition(ref, method);
answer.setCache(cache);
@@ -2665,8 +2731,10 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @param multiParameterArray if it is true, camel will treat the message body as an object array which holds
* the multi parameter
* @return the builder
+ * @deprecated the option multiParameterArray is deprecated
*/
@SuppressWarnings("unchecked")
+ @Deprecated
public Type beanRef(String ref, String method, boolean cache, boolean multiParameterArray) {
BeanDefinition answer = new BeanDefinition(ref, method);
answer.setCache(cache);
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BeanChoseMethodWithMatchingTypeAndSkipSettersTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanChoseMethodWithMatchingTypeAndSkipSettersTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanChoseMethodWithMatchingTypeAndSkipSettersTest.java
index 2e10168..0344b7d 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanChoseMethodWithMatchingTypeAndSkipSettersTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanChoseMethodWithMatchingTypeAndSkipSettersTest.java
@@ -79,7 +79,7 @@ public class BeanChoseMethodWithMatchingTypeAndSkipSettersTest extends ContextTe
@Override
public void configure() throws Exception {
from("file://target/file/order", "seda:xml")
- .beanRef("orderService")
+ .bean("orderService")
.to("mock:queue:order");
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BeanExplicitMethodAmbiguousTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanExplicitMethodAmbiguousTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanExplicitMethodAmbiguousTest.java
index ae0f9cf..a0d79f9 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanExplicitMethodAmbiguousTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanExplicitMethodAmbiguousTest.java
@@ -64,11 +64,11 @@ public class BeanExplicitMethodAmbiguousTest extends ContextTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:hello").beanRef("dummy", "hello", true);
+ from("direct:hello").bean("dummy", "hello", true);
- from("direct:bye").beanRef("dummy", true);
+ from("direct:bye").bean("dummy", true);
- from("direct:foo").beanRef("dummy", "bar", true);
+ from("direct:foo").bean("dummy", "bar", true);
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BeanExplicitMethodTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanExplicitMethodTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanExplicitMethodTest.java
index 2a156a0..c689972 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanExplicitMethodTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanExplicitMethodTest.java
@@ -57,7 +57,7 @@ public class BeanExplicitMethodTest extends ContextTestSupport {
@Override
public void configure() throws Exception {
from("direct:start")
- .beanRef("foo", "echo")
+ .bean("foo", "echo")
.to("mock:result");
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoSelectMethodTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoSelectMethodTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoSelectMethodTest.java
index e3918ed..99c93f9 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoSelectMethodTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoSelectMethodTest.java
@@ -60,9 +60,9 @@ public class BeanInfoSelectMethodTest extends ContextTestSupport {
public void configure() throws Exception {
errorHandler(deadLetterChannel("mock:error").logStackTrace(false).maximumRedeliveries(3));
- onException(Exception.class).handled(true).beanRef("foo", "handleFailure").to("mock:result");
+ onException(Exception.class).handled(true).bean("foo", "handleFailure").to("mock:result");
- from("direct:a").beanRef("foo").to("mock:result");
+ from("direct:a").bean("foo").to("mock:result");
from("direct:b").to("mock:foo");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BeanLookupUsingJndiRegistryIssueTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanLookupUsingJndiRegistryIssueTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanLookupUsingJndiRegistryIssueTest.java
index 1ff7410..33922fb 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanLookupUsingJndiRegistryIssueTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanLookupUsingJndiRegistryIssueTest.java
@@ -35,7 +35,7 @@ public class BeanLookupUsingJndiRegistryIssueTest extends TestCase {
camel.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:start").beanRef("foo");
+ from("direct:start").bean("foo");
}
});
camel.start();
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BeanMapPutTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanMapPutTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanMapPutTest.java
index d6c9fd8..ae6eed6 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanMapPutTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanMapPutTest.java
@@ -52,7 +52,7 @@ public class BeanMapPutTest extends ContextTestSupport {
@Override
public void configure() throws Exception {
from("direct:start")
- .beanRef("myMap", "put('isMaster','true')");
+ .bean("myMap", "put('isMaster','true')");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefMethodNotFoundTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefMethodNotFoundTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefMethodNotFoundTest.java
index 6d108af..0c3e1ba 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefMethodNotFoundTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefMethodNotFoundTest.java
@@ -37,9 +37,9 @@ public class BeanRefMethodNotFoundTest extends ContextTestSupport {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:a").routeId("a").beanRef("foo", "hello").to("mock:a");
+ from("direct:a").routeId("a").bean("foo", "hello").to("mock:a");
- from("direct:b").routeId("b").beanRef("foo", "bye").to("mock:b");
+ from("direct:b").routeId("b").bean("foo", "bye").to("mock:b");
}
});
try {
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefNoCacheTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefNoCacheTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefNoCacheTest.java
index db2b4a9..cb576a3 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefNoCacheTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefNoCacheTest.java
@@ -44,7 +44,7 @@ public class BeanRefNoCacheTest extends ContextTestSupport {
@Override
public void configure() throws Exception {
from("direct:start")
- .beanRef(MyCoolBean.class.getName(), "doSomething", false)
+ .bean(MyCoolBean.class.getName(), "doSomething", false)
.to("mock:result");
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefNotFoundTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefNotFoundTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefNotFoundTest.java
index 2b1bf3b..55cc806 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefNotFoundTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefNotFoundTest.java
@@ -38,9 +38,9 @@ public class BeanRefNotFoundTest extends ContextTestSupport {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:a").routeId("a").beanRef("foo").to("mock:a");
+ from("direct:a").routeId("a").bean("foo").to("mock:a");
- from("direct:b").routeId("b").beanRef("bar").to("mock:b");
+ from("direct:b").routeId("b").bean("bar").to("mock:b");
}
});
try {
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExchangeExceptionAnnotationTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExchangeExceptionAnnotationTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExchangeExceptionAnnotationTest.java
index 8a7092f..635b8f8 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExchangeExceptionAnnotationTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExchangeExceptionAnnotationTest.java
@@ -54,11 +54,11 @@ public class BeanWithExchangeExceptionAnnotationTest extends ContextTestSupport
onException(MyCustomException.class).
maximumRedeliveries(0).
handled(true).
- beanRef("myBean", "handleException").
+ bean("myBean", "handleException").
to("mock:error");
from("direct:start").
- beanRef("myBean", "throwException").
+ bean("myBean", "throwException").
to("mock:result");
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionPredicateTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionPredicateTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionPredicateTest.java
index 62529c6..aff444e 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionPredicateTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionPredicateTest.java
@@ -53,7 +53,7 @@ public class BeanWithExpressionInjectionPredicateTest extends ContextTestSupport
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("direct:in").beanRef("myBean");
+ from("direct:in").bean("myBean");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java
index e7149ef..6327e63 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java
@@ -52,7 +52,7 @@ public class BeanWithExpressionInjectionTest extends ContextTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("direct:in").beanRef("myBean");
+ from("direct:in").bean("myBean");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithMethodHeaderTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithMethodHeaderTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithMethodHeaderTest.java
index 34ac016..c1ad432 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithMethodHeaderTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithMethodHeaderTest.java
@@ -94,7 +94,7 @@ public class BeanWithMethodHeaderTest extends ContextTestSupport {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:typo").beanRef("myBean", "ups").to("mock:result");
+ from("direct:typo").bean("myBean", "ups").to("mock:result");
}
});
fail("Should throw an exception");
@@ -134,13 +134,13 @@ public class BeanWithMethodHeaderTest extends ContextTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:echo").beanRef("myBean", "echo").to("mock:result");
+ from("direct:echo").bean("myBean", "echo").to("mock:result");
- from("direct:hi").beanRef("myBean", "hi").to("mock:result");
+ from("direct:hi").bean("myBean", "hi").to("mock:result");
- from("direct:mixed").beanRef("myBean", "echo").beanRef("myBean", "hi").to("mock:result");
+ from("direct:mixed").bean("myBean", "echo").bean("myBean", "hi").to("mock:result");
- from("direct:fail").beanRef("myBean").to("mock:result");
+ from("direct:fail").bean("myBean").to("mock:result");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java
index 9345d0f..f7485c9 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java
@@ -73,7 +73,7 @@ public class BeanWithPropertiesAndHeadersAndBodyInjectionTest extends ContextTes
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("direct:in").beanRef("myBean");
+ from("direct:in").bean("myBean");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersInjectionTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersInjectionTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersInjectionTest.java
index a18b18f..551f039 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersInjectionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersInjectionTest.java
@@ -73,7 +73,7 @@ public class BeanWithPropertiesAndHeadersInjectionTest extends ContextTestSuppor
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("direct:in").beanRef("myBean");
+ from("direct:in").bean("myBean");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BodyAnnotationToDisambiguateMethodsTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BodyAnnotationToDisambiguateMethodsTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BodyAnnotationToDisambiguateMethodsTest.java
index 8da60f2..96862e9 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BodyAnnotationToDisambiguateMethodsTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BodyAnnotationToDisambiguateMethodsTest.java
@@ -51,7 +51,7 @@ public class BodyAnnotationToDisambiguateMethodsTest extends ContextTestSupport
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("direct:in").beanRef("myBean");
+ from("direct:in").bean("myBean");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/CustomParameterMappingStrategyTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/CustomParameterMappingStrategyTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/CustomParameterMappingStrategyTest.java
index c986ec4..043c4c4 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/CustomParameterMappingStrategyTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/CustomParameterMappingStrategyTest.java
@@ -47,7 +47,7 @@ public class CustomParameterMappingStrategyTest extends ContextTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:a").beanRef("foo").to("mock:result");
+ from("direct:a").bean("foo").to("mock:result");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/DefaultParameterMappingStrategyTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/DefaultParameterMappingStrategyTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/DefaultParameterMappingStrategyTest.java
index a47bba0..eba5dac 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/DefaultParameterMappingStrategyTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/DefaultParameterMappingStrategyTest.java
@@ -86,19 +86,19 @@ public class DefaultParameterMappingStrategyTest extends ContextTestSupport {
public void configure() throws Exception {
errorHandler(deadLetterChannel("mock:error").logStackTrace(false).disableRedelivery());
- onException(Exception.class).handled(true).beanRef("foo", "withException").to("mock:result");
+ onException(Exception.class).handled(true).bean("foo", "withException").to("mock:result");
- from("direct:a").beanRef("foo", "withExchange").to("mock:result");
+ from("direct:a").bean("foo", "withExchange").to("mock:result");
- from("direct:b").beanRef("foo", "withMessage").to("mock:result");
+ from("direct:b").bean("foo", "withMessage").to("mock:result");
from("direct:c").to("mock:foo");
- from("direct:d").beanRef("foo", "withTypeConverter").to("mock:result");
+ from("direct:d").bean("foo", "withTypeConverter").to("mock:result");
- from("direct:e").beanRef("foo", "withRegistry").to("mock:result");
+ from("direct:e").bean("foo", "withRegistry").to("mock:result");
- from("direct:f").beanRef("foo", "withCamelContext").to("mock:result");
+ from("direct:f").bean("foo", "withCamelContext").to("mock:result");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java
index 2d4271e..02e87c8 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java
@@ -58,9 +58,9 @@ public class ExpressionAnnotationToDisambiguateMethodsTest extends ContextTestSu
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("direct:in").beanRef("myBean");
+ from("direct:in").bean("myBean");
- from("direct:other").beanRef("myOtherBean");
+ from("direct:other").bean("myOtherBean");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/NewInstanceTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/NewInstanceTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/NewInstanceTest.java
index 188c066..0ac4bb6 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/NewInstanceTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/NewInstanceTest.java
@@ -60,7 +60,7 @@ public class NewInstanceTest extends ContextTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("direct:start").beanRef("myBean", false).to("mock:result");
+ from("direct:start").bean("myBean", false).to("mock:result");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanVsProcessorPerformanceTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanVsProcessorPerformanceTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanVsProcessorPerformanceTest.java
index 0f8a853..ca1bc85 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanVsProcessorPerformanceTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanVsProcessorPerformanceTest.java
@@ -66,7 +66,7 @@ public class BeanVsProcessorPerformanceTest extends ContextTestSupport {
.process(new MyLittleProcessor());
from("direct:b")
- .beanRef("myLittleBean", "bye");
+ .bean("myLittleBean", "bye");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/file/ToFileRouteTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/ToFileRouteTest.java b/camel-core/src/test/java/org/apache/camel/component/file/ToFileRouteTest.java
index 2a68d52..6bc75c9 100644
--- a/camel-core/src/test/java/org/apache/camel/component/file/ToFileRouteTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/file/ToFileRouteTest.java
@@ -51,7 +51,7 @@ public class ToFileRouteTest extends ContextTestSupport {
public void configure() throws Exception {
// the reports from the seda queue is processed by our processor
// before they are written to files in the target/reports directory
- from("direct:reports").processRef("processReport").to("file://target/test-reports", "mock:result");
+ from("direct:reports").process("processReport").to("file://target/test-reports", "mock:result");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/mock/MockAsBeanTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/mock/MockAsBeanTest.java b/camel-core/src/test/java/org/apache/camel/component/mock/MockAsBeanTest.java
index bbe9aee..8b87134 100644
--- a/camel-core/src/test/java/org/apache/camel/component/mock/MockAsBeanTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/mock/MockAsBeanTest.java
@@ -67,7 +67,7 @@ public class MockAsBeanTest extends ContextTestSupport {
public void configure() throws Exception {
from("direct:start")
// send to foo bean
- .beanRef("foo")
+ .bean("foo")
// and then to result mock
.to("mock:result");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFromHeaderOverrideEndpointUriTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFromHeaderOverrideEndpointUriTest.java b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFromHeaderOverrideEndpointUriTest.java
index 0eb6c26..fe2dceb 100644
--- a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFromHeaderOverrideEndpointUriTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFromHeaderOverrideEndpointUriTest.java
@@ -63,7 +63,7 @@ public class XsltFromHeaderOverrideEndpointUriTest extends ContextTestSupport {
from("direct:start")
.to("xslt:org/apache/camel/component/xslt/transform.xsl")
.multicast()
- .beanRef("testBean")
+ .bean("testBean")
.to("mock:result");
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteAllowStAXTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteAllowStAXTest.java b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteAllowStAXTest.java
index 72787c5..84c7d29 100644
--- a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteAllowStAXTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteAllowStAXTest.java
@@ -31,7 +31,7 @@ public class XsltRouteAllowStAXTest extends XsltRouteTest {
from("direct:start")
.to("xslt:org/apache/camel/component/xslt/transform.xsl?allowStAX=true")
.multicast()
- .beanRef("testBean")
+ .bean("testBean")
.to("mock:result");
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteFileTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteFileTest.java b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteFileTest.java
index dca1172..c2ef4da 100644
--- a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteFileTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteFileTest.java
@@ -31,7 +31,7 @@ public class XsltRouteFileTest extends XsltRouteTest {
from("direct:start")
.to("xslt:file:src/test/resources/org/apache/camel/component/xslt/transform.xsl")
.multicast()
- .beanRef("testBean")
+ .bean("testBean")
.to("mock:result");
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java
index 62d2be8..462415f 100644
--- a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java
@@ -76,7 +76,7 @@ public class XsltRouteTest extends ContextTestSupport {
from("direct:start")
.to("xslt:org/apache/camel/component/xslt/transform.xsl")
.multicast()
- .beanRef("testBean")
+ .bean("testBean")
.to("mock:result");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/main/MainExample.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/main/MainExample.java b/camel-core/src/test/java/org/apache/camel/main/MainExample.java
index f081aac..8e30738 100644
--- a/camel-core/src/test/java/org/apache/camel/main/MainExample.java
+++ b/camel-core/src/test/java/org/apache/camel/main/MainExample.java
@@ -59,7 +59,7 @@ public class MainExample {
System.out.println("Invoked timer at " + new Date());
}
})
- .beanRef("foo");
+ .bean("foo");
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/model/ProcessorTypeConfigurationTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/model/ProcessorTypeConfigurationTest.java b/camel-core/src/test/java/org/apache/camel/model/ProcessorTypeConfigurationTest.java
index 4e93ab8..aa4aee9 100644
--- a/camel-core/src/test/java/org/apache/camel/model/ProcessorTypeConfigurationTest.java
+++ b/camel-core/src/test/java/org/apache/camel/model/ProcessorTypeConfigurationTest.java
@@ -29,7 +29,7 @@ public class ProcessorTypeConfigurationTest extends ContextTestSupport {
try {
context.addRoutes(new RouteBuilder() {
public void configure() throws Exception {
- from("direct:in").processRef("hello");
+ from("direct:in").process("hello");
}
});
fail("Should have thrown IllegalArgumentException");
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/model/StartingRoutesErrorReportedTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/model/StartingRoutesErrorReportedTest.java b/camel-core/src/test/java/org/apache/camel/model/StartingRoutesErrorReportedTest.java
index 6e1afcc..e9beb08 100644
--- a/camel-core/src/test/java/org/apache/camel/model/StartingRoutesErrorReportedTest.java
+++ b/camel-core/src/test/java/org/apache/camel/model/StartingRoutesErrorReportedTest.java
@@ -63,7 +63,7 @@ public class StartingRoutesErrorReportedTest extends ContextTestSupport {
public void configure() throws Exception {
from("direct:start").routeId("route3")
.to("mock:foo")
- .beanRef("");
+ .bean("");
}
});
context.start();
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListNoMethodNameTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListNoMethodNameTest.java b/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListNoMethodNameTest.java
index e80fb51..deb135f 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListNoMethodNameTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListNoMethodNameTest.java
@@ -26,7 +26,7 @@ public class BeanRecipientListNoMethodNameTest extends BeanRecipientListTest {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("direct:in").beanRef("myBean");
+ from("direct:in").bean("myBean");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java b/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java
index ef27ab4..67a7c69 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java
@@ -65,7 +65,7 @@ public class BeanRecipientListTest extends ContextTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("direct:in").beanRef("myBean", "route");
+ from("direct:in").bean("myBean", "route");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTimeoutTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTimeoutTest.java b/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTimeoutTest.java
index f30be22..4b20357 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTimeoutTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTimeoutTest.java
@@ -62,7 +62,7 @@ public class BeanRecipientListTimeoutTest extends ContextTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("direct:start").beanRef("myBean", "route").to("mock:result");
+ from("direct:start").bean("myBean", "route").to("mock:result");
from("direct:a").delay(2000).setBody(constant("A"));
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/BeanRouteTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/BeanRouteTest.java b/camel-core/src/test/java/org/apache/camel/processor/BeanRouteTest.java
index 858f521..af20075 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/BeanRouteTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/BeanRouteTest.java
@@ -74,7 +74,7 @@ public class BeanRouteTest extends ContextTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("direct:in").beanRef("myBean");
+ from("direct:in").bean("myBean");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/BeanWithExceptionTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/BeanWithExceptionTest.java b/camel-core/src/test/java/org/apache/camel/processor/BeanWithExceptionTest.java
index e712d1b..adaf5ca 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/BeanWithExceptionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/BeanWithExceptionTest.java
@@ -91,7 +91,7 @@ public class BeanWithExceptionTest extends ContextTestSupport {
public void configure() {
onException(ValidationException.class).to("mock:invalid");
- from("direct:start").beanRef("myBean").to("mock:valid");
+ from("direct:start").bean("myBean").to("mock:valid");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/BeanWithXPathInjectionTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/BeanWithXPathInjectionTest.java b/camel-core/src/test/java/org/apache/camel/processor/BeanWithXPathInjectionTest.java
index 6c624c3..20b6802 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/BeanWithXPathInjectionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/BeanWithXPathInjectionTest.java
@@ -72,7 +72,7 @@ public class BeanWithXPathInjectionTest extends ContextTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("direct:in").beanRef("myBean");
+ from("direct:in").bean("myBean");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/DefaultErrorHandlerOnExceptionTraceTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/DefaultErrorHandlerOnExceptionTraceTest.java b/camel-core/src/test/java/org/apache/camel/processor/DefaultErrorHandlerOnExceptionTraceTest.java
index b4402ea..4ec4441 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/DefaultErrorHandlerOnExceptionTraceTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/DefaultErrorHandlerOnExceptionTraceTest.java
@@ -96,7 +96,7 @@ public class DefaultErrorHandlerOnExceptionTraceTest extends ContextTestSupport
onException(IllegalArgumentException.class).handled(true).to("log:boom").to("mock:boom");
- from("direct:start").processRef("myProcessor").to("mock:result");
+ from("direct:start").process("myProcessor").to("mock:result");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/OnCompletionGlobalTraceTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/OnCompletionGlobalTraceTest.java b/camel-core/src/test/java/org/apache/camel/processor/OnCompletionGlobalTraceTest.java
index 48be466..45d9329 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/OnCompletionGlobalTraceTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/OnCompletionGlobalTraceTest.java
@@ -113,7 +113,7 @@ public class OnCompletionGlobalTraceTest extends ContextTestSupport {
onCompletion().to("log:global").to("mock:sync");
from("direct:start")
- .processRef("myProcessor")
+ .process("myProcessor")
.to("mock:result");
// END SNIPPET: e1
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java b/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java
index d312fd3..9627fcb 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java
@@ -63,7 +63,7 @@ public class RecipientListReturnValueTest extends ContextTestSupport {
public void configure() {
getContext().addInterceptStrategy(new Tracer());
- from("direct:beanRef").beanRef("myBean", "route");
+ from("direct:beanRef").bean("myBean", "route");
from("direct:recipientList").recipientList().method("myBean", "recipientList");
from("direct:a").transform(constant("Hello a")).to("mock:a");
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateForceCompletionOnStopParallelTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateForceCompletionOnStopParallelTest.java b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateForceCompletionOnStopParallelTest.java
index 9060ce4..36f8813 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateForceCompletionOnStopParallelTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateForceCompletionOnStopParallelTest.java
@@ -32,12 +32,12 @@ public class AggregateForceCompletionOnStopParallelTest extends AggregateForceCo
from("direct:forceCompletionTrue").routeId("foo")
.aggregate(header("id"), new BodyInAggregatingStrategy()).forceCompletionOnStop().completionSize(10).parallelProcessing()
.delay(100)
- .processRef("myCompletionProcessor");
+ .process("myCompletionProcessor");
from("direct:forceCompletionFalse").routeId("bar")
.aggregate(header("id"), new BodyInAggregatingStrategy()).completionSize(10).parallelProcessing()
.delay(100)
- .processRef("myCompletionProcessor");
+ .process("myCompletionProcessor");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateForceCompletionOnStopTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateForceCompletionOnStopTest.java b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateForceCompletionOnStopTest.java
index 77f757c..e071a08 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateForceCompletionOnStopTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateForceCompletionOnStopTest.java
@@ -110,12 +110,12 @@ public class AggregateForceCompletionOnStopTest extends ContextTestSupport {
from("direct:forceCompletionTrue").routeId("foo")
.aggregate(header("id"), new BodyInAggregatingStrategy()).forceCompletionOnStop().completionSize(10)
.delay(100)
- .processRef("myCompletionProcessor");
+ .process("myCompletionProcessor");
from("direct:forceCompletionFalse").routeId("bar")
.aggregate(header("id"), new BodyInAggregatingStrategy()).completionSize(10)
.delay(100)
- .processRef("myCompletionProcessor");
+ .process("myCompletionProcessor");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean3Test.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean3Test.java b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean3Test.java
index aec9bb8..3308068 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean3Test.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean3Test.java
@@ -64,7 +64,7 @@ public class AsyncEndpointRecipientListBean3Test extends ContextTestSupport {
beforeThreadName = Thread.currentThread().getName();
}
})
- .beanRef("myBean");
+ .bean("myBean");
from("direct:foo")
.process(new Processor() {
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean4Test.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean4Test.java b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean4Test.java
index 1653b23..e30ed93 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean4Test.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean4Test.java
@@ -64,7 +64,7 @@ public class AsyncEndpointRecipientListBean4Test extends ContextTestSupport {
beforeThreadName = Thread.currentThread().getName();
}
})
- .beanRef("myBean");
+ .bean("myBean");
from("direct:foo")
.process(new Processor() {
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBeanTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBeanTest.java b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBeanTest.java
index 6ff1724..07955ec 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBeanTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBeanTest.java
@@ -64,7 +64,7 @@ public class AsyncEndpointRecipientListBeanTest extends ContextTestSupport {
beforeThreadName = Thread.currentThread().getName();
}
})
- .beanRef("myBean")
+ .bean("myBean")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
afterThreadName = Thread.currentThread().getName();
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBean2Test.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBean2Test.java b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBean2Test.java
index 084cda5..5e056c6 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBean2Test.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBean2Test.java
@@ -46,7 +46,7 @@ public class AsyncEndpointRoutingSlipBean2Test extends ContextTestSupport {
context.addComponent("async", new MyAsyncComponent());
from("direct:start")
- .beanRef("myBean");
+ .bean("myBean");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBean3Test.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBean3Test.java b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBean3Test.java
index 1b3c267..920e41c 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBean3Test.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBean3Test.java
@@ -66,7 +66,7 @@ public class AsyncEndpointRoutingSlipBean3Test extends ContextTestSupport {
beforeThreadName = Thread.currentThread().getName();
}
})
- .beanRef("myBean");
+ .bean("myBean");
from("direct:foo")
.process(new Processor() {
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBeanTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBeanTest.java b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBeanTest.java
index 95439dc..e70ad9b 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBeanTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBeanTest.java
@@ -50,7 +50,7 @@ public class AsyncEndpointRoutingSlipBeanTest extends ContextTestSupport {
context.addComponent("async", new MyAsyncComponent());
from("direct:start")
- .beanRef("myBean");
+ .bean("myBean");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/view/DotViewTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/view/DotViewTest.java b/camel-core/src/test/java/org/apache/camel/view/DotViewTest.java
index 7b5980f..625ae0b 100644
--- a/camel-core/src/test/java/org/apache/camel/view/DotViewTest.java
+++ b/camel-core/src/test/java/org/apache/camel/view/DotViewTest.java
@@ -85,7 +85,7 @@ public class DotViewTest extends ContextTestSupport {
static class FromToBeanRoute extends RouteBuilder {
public void configure() throws Exception {
- from("seda:foo2").beanRef("myBean", "hello");
+ from("seda:foo2").bean("myBean", "hello");
}
}