svn commit: r1470420 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/model/NoOutputExpressionNode.java main/java/org/apache/camel/model/ProcessorDefinition.java test/java/org/apache/camel/processor/ValidateIdTest.java

[da...@apache.org]

Author: davsclaus
Date: Mon Apr 22 09:22:01 2013
New Revision: 1470420

URL: http://svn.apache.org/r1470420
Log:
CAMEL-6298: Fixed setting id in Java DSL on no output types such as validate.

Added:
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidateIdTest.java
Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/NoOutputExpressionNode.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/NoOutputExpressionNode.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/NoOutputExpressionNode.java?rev=1470420&r1=1470419&r2=1470420&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/NoOutputExpressionNode.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/NoOutputExpressionNode.java Mon Apr 22 09:22:01 2013
@@ -67,4 +67,11 @@ public class NoOutputExpressionNode exte
         getParent().addOutput(output);
     }
 
+    @Override
+    public ExpressionNode id(String id) {
+        // let parent handle assigning the id, as we do not support outputs
+        getParent().id(id);
+        return this;
+    }
 }
+

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java?rev=1470420&r1=1470419&r2=1470420&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java Mon Apr 22 09:22:01 2013
@@ -1006,7 +1006,7 @@ public abstract class ProcessorDefinitio
      */
     @SuppressWarnings("unchecked")
     public Type id(String id) {
-        if (getOutputs().isEmpty()) {
+        if (isOutputSupported() && getOutputs().isEmpty()) {
             // set id on this
             setId(id);
         } else {

Added: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidateIdTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidateIdTest.java?rev=1470420&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidateIdTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidateIdTest.java Mon Apr 22 09:22:01 2013
@@ -0,0 +1,58 @@
+/**
+ * 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.processor;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.RouteDefinition;
+
+/**
+ *
+ */
+public class ValidateIdTest extends ContextTestSupport {
+
+    public void testValidateId() throws Exception {
+        getMockEndpoint("mock:result").expectedMessageCount(1);
+
+        template.sendBody("direct:start", "Hello World");
+
+        assertMockEndpointsSatisfied();
+
+        RouteDefinition route = context.getRouteDefinition("myRoute");
+        assertNotNull(route);
+
+        // mock:result should be the only with the result as id
+        assertTrue(route.getOutputs().get(0).getId().equals("myValidate"));
+        assertFalse(route.getOutputs().get(1).getId().equals("result"));
+        assertTrue(route.getOutputs().get(2).getId().equals("result"));
+        assertTrue(route.getOutputs().get(3).getId().equals("after"));
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start").routeId("myRoute")
+                        .validate(body().isInstanceOf(String.class)).id("myValidate")
+                        .to("log:foo")
+                        .to("mock:result").id("result")
+                        .to("log:after").id("after");
+            }
+        };
+    }
+}