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 5c574d5 CAMEL-14181: advice with - Should not dump routes if jaxb is
not on classpath (will fail when attempting to dump, so we ignore this)
5c574d5 is described below
commit 5c574d563401a7652d03e055e3fdf49eb2065c26
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Nov 18 13:42:52 2019 +0100
CAMEL-14181: advice with - Should not dump routes if jaxb is not on
classpath (will fail when attempting to dump, so we ignore this)
---
.../apache/camel/builder/AdviceWithRouteBuilder.java | 10 ++++++++++
.../java/org/apache/camel/reifier/RouteReifier.java | 19 +++++++++++++------
...omponentAdviceWithInterceptSendToEndpointTest.java | 3 ++-
...thInterceptSendToEndpointWithLoadbalancerTest.java | 3 ++-
.../issues/AdviceWithOnExceptionAndInterceptTest.java | 5 +++--
.../camel/issues/AdviceWithStartTargetIssueTest.java | 3 ++-
.../camel/issues/ErrorHandlerAdviceIssueTest.java | 5 +++--
.../RouteScopedErrorHandlerAndOnExceptionTest.java | 5 +++--
...ExceptionWithInterceptSendToEndpointIssueTest.java | 3 ++-
...InterceptSendToEndpointIssueWithPredicateTest.java | 3 ++-
.../issues/StopRouteImpactsErrorHandlerTest.java | 5 +++--
...InterceptSendToEndpointIssueWithPredicateTest.java | 3 ++-
.../InterceptSendToEndpointWithParametersTest.java | 3 ++-
.../processor/interceptor/AdviceWithRouteIdTest.java | 3 ++-
.../camel/processor/interceptor/AdviceWithTest.java | 9 +++++----
15 files changed, 56 insertions(+), 26 deletions(-)
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
b/core/camel-core-engine/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
index 0f86eff..04999ca 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
@@ -112,11 +112,21 @@ public abstract class AdviceWithRouteBuilder extends
RouteBuilder {
return RouteReifier.adviceWith(rd, camelContext, new
AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
+ if (builder instanceof AdviceWithRouteBuilder) {
+ setLogRouteAsXml(((AdviceWithRouteBuilder)
builder).isLogRouteAsXml());
+ }
builder.accept(this);
}
});
}
+ public AdviceWithRouteBuilder() {
+ }
+
+ public AdviceWithRouteBuilder(CamelContext context) {
+ super(context);
+ }
+
/**
* Sets the original route to be adviced.
*
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RouteReifier.java
b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RouteReifier.java
index 758e199..cf5d223 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RouteReifier.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RouteReifier.java
@@ -159,8 +159,7 @@ public class RouteReifier extends
ProcessorReifier<RouteDefinition> {
log.debug("AdviceWith route before: {}", this);
- // inject this route into the advice route builder so it can access
this
- // route
+ // inject this route into the advice route builder so it can access
this route
// and offer features to manipulate the route directly
boolean logRoutesAsXml = true;
if (builder instanceof AdviceWithRouteBuilder) {
@@ -191,7 +190,11 @@ public class RouteReifier extends
ProcessorReifier<RouteDefinition> {
String beforeAsXml = null;
if (logRoutesAsXml && log.isInfoEnabled()) {
- beforeAsXml = ModelHelper.dumpModelAsXml(camelContext, definition);
+ try {
+ beforeAsXml = ModelHelper.dumpModelAsXml(camelContext,
definition);
+ } catch (Throwable e) {
+ // ignore, it may be due jaxb is not on classpath etc
+ }
}
// stop and remove this existing route
@@ -218,9 +221,13 @@ public class RouteReifier extends
ProcessorReifier<RouteDefinition> {
log.info("AdviceWith route after: {}", merged);
}
- if (logRoutesAsXml && log.isInfoEnabled()) {
- String afterAsXml = ModelHelper.dumpModelAsXml(camelContext,
merged);
- log.info("Adviced route before/after as XML:\n{}\n{}",
beforeAsXml, afterAsXml);
+ if (beforeAsXml != null && logRoutesAsXml && log.isInfoEnabled()) {
+ try {
+ String afterAsXml = ModelHelper.dumpModelAsXml(camelContext,
merged);
+ log.info("Adviced route before/after as XML:\n{}\n{}",
beforeAsXml, afterAsXml);
+ } catch (Throwable e) {
+ // ignore, it may be due jaxb is not on classpath etc
+ }
}
// If the camel context is started then we start the route
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentAdviceWithInterceptSendToEndpointTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentAdviceWithInterceptSendToEndpointTest.java
index 0181226..475b547 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentAdviceWithInterceptSendToEndpointTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentAdviceWithInterceptSendToEndpointTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.properties;
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.reifier.RouteReifier;
@@ -28,7 +29,7 @@ public class
PropertiesComponentAdviceWithInterceptSendToEndpointTest extends Co
@Test
public void testAdviceWithInterceptSendToEndpoint() throws Exception {
RouteDefinition route = context.getRouteDefinition("foo");
- RouteReifier.adviceWith(route, context, new RouteBuilder() {
+ RouteReifier.adviceWith(route, context, new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
interceptSendToEndpoint("{{cool.mock}}:res*").to("mock:foo");
diff --git
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInterceptSendToEndpointWithLoadbalancerTest.java
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInterceptSendToEndpointWithLoadbalancerTest.java
index 53689c4..532a358 100644
---
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInterceptSendToEndpointWithLoadbalancerTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInterceptSendToEndpointWithLoadbalancerTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.issues;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.reifier.RouteReifier;
@@ -39,7 +40,7 @@ public class
AdviceWithInterceptSendToEndpointWithLoadbalancerTest extends Conte
});
RouteDefinition route = context.getRouteDefinitions().get(0);
- RouteReifier.adviceWith(route, context, new RouteBuilder() {
+ RouteReifier.adviceWith(route, context, new AdviceWithRouteBuilder() {
public void configure() throws Exception {
interceptSendToEndpoint("seda:end1").skipSendToOriginalEndpoint().to("mock:end");
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithOnExceptionAndInterceptTest.java
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithOnExceptionAndInterceptTest.java
index c0ecd1e..789eb3d 100644
---
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithOnExceptionAndInterceptTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithOnExceptionAndInterceptTest.java
@@ -22,6 +22,7 @@ import java.sql.SQLException;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.reifier.RouteReifier;
@@ -37,7 +38,7 @@ public class AdviceWithOnExceptionAndInterceptTest extends
ContextTestSupport {
return false;
}
- class AdviceWithRouteBuilder extends RouteBuilder {
+ class MyAdviceWithRouteBuilder extends AdviceWithRouteBuilder {
@Override
public void configure() {
onException(SQLException.class).handled(true).transform(constant("Intercepted
SQL!")).log("sending ${body}").to("mock:b");
@@ -61,7 +62,7 @@ public class AdviceWithOnExceptionAndInterceptTest extends
ContextTestSupport {
});
RouteDefinition routeDefinition = context.getRouteDefinitions().get(0);
- RouteReifier.adviceWith(routeDefinition, context, new
AdviceWithRouteBuilder());
+ RouteReifier.adviceWith(routeDefinition, context, new
MyAdviceWithRouteBuilder());
context.start();
getMockEndpoint("mock:a").expectedMessageCount(0);
diff --git
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithStartTargetIssueTest.java
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithStartTargetIssueTest.java
index 85c3fda..e82d90f 100644
---
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithStartTargetIssueTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithStartTargetIssueTest.java
@@ -22,6 +22,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.NamedNode;
import org.apache.camel.Processor;
+import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.reifier.RouteReifier;
import org.apache.camel.spi.InterceptStrategy;
@@ -37,7 +38,7 @@ public class AdviceWithStartTargetIssueTest extends
ContextTestSupport {
@Test
public void testAdvised() throws Exception {
- RouteReifier.adviceWith(context.getRouteDefinitions().get(0), context,
new RouteBuilder() {
+ RouteReifier.adviceWith(context.getRouteDefinitions().get(0), context,
new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
interceptSendToEndpoint("mock:foo").skipSendToOriginalEndpoint().to("log:foo").to("mock:advised");
diff --git
a/core/camel-core/src/test/java/org/apache/camel/issues/ErrorHandlerAdviceIssueTest.java
b/core/camel-core/src/test/java/org/apache/camel/issues/ErrorHandlerAdviceIssueTest.java
index 05ee20b..9e46155 100644
---
a/core/camel-core/src/test/java/org/apache/camel/issues/ErrorHandlerAdviceIssueTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/issues/ErrorHandlerAdviceIssueTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.issues;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.reifier.RouteReifier;
@@ -30,7 +31,7 @@ public class ErrorHandlerAdviceIssueTest extends
ContextTestSupport {
@Test
public void testErrorHandlerAdvice() throws Exception {
RouteDefinition foo = context.getRouteDefinition("foo");
- RouteReifier.adviceWith(foo, context, new RouteBuilder() {
+ RouteReifier.adviceWith(foo, context, new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
interceptSendToEndpoint("seda:*").skipSendToOriginalEndpoint().throwException(new
IllegalAccessException("Forced"));
@@ -38,7 +39,7 @@ public class ErrorHandlerAdviceIssueTest extends
ContextTestSupport {
});
RouteDefinition error = context.getRouteDefinition("error");
- RouteReifier.adviceWith(error, context, new RouteBuilder() {
+ RouteReifier.adviceWith(error, context, new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
interceptSendToEndpoint("file:*").skipSendToOriginalEndpoint().to("mock:file");
diff --git
a/core/camel-core/src/test/java/org/apache/camel/issues/RouteScopedErrorHandlerAndOnExceptionTest.java
b/core/camel-core/src/test/java/org/apache/camel/issues/RouteScopedErrorHandlerAndOnExceptionTest.java
index 5682470..addae67 100644
---
a/core/camel-core/src/test/java/org/apache/camel/issues/RouteScopedErrorHandlerAndOnExceptionTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/issues/RouteScopedErrorHandlerAndOnExceptionTest.java
@@ -22,6 +22,7 @@ import java.net.ConnectException;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.LoggingLevel;
+import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.reifier.RouteReifier;
@@ -35,7 +36,7 @@ public class RouteScopedErrorHandlerAndOnExceptionTest
extends ContextTestSuppor
@Test
public void testOnException() throws Exception {
RouteDefinition route = context.getRouteDefinitions().get(0);
- RouteReifier.adviceWith(route, context, new RouteBuilder() {
+ RouteReifier.adviceWith(route, context, new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
interceptSendToEndpoint("seda:*").skipSendToOriginalEndpoint().throwException(new
ConnectException("Forced"));
@@ -61,7 +62,7 @@ public class RouteScopedErrorHandlerAndOnExceptionTest
extends ContextTestSuppor
@Test
public void testErrorHandler() throws Exception {
RouteDefinition route = context.getRouteDefinitions().get(0);
- RouteReifier.adviceWith(route, context, new RouteBuilder() {
+ RouteReifier.adviceWith(route, context, new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
interceptSendToEndpoint("seda:*").skipSendToOriginalEndpoint().throwException(new
FileNotFoundException("Forced"));
diff --git
a/core/camel-core/src/test/java/org/apache/camel/issues/RouteScopedOnExceptionWithInterceptSendToEndpointIssueTest.java
b/core/camel-core/src/test/java/org/apache/camel/issues/RouteScopedOnExceptionWithInterceptSendToEndpointIssueTest.java
index 5b6e332..47d4add 100644
---
a/core/camel-core/src/test/java/org/apache/camel/issues/RouteScopedOnExceptionWithInterceptSendToEndpointIssueTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/issues/RouteScopedOnExceptionWithInterceptSendToEndpointIssueTest.java
@@ -21,6 +21,7 @@ import java.net.ConnectException;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.LoggingLevel;
+import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.reifier.RouteReifier;
@@ -34,7 +35,7 @@ public class
RouteScopedOnExceptionWithInterceptSendToEndpointIssueTest extends
@Test
public void testIssue() throws Exception {
RouteDefinition route = context.getRouteDefinitions().get(0);
- RouteReifier.adviceWith(route, context, new RouteBuilder() {
+ RouteReifier.adviceWith(route, context, new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
interceptSendToEndpoint("seda:*").skipSendToOriginalEndpoint().throwException(new
ConnectException("Forced"));
diff --git
a/core/camel-core/src/test/java/org/apache/camel/issues/RouteScopedOnExceptionWithInterceptSendToEndpointIssueWithPredicateTest.java
b/core/camel-core/src/test/java/org/apache/camel/issues/RouteScopedOnExceptionWithInterceptSendToEndpointIssueWithPredicateTest.java
index 3b2d523..2bc3dec 100644
---
a/core/camel-core/src/test/java/org/apache/camel/issues/RouteScopedOnExceptionWithInterceptSendToEndpointIssueWithPredicateTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/issues/RouteScopedOnExceptionWithInterceptSendToEndpointIssueWithPredicateTest.java
@@ -24,6 +24,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.LoggingLevel;
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
+import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.PredicateBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.RouteDefinition;
@@ -42,7 +43,7 @@ public class
RouteScopedOnExceptionWithInterceptSendToEndpointIssueWithPredicate
final Predicate fail =
PredicateBuilder.or(header(Exchange.REDELIVERY_COUNTER).isNull(),
header(Exchange.REDELIVERY_COUNTER).isLessThan(5));
RouteDefinition route = context.getRouteDefinitions().get(0);
- RouteReifier.adviceWith(route, context, new RouteBuilder() {
+ RouteReifier.adviceWith(route, context, new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
interceptSendToEndpoint("seda:*").skipSendToOriginalEndpoint().process(new
Processor() {
diff --git
a/core/camel-core/src/test/java/org/apache/camel/issues/StopRouteImpactsErrorHandlerTest.java
b/core/camel-core/src/test/java/org/apache/camel/issues/StopRouteImpactsErrorHandlerTest.java
index efba857..568bf55 100644
---
a/core/camel-core/src/test/java/org/apache/camel/issues/StopRouteImpactsErrorHandlerTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/issues/StopRouteImpactsErrorHandlerTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.issues;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.reifier.RouteReifier;
@@ -30,7 +31,7 @@ public class StopRouteImpactsErrorHandlerTest extends
ContextTestSupport {
@Test
public void testIssue() throws Exception {
RouteDefinition testRoute = context.getRouteDefinition("TestRoute");
- RouteReifier.adviceWith(testRoute, context, new RouteBuilder() {
+ RouteReifier.adviceWith(testRoute, context, new
AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
interceptSendToEndpoint("seda:*").skipSendToOriginalEndpoint().to("log:seda").throwException(new
IllegalArgumentException("Forced"));
@@ -38,7 +39,7 @@ public class StopRouteImpactsErrorHandlerTest extends
ContextTestSupport {
});
RouteDefinition smtpRoute = context.getRouteDefinition("smtpRoute");
- RouteReifier.adviceWith(smtpRoute, context, new RouteBuilder() {
+ RouteReifier.adviceWith(smtpRoute, context, new
AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
interceptSendToEndpoint("smtp*").to("log:smtp").skipSendToOriginalEndpoint().to("mock:smtp");
diff --git
a/core/camel-core/src/test/java/org/apache/camel/issues/TwoRouteScopedOnExceptionWithInterceptSendToEndpointIssueWithPredicateTest.java
b/core/camel-core/src/test/java/org/apache/camel/issues/TwoRouteScopedOnExceptionWithInterceptSendToEndpointIssueWithPredicateTest.java
index f5d27724..ecb9d60 100644
---
a/core/camel-core/src/test/java/org/apache/camel/issues/TwoRouteScopedOnExceptionWithInterceptSendToEndpointIssueWithPredicateTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/issues/TwoRouteScopedOnExceptionWithInterceptSendToEndpointIssueWithPredicateTest.java
@@ -24,6 +24,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.LoggingLevel;
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
+import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.PredicateBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.RouteDefinition;
@@ -42,7 +43,7 @@ public class
TwoRouteScopedOnExceptionWithInterceptSendToEndpointIssueWithPredic
final Predicate fail =
PredicateBuilder.or(header(Exchange.REDELIVERY_COUNTER).isNull(),
header(Exchange.REDELIVERY_COUNTER).isLessThan(5));
RouteDefinition route = context.getRouteDefinitions().get(0);
- RouteReifier.adviceWith(route, context, new RouteBuilder() {
+ RouteReifier.adviceWith(route, context, new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
interceptSendToEndpoint("seda:*").skipSendToOriginalEndpoint().process(new
Processor() {
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSendToEndpointWithParametersTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSendToEndpointWithParametersTest.java
index 1f504ae..c531de8 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSendToEndpointWithParametersTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSendToEndpointWithParametersTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.processor.intercept;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.reifier.RouteReifier;
@@ -27,7 +28,7 @@ public class InterceptSendToEndpointWithParametersTest
extends ContextTestSuppor
@Test
public void testInterceptSendToEndpoint() throws Exception {
RouteDefinition route = context.getRouteDefinitions().get(0);
- RouteReifier.adviceWith(route, context, new RouteBuilder() {
+ RouteReifier.adviceWith(route, context, new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
interceptSendToEndpoint("log*").to("mock:http").skipSendToOriginalEndpoint();
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithRouteIdTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithRouteIdTest.java
index 6787cdc..d1875d7 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithRouteIdTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithRouteIdTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.processor.interceptor;
+import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.reifier.RouteReifier;
import org.junit.Test;
@@ -25,7 +26,7 @@ public class AdviceWithRouteIdTest extends AdviceWithTest {
@Override
@Test
public void testAdvised() throws Exception {
- RouteReifier.adviceWith(context.getRouteDefinition("myRoute"),
context, new RouteBuilder() {
+ RouteReifier.adviceWith(context.getRouteDefinition("myRoute"),
context, new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
interceptSendToEndpoint("mock:foo").skipSendToOriginalEndpoint().to("log:foo").to("mock:advised");
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithTest.java
index 93787ea..512a500 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.processor.interceptor;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.reifier.RouteReifier;
@@ -39,7 +40,7 @@ public class AdviceWithTest extends ContextTestSupport {
@Test
public void testAdvised() throws Exception {
// advice the first route using the inlined route builder
- RouteReifier.adviceWith(context.getRouteDefinitions().get(0), context,
new RouteBuilder() {
+ RouteReifier.adviceWith(context.getRouteDefinitions().get(0), context,
new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
// intercept sending to mock:foo and do something else
@@ -60,7 +61,7 @@ public class AdviceWithTest extends ContextTestSupport {
@Test
public void testAdvisedNoNewRoutesAllowed() throws Exception {
try {
- RouteReifier.adviceWith(context.getRouteDefinitions().get(0),
context, new RouteBuilder() {
+ RouteReifier.adviceWith(context.getRouteDefinitions().get(0),
context, new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
from("direct:bar").to("mock:bar");
@@ -76,7 +77,7 @@ public class AdviceWithTest extends ContextTestSupport {
@Test
public void testAdvisedThrowException() throws Exception {
- RouteReifier.adviceWith(context.getRouteDefinitions().get(0), context,
new RouteBuilder() {
+ RouteReifier.adviceWith(context.getRouteDefinitions().get(0), context,
new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
interceptSendToEndpoint("mock:foo").to("mock:advised").throwException(new
IllegalArgumentException("Damn"));
@@ -101,7 +102,7 @@ public class AdviceWithTest extends ContextTestSupport {
@Test
public void testAdvisedEmptyRoutes() throws Exception {
try {
- RouteReifier.adviceWith(new RouteDefinition(), context, new
RouteBuilder() {
+ RouteReifier.adviceWith(new RouteDefinition(), context, new
AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
interceptSendToEndpoint("mock:foo").skipSendToOriginalEndpoint().to("log:foo").to("mock:advised");
