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 2017/02/17 10:53:22 UTC
[2/2] camel git commit: CAMEL-10855: Camel adviceWith behaves
differently when changing the order of weave statements
CAMEL-10855: Camel adviceWith behaves differently when changing the order of weave statements
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d035f771
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d035f771
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d035f771
Branch: refs/heads/camel-2.18.x
Commit: d035f771c8c6236ba9a8cbe1024519fb8deb46d7
Parents: c123041
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Feb 17 11:52:37 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Feb 17 11:53:18 2017 +0100
----------------------------------------------------------------------
.../apache/camel/builder/AdviceWithTasks.java | 66 +++++++++-----------
.../interceptor/AdviceWithWeaveLastCBRTest.java | 20 ++++++
.../AdviceWithWeaveToUriAndAddLastTest.java | 57 +++++++++++++++++
3 files changed, 107 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d035f771/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
index ef1531d..f89a042 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
@@ -144,35 +144,32 @@ public final class AdviceWithTasks {
public static AdviceWithTask replaceByToString(final RouteDefinition route, final String toString, final ProcessorDefinition<?> replace,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo, int maxDeep) {
MatchBy matchBy = new MatchByToString(toString);
- Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
- return doReplace(route, new MatchByToString(toString), replace, it);
+ return doReplace(route, matchBy, replace, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
}
public static AdviceWithTask replaceByToUri(final RouteDefinition route, final String toUri, final ProcessorDefinition<?> replace,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo, int maxDeep) {
MatchBy matchBy = new MatchByToUri(toUri);
- Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
- return doReplace(route, new MatchByToUri(toUri), replace, it);
+ return doReplace(route, matchBy, replace, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
}
public static AdviceWithTask replaceById(final RouteDefinition route, final String id, final ProcessorDefinition<?> replace,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo, int maxDeep) {
MatchBy matchBy = new MatchById(id);
- Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
- return doReplace(route, matchBy, replace, it);
+ return doReplace(route, matchBy, replace, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
}
public static AdviceWithTask replaceByType(final RouteDefinition route, final Class<?> type, final ProcessorDefinition<?> replace,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo, int maxDeep) {
MatchBy matchBy = new MatchByType(type);
- Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
- return doReplace(route, matchBy, replace, it);
+ return doReplace(route, matchBy, replace, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
}
private static AdviceWithTask doReplace(final RouteDefinition route, final MatchBy matchBy, final ProcessorDefinition<?> replace,
- final Iterator<ProcessorDefinition<?>> it) {
+ boolean selectFirst, boolean selectLast, int selectFrom, int selectTo, int maxDeep) {
return new AdviceWithTask() {
public void task() throws Exception {
+ Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
boolean match = false;
while (it.hasNext()) {
ProcessorDefinition<?> output = it.next();
@@ -184,6 +181,8 @@ public final class AdviceWithTasks {
match = true;
outputs.add(index + 1, replace);
Object old = outputs.remove(index);
+ // must set parent on the node we added in the route
+ replace.setParent(output.getParent());
LOG.info("AdviceWith (" + matchBy.getId() + ") : [" + old + "] --> replace [" + replace + "]");
}
}
@@ -200,36 +199,33 @@ public final class AdviceWithTasks {
public static AdviceWithTask removeByToString(final RouteDefinition route, final String toString,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo, int maxDeep) {
MatchBy matchBy = new MatchByToString(toString);
- Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
- return doRemove(route, matchBy, it);
+ return doRemove(route, matchBy, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
}
public static AdviceWithTask removeByToUri(final RouteDefinition route, final String toUri,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo, int maxDeep) {
MatchBy matchBy = new MatchByToUri(toUri);
- Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
- return doRemove(route, matchBy, it);
+ return doRemove(route, matchBy, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
}
public static AdviceWithTask removeById(final RouteDefinition route, final String id,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo, int maxDeep) {
MatchBy matchBy = new MatchById(id);
- Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
- return doRemove(route, matchBy, it);
+ return doRemove(route, matchBy, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
}
public static AdviceWithTask removeByType(final RouteDefinition route, final Class<?> type,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo, int maxDeep) {
MatchBy matchBy = new MatchByType(type);
- Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
- return doRemove(route, matchBy, it);
+ return doRemove(route, matchBy, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
}
private static AdviceWithTask doRemove(final RouteDefinition route, final MatchBy matchBy,
- final Iterator<ProcessorDefinition<?>> it) {
+ boolean selectFirst, boolean selectLast, int selectFrom, int selectTo, int maxDeep) {
return new AdviceWithTask() {
public void task() throws Exception {
boolean match = false;
+ Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
while (it.hasNext()) {
ProcessorDefinition<?> output = it.next();
if (matchBy.match(output)) {
@@ -255,36 +251,33 @@ public final class AdviceWithTasks {
public static AdviceWithTask beforeByToString(final RouteDefinition route, final String toString, final ProcessorDefinition<?> before,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo, int maxDeep) {
MatchBy matchBy = new MatchByToString(toString);
- Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
- return doBefore(route, matchBy, before, it);
+ return doBefore(route, matchBy, before, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
}
public static AdviceWithTask beforeByToUri(final RouteDefinition route, final String toUri, final ProcessorDefinition<?> before,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo, int maxDeep) {
MatchBy matchBy = new MatchByToUri(toUri);
- Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
- return doBefore(route, matchBy, before, it);
+ return doBefore(route, matchBy, before, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
}
public static AdviceWithTask beforeById(final RouteDefinition route, final String id, final ProcessorDefinition<?> before,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo, int maxDeep) {
MatchBy matchBy = new MatchById(id);
- Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
- return doBefore(route, matchBy, before, it);
+ return doBefore(route, matchBy, before, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
}
public static AdviceWithTask beforeByType(final RouteDefinition route, final Class<?> type, final ProcessorDefinition<?> before,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo, int maxDeep) {
MatchBy matchBy = new MatchByType(type);
- Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
- return doBefore(route, matchBy, before, it);
+ return doBefore(route, matchBy, before, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
}
private static AdviceWithTask doBefore(final RouteDefinition route, final MatchBy matchBy, final ProcessorDefinition<?> before,
- final Iterator<ProcessorDefinition<?>> it) {
+ boolean selectFirst, boolean selectLast, int selectFrom, int selectTo, int maxDeep) {
return new AdviceWithTask() {
public void task() throws Exception {
boolean match = false;
+ Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
while (it.hasNext()) {
ProcessorDefinition<?> output = it.next();
if (matchBy.match(output)) {
@@ -295,6 +288,8 @@ public final class AdviceWithTasks {
match = true;
Object existing = outputs.get(index);
outputs.add(index, before);
+ // must set parent on the node we added in the route
+ before.setParent(output.getParent());
LOG.info("AdviceWith (" + matchBy.getId() + ") : [" + existing + "] --> before [" + before + "]");
}
}
@@ -311,36 +306,33 @@ public final class AdviceWithTasks {
public static AdviceWithTask afterByToString(final RouteDefinition route, final String toString, final ProcessorDefinition<?> after,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo, int maxDeep) {
MatchBy matchBy = new MatchByToString(toString);
- Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
- return doAfter(route, matchBy, after, it);
+ return doAfter(route, matchBy, after, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
}
public static AdviceWithTask afterByToUri(final RouteDefinition route, final String toUri, final ProcessorDefinition<?> after,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo, int maxDeep) {
MatchBy matchBy = new MatchByToUri(toUri);
- Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
- return doAfter(route, matchBy, after, it);
+ return doAfter(route, matchBy, after, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
}
public static AdviceWithTask afterById(final RouteDefinition route, final String id, final ProcessorDefinition<?> after,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo, int maxDeep) {
MatchBy matchBy = new MatchById(id);
- Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
- return doAfter(route, matchBy, after, it);
+ return doAfter(route, matchBy, after, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
}
public static AdviceWithTask afterByType(final RouteDefinition route, final Class<?> type, final ProcessorDefinition<?> after,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo, int maxDeep) {
MatchBy matchBy = new MatchByType(type);
- Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
- return doAfter(route, matchBy, after, it);
+ return doAfter(route, matchBy, after, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
}
private static AdviceWithTask doAfter(final RouteDefinition route, final MatchBy matchBy, final ProcessorDefinition<?> after,
- final Iterator<ProcessorDefinition<?>> it) {
+ boolean selectFirst, boolean selectLast, int selectFrom, int selectTo, int maxDeep) {
return new AdviceWithTask() {
public void task() throws Exception {
boolean match = false;
+ Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo, maxDeep);
while (it.hasNext()) {
ProcessorDefinition<?> output = it.next();
if (matchBy.match(output)) {
@@ -351,6 +343,8 @@ public final class AdviceWithTasks {
match = true;
Object existing = outputs.get(index);
outputs.add(index + 1, after);
+ // must set parent on the node we added in the route
+ after.setParent(output.getParent());
LOG.info("AdviceWith (" + matchBy.getId() + ") : [" + existing + "] --> after [" + after + "]");
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d035f771/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithWeaveLastCBRTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithWeaveLastCBRTest.java b/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithWeaveLastCBRTest.java
index b47b256..68e2951 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithWeaveLastCBRTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithWeaveLastCBRTest.java
@@ -43,6 +43,26 @@ public class AdviceWithWeaveLastCBRTest extends ContextTestSupport {
assertMockEndpointsSatisfied();
}
+ public void testWeaveByToUriAndAddLast() throws Exception {
+ context.getRouteDefinitions().get(0).adviceWith(context, new AdviceWithRouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ weaveByToUri("mock:foo").replace().to("mock:foo2");
+ // insert at the end of the existing route, the given piece of route
+ weaveAddLast().to("mock:last");
+ }
+ });
+
+ getMockEndpoint("mock:foo").expectedMessageCount(0);
+ getMockEndpoint("mock:foo2").expectedMessageCount(1);
+ getMockEndpoint("mock:bar").expectedMessageCount(0);
+ getMockEndpoint("mock:last").expectedMessageCount(1);
+
+ template.sendBodyAndHeader("direct:start", "Hello World", "foo", "yeah");
+
+ assertMockEndpointsSatisfied();
+ }
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
http://git-wip-us.apache.org/repos/asf/camel/blob/d035f771/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithWeaveToUriAndAddLastTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithWeaveToUriAndAddLastTest.java b/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithWeaveToUriAndAddLastTest.java
new file mode 100644
index 0000000..269f47d
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithWeaveToUriAndAddLastTest.java
@@ -0,0 +1,57 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.processor.interceptor;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.AdviceWithRouteBuilder;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * Advice with tests
+ */
+public class AdviceWithWeaveToUriAndAddLastTest extends ContextTestSupport {
+
+ public void testWeaveByToUriAndAddLast() throws Exception {
+ context.getRouteDefinitions().get(0).adviceWith(context, new AdviceWithRouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ weaveByToUri("mock:foo").replace().to("mock:foo2");
+ // insert at the end of the existing route, the given piece of route
+ weaveAddLast().to("mock:last");
+ }
+ });
+
+ getMockEndpoint("mock:foo").expectedMessageCount(0);
+ getMockEndpoint("mock:foo2").expectedMessageCount(1);
+ getMockEndpoint("mock:last").expectedMessageCount(1);
+
+ template.sendBodyAndHeader("direct:start", "Hello World", "foo", "yeah");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start")
+ .to("mock:foo");
+ }
+ };
+ }
+}
\ No newline at end of file