Fixed #924

FasterXML · Nov 6, 2015 · 03a3b55 · 03a3b55
1 parent 25fc003
commit 03a3b55
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/release-notes/CREDITS b/release-notes/CREDITS
@@ -358,3 +358,7 @@ Ievgen Pianov (pyanoveugen@github)
 Miles Kaufmann (milesk-amzn@github)
   * Reported #432: `StdValueInstantiator` unwraps exceptions, losing context
    (2.7.0)
+
+Jirka Kremser (Jiri-Kremser@github)
+  * Suggested #924: SequenceWriter.writeAll() could accept Iterable
+   (2.7.0)
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -16,6 +16,8 @@ Project: jackson-databind
 #819: Add support for setting `FormatFeature` via `ObjectReader`, `ObjectWriter`
 #918: Add `MapperFeature.ALLOW_EXPLICIT_PROPERTY_RENAMING`
  (contributed by David H)
+#924: `SequenceWriter.writeAll()` could accept `Iterable`
+ (suggested by Jiri-Kremser@github(
 #932: Rewrite ser/deser for `AtomicReference`, based on "optional" ser/desers
 #933: Close some gaps to allow using the `tryToResolveUnresolved` flows
 #936: Deserialization into List subtype with JsonCreator no longer works

diff --git a/src/main/java/com/fasterxml/jackson/databind/SequenceWriter.java b/src/main/java/com/fasterxml/jackson/databind/SequenceWriter.java
@@ -196,6 +196,7 @@ public SequenceWriter writeAll(Object[] value) throws IOException
         return this;
     }
 
+    @Deprecated
     public <C extends Collection<?>> SequenceWriter writeAll(C container) throws IOException
     {
         for (Object value : container) {
@@ -204,6 +205,17 @@ public <C extends Collection<?>> SequenceWriter writeAll(C container) throws IOE
         return this;
     }
 
+    /**
+     * @since 2.7
+     */
+    public SequenceWriter writeAll(Iterable<?> iterable) throws IOException
+    {
+        for (Object value : iterable) {
+            write(value);
+        }
+        return this;
+    }
+
     @Override
     public void flush() throws IOException {
         if (!_closed) {

diff --git a/src/test/java/com/fasterxml/jackson/databind/seq/SequenceWriterTest.java b/src/test/java/com/fasterxml/jackson/databind/seq/SequenceWriterTest.java
@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.databind.seq;
 
 import java.io.StringWriter;
+import java.util.Arrays;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -57,9 +58,11 @@ public void testSimpleNonArray() throws Exception
                 .writeValues(strw);
         w.write(new Bean(13))
         .write(new Bean(-6))
-        .writeAll(new Bean[] { new Bean(3), new Bean(1) });
+        .writeAll(new Bean[] { new Bean(3), new Bean(1) })
+        .writeAll(Arrays.asList(new Bean(5), new Bean(7)))
+        ;
         w.close();
-        assertEquals(aposToQuotes("{'a':13}\n{'a':-6}\n{'a':3}\n{'a':1}"),
+        assertEquals(aposToQuotes("{'a':13}\n{'a':-6}\n{'a':3}\n{'a':1}\n{'a':5}\n{'a':7}"),
                 strw.toString());
     }