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 5e6515f CAMEL-15739: camel-core - Move AdviceWith from Reifier to
Builder
5e6515f is described below
commit 5e6515f302713313d0ba9e67b92714d624b6798a
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Oct 22 19:42:59 2020 +0200
CAMEL-15739: camel-core - Move AdviceWith from Reifier to Builder
---
.../java/org/apache/camel/cdi/test/AdvisedRouteTest.java | 4 ++--
.../org/apache/camel/component/exec/ExecJavaProcessTest.java | 4 ++--
.../camel/component/jms/issues/AdviceWithIssueTest.java | 4 ++--
.../jms/tx/JMSTransactionIsTransactedRedeliveredTest.java | 4 ++--
...TransactedInterceptUsingAdviceWithSendToEndpointTest.java | 4 ++--
.../camel/spring/issues/AdviceWithTransactionIssueTest.java | 6 +++---
.../SpringAdviceWithContextScopedErrorHandlerIssueTest.java | 4 ++--
.../idempotent/jdbc/JdbcMessageIdRepositoryTest.java | 4 ++--
.../java/org/apache/camel/test/junit5/CamelTestSupport.java | 4 ++--
.../camel/test/junit5/patterns/AdviceWithNotStartedTest.java | 4 ++--
.../test/junit5/patterns/SimpleWeaveAddMockLastTest.java | 4 ++--
.../UseOverridePropertiesWithPropertiesComponentTest.java | 4 ++--
.../test/issues/AdviceWithOnExceptionMultipleIssueTest.java | 6 +++---
...dviceWithInterceptSendToEndpointWithLoadbalancerTest.java | 4 ++--
.../apache/camel/test/issues/AdviceWithOnCompletionTest.java | 4 ++--
.../test/issues/AdviceWithOnExceptionMultipleIssueTest.java | 12 ++++++------
.../java/org/apache/camel/test/junit4/CamelTestSupport.java | 4 ++--
.../apache/camel/test/patterns/AdviceWithNotStartedTest.java | 4 ++--
.../camel/test/patterns/SimpleWeaveAddMockLastTest.java | 4 ++--
.../UseOverridePropertiesWithPropertiesComponentTest.java | 4 ++--
.../modules/ROOT/pages/camel-3x-upgrade-guide-3_7.adoc | 4 ++++
.../camel/itest/issues/AdviceWithWeaveFirstLastTest.java | 6 +++---
.../apache/camel/itest/issues/IsUseAdviceWithJUnit5Test.java | 4 ++--
.../camel/itest/jms/AdviceWithTransactionIssueTest.java | 6 +++---
.../itest/jms/JMSTransactionIsTransactedRedeliveredTest.java | 4 ++--
25 files changed, 60 insertions(+), 56 deletions(-)
diff --git
a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/AdvisedRouteTest.java
b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/AdvisedRouteTest.java
index 15e488c..7514d09 100644
---
a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/AdvisedRouteTest.java
+++
b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/AdvisedRouteTest.java
@@ -25,6 +25,7 @@ import javax.inject.Inject;
import javax.inject.Named;
import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.AdviceWith;
import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.cdi.CdiCamelExtension;
import org.apache.camel.cdi.Uri;
@@ -33,7 +34,6 @@ import org.apache.camel.cdi.bean.PropertyEndpointRoute;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.properties.PropertiesComponent;
import org.apache.camel.model.ModelCamelContext;
-import org.apache.camel.reifier.RouteReifier;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.junit.InSequence;
@@ -86,7 +86,7 @@ public class AdvisedRouteTest {
@Test
@InSequence(1)
public void adviseCamelContext(ModelCamelContext context) throws Exception
{
- RouteReifier.adviceWith(context.getRouteDefinition("route"), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith(context.getRouteDefinition("route"), context,
new AdviceWithRouteBuilder() {
@Override
public void configure() {
interceptSendToEndpoint("{{to}}").skipSendToOriginalEndpoint().to("mock:outbound");
diff --git
a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java
b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java
index 1c35901..83d7f76 100644
---
a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java
+++
b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java
@@ -27,12 +27,12 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.AdviceWith;
import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
import
org.apache.camel.component.exec.impl.ProvokeExceptionExecCommandExecutor;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
-import org.apache.camel.reifier.RouteReifier;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.commons.io.IOUtils;
import org.junit.jupiter.api.Test;
@@ -401,7 +401,7 @@ public class ExecJavaProcessTest extends CamelTestSupport {
*/
@Test
public void testExecJavaProcessWithThrownExecException() throws Exception {
- RouteReifier.adviceWith(context.getRouteDefinitions().get(0), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith(context.getRouteDefinitions().get(0), context,
new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
weaveByToString(".*java.*").replace().to("exec:java?commandExecutor=#executorMock");
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/AdviceWithIssueTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/AdviceWithIssueTest.java
index d992c0d..4e62ca7 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/AdviceWithIssueTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/AdviceWithIssueTest.java
@@ -19,11 +19,11 @@ package org.apache.camel.component.jms.issues;
import java.util.Collections;
import org.apache.camel.CamelContext;
+import org.apache.camel.builder.AdviceWith;
import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.JmsComponent;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.reifier.RouteReifier;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -40,7 +40,7 @@ public class AdviceWithIssueTest extends CamelTestSupport {
@Test
public void testAdviceWith() throws Exception {
- RouteReifier.adviceWith(context.getRouteDefinition("starter"),
context, new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith(context.getRouteDefinition("starter"), context,
new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
// when advicing then use wildcard as URI options cannot be
matched
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.java
index d79bf72..f2a463a 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.java
@@ -23,9 +23,9 @@ import javax.management.ObjectName;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.builder.AdviceWith;
import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.reifier.RouteReifier;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -56,7 +56,7 @@ public class JMSTransactionIsTransactedRedeliveredTest
extends CamelSpringTestSu
@Test
public void testTransactionSuccess() throws Exception {
- RouteReifier.adviceWith(context.getRouteDefinitions().get(0), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith(context.getRouteDefinitions().get(0), context,
new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
onException(AssertionError.class).to("log:error",
"mock:error");
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactedInterceptUsingAdviceWithSendToEndpointTest.java
b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactedInterceptUsingAdviceWithSendToEndpointTest.java
index a6c50da..87b6ef5 100644
---
a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactedInterceptUsingAdviceWithSendToEndpointTest.java
+++
b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactedInterceptUsingAdviceWithSendToEndpointTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.camel.spring.interceptor;
+import org.apache.camel.builder.AdviceWith;
import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.reifier.RouteReifier;
import org.junit.jupiter.api.Test;
/**
@@ -56,7 +56,7 @@ public class
TransactedInterceptUsingAdviceWithSendToEndpointTest extends Transa
}
private void addInterceptor(String routeId) throws Exception {
- RouteReifier.adviceWith(context.getRouteDefinition(routeId), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith(context.getRouteDefinition(routeId), context,
new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
interceptSendToEndpoint("direct:(foo|bar)")
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/AdviceWithTransactionIssueTest.java
b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/AdviceWithTransactionIssueTest.java
index 01aca9d..d8f4b35 100644
---
a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/AdviceWithTransactionIssueTest.java
+++
b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/AdviceWithTransactionIssueTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.spring.issues;
+import org.apache.camel.builder.AdviceWith;
import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.reifier.RouteReifier;
import org.apache.camel.spring.SpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
@@ -38,7 +38,7 @@ public class AdviceWithTransactionIssueTest extends
SpringTestSupport {
@Test
public void testAdviceWithWeaveById() throws Exception {
- RouteReifier.adviceWith(context.getRouteDefinitions().get(0), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith(context.getRouteDefinitions().get(0), context,
new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
weaveById("mock-b*").after().to("mock:last");
@@ -57,7 +57,7 @@ public class AdviceWithTransactionIssueTest extends
SpringTestSupport {
@Test
public void testAdviceWithAddLast() throws Exception {
- RouteReifier.adviceWith(context.getRouteDefinitions().get(0), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith(context.getRouteDefinitions().get(0), context,
new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
weaveAddLast().to("mock:last");
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.java
b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.java
index b080ddc..bbe4ac2 100644
---
a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.java
+++
b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.spring.issues;
+import org.apache.camel.builder.AdviceWith;
import org.apache.camel.builder.AdviceWithRouteBuilder;
-import org.apache.camel.reifier.RouteReifier;
import org.apache.camel.spring.SpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
@@ -36,7 +36,7 @@ public class
SpringAdviceWithContextScopedErrorHandlerIssueTest extends SpringTe
@Test
public void testAdviceWith() throws Exception {
- RouteReifier.adviceWith(context.getRouteDefinition("route-a"),
context, new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith(context.getRouteDefinition("route-a"), context,
new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
interceptSendToEndpoint("direct:bar")
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/JdbcMessageIdRepositoryTest.java
b/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/JdbcMessageIdRepositoryTest.java
index 4e5caf1..51c0a49 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/JdbcMessageIdRepositoryTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/JdbcMessageIdRepositoryTest.java
@@ -23,10 +23,10 @@ import javax.sql.DataSource;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.builder.AdviceWith;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.model.RouteDefinition;
-import org.apache.camel.reifier.RouteReifier;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -103,7 +103,7 @@ public class JdbcMessageIdRepositoryTest extends
CamelSpringTestSupport {
}
};
RouteDefinition routeDefinition =
context.getRouteDefinition("JdbcMessageIdRepositoryTest");
- RouteReifier.adviceWith(routeDefinition, context, interceptor);
+ AdviceWith.adviceWith(routeDefinition, context, interceptor);
// we send in 2 messages with id 2 that fails
errorEndpoint.expectedMessageCount(2);
diff --git
a/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
b/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
index 11749b7..687cffd 100644
---
a/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
+++
b/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
@@ -43,6 +43,7 @@ import org.apache.camel.ServiceStatus;
import org.apache.camel.api.management.JmxSystemPropertyKeys;
import org.apache.camel.api.management.ManagedCamelContext;
import org.apache.camel.api.management.mbean.ManagedCamelContextMBean;
+import org.apache.camel.builder.AdviceWith;
import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -53,7 +54,6 @@ import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.processor.interceptor.BreakpointSupport;
import org.apache.camel.processor.interceptor.DefaultDebugger;
-import org.apache.camel.reifier.RouteReifier;
import org.apache.camel.spi.CamelBeanPostProcessor;
import org.apache.camel.spi.Language;
import org.apache.camel.spi.PropertiesComponent;
@@ -505,7 +505,7 @@ public abstract class CamelTestSupport
private void replaceFromEndpoints() throws Exception {
for (final Map.Entry<String, String> entry : fromEndpoints.entrySet())
{
-
RouteReifier.adviceWith(context.getRouteDefinition(entry.getKey()), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith(context.getRouteDefinition(entry.getKey()),
context, new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
replaceFromWith(entry.getValue());
diff --git
a/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/AdviceWithNotStartedTest.java
b/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/AdviceWithNotStartedTest.java
index a20d400..7e18af5 100644
---
a/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/AdviceWithNotStartedTest.java
+++
b/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/AdviceWithNotStartedTest.java
@@ -20,9 +20,9 @@ import java.util.concurrent.RejectedExecutionException;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.RoutesBuilder;
+import org.apache.camel.builder.AdviceWith;
import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.reifier.RouteReifier;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -38,7 +38,7 @@ public class AdviceWithNotStartedTest extends
CamelTestSupport {
@Test
public void testNotStarted() throws Exception {
- RouteReifier.adviceWith(context.getRouteDefinition("foo"), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith(context.getRouteDefinition("foo"), context, new
AdviceWithRouteBuilder() {
@Override
public void configure() {
weaveAddLast().to("mock:result");
diff --git
a/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/SimpleWeaveAddMockLastTest.java
b/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/SimpleWeaveAddMockLastTest.java
index cf27ab4..4293758 100644
---
a/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/SimpleWeaveAddMockLastTest.java
+++
b/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/SimpleWeaveAddMockLastTest.java
@@ -17,9 +17,9 @@
package org.apache.camel.test.junit5.patterns;
import org.apache.camel.RoutesBuilder;
+import org.apache.camel.builder.AdviceWith;
import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.reifier.RouteReifier;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -31,7 +31,7 @@ public class SimpleWeaveAddMockLastTest extends
CamelTestSupport {
@Test
public void testWeaveAddMockLast() throws Exception {
- RouteReifier.adviceWith(context.getRouteDefinitions().get(0), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith(context.getRouteDefinitions().get(0), context,
new AdviceWithRouteBuilder() {
@Override
public void configure() {
weaveAddLast().to("mock:result");
diff --git
a/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/UseOverridePropertiesWithPropertiesComponentTest.java
b/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/UseOverridePropertiesWithPropertiesComponentTest.java
index 23bc74e..761ae43 100644
---
a/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/UseOverridePropertiesWithPropertiesComponentTest.java
+++
b/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/UseOverridePropertiesWithPropertiesComponentTest.java
@@ -18,9 +18,9 @@ package org.apache.camel.test.junit5.patterns;
import java.util.Properties;
+import org.apache.camel.builder.AdviceWith;
import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.reifier.RouteReifier;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -42,7 +42,7 @@ public class UseOverridePropertiesWithPropertiesComponentTest
extends CamelTestS
interceptSendToEndpoint("file:*").skipSendToOriginalEndpoint().to("mock:file");
}
};
- RouteReifier.adviceWith(context.getRouteDefinition("myRoute"),
context, mocker);
+ AdviceWith.adviceWith(context.getRouteDefinition("myRoute"), context,
mocker);
}
@Override
diff --git
a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/issues/AdviceWithOnExceptionMultipleIssueTest.java
b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/issues/AdviceWithOnExceptionMultipleIssueTest.java
index e1d992f..d0909b6 100644
---
a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/issues/AdviceWithOnExceptionMultipleIssueTest.java
+++
b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/issues/AdviceWithOnExceptionMultipleIssueTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.test.issues;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.builder.AdviceWith;
import org.apache.camel.builder.AdviceWithRouteBuilder;
-import org.apache.camel.reifier.RouteReifier;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
@@ -70,7 +70,7 @@ public class AdviceWithOnExceptionMultipleIssueTest extends
CamelSpringTestSuppo
@Test
public void testMultipleAdvice() throws Exception {
- RouteReifier.adviceWith(context.getRouteDefinition("RouteA"), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith(context.getRouteDefinition("RouteA"), context,
new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
interceptSendToEndpoint("mock:resultA").process(new
Processor() {
@@ -82,7 +82,7 @@ public class AdviceWithOnExceptionMultipleIssueTest extends
CamelSpringTestSuppo
}
});
- RouteReifier.adviceWith(context.getRouteDefinition("RouteB"), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith(context.getRouteDefinition("RouteB"), context,
new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
}
diff --git
a/components/camel-test-spring/src/test/java/org/apache/camel/test/issues/AdviceWithInterceptSendToEndpointWithLoadbalancerTest.java
b/components/camel-test-spring/src/test/java/org/apache/camel/test/issues/AdviceWithInterceptSendToEndpointWithLoadbalancerTest.java
index f7d68d2..7557c61 100644
---
a/components/camel-test-spring/src/test/java/org/apache/camel/test/issues/AdviceWithInterceptSendToEndpointWithLoadbalancerTest.java
+++
b/components/camel-test-spring/src/test/java/org/apache/camel/test/issues/AdviceWithInterceptSendToEndpointWithLoadbalancerTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.test.issues;
+import org.apache.camel.builder.AdviceWith;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.RouteDefinition;
-import org.apache.camel.reifier.RouteReifier;
import org.apache.camel.test.spring.CamelSpringTestSupport;
import org.junit.Test;
import org.springframework.context.support.AbstractApplicationContext;
@@ -40,7 +40,7 @@ public class
AdviceWithInterceptSendToEndpointWithLoadbalancerTest extends Camel
@Test
public void testSimpleMultipleAdvice() throws Exception {
RouteDefinition route = context.getRouteDefinitions().get(0);
- RouteReifier.adviceWith(route, context, new RouteBuilder() {
+ AdviceWith.adviceWith(route, context, new RouteBuilder() {
public void configure() throws Exception {
interceptSendToEndpoint("seda:end1")
.skipSendToOriginalEndpoint()
diff --git
a/components/camel-test-spring/src/test/java/org/apache/camel/test/issues/AdviceWithOnCompletionTest.java
b/components/camel-test-spring/src/test/java/org/apache/camel/test/issues/AdviceWithOnCompletionTest.java
index cb77d3f..95692ba 100644
---
a/components/camel-test-spring/src/test/java/org/apache/camel/test/issues/AdviceWithOnCompletionTest.java
+++
b/components/camel-test-spring/src/test/java/org/apache/camel/test/issues/AdviceWithOnCompletionTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.test.issues;
+import org.apache.camel.builder.AdviceWith;
import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.model.RouteDefinition;
-import org.apache.camel.reifier.RouteReifier;
import org.apache.camel.test.spring.CamelSpringTestSupport;
import org.junit.Test;
import org.springframework.context.support.AbstractApplicationContext;
@@ -39,7 +39,7 @@ public class AdviceWithOnCompletionTest extends
CamelSpringTestSupport {
@Test
public void testOnCompletion() throws Exception {
RouteDefinition route = context.getRouteDefinitions().get(0);
- RouteReifier.adviceWith(route, context, new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith(route, context, new AdviceWithRouteBuilder() {
public void configure() throws Exception {
replaceFromWith("direct:start");
diff --git
a/components/camel-test-spring/src/test/java/org/apache/camel/test/issues/AdviceWithOnExceptionMultipleIssueTest.java
b/components/camel-test-spring/src/test/java/org/apache/camel/test/issues/AdviceWithOnExceptionMultipleIssueTest.java
index a9c7007..ea7ed03 100644
---
a/components/camel-test-spring/src/test/java/org/apache/camel/test/issues/AdviceWithOnExceptionMultipleIssueTest.java
+++
b/components/camel-test-spring/src/test/java/org/apache/camel/test/issues/AdviceWithOnExceptionMultipleIssueTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.test.issues;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.builder.AdviceWith;
import org.apache.camel.builder.AdviceWithRouteBuilder;
-import org.apache.camel.reifier.RouteReifier;
import org.apache.camel.test.spring.CamelSpringTestSupport;
import org.junit.Test;
import org.springframework.context.support.AbstractApplicationContext;
@@ -42,7 +42,7 @@ public class AdviceWithOnExceptionMultipleIssueTest extends
CamelSpringTestSuppo
@Test
public void testSimpleMultipleAdvice() throws Exception {
- RouteReifier.adviceWith(context.getRouteDefinition("RouteA"), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith(context.getRouteDefinition("RouteA"), context,
new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
interceptSendToEndpoint("mock:resultA").process(new
Processor() {
@@ -53,7 +53,7 @@ public class AdviceWithOnExceptionMultipleIssueTest extends
CamelSpringTestSuppo
}
});
- RouteReifier.adviceWith(context.getRouteDefinition("RouteB"), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith(context.getRouteDefinition("RouteB"), context,
new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
}
@@ -68,7 +68,7 @@ public class AdviceWithOnExceptionMultipleIssueTest extends
CamelSpringTestSuppo
@Test
public void testMultipleAdviceWithExceptionThrown() throws Exception {
- RouteReifier.adviceWith(context.getRouteDefinition("RouteA"), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith(context.getRouteDefinition("RouteA"), context,
new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
interceptSendToEndpoint("mock:resultA").process(new
Processor() {
@@ -89,7 +89,7 @@ public class AdviceWithOnExceptionMultipleIssueTest extends
CamelSpringTestSuppo
@Test
public void testMultipleAdvice() throws Exception {
- RouteReifier.adviceWith(context.getRouteDefinition("RouteA"), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith(context.getRouteDefinition("RouteA"), context,
new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
interceptSendToEndpoint("mock:resultA").process(new
Processor() {
@@ -101,7 +101,7 @@ public class AdviceWithOnExceptionMultipleIssueTest extends
CamelSpringTestSuppo
}
});
- RouteReifier.adviceWith(context.getRouteDefinition("RouteB"), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith(context.getRouteDefinition("RouteB"), context,
new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
}
diff --git
a/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
b/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
index c9181ab..27f3136 100644
---
a/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
+++
b/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
@@ -65,6 +65,7 @@ import org.apache.camel.api.management.ManagedCamelContext;
import org.apache.camel.api.management.mbean.ManagedCamelContextMBean;
import org.apache.camel.api.management.mbean.ManagedProcessorMBean;
import org.apache.camel.api.management.mbean.ManagedRouteMBean;
+import org.apache.camel.builder.AdviceWith;
import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -75,7 +76,6 @@ import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.processor.interceptor.BreakpointSupport;
import org.apache.camel.processor.interceptor.DefaultDebugger;
-import org.apache.camel.reifier.RouteReifier;
import org.apache.camel.spi.CamelBeanPostProcessor;
import org.apache.camel.spi.Language;
import org.apache.camel.spi.PropertiesComponent;
@@ -469,7 +469,7 @@ public abstract class CamelTestSupport extends TestSupport {
private void replaceFromEndpoints() throws Exception {
for (final Map.Entry<String, String> entry : fromEndpoints.entrySet())
{
-
RouteReifier.adviceWith(context.getRouteDefinition(entry.getKey()), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith(context.getRouteDefinition(entry.getKey()),
context, new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
replaceFromWith(entry.getValue());
diff --git
a/components/camel-test/src/test/java/org/apache/camel/test/patterns/AdviceWithNotStartedTest.java
b/components/camel-test/src/test/java/org/apache/camel/test/patterns/AdviceWithNotStartedTest.java
index bcbc0e4..65e2092 100644
---
a/components/camel-test/src/test/java/org/apache/camel/test/patterns/AdviceWithNotStartedTest.java
+++
b/components/camel-test/src/test/java/org/apache/camel/test/patterns/AdviceWithNotStartedTest.java
@@ -20,9 +20,9 @@ import java.util.concurrent.RejectedExecutionException;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.RoutesBuilder;
+import org.apache.camel.builder.AdviceWith;
import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.reifier.RouteReifier;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
@@ -35,7 +35,7 @@ public class AdviceWithNotStartedTest extends
CamelTestSupport {
@Test
public void testNotStarted() throws Exception {
- RouteReifier.adviceWith(context.getRouteDefinition("foo"), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith(context.getRouteDefinition("foo"), context, new
AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
weaveAddLast().to("mock:result");
diff --git
a/components/camel-test/src/test/java/org/apache/camel/test/patterns/SimpleWeaveAddMockLastTest.java
b/components/camel-test/src/test/java/org/apache/camel/test/patterns/SimpleWeaveAddMockLastTest.java
index 8c2c5a6..a121204 100644
---
a/components/camel-test/src/test/java/org/apache/camel/test/patterns/SimpleWeaveAddMockLastTest.java
+++
b/components/camel-test/src/test/java/org/apache/camel/test/patterns/SimpleWeaveAddMockLastTest.java
@@ -17,9 +17,9 @@
package org.apache.camel.test.patterns;
import org.apache.camel.RoutesBuilder;
+import org.apache.camel.builder.AdviceWith;
import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.reifier.RouteReifier;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
@@ -32,7 +32,7 @@ public class SimpleWeaveAddMockLastTest extends
CamelTestSupport {
@Test
public void testWeaveAddMockLast() throws Exception {
- RouteReifier.adviceWith(context.getRouteDefinitions().get(0), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith(context.getRouteDefinitions().get(0), context,
new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
weaveAddLast().to("mock:result");
diff --git
a/components/camel-test/src/test/java/org/apache/camel/test/patterns/UseOverridePropertiesWithPropertiesComponentTest.java
b/components/camel-test/src/test/java/org/apache/camel/test/patterns/UseOverridePropertiesWithPropertiesComponentTest.java
index c1be2b5..9440eff 100644
---
a/components/camel-test/src/test/java/org/apache/camel/test/patterns/UseOverridePropertiesWithPropertiesComponentTest.java
+++
b/components/camel-test/src/test/java/org/apache/camel/test/patterns/UseOverridePropertiesWithPropertiesComponentTest.java
@@ -18,9 +18,9 @@ package org.apache.camel.test.patterns;
import java.util.Properties;
+import org.apache.camel.builder.AdviceWith;
import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.reifier.RouteReifier;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Before;
import org.junit.Test;
@@ -44,7 +44,7 @@ public class UseOverridePropertiesWithPropertiesComponentTest
extends CamelTestS
.to("mock:file");
}
};
- RouteReifier.adviceWith(context.getRouteDefinition("myRoute"),
context, mocker);
+ AdviceWith.adviceWith(context.getRouteDefinition("myRoute"), context,
mocker);
}
@Override
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_7.adoc
b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_7.adoc
index 59ee155..8b88c1a 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_7.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_7.adoc
@@ -6,6 +6,10 @@ from both 3.0 to 3.1 and 3.1 to 3.2.
== Upgrading Camel 3.6 to 3.7
+=== AdviceWith
+
+Advice routes moved the `adviceWith` method from
`org.apache.camel.reifier.RouteReifier` to
`org.apache.camel.builder.AdviceWith`.
+
=== API changes
These internal classes has been moved to locations that better suit where
other similar processors are located.
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/AdviceWithWeaveFirstLastTest.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/AdviceWithWeaveFirstLastTest.java
index e72ec39..5309e0b 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/AdviceWithWeaveFirstLastTest.java
+++
b/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/AdviceWithWeaveFirstLastTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.itest.issues;
+import org.apache.camel.builder.AdviceWith;
import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.reifier.RouteReifier;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -37,7 +37,7 @@ public class AdviceWithWeaveFirstLastTest extends
CamelTestSupport {
@Test
void testWeaveAddFirst() throws Exception {
// START SNIPPET: e1
- RouteReifier.adviceWith(context.getRouteDefinitions().get(0), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith(context.getRouteDefinitions().get(0), context,
new AdviceWithRouteBuilder() {
@Override
public void configure() {
// insert at first the given piece of route to the existing
route
@@ -61,7 +61,7 @@ public class AdviceWithWeaveFirstLastTest extends
CamelTestSupport {
@Test
void testWeaveAddLast() throws Exception {
// START SNIPPET: e2
- RouteReifier.adviceWith(context.getRouteDefinitions().get(0), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith(context.getRouteDefinitions().get(0), context,
new AdviceWithRouteBuilder() {
@Override
public void configure() {
// insert at the end of the existing route, the given piece of
route
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/IsUseAdviceWithJUnit5Test.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/IsUseAdviceWithJUnit5Test.java
index f6d6f8b..4f391f6 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/IsUseAdviceWithJUnit5Test.java
+++
b/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/IsUseAdviceWithJUnit5Test.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.itest.issues;
+import org.apache.camel.builder.AdviceWith;
import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.reifier.RouteReifier;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -46,7 +46,7 @@ public class IsUseAdviceWithJUnit5Test extends
CamelTestSupport {
@Test
void testIsUseAdviceWith() throws Exception {
- RouteReifier.adviceWith(context.getRouteDefinitions().get(0), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith(context.getRouteDefinitions().get(0), context,
new AdviceWithRouteBuilder() {
public void configure() {
replaceFromWith(directEndPointURI);
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/AdviceWithTransactionIssueTest.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/AdviceWithTransactionIssueTest.java
index 5307907..7922cf6 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/AdviceWithTransactionIssueTest.java
+++
b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/AdviceWithTransactionIssueTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.camel.itest.jms;
+import org.apache.camel.builder.AdviceWith;
import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.utils.extensions.JmsServiceExtension;
-import org.apache.camel.reifier.RouteReifier;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.junit.jupiter.api.Test;
@@ -42,7 +42,7 @@ public class AdviceWithTransactionIssueTest extends
CamelSpringTestSupport {
@Test
void testAdviceWithWeaveById() throws Exception {
- RouteReifier.adviceWith(context.getRouteDefinitions().get(0), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith(context.getRouteDefinitions().get(0), context,
new AdviceWithRouteBuilder() {
@Override
public void configure() {
weaveById("mock-b*").after().to("mock:last");
@@ -61,7 +61,7 @@ public class AdviceWithTransactionIssueTest extends
CamelSpringTestSupport {
@Test
void testAdviceWithAddLast() throws Exception {
- RouteReifier.adviceWith(context.getRouteDefinitions().get(0), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith(context.getRouteDefinitions().get(0), context,
new AdviceWithRouteBuilder() {
@Override
public void configure() {
weaveAddLast().to("mock:last");
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.java
index f4dade4..610340a 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.java
+++
b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.java
@@ -18,10 +18,10 @@ package org.apache.camel.itest.jms;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.builder.AdviceWith;
import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.utils.extensions.JmsServiceExtension;
-import org.apache.camel.reifier.RouteReifier;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
@@ -59,7 +59,7 @@ public class JMSTransactionIsTransactedRedeliveredTest
extends CamelSpringTestSu
@Test
void testTransactionSuccess() throws Exception {
- RouteReifier.adviceWith(context.getRouteDefinitions().get(0), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith(context.getRouteDefinitions().get(0), context,
new AdviceWithRouteBuilder() {
@Override
public void configure() {
onException(AssertionError.class).to("log:error",
"mock:error");
