You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/02/24 18:07:38 UTC
svn commit: r1293339 - in /camel/branches/camel-2.9.x: ./
camel-core/src/main/java/org/apache/camel/util/
camel-core/src/test/java/org/apache/camel/util/
components/camel-http/src/main/java/org/apache/camel/component/http/
components/camel-http4/src/ma...
Author: davsclaus
Date: Fri Feb 24 17:07:38 2012
New Revision: 1293339
URL: http://svn.apache.org/viewvc?rev=1293339&view=rev
Log:
CAMEL-4984: Fixed http producers to send http headers with empty values.
Added:
camel/branches/camel-2.9.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerSendEmptyHeaderTest.java
- copied unchanged from r1293330, camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerSendEmptyHeaderTest.java
camel/branches/camel-2.9.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSendEmptyHeaderTest.java
- copied unchanged from r1293330, camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSendEmptyHeaderTest.java
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
camel/branches/camel-2.9.x/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
camel/branches/camel-2.9.x/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java
camel/branches/camel-2.9.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 24 17:07:38 2012
@@ -1 +1 @@
-/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870,1244872,1245021,1291555,1291727,1291848,1291864,1292114,1292384,1292725,1292760,1292767,1293079,1293268,1293288
+/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870,1244872,1245021,1291555,1291727,1291848,1291864,1292114,1292384,1292725,1292760,1292767,1293079,1293268,1293288,1293330
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java?rev=1293339&r1=1293338&r2=1293339&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java Fri Feb 24 17:07:38 2012
@@ -460,6 +460,7 @@ public final class ObjectHelper {
* we just create a singleton collection iterator over a single value
* <p/>
* Will default use comma for String separating String values.
+ * This method does <b>not</b> allow empty values
*
* @param value the value
* @return the iterator
@@ -473,13 +474,31 @@ public final class ObjectHelper {
* Object[], a String with values separated by the given delimiter,
* or a primitive type array; otherwise to simplify the caller's
* code, we just create a singleton collection iterator over a single value
+ * <p/>
+ * This method does <b>not</b> allow empty values
*
- * @param value the value
- * @param delimiter delimiter for separating String values
+ * @param value the value
+ * @param delimiter delimiter for separating String values
* @return the iterator
*/
- @SuppressWarnings("unchecked")
public static Iterator<Object> createIterator(Object value, String delimiter) {
+ return createIterator(value, delimiter, false);
+ }
+
+ /**
+ * Creates an iterator over the value if the value is a collection, an
+ * Object[], a String with values separated by the given delimiter,
+ * or a primitive type array; otherwise to simplify the caller's
+ * code, we just create a singleton collection iterator over a single value
+ *
+ * @param value the value
+ * @param delimiter delimiter for separating String values
+ * @param allowEmptyValues whether to allow empty values
+ * @return the iterator
+ */
+ @SuppressWarnings("unchecked")
+ public static Iterator<Object> createIterator(Object value, String delimiter, final boolean allowEmptyValues) {
+
// if its a message than we want to iterate its body
if (value instanceof Message) {
value = ((Message) value).getBody();
@@ -545,8 +564,7 @@ public final class ObjectHelper {
int idx = -1;
public boolean hasNext() {
- // empty string should not be regarded as having next
- return idx + 1 == 0 && ObjectHelper.isNotEmpty(s);
+ return idx + 1 == 0 && (allowEmptyValues || ObjectHelper.isNotEmpty(s));
}
public String next() {
Modified: camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java?rev=1293339&r1=1293338&r2=1293339&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java Fri Feb 24 17:07:38 2012
@@ -139,6 +139,15 @@ public class ObjectHelperTest extends Te
assertSame("Should return the same iterator", iterator, ObjectHelper.createIterator(iterator));
}
+ public void testCreateIteratorAllowEmpty() {
+ String s = "a,b,,c";
+ Iterator<String> it = CastUtils.cast(ObjectHelper.createIterator(s, ",", true));
+ assertEquals("a", it.next());
+ assertEquals("b", it.next());
+ assertEquals("", it.next());
+ assertEquals("c", it.next());
+ }
+
public void testCreateIteratorWithStringAndCommaSeparator() {
String s = "a,b,c";
Iterator<String> it = CastUtils.cast(ObjectHelper.createIterator(s, ","));
@@ -147,6 +156,13 @@ public class ObjectHelperTest extends Te
assertEquals("c", it.next());
}
+ public void testCreateIteratorWithStringAndCommaSeparatorEmptyString() {
+ String s = "";
+ Iterator<String> it = CastUtils.cast(ObjectHelper.createIterator(s, ",", true));
+ assertEquals("", it.next());
+ assertFalse(it.hasNext());
+ }
+
public void testCreateIteratorWithStringAndSemiColonSeparator() {
String s = "a;b;c";
Iterator<String> it = CastUtils.cast(ObjectHelper.createIterator(s, ";"));
Modified: camel/branches/camel-2.9.x/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java?rev=1293339&r1=1293338&r2=1293339&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java (original)
+++ camel/branches/camel-2.9.x/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java Fri Feb 24 17:07:38 2012
@@ -103,8 +103,8 @@ public class HttpProducer extends Defaul
Object headerValue = in.getHeader(key);
if (headerValue != null) {
- // use an iterator as there can be multiple values. (must not use a delimiter)
- final Iterator it = ObjectHelper.createIterator(headerValue, null);
+ // use an iterator as there can be multiple values. (must not use a delimiter, and allow empty values)
+ final Iterator<?> it = ObjectHelper.createIterator(headerValue, null, true);
// the value to add as request header
final List<String> values = new ArrayList<String>();
Modified: camel/branches/camel-2.9.x/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java?rev=1293339&r1=1293338&r2=1293339&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java (original)
+++ camel/branches/camel-2.9.x/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java Fri Feb 24 17:07:38 2012
@@ -103,8 +103,8 @@ public class HttpProducer extends Defaul
Object headerValue = in.getHeader(key);
if (headerValue != null) {
- // use an iterator as there can be multiple values. (must not use a delimiter)
- final Iterator it = ObjectHelper.createIterator(headerValue, null);
+ // use an iterator as there can be multiple values. (must not use a delimiter, and allow empty values)
+ final Iterator<?> it = ObjectHelper.createIterator(headerValue, null, true);
// the value to add as request header
final List<String> values = new ArrayList<String>();
Modified: camel/branches/camel-2.9.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java?rev=1293339&r1=1293338&r2=1293339&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java (original)
+++ camel/branches/camel-2.9.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java Fri Feb 24 17:07:38 2012
@@ -153,8 +153,8 @@ public class JettyHttpProducer extends D
Object headerValue = in.getHeader(key);
if (headerValue != null) {
- // use an iterator as there can be multiple values. (must not use a delimiter)
- final Iterator it = ObjectHelper.createIterator(headerValue, null);
+ // use an iterator as there can be multiple values. (must not use a delimiter, and allow empty values)
+ final Iterator<?> it = ObjectHelper.createIterator(headerValue, null, true);
// the values to add as a request header
final List<String> values = new ArrayList<String>();