svn commit: r949703 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/model/ components/camel-web/src/main/java/org/apache/camel/web/util/ components/camel-web/src/test/java/org/apache/camel/web/groovy/

[ni...@apache.org]

Author: ningjiang
Date: Mon May 31 10:02:26 2010
New Revision: 949703

URL: http://svn.apache.org/viewvc?rev=949703&view=rev
Log:
CAMEL-2704 Fixed RoutingSlipDSLTest error of camel-web

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ExpressionNodeRenderer.java
    camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/RoutingSlipDSLTest.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java?rev=949703&r1=949702&r2=949703&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java Mon May 31 10:02:26 2010
@@ -26,6 +26,7 @@ import javax.xml.bind.annotation.XmlRoot
 
 import org.apache.camel.Expression;
 import org.apache.camel.Processor;
+import org.apache.camel.builder.Builder;
 import org.apache.camel.processor.RoutingSlip;
 import org.apache.camel.spi.RouteContext;
 import org.apache.camel.util.ObjectHelper;
@@ -53,8 +54,9 @@ public class RoutingSlipDefinition <Type
     }
 
     public RoutingSlipDefinition(String headerName, String uriDelimiter) {
+        super(Builder.header(headerName));
         setHeaderName(headerName);
-        setUriDelimiter(uriDelimiter);
+        setUriDelimiter(uriDelimiter);       
     }
     
     public RoutingSlipDefinition(Expression expression, String uriDelimiter) {

Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ExpressionNodeRenderer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ExpressionNodeRenderer.java?rev=949703&r1=949702&r2=949703&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ExpressionNodeRenderer.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ExpressionNodeRenderer.java Mon May 31 10:02:26 2010
@@ -24,6 +24,7 @@ import org.apache.camel.model.Idempotent
 import org.apache.camel.model.LoopDefinition;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.model.RecipientListDefinition;
+import org.apache.camel.model.RoutingSlipDefinition;
 import org.apache.camel.model.SetBodyDefinition;
 import org.apache.camel.model.SetHeaderDefinition;
 import org.apache.camel.model.SetOutHeaderDefinition;
@@ -59,7 +60,17 @@ public final class ExpressionNodeRendere
             buffer.append("(");
             ExpressionRenderer.render(buffer, expression);
             buffer.append(")");
-        } else if (expNode instanceof SetBodyDefinition) {
+        } else if (expNode instanceof RoutingSlipDefinition) {            
+            ExpressionDefinition expression = expNode.getExpression();
+            buffer.append("(");
+            ExpressionRenderer.render(buffer, expression);
+            if (((RoutingSlipDefinition)expNode).getUriDelimiter() != null) {
+                buffer.append(", \"");
+                buffer.append(((RoutingSlipDefinition)expNode).getUriDelimiter());
+                buffer.append("\"");
+            }
+            buffer.append(")");
+        } else if (expNode instanceof SetBodyDefinition) {        
             renderSetBody(buffer, expNode);
         } else if (expNode instanceof SetHeaderDefinition) {
             renderSetHeader(buffer, expNode);

Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/RoutingSlipDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/RoutingSlipDSLTest.java?rev=949703&r1=949702&r2=949703&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/RoutingSlipDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/RoutingSlipDSLTest.java Mon May 31 10:02:26 2010
@@ -26,23 +26,16 @@ public class RoutingSlipDSLTest extends 
 
     @Test
     public void testRoutingSlip() throws Exception {
-        String dsl = "from(\"direct:a\").routingSlip(\"myHeader\").to(\"mock:end\")";
-        String expected = "from(\"direct:a\").routingSlip(\"myHeader\", \",\").to(\"mock:end\")";
+        String dsl = "from(\"direct:a\").routingSlip(header(\"myHeader\"))";
+        String expected = "from(\"direct:a\").routingSlip(header(\"myHeader\"), \",\")";
 
         assertEquals(expected, render(dsl));
     }
 
     @Test
     public void testRoutingSlip1() throws Exception {
-        String dsl = "from(\"direct:b\").routingSlip(\"aRoutingSlipHeader\")";
-        String expected = "from(\"direct:b\").routingSlip(\"aRoutingSlipHeader\", \",\")";
-
-        assertEquals(expected, render(dsl));
-    }
-
-    @Test
-    public void testRoutingSlip2() throws Exception {
-        String dsl = "from(\"direct:c\").routingSlip(\"aRoutingSlipHeader\", \"#\")";
+        String dsl = "from(\"direct:b\").routingSlip(header(\"aRoutingSlipHeader\"), \"#\")";
         assertEquals(dsl, render(dsl));
     }
+    
 }