|
|
@ -93,7 +93,6 @@ public class JacksonJsonNodeJsonProvider extends AbstractJsonProvider { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public Object unwrap(Object o) { |
|
|
|
public Object unwrap(Object o) { |
|
|
|
|
|
|
|
|
|
|
|
if (o == null) { |
|
|
|
if (o == null) { |
|
|
|
return null; |
|
|
|
return null; |
|
|
|
} |
|
|
|
} |
|
|
@ -230,11 +229,23 @@ public class JacksonJsonNodeJsonProvider extends AbstractJsonProvider { |
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public Iterable<?> toIterable(Object obj) { |
|
|
|
public Iterable<?> toIterable(Object obj) { |
|
|
|
ArrayNode arr = toJsonArray(obj); |
|
|
|
ArrayNode arr = toJsonArray(obj); |
|
|
|
List<Object> values = new ArrayList<Object>(arr.size()); |
|
|
|
Iterator<?> iterator = arr.iterator(); |
|
|
|
for (Object o : arr) { |
|
|
|
return new Iterable<Object>() { |
|
|
|
values.add(unwrap(o)); |
|
|
|
@Override |
|
|
|
} |
|
|
|
public Iterator<Object> iterator() { |
|
|
|
return values; |
|
|
|
return new Iterator<Object>() { |
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
|
|
public boolean hasNext() { |
|
|
|
|
|
|
|
return iterator.hasNext(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
|
|
public Object next() { |
|
|
|
|
|
|
|
return unwrap(iterator.next()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private JsonNode createJsonElement(Object o) { |
|
|
|
private JsonNode createJsonElement(Object o) { |
|
|
|