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 80e842b CAMEL-15413: RouteBuilderConfigurer - Rename to
LambdaRouteBuilder
80e842b is described below
commit 80e842b548448690fef0ed662af3fd96c5e132d5
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Aug 26 10:32:06 2020 +0200
CAMEL-15413: RouteBuilderConfigurer - Rename to LambdaRouteBuilder
---
...outeBuilderConfigurer.java => LambdaRouteBuilder.java} | 4 ++--
.../main/java/org/apache/camel/builder/RouteBuilder.java | 2 +-
.../org/apache/camel/builder/RouteBuilderConfigurer.java | 15 +++------------
...derConfigurerTest.java => LambdaRouteBuilderTest.java} | 10 +++++-----
.../org/apache/camel/main/DefaultRoutesCollector.java | 8 ++++----
...onfigurerTest.java => MainLambdaRouteBuilderTest.java} | 6 +++---
docs/user-manual/modules/ROOT/nav.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/index.adoc | 2 +-
...-builder-configurer.adoc => lambda-route-builder.adoc} | 12 ++++++------
docs/user-manual/modules/ROOT/pages/routes.adoc | 4 ++--
10 files changed, 28 insertions(+), 37 deletions(-)
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/builder/RouteBuilderConfigurer.java
b/core/camel-core-engine/src/main/java/org/apache/camel/builder/LambdaRouteBuilder.java
similarity index 88%
copy from
core/camel-core-engine/src/main/java/org/apache/camel/builder/RouteBuilderConfigurer.java
copy to
core/camel-core-engine/src/main/java/org/apache/camel/builder/LambdaRouteBuilder.java
index 948cc01..48cf43c 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/builder/RouteBuilderConfigurer.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/builder/LambdaRouteBuilder.java
@@ -27,9 +27,9 @@ import org.apache.camel.util.function.ThrowingConsumer;
* rb.from("direct:inbound").bean(ProduceTemplateBean.class)));
* </pre>
*
- * @see RouteBuilder#addRoutes(CamelContext, RouteBuilderConfigurer)
+ * @see RouteBuilder#addRoutes(CamelContext, LambdaRouteBuilder)
*/
@FunctionalInterface
-public interface RouteBuilderConfigurer extends ThrowingConsumer<RouteBuilder,
Exception> {
+public interface LambdaRouteBuilder extends ThrowingConsumer<RouteBuilder,
Exception> {
}
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/builder/RouteBuilder.java
b/core/camel-core-engine/src/main/java/org/apache/camel/builder/RouteBuilder.java
index 6ba0cc6..562f912 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/builder/RouteBuilder.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/builder/RouteBuilder.java
@@ -98,7 +98,7 @@ public abstract class RouteBuilder extends BuilderSupport
implements RoutesBuild
* @param rbc a lambda expression receiving the {@code
RouteBuilder} to use to create routes
* @throws Exception if an error occurs
*/
- public static void addRoutes(CamelContext context, RouteBuilderConfigurer
rbc) throws Exception {
+ public static void addRoutes(CamelContext context, LambdaRouteBuilder rbc)
throws Exception {
context.addRoutes(new RouteBuilder(context) {
@Override
public void configure() throws Exception {
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/builder/RouteBuilderConfigurer.java
b/core/camel-core-engine/src/main/java/org/apache/camel/builder/RouteBuilderConfigurer.java
index 948cc01..ae29cd4 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/builder/RouteBuilderConfigurer.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/builder/RouteBuilderConfigurer.java
@@ -16,20 +16,11 @@
*/
package org.apache.camel.builder;
-import org.apache.camel.CamelContext;
-import org.apache.camel.util.function.ThrowingConsumer;
-
/**
- * Functional interface for adding routes to a context using a lambda
expression. It can be used as following:
- *
- * <pre>
- * RouteBuilder.addRoutes(context, rb ->
- * rb.from("direct:inbound").bean(ProduceTemplateBean.class)));
- * </pre>
- *
- * @see RouteBuilder#addRoutes(CamelContext, RouteBuilderConfigurer)
+ * @deprecated use {@link LambdaRouteBuilder}
*/
@FunctionalInterface
-public interface RouteBuilderConfigurer extends ThrowingConsumer<RouteBuilder,
Exception> {
+@Deprecated
+public interface RouteBuilderConfigurer extends LambdaRouteBuilder {
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/RouteBuilderConfigurerTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/LambdaRouteBuilderTest.java
similarity index 86%
rename from
core/camel-core/src/test/java/org/apache/camel/processor/RouteBuilderConfigurerTest.java
rename to
core/camel-core/src/test/java/org/apache/camel/processor/LambdaRouteBuilderTest.java
index 3e4de38..adae3a6 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/RouteBuilderConfigurerTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/LambdaRouteBuilderTest.java
@@ -17,14 +17,14 @@
package org.apache.camel.processor;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.LambdaRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.builder.RouteBuilderConfigurer;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-public class RouteBuilderConfigurerTest extends ContextTestSupport {
+public class LambdaRouteBuilderTest extends ContextTestSupport {
@Override
public boolean isUseRouteBuilder() {
@@ -32,10 +32,10 @@ public class RouteBuilderConfigurerTest extends
ContextTestSupport {
}
@Test
- public void testRouteBuilderConfigurer() throws Exception {
+ public void testLambda() throws Exception {
assertEquals(0, context.getRoutesSize());
- RouteBuilderConfigurer builder = rb ->
rb.from("direct:start").to("mock:result");
+ LambdaRouteBuilder builder = rb ->
rb.from("direct:start").to("mock:result");
context.addRoutes(new RouteBuilder(context) {
@Override
public void configure() throws Exception {
@@ -55,7 +55,7 @@ public class RouteBuilderConfigurerTest extends
ContextTestSupport {
}
@Test
- public void testRouteBuilderConfigurerLambda() throws Exception {
+ public void testLambdaTwo() throws Exception {
assertEquals(0, context.getRoutesSize());
RouteBuilder.addRoutes(context, rb ->
rb.from("direct:start").to("mock:result"));
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/DefaultRoutesCollector.java
b/core/camel-main/src/main/java/org/apache/camel/main/DefaultRoutesCollector.java
index 1eeb66a..16e515c 100644
---
a/core/camel-main/src/main/java/org/apache/camel/main/DefaultRoutesCollector.java
+++
b/core/camel-main/src/main/java/org/apache/camel/main/DefaultRoutesCollector.java
@@ -27,8 +27,8 @@ import org.apache.camel.CamelContext;
import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.builder.LambdaRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.builder.RouteBuilderConfigurer;
import org.apache.camel.model.RouteTemplatesDefinition;
import org.apache.camel.model.RoutesDefinition;
import org.apache.camel.model.rest.RestsDefinition;
@@ -55,12 +55,12 @@ public class DefaultRoutesCollector implements
RoutesCollector {
final AntPathMatcher matcher = new AntPathMatcher();
- Set<RouteBuilderConfigurer> configurers =
camelContext.getRegistry().findByType(RouteBuilderConfigurer.class);
- for (RouteBuilderConfigurer configurer : configurers) {
+ Set<LambdaRouteBuilder> lrbs =
camelContext.getRegistry().findByType(LambdaRouteBuilder.class);
+ for (LambdaRouteBuilder lrb : lrbs) {
RouteBuilder rb = new RouteBuilder() {
@Override
public void configure() throws Exception {
- configurer.accept(this);
+ lrb.accept(this);
}
};
routes.add(rb);
diff --git
a/core/camel-main/src/test/java/org/apache/camel/main/MainRouteConfigurerTest.java
b/core/camel-main/src/test/java/org/apache/camel/main/MainLambdaRouteBuilderTest.java
similarity index 89%
rename from
core/camel-main/src/test/java/org/apache/camel/main/MainRouteConfigurerTest.java
rename to
core/camel-main/src/test/java/org/apache/camel/main/MainLambdaRouteBuilderTest.java
index 99d425e..e2c492d 100644
---
a/core/camel-main/src/test/java/org/apache/camel/main/MainRouteConfigurerTest.java
+++
b/core/camel-main/src/test/java/org/apache/camel/main/MainLambdaRouteBuilderTest.java
@@ -17,19 +17,19 @@
package org.apache.camel.main;
import org.apache.camel.CamelContext;
-import org.apache.camel.builder.RouteBuilderConfigurer;
+import org.apache.camel.builder.LambdaRouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-public class MainRouteConfigurerTest {
+public class MainLambdaRouteBuilderTest {
@Test
public void testMainRoutesCollector() throws Exception {
Main main = new Main();
- main.bind("myBarRoute", (RouteBuilderConfigurer) rb ->
rb.from("direct:start").to("mock:results"));
+ main.bind("myBarRoute", (LambdaRouteBuilder) rb ->
rb.from("direct:start").to("mock:results"));
main.start();
CamelContext camelContext = main.getCamelContext();
diff --git a/docs/user-manual/modules/ROOT/nav.adoc
b/docs/user-manual/modules/ROOT/nav.adoc
index cda67b2..0c11093 100644
--- a/docs/user-manual/modules/ROOT/nav.adoc
+++ b/docs/user-manual/modules/ROOT/nav.adoc
@@ -80,7 +80,7 @@
** xref:processor.adoc[Processor]
** xref:registry.adoc[Registry]
** xref:route-builder.adoc[RouteBuilder]
-** xref:route-builder-configurer.adoc[RouteBuilderConfigurer]
+** xref:lambda-route-builder.adoc[LambdaRouteBuilder]
** xref:route-controller.adoc[RouteController]
** xref:route-policy.adoc[RoutePolicy]
** xref:route-template.adoc[RouteTemplate]
diff --git a/docs/user-manual/modules/ROOT/pages/index.adoc
b/docs/user-manual/modules/ROOT/pages/index.adoc
index 474929e..76e9fe2 100644
--- a/docs/user-manual/modules/ROOT/pages/index.adoc
+++ b/docs/user-manual/modules/ROOT/pages/index.adoc
@@ -114,7 +114,7 @@ camel routes without them knowing
* xref:processor.adoc[Processor]
* xref:registry.adoc[Registry]
* xref:route-builder.adoc[RouteBuilder]
-* xref:route-builder-configurer.adoc[RouteBuilderConfigurer]
+* xref:lambda-route-builder.adoc[LambdaRouteBuilder]
* xref:route-controller.adoc[RouteController]
* xref:route-policy.adoc[RoutePolicy]
* xref:route-template.adoc[RouteTemplate]
diff --git a/docs/user-manual/modules/ROOT/pages/route-builder-configurer.adoc
b/docs/user-manual/modules/ROOT/pages/lambda-route-builder.adoc
similarity index 62%
rename from docs/user-manual/modules/ROOT/pages/route-builder-configurer.adoc
rename to docs/user-manual/modules/ROOT/pages/lambda-route-builder.adoc
index cd70d50..19f4021 100644
--- a/docs/user-manual/modules/ROOT/pages/route-builder-configurer.adoc
+++ b/docs/user-manual/modules/ROOT/pages/lambda-route-builder.adoc
@@ -1,7 +1,7 @@
-[[RouteBuilderConfigurer-RouteBuilderConfigurer]]
-= RouteBuilderConfigurer
+[[LambdaRouteBuilder-LambdaRouteBuilder]]
+= LambdaRouteBuilder
-The `RouteBuilderConfigurer` is a functional interface which is used for
creating a routing rule using the DSL,
+The `LambdaRouteBuilder` is a functional interface which is used for creating
a routing rule using the DSL,
using Java lambda style.
[source,java]
@@ -9,12 +9,12 @@ using Java lambda style.
rb -> rb.from("timer:foo").log("Hello Lambda");
----
-Instances of RouteBuilderConfigurer are discovered and transformed into
RouteBuilder instances
+Instances of `LambdaRouteBuilder` are discovered and transformed into
`RouteBuilder` instances
which are added to the CamelContext.
== Usage
-To use `RouteBuilderConfigurer` you need to create a method that returns
`RouteBuilderConfigurer` which then
+To use `LambdaRouteBuilder` you need to create a method that returns
`LambdaRouteBuilder` which then
allows to use Java lambda style to define a single route.
In the example below the method myRoute is used to create a Camel route that
consume from Kafka and send the messages to JMS.
@@ -26,7 +26,7 @@ you should use `@BindToRegistry` and with Spring Boot use
`@Bean` and with Quark
----
public class MyConfiguration {
@BindToRegistry
- public RouteBuilderConfigurer myRoute() {
+ public LambdaRouteBuilder myRoute() {
return rb -> rb.from("kafka:cheese").to("jms:queue:foo");
}
}
diff --git a/docs/user-manual/modules/ROOT/pages/routes.adoc
b/docs/user-manual/modules/ROOT/pages/routes.adoc
index a647562..46c4b45 100644
--- a/docs/user-manual/modules/ROOT/pages/routes.adoc
+++ b/docs/user-manual/modules/ROOT/pages/routes.adoc
@@ -60,8 +60,8 @@ For example using lambda style you can define a Camel route
that takes messages
rb -> rb.from("kafka:cheese").to("jms:queue:foo");
----
-There is a bit more to this as the lambda route must be coded in a Java method
that returns an instance of `RouteBuilderConfigurer`.
-See more at the xref:route-builder-configurer.adoc[RouteBuilderConfigurer]
documentation.
+There is a bit more to this as the lambda route must be coded in a Java method
that returns an instance of `LambdaRouteBuilder`.
+See more at the xref:lambda-route-builder.adoc[LambdaRouteBuilder]
documentation.
[[Routes-Choices]]
== Choices
