You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2020/09/02 11:56:22 UTC
[camel-quarkus] 07/13: CAMEL-15413: RouteBuilderConfigurer - Rename
to LambdaRouteBuilder
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit de3f7e5cb82538beaaa6780d62348bef8f8d8284
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Aug 26 10:46:18 2020 +0200
CAMEL-15413: RouteBuilderConfigurer - Rename to LambdaRouteBuilder
---
.../org/apache/camel/quarkus/core/deployment/CamelProcessor.java | 6 +++---
.../java/org/apache/camel/quarkus/core/CamelContextRecorder.java | 4 ++--
.../java/org/apache/camel/quarkus/core/RegistryRoutesLoaders.java | 8 ++++----
...eryTest.java => CamelMainLambdaRouteBuilderDiscoveryTest.java} | 6 +++---
.../src/main/java/org/apache/camel/quarkus/core/CoreResource.java | 6 +++---
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
index 870fa8d..fcc0b70 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
@@ -79,8 +79,8 @@ class CamelProcessor {
"org.apache.camel.RoutesBuilder");
private static final DotName ROUTE_BUILDER_TYPE = DotName.createSimple(
"org.apache.camel.builder.RouteBuilder");
- private static final DotName ROUTE_BUILDER_CONFIGURER_TYPE = DotName.createSimple(
- "org.apache.camel.builder.RouteBuilderConfigurer");
+ private static final DotName LAMBDA_ROUTE_BUILDER_TYPE = DotName.createSimple(
+ "org.apache.camel.builder.LambdaRouteBuilder");
private static final DotName ADVICE_WITH_ROUTE_BUILDER_TYPE = DotName.createSimple(
"org.apache.camel.builder.AdviceWithRouteBuilder");
private static final DotName DATA_FORMAT_TYPE = DotName.createSimple(
@@ -96,7 +96,7 @@ class CamelProcessor {
private static final Set<DotName> UNREMOVABLE_BEANS_TYPES = CamelSupport.setOf(
ROUTES_BUILDER_TYPE,
- ROUTE_BUILDER_CONFIGURER_TYPE,
+ LAMBDA_ROUTE_BUILDER_TYPE,
DATA_FORMAT_TYPE,
LANGUAGE_TYPE,
COMPONENT_TYPE,
diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java
index 9a555ba..a9002fa 100644
--- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java
@@ -21,8 +21,8 @@ import io.quarkus.runtime.RuntimeValue;
import io.quarkus.runtime.annotations.Recorder;
import org.apache.camel.CamelContext;
import org.apache.camel.RoutesBuilder;
+import org.apache.camel.builder.LambdaRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.builder.RouteBuilderConfigurer;
import org.apache.camel.catalog.RuntimeCamelCatalog;
import org.apache.camel.spi.FactoryFinderResolver;
import org.apache.camel.spi.ModelJAXBContextFactory;
@@ -99,7 +99,7 @@ public class CamelContextRecorder {
public void addRoutesFromContainer(RuntimeValue<CamelContext> context) {
try {
- for (RouteBuilderConfigurer builder : context.getValue().getRegistry().findByType(RouteBuilderConfigurer.class)) {
+ for (LambdaRouteBuilder builder : context.getValue().getRegistry().findByType(LambdaRouteBuilder.class)) {
context.getValue().addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/RegistryRoutesLoaders.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/RegistryRoutesLoaders.java
index 2aa04f5..be76546 100644
--- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/RegistryRoutesLoaders.java
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/RegistryRoutesLoaders.java
@@ -24,8 +24,8 @@ import java.util.Set;
import org.apache.camel.CamelContext;
import org.apache.camel.RoutesBuilder;
+import org.apache.camel.builder.LambdaRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.builder.RouteBuilderConfigurer;
import org.apache.camel.util.AntPathMatcher;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
@@ -58,12 +58,12 @@ public final class RegistryRoutesLoaders {
final List<RoutesBuilder> routes = new ArrayList<>();
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/extensions-core/main/deployment/src/test/java/org/apache/camel/quarkus/main/deployment/CamelMainRouteBuilderConfigurerDiscoveryTest.java b/extensions-core/main/deployment/src/test/java/org/apache/camel/quarkus/main/deployment/CamelMainLambdaRouteBuilderDiscoveryTest.java
similarity index 93%
rename from extensions-core/main/deployment/src/test/java/org/apache/camel/quarkus/main/deployment/CamelMainRouteBuilderConfigurerDiscoveryTest.java
rename to extensions-core/main/deployment/src/test/java/org/apache/camel/quarkus/main/deployment/CamelMainLambdaRouteBuilderDiscoveryTest.java
index bbf9f3f..3697f7e 100644
--- a/extensions-core/main/deployment/src/test/java/org/apache/camel/quarkus/main/deployment/CamelMainRouteBuilderConfigurerDiscoveryTest.java
+++ b/extensions-core/main/deployment/src/test/java/org/apache/camel/quarkus/main/deployment/CamelMainLambdaRouteBuilderDiscoveryTest.java
@@ -25,7 +25,7 @@ import javax.enterprise.inject.Produces;
import javax.inject.Inject;
import io.quarkus.test.QuarkusUnitTest;
-import org.apache.camel.builder.RouteBuilderConfigurer;
+import org.apache.camel.builder.LambdaRouteBuilder;
import org.apache.camel.quarkus.main.CamelMain;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.Asset;
@@ -36,7 +36,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
import static org.assertj.core.api.Assertions.assertThat;
-public class CamelMainRouteBuilderConfigurerDiscoveryTest {
+public class CamelMainLambdaRouteBuilderDiscoveryTest {
@RegisterExtension
static final QuarkusUnitTest CONFIG = new QuarkusUnitTest()
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
@@ -67,7 +67,7 @@ public class CamelMainRouteBuilderConfigurerDiscoveryTest {
}
@Produces
- public RouteBuilderConfigurer myRoute() {
+ public LambdaRouteBuilder myRoute() {
return rb -> rb.from("direct:in").routeId("my-route").to("log:out");
}
diff --git a/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CoreResource.java b/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CoreResource.java
index af45a13..34ee80e 100644
--- a/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CoreResource.java
+++ b/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CoreResource.java
@@ -40,7 +40,7 @@ import org.apache.camel.CamelContextAware;
import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.NoSuchLanguageException;
import org.apache.camel.Route;
-import org.apache.camel.builder.RouteBuilderConfigurer;
+import org.apache.camel.builder.LambdaRouteBuilder;
import org.apache.camel.catalog.RuntimeCamelCatalog;
import org.apache.camel.component.log.LogComponent;
import org.apache.camel.model.ModelCamelContext;
@@ -73,7 +73,7 @@ public class CoreResource {
}
@javax.enterprise.inject.Produces
- public RouteBuilderConfigurer myOtherRoute() {
+ public LambdaRouteBuilder myOtherRoute() {
return rb -> rb.from("timer:bar").routeId("bar").to("log:bar");
}
@@ -81,7 +81,7 @@ public class CoreResource {
@GET
@Produces(MediaType.TEXT_PLAIN)
public String lookupRoutes() {
- // there should be 2 routes, the one with RouteBuilderConfigurer method above and from CoreRoutes.java
+ // there should be 2 routes, the one with LambdaRouteBuilder method above and from CoreRoutes.java
return context.getRoutes().stream().map(Route::getId).sorted().collect(Collectors.joining(","));
}