svn commit: r1413243 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/impl/ camel-core/src/main/java/org/apache/camel/model/ camel-core/src/test/java/org/apache/camel/component/properties/ camel-core/src/test/resources/org/apache/camel/comp...

[da...@apache.org]

Author: davsclaus
Date: Sat Nov 24 18:54:52 2012
New Revision: 1413243

URL: http://svn.apache.org/viewvc?rev=1413243&view=rev
Log:
CAMEL-5820: IDs in Camel routes now support property placeholders.

Added:
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesRouteIdTest.java   (with props)
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesRouteIdTest.java
      - copied, changed from r1413211, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertyPlaceholderOnExceptionRefTest.java
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesRouteIdTest.xml
      - copied, changed from r1413211, camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesResolverTest.xml
Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
    camel/trunk/camel-core/src/test/resources/org/apache/camel/component/properties/myproperties.properties

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=1413243&r1=1413242&r2=1413243&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Sat Nov 24 18:54:52 2012
@@ -718,7 +718,8 @@ public class DefaultCamelContext extends
     }
 
     public void startRoute(RouteDefinition route) throws Exception {
-        // validate that the id's is all unique
+        // assign ids to the routes and validate that the id's is all unique
+        RouteDefinitionHelper.forceAssignIds(this, routeDefinitions);
         String duplicate = RouteDefinitionHelper.validateUniqueIds(route, routeDefinitions);
         if (duplicate != null) {
             throw new FailedToStartRouteException(route.getId(), "duplicate id detected: " + duplicate + ". Please correct ids to be unique among all your routes.");

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java?rev=1413243&r1=1413242&r2=1413243&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java Sat Nov 24 18:54:52 2012
@@ -40,6 +40,26 @@ public final class RouteDefinitionHelper
     }
 
     /**
+     * Force assigning ids to the routes
+     *
+     * @param context the camel context
+     * @param routes  the routes
+     * @throws Exception is thrown if error force assign ids to the routes
+     */
+    public static void forceAssignIds(CamelContext context, List<RouteDefinition> routes) throws Exception {
+        for (RouteDefinition route : routes) {
+            // force id on the route
+            route.idOrCreate(context.getNodeIdFactory());
+
+            // if there was a custom id assigned, then make sure to support property placeholders
+            if (route.hasCustomIdAssigned()) {
+                String id = route.getId();
+                route.setId(context.resolvePropertyPlaceholders(id));
+            }
+        }
+    }
+
+    /**
      * Validates that the target route has no duplicate id's from any of the existing routes.
      *
      * @param target  the target route
@@ -408,6 +428,16 @@ public final class RouteDefinitionHelper
         // force id on the child
         processor.idOrCreate(context.getNodeIdFactory());
 
+        // if there was a custom id assigned, then make sure to support property placeholders
+        if (processor.hasCustomIdAssigned()) {
+            String id = processor.getId();
+            try {
+                processor.setId(context.resolvePropertyPlaceholders(id));
+            } catch (Exception e) {
+                throw ObjectHelper.wrapRuntimeCamelException(e);
+            }
+        }
+
         List<ProcessorDefinition> children = processor.getOutputs();
         if (children != null && !children.isEmpty()) {
             for (ProcessorDefinition child : children) {

Added: camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesRouteIdTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesRouteIdTest.java?rev=1413243&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesRouteIdTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesRouteIdTest.java Sat Nov 24 18:54:52 2012
@@ -0,0 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.properties;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ *
+ */
+public class PropertiesRouteIdTest extends ContextTestSupport {
+
+    public void testPropertiesRouteId() throws Exception {
+        assertEquals(1, context.getRoutes().size());
+        assertNotNull("Route with name Camel should exist", context.getRoute("Camel"));
+
+        String id = context.getRouteDefinition("Camel").getOutputs().get(0).getId();
+        assertEquals("Cheese", id);
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start").routeId("{{cool.name}}")
+                    .to("mock:result").id("{{cool.other.name}}");
+            }
+        };
+    }
+
+    @Override
+    protected CamelContext createCamelContext() throws Exception {
+        CamelContext context = super.createCamelContext();
+        context.addComponent("properties", new PropertiesComponent("classpath:org/apache/camel/component/properties/myproperties.properties"));
+        return context;
+    }
+
+}

Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesRouteIdTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesRouteIdTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: camel/trunk/camel-core/src/test/resources/org/apache/camel/component/properties/myproperties.properties
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/resources/org/apache/camel/component/properties/myproperties.properties?rev=1413243&r1=1413242&r2=1413243&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/resources/org/apache/camel/component/properties/myproperties.properties (original)
+++ camel/trunk/camel-core/src/test/resources/org/apache/camel/component/properties/myproperties.properties Sat Nov 24 18:54:52 2012
@@ -21,6 +21,7 @@ cool.concat=mock:{{cool.result}}
 cool.start=direct:cool
 cool.showid=true
 cool.name=Camel
+cool.other.name=Cheese
 
 # circular reference test
 cool.a={{cool.b}}

Copied: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesRouteIdTest.java (from r1413211, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertyPlaceholderOnExceptionRefTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesRouteIdTest.java?p2=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesRouteIdTest.java&p1=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertyPlaceholderOnExceptionRefTest.java&r1=1413211&r2=1413243&rev=1413243&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertyPlaceholderOnExceptionRefTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesRouteIdTest.java Sat Nov 24 18:54:52 2012
@@ -25,10 +25,10 @@ import static org.apache.camel.spring.pr
  *
  * @version 
  */
-public class SpringPropertyPlaceholderOnExceptionRefTest extends PropertiesComponentOnExceptionTest {
+public class SpringPropertiesRouteIdTest extends PropertiesRouteIdTest {
 
     protected CamelContext createCamelContext() throws Exception {
-        return createSpringCamelContext(this, "org/apache/camel/component/properties/SpringPropertyPlaceholderOnExceptionRefTest.xml");
+        return createSpringCamelContext(this, "org/apache/camel/component/properties/SpringPropertiesRouteIdTest.xml");
     }
 
 }

Copied: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesRouteIdTest.xml (from r1413211, camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesResolverTest.xml)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesRouteIdTest.xml?p2=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesRouteIdTest.xml&p1=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesResolverTest.xml&r1=1413211&r2=1413243&rev=1413243&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesResolverTest.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesRouteIdTest.xml Sat Nov 24 18:54:52 2012
@@ -22,17 +22,12 @@
        http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
 
-    <bean id="myResolver" class="org.apache.camel.component.properties.PropertiesResolverTest$MyCustomResolver"/>
+    <camelContext id="myCamel" xmlns="http://camel.apache.org/schema/spring">
+      <propertyPlaceholder id="properties" location="org/apache/camel/component/properties/myproperties.properties"/>
 
-    <bean id="properties" class="org.apache.camel.component.properties.PropertiesComponent">
-        <property name="location" value="foo"/>
-        <property name="propertiesResolver" ref="myResolver"/>
-    </bean>
-
-    <camelContext xmlns="http://camel.apache.org/schema/spring">
-        <route>
+        <route id="{{cool.name}}">
             <from uri="direct:start"/>
-            <to uri="properties:foo"/>
+            <to uri="mock:result" id="{{cool.other.name}}"/>
         </route>
     </camelContext>