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 7203fcd chore(main): use RoutesBuilder instad of RouteBuilder (#3223)
7203fcd is described below
commit 7203fcd9f5381cce3fc0fb94d0ff1f4cec2eba5d
Author: Luca Burgazzoli <lburgazz...@users.noreply.github.com>
AuthorDate: Sun Oct 6 11:34:59 2019 +0200
chore(main): use RoutesBuilder instad of RouteBuilder (#3223)
---
.../org/apache/camel/main/BaseMainSupport.java | 41 +++++++++++++++++-----
.../java/org/apache/camel/main/MainExample.java | 2 +-
.../main/MainIoCNewRouteBuilderComplexTest.java | 2 +-
.../camel/main/MainIoCNewRouteBuilderTest.java | 2 +-
.../apache/camel/main/MainRouteOrderedTest.java | 4 +--
.../java/org/apache/camel/main/MainSedaTest.java | 2 +-
.../test/java/org/apache/camel/main/MainTest.java | 8 ++---
.../java/org/apache/camel/main/MainVetoTest.java | 6 ++--
8 files changed, 46 insertions(+), 21 deletions(-)
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
index 4be0171..ad8caf5 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
@@ -37,6 +37,7 @@ import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.NoSuchLanguageException;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.PropertyBindingException;
+import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.HystrixConfigurationDefinition;
import org.apache.camel.model.Model;
@@ -80,7 +81,7 @@ public abstract class BaseMainSupport extends ServiceSupport {
protected final List<MainListener> listeners = new ArrayList<>();
protected final MainConfigurationProperties mainConfigurationProperties =
new MainConfigurationProperties();
- protected List<RouteBuilder> routeBuilders = new ArrayList<>();
+ protected List<RoutesBuilder> routeBuilders = new ArrayList<>();
protected String routeBuilderClasses;
protected List<Object> configurations = new ArrayList<>();
protected String configurationClasses;
@@ -330,11 +331,27 @@ public abstract class BaseMainSupport extends
ServiceSupport {
return camelContext;
}
- public List<RouteBuilder> getRouteBuilders() {
+ /**
+ * @deprecated use {@link #getRoutesBuilders()}
+ */
+ @Deprecated
+ public List<RoutesBuilder> getRouteBuilders() {
+ return getRoutesBuilders();
+ }
+
+ /**
+ * @deprecated use {@link #setRoutesBuilders(List)} ()}
+ */
+ @Deprecated
+ public void setRouteBuilders(List<RoutesBuilder> routeBuilders) {
+ setRoutesBuilders(routeBuilders);
+ }
+
+ public List<RoutesBuilder> getRoutesBuilders() {
return routeBuilders;
}
- public void setRouteBuilders(List<RouteBuilder> routeBuilders) {
+ public void setRoutesBuilders(List<RoutesBuilder> routesBuilders) {
this.routeBuilders = routeBuilders;
}
@@ -377,7 +394,7 @@ public abstract class BaseMainSupport extends
ServiceSupport {
// lets use Camel's bean post processor on any existing route builder
classes
// so the instance has some support for dependency injection
CamelBeanPostProcessor postProcessor =
camelContext.adapt(ExtendedCamelContext.class).getBeanPostProcessor();
- for (RouteBuilder routeBuilder : getRouteBuilders()) {
+ for (RoutesBuilder routeBuilder : getRoutesBuilders()) {
postProcessor.postProcessBeforeInitialization(routeBuilder,
routeBuilder.getClass().getName());
postProcessor.postProcessAfterInitialization(routeBuilder,
routeBuilder.getClass().getName());
}
@@ -389,7 +406,7 @@ public abstract class BaseMainSupport extends
ServiceSupport {
// lets use Camel's injector so the class has some support for
dependency injection
Object builder =
camelContext.getInjector().newInstance(routeClazz);
if (builder instanceof RouteBuilder) {
- getRouteBuilders().add((RouteBuilder) builder);
+ getRoutesBuilders().add((RouteBuilder) builder);
} else {
LOG.warn("Class {} is not a RouteBuilder class",
routeClazz);
}
@@ -504,7 +521,7 @@ public abstract class BaseMainSupport extends
ServiceSupport {
loadRouteBuilders(camelContext);
// sort routes according to ordered
routeBuilders.sort(OrderedComparator.get());
- for (RouteBuilder routeBuilder : routeBuilders) {
+ for (RoutesBuilder routeBuilder : routeBuilders) {
camelContext.addRoutes(routeBuilder);
}
// register lifecycle so we are notified in Camel is stopped from JMX
or somewhere else
@@ -912,8 +929,16 @@ public abstract class BaseMainSupport extends
ServiceSupport {
}
}
- public void addRouteBuilder(RouteBuilder routeBuilder) {
- getRouteBuilders().add(routeBuilder);
+ /**
+ * @deprecated use {@link #addRoutesBuilder(RoutesBuilder)}
+ */
+ @Deprecated
+ public void addRouteBuilder(RoutesBuilder routeBuilder) {
+ getRoutesBuilders().add(routeBuilder);
+ }
+
+ public void addRoutesBuilder(RoutesBuilder routeBuilder) {
+ getRoutesBuilders().add(routeBuilder);
}
public void addRouteBuilder(Class... routeBuilder) {
diff --git
a/core/camel-main/src/test/java/org/apache/camel/main/MainExample.java
b/core/camel-main/src/test/java/org/apache/camel/main/MainExample.java
index 285f132..a6f2409 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/MainExample.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MainExample.java
@@ -38,7 +38,7 @@ public class MainExample {
// bind MyBean into the registry
main.bind("foo", new MyBean());
// add routes
- main.addRouteBuilder(new MyRouteBuilder());
+ main.addRoutesBuilder(new MyRouteBuilder());
// add event listener
main.addMainListener(new Events());
// set the properties from a file
diff --git
a/core/camel-main/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderComplexTest.java
b/core/camel-main/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderComplexTest.java
index a7304d6..4b282da 100644
---
a/core/camel-main/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderComplexTest.java
+++
b/core/camel-main/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderComplexTest.java
@@ -29,7 +29,7 @@ public class MainIoCNewRouteBuilderComplexTest extends Assert
{
@Test
public void testMainIoC() throws Exception {
Main main = new Main();
- main.addRouteBuilder(new MyRouteBuilder());
+ main.addRoutesBuilder(new MyRouteBuilder());
main.start();
CamelContext camelContext = main.getCamelContext();
diff --git
a/core/camel-main/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderTest.java
b/core/camel-main/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderTest.java
index 4eaa5bd..d41bc2c 100644
---
a/core/camel-main/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderTest.java
+++
b/core/camel-main/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderTest.java
@@ -31,7 +31,7 @@ public class MainIoCNewRouteBuilderTest extends Assert {
public void testMainIoC() throws Exception {
Main main = new Main();
main.addConfiguration(new MyConfiguration());
- main.addRouteBuilder(new MyRouteBuilder());
+ main.addRoutesBuilder(new MyRouteBuilder());
main.start();
CamelContext camelContext = main.getCamelContext();
diff --git
a/core/camel-main/src/test/java/org/apache/camel/main/MainRouteOrderedTest.java
b/core/camel-main/src/test/java/org/apache/camel/main/MainRouteOrderedTest.java
index feb334b..2ad6483 100644
---
a/core/camel-main/src/test/java/org/apache/camel/main/MainRouteOrderedTest.java
+++
b/core/camel-main/src/test/java/org/apache/camel/main/MainRouteOrderedTest.java
@@ -26,8 +26,8 @@ public class MainRouteOrderedTest extends Assert {
@Test
public void testOrdered() throws Exception {
Main main = new Main();
- main.addRouteBuilder(new BarRouteBuilder());
- main.addRouteBuilder(new FooRouteBuilder());
+ main.addRoutesBuilder(new BarRouteBuilder());
+ main.addRoutesBuilder(new FooRouteBuilder());
main.start();
CamelContext camelContext = main.getCamelContext();
diff --git
a/core/camel-main/src/test/java/org/apache/camel/main/MainSedaTest.java
b/core/camel-main/src/test/java/org/apache/camel/main/MainSedaTest.java
index c33dd53..09ad4a1 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/MainSedaTest.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MainSedaTest.java
@@ -27,7 +27,7 @@ public class MainSedaTest extends Assert {
@Test
public void testSedaMain() throws Exception {
Main main = new Main();
- main.addRouteBuilder(new MyRouteBuilder());
+ main.addRoutesBuilder(new MyRouteBuilder());
main.addProperty("camel.component.seda.defaultQueueFactory",
"#class:org.apache.camel.main.MySedaBlockingQueueFactory");
main.addProperty("camel.component.seda.defaultQueueFactory.counter",
"123");
main.start();
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainTest.java
b/core/camel-main/src/test/java/org/apache/camel/main/MainTest.java
index a98d0ee..d60c43a 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/MainTest.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MainTest.java
@@ -28,7 +28,7 @@ public class MainTest extends Assert {
public void testMain() throws Exception {
// lets make a simple route
Main main = new Main();
- main.addRouteBuilder(new MyRouteBuilder());
+ main.addRoutesBuilder(new MyRouteBuilder());
main.enableTrace();
main.bind("foo", 31);
main.start();
@@ -52,7 +52,7 @@ public class MainTest extends Assert {
public void testDisableHangupSupport() throws Exception {
// lets make a simple route
Main main = new Main();
- main.addRouteBuilder(new MyRouteBuilder());
+ main.addRoutesBuilder(new MyRouteBuilder());
main.disableHangupSupport();
main.enableTrace();
main.bind("foo", 31);
@@ -71,7 +71,7 @@ public class MainTest extends Assert {
main.stop();
}
-
+
@Test
public void testLoadingRouteFromCommand() throws Exception {
Main main = new Main();
@@ -94,7 +94,7 @@ public class MainTest extends Assert {
public void testOptionalProperties() throws Exception {
// lets make a simple route
Main main = new Main();
- main.addRouteBuilder(new MyRouteBuilder());
+ main.addRoutesBuilder(new MyRouteBuilder());
main.start();
CamelContext camelContext = main.getCamelContext();
diff --git
a/core/camel-main/src/test/java/org/apache/camel/main/MainVetoTest.java
b/core/camel-main/src/test/java/org/apache/camel/main/MainVetoTest.java
index 9f32149..4c989e3 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/MainVetoTest.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MainVetoTest.java
@@ -30,9 +30,9 @@ public class MainVetoTest extends Assert {
public void testMain() throws Exception {
// lets make a simple route
Main main = new Main();
- main.setDuration(30);
- main.setDurationHitExitCode(99);
- main.addRouteBuilder(new MyRoute());
+ main.configure().setDurationMaxSeconds(30);
+ main.configure().setDurationHitExitCode(99);
+ main.addRoutesBuilder(new MyRoute());
main.addMainListener(new MainListenerSupport() {
@Override
public void configure(CamelContext context) {
