support Iterable for generic iterable based structures for builder

This commit is contained in:
Shay Banon 2012-01-09 23:07:38 +02:00
parent 5b2854e8bb
commit 710e0d78df

View File

@ -34,7 +34,6 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.Date; import java.util.Date;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
@ -486,7 +485,7 @@ public final class XContentBuilder {
return this; return this;
} }
public XContentBuilder field(String name, List value) throws IOException { public XContentBuilder field(String name, Iterable value) throws IOException {
startArray(name); startArray(name);
for (Object o : value) { for (Object o : value) {
value(o); value(o);
@ -495,7 +494,7 @@ public final class XContentBuilder {
return this; return this;
} }
public XContentBuilder field(XContentBuilderString name, List value) throws IOException { public XContentBuilder field(XContentBuilderString name, Iterable value) throws IOException {
startArray(name); startArray(name);
for (Object o : value) { for (Object o : value) {
value(o); value(o);
@ -644,8 +643,8 @@ public final class XContentBuilder {
} else if (value instanceof Map) { } else if (value instanceof Map) {
//noinspection unchecked //noinspection unchecked
field(name, (Map<String, Object>) value); field(name, (Map<String, Object>) value);
} else if (value instanceof List) { } else if (value instanceof Iterable) {
field(name, (List) value); field(name, (Iterable) value);
} else if (value instanceof Object[]) { } else if (value instanceof Object[]) {
field(name, (Object[]) value); field(name, (Object[]) value);
} else if (value instanceof int[]) { } else if (value instanceof int[]) {
@ -695,8 +694,8 @@ public final class XContentBuilder {
} else if (value instanceof Map) { } else if (value instanceof Map) {
//noinspection unchecked //noinspection unchecked
field(name, (Map<String, Object>) value); field(name, (Map<String, Object>) value);
} else if (value instanceof List) { } else if (value instanceof Iterable) {
field(name, (List) value); field(name, (Iterable) value);
} else if (value instanceof Object[]) { } else if (value instanceof Object[]) {
field(name, (Object[]) value); field(name, (Object[]) value);
} else if (value instanceof int[]) { } else if (value instanceof int[]) {