svn commit: r807074 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/builder/RouteBuilder.java test/java/org/apache/camel/builder/RouteBuilderAddRoutesOnlyInterceptTest.java test/java/org/apache/camel/builder/RouteBuilderAddRoutesTest.java

[da...@apache.org]

Author: davsclaus
Date: Mon Aug 24 04:44:18 2009
New Revision: 807074

URL: http://svn.apache.org/viewvc?rev=807074&view=rev
Log:
CAMEL-1919 addRoutes @deprecated use includeRoutes instead as it names is more in line what you do in xml files to include other xml files etc.

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderAddRoutesOnlyInterceptTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderAddRoutesTest.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java?rev=807074&r1=807073&r2=807074&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java Mon Aug 24 04:44:18 2009
@@ -237,6 +237,31 @@
         checkInitialized();
     }
 
+    /**
+     * Includes the routes from the build to this builder.
+     * <p/>
+     * This allows you to use other builds as route templates.
+     * @param routes other builder with routes to include
+     *
+     * @throws Exception can be thrown during configuration
+     */
+    public void includeRoutes(RoutesBuilder routes) throws Exception {
+        // TODO: We should support including multiple routes so I think invoking configure()
+        // needs to be deferred to later
+        if (routes instanceof RouteBuilder) {
+            // if its a RouteBuilder then let it use my route collection and error handler
+            // then we are integrated seamless
+            RouteBuilder builder = (RouteBuilder) routes;
+            builder.setContext(this.getContext());
+            builder.setRouteCollection(this.getRouteCollection());
+            builder.setErrorHandlerBuilder(this.getErrorHandlerBuilder());
+            // must invoke configure on the original builder so it adds its configuration to me
+            builder.configure();
+        } else {
+            getContext().addRoutes(routes);
+        }
+    }
+
     @Override
     public void setErrorHandlerBuilder(ErrorHandlerBuilder errorHandlerBuilder) {
         super.setErrorHandlerBuilder(errorHandlerBuilder);
@@ -289,20 +314,11 @@
      * Adds a collection of routes to this context
      *
      * @throws Exception if the routes could not be created for whatever reason
+     * @deprecated use {@link #includeRoutes(org.apache.camel.RoutesBuilder) includeRoutes} instead.
      */
+    @Deprecated
     protected void addRoutes(RoutesBuilder routes) throws Exception {
-        if (routes instanceof RouteBuilder) {
-            // if its a RouteBuilder then let it use my route collection and error handler
-            // then we are integrated seamless
-            RouteBuilder builder = (RouteBuilder) routes;
-            builder.setContext(this.getContext());
-            builder.setRouteCollection(this.getRouteCollection());
-            builder.setErrorHandlerBuilder(this.getErrorHandlerBuilder());
-            // must invoke configure on the original builder so it adds its configuration to me
-            builder.configure();
-        } else {
-            getContext().addRoutes(routes);
-        }
+        includeRoutes(routes);
     }
 
 }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderAddRoutesOnlyInterceptTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderAddRoutesOnlyInterceptTest.java?rev=807074&r1=807073&r2=807074&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderAddRoutesOnlyInterceptTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderAddRoutesOnlyInterceptTest.java Mon Aug 24 04:44:18 2009
@@ -28,7 +28,7 @@
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                addRoutes(new MyExtraRoute());
+                includeRoutes(new MyExtraRoute());
 
                 from("direct:start").to("mock:result");
             }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderAddRoutesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderAddRoutesTest.java?rev=807074&r1=807073&r2=807074&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderAddRoutesTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderAddRoutesTest.java Mon Aug 24 04:44:18 2009
@@ -30,7 +30,7 @@
             public void configure() throws Exception {
                 from("direct:start").to("mock:result");
 
-                addRoutes(new MyExtraRoute());
+                includeRoutes(new MyExtraRoute());
             }
         };
     }