svn commit: r1470421 - in /camel/branches/camel-2.10.x: ./ camel-core/src/main/java/org/apache/camel/model/ camel-core/src/test/java/org/apache/camel/processor/

[davsclaus]

Author: davsclaus
Date: Mon Apr 22 09:22:44 2013
New Revision: 1470421

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

Added:
    
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/ValidateIdTest.java
      - copied unchanged from r1470420, 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidateIdTest.java
Modified:
    camel/branches/camel-2.10.x/   (props changed)
    
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/model/NoOutputExpressionNode.java
    
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java

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

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/NoOutputExpressionNode.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/model/NoOutputExpressionNode.java?rev=1470421&r1=1470420&r2=1470421&view=diff
==============================================================================
--- 
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/model/NoOutputExpressionNode.java
 (original)
+++ 
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/model/NoOutputExpressionNode.java
 Mon Apr 22 09:22:44 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/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=1470421&r1=1470420&r2=1470421&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
 Mon Apr 22 09:22:44 2013
@@ -988,7 +988,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 {