Repository: johnzon Updated Branches: refs/heads/master 6a2d5511f -> 86f3193c1
JOHNZON-96 move to Collection<?> as we suggested in a spec ticket Project: http://git-wip-us.apache.org/repos/asf/johnzon/repo Commit: http://git-wip-us.apache.org/repos/asf/johnzon/commit/86f3193c Tree: http://git-wip-us.apache.org/repos/asf/johnzon/tree/86f3193c Diff: http://git-wip-us.apache.org/repos/asf/johnzon/diff/86f3193c Branch: refs/heads/master Commit: 86f3193c19bd5de2e66d0fd7f31263a30592ff31 Parents: 6a2d551 Author: Mark Struberg <[email protected]> Authored: Tue Mar 7 18:40:56 2017 +0100 Committer: Mark Struberg <[email protected]> Committed: Tue Mar 7 18:40:56 2017 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/johnzon/core/JsonArrayBuilderImpl.java | 2 +- .../java/org/apache/johnzon/core/JsonBuilderFactoryImpl.java | 2 +- .../src/main/java/org/apache/johnzon/core/JsonProviderImpl.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/johnzon/blob/86f3193c/johnzon-core/src/main/java/org/apache/johnzon/core/JsonArrayBuilderImpl.java ---------------------------------------------------------------------- diff --git a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonArrayBuilderImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonArrayBuilderImpl.java index 0936e22..69e2281 100644 --- a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonArrayBuilderImpl.java +++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonArrayBuilderImpl.java @@ -41,7 +41,7 @@ class JsonArrayBuilderImpl implements JsonArrayBuilder, Serializable { tmpList = new ArrayList<>(initialData); } - public JsonArrayBuilderImpl(Collection<Object> initialData) { + public JsonArrayBuilderImpl(Collection<?> initialData) { tmpList = new ArrayList<>(); for (Object initialValue : initialData) { add(initialValue); http://git-wip-us.apache.org/repos/asf/johnzon/blob/86f3193c/johnzon-core/src/main/java/org/apache/johnzon/core/JsonBuilderFactoryImpl.java ---------------------------------------------------------------------- diff --git a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonBuilderFactoryImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonBuilderFactoryImpl.java index c6062a7..a22718b 100644 --- a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonBuilderFactoryImpl.java +++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonBuilderFactoryImpl.java @@ -74,7 +74,7 @@ class JsonBuilderFactoryImpl implements JsonBuilderFactory { return new JsonArrayBuilderImpl(initialData); } - public JsonArrayBuilder createArrayBuilder(Collection<Object> initialData) { + public JsonArrayBuilder createArrayBuilder(Collection<?> initialData) { return new JsonArrayBuilderImpl(initialData); } http://git-wip-us.apache.org/repos/asf/johnzon/blob/86f3193c/johnzon-core/src/main/java/org/apache/johnzon/core/JsonProviderImpl.java ---------------------------------------------------------------------- diff --git a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonProviderImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonProviderImpl.java index 9df37da..c7c8000 100644 --- a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonProviderImpl.java +++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonProviderImpl.java @@ -155,7 +155,7 @@ public class JsonProviderImpl extends JsonProvider implements Serializable { } @Override - public JsonArrayBuilder createArrayBuilder(Collection<Object> initialData) { + public JsonArrayBuilder createArrayBuilder(Collection<?> initialData) { return DELEGATE.createArrayBuilder(initialData); } @@ -306,7 +306,7 @@ public class JsonProviderImpl extends JsonProvider implements Serializable { return builderFactory.createArrayBuilder(initialData); } - public JsonArrayBuilder createArrayBuilder(Collection<Object> initialData) { + public JsonArrayBuilder createArrayBuilder(Collection<?> initialData) { return builderFactory.createArrayBuilder(initialData); }
