This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 5a82bb6bf5cc Polish
5a82bb6bf5cc is described below
commit 5a82bb6bf5cc5866afaf6aa303c6b6177e5683db
Author: Claus Ibsen <[email protected]>
AuthorDate: Tue Mar 3 07:11:18 2026 +0100
Polish
---
.../component/rest/AdviceWithFromRestInlineRoutesTest.java | 4 ++--
.../issues/AdviceWithContextScopedErrorHandlerIssueTest.java | 2 +-
.../apache/camel/issues/AdviceWithErrorHandlerRemoveTest.java | 4 ++--
.../apache/camel/issues/AdviceWithInterceptFromRemoveTest.java | 4 ++--
.../org/apache/camel/issues/AdviceWithInterceptRemoveTest.java | 4 ++--
.../issues/AdviceWithInterceptSendToEndpointRemoveTest.java | 4 ++--
.../java/org/apache/camel/issues/AdviceWithInterceptTest.java | 2 +-
.../apache/camel/issues/AdviceWithInvalidConfiguredTest.java | 4 ++--
.../apache/camel/issues/AdviceWithOnCompletionRemoveTest.java | 4 ++--
.../camel/issues/AdviceWithOnExceptionMultipleIssueTest.java | 10 +++++-----
.../apache/camel/issues/AdviceWithOnExceptionRemoveTest.java | 4 ++--
.../issues/AdviceWithRouteScopedErrorHandlerIssueTest.java | 2 +-
.../camel/issues/AdviceWithTwoRoutesOnExceptionIssueTest.java | 4 ++--
.../java/org/apache/camel/issues/AdviceWithUrlIssueTest.java | 4 ++--
.../camel/processor/interceptor/AdviceWithRouteIdTest.java | 2 +-
15 files changed, 29 insertions(+), 29 deletions(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/rest/AdviceWithFromRestInlineRoutesTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/rest/AdviceWithFromRestInlineRoutesTest.java
index 5a712eee157b..d98d09d1a90f 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/rest/AdviceWithFromRestInlineRoutesTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/rest/AdviceWithFromRestInlineRoutesTest.java
@@ -41,13 +41,13 @@ public class AdviceWithFromRestInlineRoutesTest extends
ContextTestSupport {
@Test
public void testAdviceWithInlined() throws Exception {
- AdviceWith.adviceWith(context.getRouteDefinition("hello"), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith("hello", context, new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
weaveAddLast().to("mock:hello");
}
});
- AdviceWith.adviceWith(context.getRouteDefinition("bye"), context, new
AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith("bye", context, new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
weaveByType(TransformDefinition.class).replace().transform().simple("Echo
${body}");
diff --git
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithContextScopedErrorHandlerIssueTest.java
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithContextScopedErrorHandlerIssueTest.java
index 9b3da69ed7b6..06d1b5fcc1de 100644
---
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithContextScopedErrorHandlerIssueTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithContextScopedErrorHandlerIssueTest.java
@@ -29,7 +29,7 @@ public class AdviceWithContextScopedErrorHandlerIssueTest
extends ContextTestSup
@Test
public void testAdviceWith() throws Exception {
- AdviceWith.adviceWith(context.getRouteDefinition("route-a"), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith("route-a", context, new AdviceWithRouteBuilder()
{
@Override
public void configure() {
interceptSendToEndpoint("direct:bar").skipSendToOriginalEndpoint()
diff --git
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithErrorHandlerRemoveTest.java
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithErrorHandlerRemoveTest.java
index 187bfad637f8..a3feb84fa203 100644
---
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithErrorHandlerRemoveTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithErrorHandlerRemoveTest.java
@@ -42,7 +42,7 @@ public class AdviceWithErrorHandlerRemoveTest extends
ContextTestSupport {
getMockEndpoint("mock:d").expectedMessageCount(0);
getMockEndpoint("mock:dead").expectedMessageCount(0);
- AdviceWith.adviceWith(context.getRouteDefinition("foo"), context, new
AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith("foo", context, new AdviceWithRouteBuilder() {
@Override
public void configure() {
getOriginalRoute().errorHandler(noErrorHandler());
@@ -70,7 +70,7 @@ public class AdviceWithErrorHandlerRemoveTest extends
ContextTestSupport {
getMockEndpoint("mock:dead").expectedMessageCount(0);
getMockEndpoint("mock:dead2").expectedMessageCount(1);
- AdviceWith.adviceWith(context.getRouteDefinition("foo"), context, new
AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith("foo", context, new AdviceWithRouteBuilder() {
@Override
public void configure() {
// override errorHandler by using on exception
diff --git
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInterceptFromRemoveTest.java
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInterceptFromRemoveTest.java
index 48a2f00e3a7b..b4095fed48f9 100644
---
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInterceptFromRemoveTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInterceptFromRemoveTest.java
@@ -39,7 +39,7 @@ public class AdviceWithInterceptFromRemoveTest extends
ContextTestSupport {
getMockEndpoint("mock:d").expectedMessageCount(0);
getMockEndpoint("mock:intercept").expectedMessageCount(0);
- AdviceWith.adviceWith(context.getRouteDefinition("foo"), context, new
AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith("foo", context, new AdviceWithRouteBuilder() {
@Override
public void configure() {
weaveById("myIntercept").remove();
@@ -64,7 +64,7 @@ public class AdviceWithInterceptFromRemoveTest extends
ContextTestSupport {
getMockEndpoint("mock:intercept").expectedMessageCount(0);
getMockEndpoint("mock:intercept2").expectedMessageCount(1);
- AdviceWith.adviceWith(context.getRouteDefinition("foo"), context, new
AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith("foo", context, new AdviceWithRouteBuilder() {
@Override
public void configure() {
weaveById("myIntercept").replace().to("mock:intercept2");
diff --git
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInterceptRemoveTest.java
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInterceptRemoveTest.java
index ea5032768028..5846133c6924 100644
---
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInterceptRemoveTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInterceptRemoveTest.java
@@ -39,7 +39,7 @@ public class AdviceWithInterceptRemoveTest extends
ContextTestSupport {
getMockEndpoint("mock:d").expectedMessageCount(0);
getMockEndpoint("mock:intercept").expectedMessageCount(0);
- AdviceWith.adviceWith(context.getRouteDefinition("foo"), context, new
AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith("foo", context, new AdviceWithRouteBuilder() {
@Override
public void configure() {
weaveById("myIntercept").remove();
@@ -64,7 +64,7 @@ public class AdviceWithInterceptRemoveTest extends
ContextTestSupport {
getMockEndpoint("mock:intercept").expectedMessageCount(0);
getMockEndpoint("mock:intercept2").expectedMessageCount(1);
- AdviceWith.adviceWith(context.getRouteDefinition("foo"), context, new
AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith("foo", context, new AdviceWithRouteBuilder() {
@Override
public void configure() {
weaveById("myIntercept").replace().to("mock:intercept2");
diff --git
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInterceptSendToEndpointRemoveTest.java
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInterceptSendToEndpointRemoveTest.java
index 33108160e639..852a75fd9151 100644
---
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInterceptSendToEndpointRemoveTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInterceptSendToEndpointRemoveTest.java
@@ -39,7 +39,7 @@ public class AdviceWithInterceptSendToEndpointRemoveTest
extends ContextTestSupp
getMockEndpoint("mock:d").expectedMessageCount(0);
getMockEndpoint("mock:intercept").expectedMessageCount(0);
- AdviceWith.adviceWith(context.getRouteDefinition("foo"), context, new
AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith("foo", context, new AdviceWithRouteBuilder() {
@Override
public void configure() {
weaveById("myIntercept").remove();
@@ -64,7 +64,7 @@ public class AdviceWithInterceptSendToEndpointRemoveTest
extends ContextTestSupp
getMockEndpoint("mock:intercept").expectedMessageCount(0);
getMockEndpoint("mock:intercept2").expectedMessageCount(1);
- AdviceWith.adviceWith(context.getRouteDefinition("foo"), context, new
AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith("foo", context, new AdviceWithRouteBuilder() {
@Override
public void configure() {
weaveById("myIntercept").replace().to("mock:intercept2");
diff --git
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInterceptTest.java
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInterceptTest.java
index bc051f71c032..0d69f3891f28 100644
---
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInterceptTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInterceptTest.java
@@ -28,7 +28,7 @@ public class AdviceWithInterceptTest extends
ContextTestSupport {
public void testAdviceIntercept() throws Exception {
getMockEndpoint("mock:advice").expectedMessageCount(1);
- AdviceWith.adviceWith(context.getRouteDefinition("main"), context, new
AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith("main", context, new AdviceWithRouteBuilder() {
@Override
public void configure() {
weaveAddFirst().to("direct:advice");
diff --git
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInvalidConfiguredTest.java
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInvalidConfiguredTest.java
index f287b755ea3c..36104cdd8e51 100644
---
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInvalidConfiguredTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInvalidConfiguredTest.java
@@ -33,7 +33,7 @@ public class AdviceWithInvalidConfiguredTest extends
ContextTestSupport {
@Test
public void testNoErrorHandler() {
IllegalArgumentException e =
assertThrows(IllegalArgumentException.class, () -> {
- AdviceWith.adviceWith(context.getRouteDefinition("route-a"),
context, new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith("route-a", context, new
AdviceWithRouteBuilder() {
@Override
public void configure() {
errorHandler(defaultErrorHandler());
@@ -51,7 +51,7 @@ public class AdviceWithInvalidConfiguredTest extends
ContextTestSupport {
@Test
public void testNoExtraRoutes() {
IllegalArgumentException e =
assertThrows(IllegalArgumentException.class, () -> {
- AdviceWith.adviceWith(context.getRouteDefinition("route-a"),
context, new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith("route-a", context, new
AdviceWithRouteBuilder() {
@Override
public void configure() {
from("direct:foo").to("mock:foo");
diff --git
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithOnCompletionRemoveTest.java
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithOnCompletionRemoveTest.java
index bb9515e5a8ea..00555e35c253 100644
---
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithOnCompletionRemoveTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithOnCompletionRemoveTest.java
@@ -39,7 +39,7 @@ public class AdviceWithOnCompletionRemoveTest extends
ContextTestSupport {
getMockEndpoint("mock:d").expectedMessageCount(0);
getMockEndpoint("mock:done").expectedMessageCount(0);
- AdviceWith.adviceWith(context.getRouteDefinition("foo"), context, new
AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith("foo", context, new AdviceWithRouteBuilder() {
@Override
public void configure() {
weaveById("myCompletion").remove();
@@ -64,7 +64,7 @@ public class AdviceWithOnCompletionRemoveTest extends
ContextTestSupport {
getMockEndpoint("mock:done").expectedMessageCount(0);
getMockEndpoint("mock:done2").expectedMessageCount(1);
- AdviceWith.adviceWith(context.getRouteDefinition("foo"), context, new
AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith("foo", context, new AdviceWithRouteBuilder() {
@Override
public void configure() {
weaveById("myCompletion").replace().onCompletion().to("mock:done2");
diff --git
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithOnExceptionMultipleIssueTest.java
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithOnExceptionMultipleIssueTest.java
index 580a6b340a20..6e0768002ed7 100644
---
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithOnExceptionMultipleIssueTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithOnExceptionMultipleIssueTest.java
@@ -51,7 +51,7 @@ public class AdviceWithOnExceptionMultipleIssueTest extends
ContextTestSupport {
public void testSimpleMultipleAdvice() throws Exception {
context.addRoutes(createRouteBuilder());
- AdviceWith.adviceWith(context.getRouteDefinition("RouteA"), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith("RouteA", context, new AdviceWithRouteBuilder() {
@Override
public void configure() {
interceptSendToEndpoint("mock:resultA").process(new
Processor() {
@@ -62,7 +62,7 @@ public class AdviceWithOnExceptionMultipleIssueTest extends
ContextTestSupport {
}
});
- AdviceWith.adviceWith(context.getRouteDefinition("RouteB"), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith("RouteB", context, new AdviceWithRouteBuilder() {
@Override
public void configure() {
}
@@ -79,7 +79,7 @@ public class AdviceWithOnExceptionMultipleIssueTest extends
ContextTestSupport {
public void testMultipleAdviceWithExceptionThrown() throws Exception {
context.addRoutes(createRouteBuilder());
- AdviceWith.adviceWith(context.getRouteDefinition("RouteA"), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith("RouteA", context, new AdviceWithRouteBuilder() {
@Override
public void configure() {
interceptSendToEndpoint("mock:resultA").process(new
Processor() {
@@ -102,7 +102,7 @@ public class AdviceWithOnExceptionMultipleIssueTest extends
ContextTestSupport {
public void testMultipleAdvice() throws Exception {
context.addRoutes(createRouteBuilder());
- AdviceWith.adviceWith(context.getRouteDefinition("RouteA"), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith("RouteA", context, new AdviceWithRouteBuilder() {
@Override
public void configure() {
interceptSendToEndpoint("mock:resultA").process(new
Processor() {
@@ -114,7 +114,7 @@ public class AdviceWithOnExceptionMultipleIssueTest extends
ContextTestSupport {
}
});
- AdviceWith.adviceWith(context.getRouteDefinition("RouteB"), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith("RouteB", context, new AdviceWithRouteBuilder() {
@Override
public void configure() {
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithOnExceptionRemoveTest.java
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithOnExceptionRemoveTest.java
index 8430d551efb1..eaa499a48733 100644
---
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithOnExceptionRemoveTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithOnExceptionRemoveTest.java
@@ -42,7 +42,7 @@ public class AdviceWithOnExceptionRemoveTest extends
ContextTestSupport {
getMockEndpoint("mock:d").expectedMessageCount(0);
getMockEndpoint("mock:dead").expectedMessageCount(0);
- AdviceWith.adviceWith(context.getRouteDefinition("foo"), context, new
AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith("foo", context, new AdviceWithRouteBuilder() {
@Override
public void configure() {
weaveById("myException").remove();
@@ -70,7 +70,7 @@ public class AdviceWithOnExceptionRemoveTest extends
ContextTestSupport {
getMockEndpoint("mock:dead").expectedMessageCount(0);
getMockEndpoint("mock:dead2").expectedMessageCount(1);
- AdviceWith.adviceWith(context.getRouteDefinition("foo"), context, new
AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith("foo", context, new AdviceWithRouteBuilder() {
@Override
public void configure() {
weaveById("myException").replace().onException(Exception.class).handled(true).to("mock:dead2");
diff --git
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithRouteScopedErrorHandlerIssueTest.java
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithRouteScopedErrorHandlerIssueTest.java
index 6be7d8e49dbe..4d1f4b889dd3 100644
---
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithRouteScopedErrorHandlerIssueTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithRouteScopedErrorHandlerIssueTest.java
@@ -29,7 +29,7 @@ public class AdviceWithRouteScopedErrorHandlerIssueTest
extends ContextTestSuppo
@Test
public void testAdviceWith() throws Exception {
- AdviceWith.adviceWith(context.getRouteDefinition("route-a"), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith("route-a", context, new AdviceWithRouteBuilder()
{
@Override
public void configure() {
interceptSendToEndpoint("direct:bar").skipSendToOriginalEndpoint()
diff --git
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithTwoRoutesOnExceptionIssueTest.java
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithTwoRoutesOnExceptionIssueTest.java
index eecbbaff9b9d..33e6eb3d0954 100644
---
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithTwoRoutesOnExceptionIssueTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithTwoRoutesOnExceptionIssueTest.java
@@ -33,14 +33,14 @@ public class AdviceWithTwoRoutesOnExceptionIssueTest
extends ContextTestSupport
@Test
public void testAdviceWith() throws Exception {
- AdviceWith.adviceWith(context.getRouteDefinition("a"), context, new
AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith("a", context, new AdviceWithRouteBuilder() {
@Override
public void configure() {
interceptSendToEndpoint("mock:a").skipSendToOriginalEndpoint().to("mock:error");
}
});
- AdviceWith.adviceWith(context.getRouteDefinition("b"), context, new
AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith("b", context, new AdviceWithRouteBuilder() {
@Override
public void configure() {
interceptSendToEndpoint("mock:b").skipSendToOriginalEndpoint().to("mock:error");
diff --git
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithUrlIssueTest.java
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithUrlIssueTest.java
index 8945128ee225..4d9b2c1a566f 100644
---
a/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithUrlIssueTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/issues/AdviceWithUrlIssueTest.java
@@ -39,7 +39,7 @@ public class AdviceWithUrlIssueTest extends
ContextTestSupport {
@Test
public void testProducerWithDifferentUri() throws Exception {
- AdviceWith.adviceWith(context.getRouteDefinition("sedaroute"),
context, new Advice());
+ AdviceWith.adviceWith("sedaroute", context, new Advice());
getMockEndpoint("mock:target").expectedMessageCount(0);
getMockEndpoint("mock:target2").expectedMessageCount(1);
@@ -51,7 +51,7 @@ public class AdviceWithUrlIssueTest extends
ContextTestSupport {
@Test
public void testProducerWithSameUri() throws Exception {
- AdviceWith.adviceWith(context.getRouteDefinition("sedaroute"),
context, new Advice());
+ AdviceWith.adviceWith("sedaroute", context, new Advice());
getMockEndpoint("mock:target").expectedMessageCount(0);
getMockEndpoint("mock:target2").expectedMessageCount(1);
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 50dc54d29929..1bcf999d1d40 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
@@ -26,7 +26,7 @@ public class AdviceWithRouteIdTest extends AdviceWithTest {
@Override
@Test
public void testAdvised() throws Exception {
- AdviceWith.adviceWith(context.getRouteDefinition("myRoute"), context,
new AdviceWithRouteBuilder() {
+ AdviceWith.adviceWith("myRoute", context, new AdviceWithRouteBuilder()
{
@Override
public void configure() throws Exception {
interceptSendToEndpoint("mock:foo").skipSendToOriginalEndpoint().to("log:foo").to("mock:advised");
