You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by al...@apache.org on 2019/09/23 08:13:56 UTC
[camel] 02/02: CAMEL-13965: Shrink the code a bit with
AdviceWithRouteBuilder
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3e58b1ae602e46537de8fd431bf1197430ea61ca
Author: aldettinger <al...@gmail.com>
AuthorDate: Sun Sep 22 21:39:24 2019 +0200
CAMEL-13965: Shrink the code a bit with AdviceWithRouteBuilder
---
...nterceptSendToEndpointWithLoadbalancerTest.java | 14 +++-------
.../test/issues/AdviceWithOnCompletionTest.java | 14 +++-------
.../AdviceWithOnExceptionMultipleIssueTest.java | 31 +++++-----------------
.../test/issues/AdviceWithOnCompletionTest.xml | 2 +-
4 files changed, 16 insertions(+), 45 deletions(-)
diff --git a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/issues/AdviceWithInterceptSendToEndpointWithLoadbalancerTest.java b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/issues/AdviceWithInterceptSendToEndpointWithLoadbalancerTest.java
index 37c6772..844cf4c 100644
--- a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/issues/AdviceWithInterceptSendToEndpointWithLoadbalancerTest.java
+++ b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/issues/AdviceWithInterceptSendToEndpointWithLoadbalancerTest.java
@@ -16,9 +16,8 @@
*/
package org.apache.camel.test.issues;
+import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
-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.Test;
import org.springframework.context.support.AbstractApplicationContext;
@@ -38,14 +37,8 @@ public class AdviceWithInterceptSendToEndpointWithLoadbalancerTest extends Camel
@Test
public void testSimpleMultipleAdvice() throws Exception {
- RouteDefinition route = context.getRouteDefinitions().get(0);
- RouteReifier.adviceWith(route, context, new RouteBuilder() {
- public void configure() throws Exception {
- interceptSendToEndpoint("seda:end1")
- .skipSendToOriginalEndpoint()
- .to("mock:end");
- }
- });
+
+ AdviceWithRouteBuilder.adviceWith(context, "load-balancer-test-route", a -> a.interceptSendToEndpoint("seda:end1").skipSendToOriginalEndpoint().to("mock:end"));
context.start();
@@ -61,6 +54,7 @@ public class AdviceWithInterceptSendToEndpointWithLoadbalancerTest extends Camel
@Override
public void configure() throws Exception {
from("direct:start")
+ .routeId("load-balancer-test-route")
.loadBalance().failover()
.to("seda:end1", "seda:end2");
}
diff --git a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/issues/AdviceWithOnCompletionTest.java b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/issues/AdviceWithOnCompletionTest.java
index 0c44cb7..1dfa9b2 100644
--- a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/issues/AdviceWithOnCompletionTest.java
+++ b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/issues/AdviceWithOnCompletionTest.java
@@ -17,8 +17,6 @@
package org.apache.camel.test.issues;
import org.apache.camel.builder.AdviceWithRouteBuilder;
-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.Test;
import org.springframework.context.support.AbstractApplicationContext;
@@ -38,14 +36,10 @@ public class AdviceWithOnCompletionTest extends CamelSpringTestSupport {
@Test
public void testOnCompletion() throws Exception {
- RouteDefinition route = context.getRouteDefinitions().get(0);
- RouteReifier.adviceWith(route, context, new AdviceWithRouteBuilder() {
- public void configure() throws Exception {
- replaceFromWith("direct:start");
-
- weaveAddFirst().convertBodyTo(String.class);
- weaveAddLast().to("mock:result");
- }
+ AdviceWithRouteBuilder.adviceWith(context, "advice-with-on-completion-test-route", a -> {
+ a.replaceFromWith("direct:start");
+ a.weaveAddFirst().convertBodyTo(String.class);
+ a.weaveAddLast().to("mock:result");
});
context.start();
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 c2d1437..fe21cf3 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
@@ -39,22 +39,11 @@ public class AdviceWithOnExceptionMultipleIssueTest extends CamelSpringTestSuppo
@Test
public void testSimpleMultipleAdvice() throws Exception {
- RouteReifier.adviceWith(context.getRouteDefinition("RouteA"), context, new AdviceWithRouteBuilder() {
- @Override
- public void configure() throws Exception {
- interceptSendToEndpoint("mock:resultA").process(new Processor() {
- @Override
- public void process(Exchange exchange) throws Exception {
- }
- });
- }
+ AdviceWithRouteBuilder.adviceWith(context, "RouteA", a -> {
+ a.interceptSendToEndpoint("mock:resultA").process();
});
- RouteReifier.adviceWith(context.getRouteDefinition("RouteB"), context, new AdviceWithRouteBuilder() {
- @Override
- public void configure() throws Exception {
- }
- });
+ AdviceWithRouteBuilder.adviceWith(context, "RouteB", a -> { });
context.start();
@@ -65,16 +54,10 @@ public class AdviceWithOnExceptionMultipleIssueTest extends CamelSpringTestSuppo
@Test
public void testMultipleAdviceWithExceptionThrown() throws Exception {
- RouteReifier.adviceWith(context.getRouteDefinition("RouteA"), context, new AdviceWithRouteBuilder() {
- @Override
- public void configure() throws Exception {
- interceptSendToEndpoint("mock:resultA").process(new Processor() {
- @Override
- public void process(Exchange exchange) throws Exception {
- throw new Exception("my exception");
- }
- });
- }
+ AdviceWithRouteBuilder.adviceWith(context, "RouteA", a -> {
+ a.interceptSendToEndpoint("mock:resultA").process(e -> {
+ throw new Exception("my exception");
+ });
});
context.start();
diff --git a/components/camel-test-spring-junit5/src/test/resources/org/apache/camel/test/issues/AdviceWithOnCompletionTest.xml b/components/camel-test-spring-junit5/src/test/resources/org/apache/camel/test/issues/AdviceWithOnCompletionTest.xml
index a75147a..d699dd7 100644
--- a/components/camel-test-spring-junit5/src/test/resources/org/apache/camel/test/issues/AdviceWithOnCompletionTest.xml
+++ b/components/camel-test-spring-junit5/src/test/resources/org/apache/camel/test/issues/AdviceWithOnCompletionTest.xml
@@ -31,7 +31,7 @@
<to uri="mock:complete" />
</onCompletion>
- <route>
+ <route id="advice-with-on-completion-test-route">
<from uri="file:start" />
<to uri="log:end" />
</route>