svn commit: r1431281 - in /camel/branches/camel-2.10.x: ./ camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java camel-core/src/test/java/org/apache/camel/issues/RecipientListDirectNoConsumerIssueTest.java

[davsclaus]

Author: davsclaus
Date: Thu Jan 10 11:18:51 2013
New Revision: 1431281

URL: http://svn.apache.org/viewvc?rev=1431281&view=rev
Log:
CAMEL-5945: Add delimiter to recipient list eip in Java DSL

Modified:
    camel/branches/camel-2.10.x/   (props changed)
    
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
    
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/issues/RecipientListDirectNoConsumerIssueTest.java

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1431280

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java?rev=1431281&r1=1431280&r2=1431281&view=diff
==============================================================================
--- 
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
 (original)
+++ 
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
 Thu Jan 10 11:18:51 2013
@@ -1557,6 +1557,20 @@ public abstract class ProcessorDefinitio
      * <a href="http://camel.apache.org/recipient-list.html";>Recipient List 
EIP:</a>
      * Creates a dynamic recipient list allowing you to route messages to a 
number of dynamically specified recipients
      *
+     * @param delimiter  a custom delimiter to use
+     * @return the builder
+     */
+    public ExpressionClause<RecipientListDefinition<Type>> 
recipientList(String delimiter) {
+        RecipientListDefinition<Type> answer = new 
RecipientListDefinition<Type>();
+        answer.setDelimiter(delimiter);
+        addOutput(answer);
+        return ExpressionClause.createAndSetExpression(answer);
+    }
+
+    /**
+     * <a href="http://camel.apache.org/recipient-list.html";>Recipient List 
EIP:</a>
+     * Creates a dynamic recipient list allowing you to route messages to a 
number of dynamically specified recipients
+     *
      * @return the expression clause to configure the expression to decide the 
destinations
      */
     public ExpressionClause<RecipientListDefinition<Type>> recipientList() {

Modified: 
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/issues/RecipientListDirectNoConsumerIssueTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/issues/RecipientListDirectNoConsumerIssueTest.java?rev=1431281&r1=1431280&r2=1431281&view=diff
==============================================================================
--- 
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/issues/RecipientListDirectNoConsumerIssueTest.java
 (original)
+++ 
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/issues/RecipientListDirectNoConsumerIssueTest.java
 Thu Jan 10 11:18:51 2013
@@ -43,6 +43,15 @@ public class RecipientListDirectNoConsum
         assertMockEndpointsSatisfied();
     }
 
+    public void testDirectNoConsumerOneMessageBar() throws Exception {
+        getMockEndpoint("mock:error").expectedMinimumMessageCount(1);
+        getMockEndpoint("mock:foo").expectedMinimumMessageCount(1);
+
+        template.sendBodyAndHeader("direct:bar", "Hello World", "bar", 
"mock:foo;direct:foo");
+
+        assertMockEndpointsSatisfied();
+    }
+
     @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
@@ -52,6 +61,9 @@ public class RecipientListDirectNoConsum
 
                 from("direct:start")
                     .recipientList().header("foo").delimiter(";");
+
+                from("direct:bar")
+                    .recipientList(";").header("bar");
             }
         };
     }