svn commit: r724122 - in /activemq/camel/trunk/camel-core/src/main/java/org/apache/camel: model/SetHeaderType.java util/ObjectHelper.java

[davsclaus]

Author: davsclaus
Date: Sun Dec  7 03:32:21 2008
New Revision: 724122

URL: http://svn.apache.org/viewvc?rev=724122&view=rev
Log:
CAMEL-1152: SetHeader requires the headerName attribute to be set with a non 
empty value

Modified:
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java?rev=724122&r1=724121&r2=724122&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java
 Sun Dec  7 03:32:21 2008
@@ -27,6 +27,7 @@
 import org.apache.camel.builder.ProcessorBuilder;
 import org.apache.camel.model.language.ExpressionType;
 import org.apache.camel.spi.RouteContext;
+import org.apache.camel.util.ObjectHelper;
 
 /**
  * Represents an XML <setHeader/> element
@@ -34,7 +35,7 @@
 @XmlRootElement(name = "setHeader")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class SetHeaderType extends ExpressionNode {
-    @XmlAttribute
+    @XmlAttribute(required = true)
     private String headerName;
     
     public SetHeaderType() {
@@ -67,6 +68,7 @@
 
     @Override
     public Processor createProcessor(RouteContext routeContext) throws 
Exception {
+        ObjectHelper.notEmpty(headerName, "headerName");
         Expression expr = getExpression().createExpression(routeContext);
         return ProcessorBuilder.setHeader(getHeaderName(), expr);
     }

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java?rev=724122&r1=724121&r2=724122&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
 Sun Dec  7 03:32:21 2008
@@ -162,6 +162,12 @@
         }
     }
 
+    public static void notEmpty(String value, String name) {
+        if (isNullOrBlank(value)) {
+            throw new IllegalArgumentException(name + " must be specified and 
not empty");
+        }
+    }
+
     public static String[] splitOnCharacter(String value, String needle, int 
count) {
         String rc[] = new String[count];
         rc[0] = value;