diff --git a/impl/src/main/java/org/eclipse/parsson/JsonParserImpl.java b/impl/src/main/java/org/eclipse/parsson/JsonParserImpl.java index a7beb5c..b60c7fb 100644 --- a/impl/src/main/java/org/eclipse/parsson/JsonParserImpl.java +++ b/impl/src/main/java/org/eclipse/parsson/JsonParserImpl.java @@ -199,27 +199,27 @@ public Stream getArrayStream() { JsonMessages.PARSER_GETARRAY_ERR(currentEvent)); } Spliterator spliterator = - new Spliterators.AbstractSpliterator(Long.MAX_VALUE, Spliterator.ORDERED) { - @Override - public Spliterator trySplit() { - return null; - } - - @Override - public boolean tryAdvance(Consumer action) { - if (action == null) { - throw new NullPointerException(); - } - if (!hasNext()) { - return false; - } - if (next() == JsonParser.Event.END_ARRAY) { - return false; - } - action.accept(getValue()); - return true; - } - }; + new Spliterators.AbstractSpliterator(Long.MAX_VALUE, Spliterator.ORDERED) { + @Override + public Spliterator trySplit() { + return null; + } + + @Override + public boolean tryAdvance(Consumer action) { + if (action == null) { + throw new NullPointerException(); + } + if (!hasNext()) { + return false; + } + if (next() == JsonParser.Event.END_ARRAY) { + return false; + } + action.accept(getValue()); + return true; + } + }; return StreamSupport.stream(spliterator, false); } @@ -230,37 +230,37 @@ public Stream> getObjectStream() { JsonMessages.PARSER_GETOBJECT_ERR(currentEvent)); } Spliterator> spliterator = - new Spliterators.AbstractSpliterator>(Long.MAX_VALUE, Spliterator.ORDERED) { - @Override - public Spliterator> trySplit() { - return null; - } - - @Override - public boolean tryAdvance(Consumer> action) { - if (action == null) { - throw new NullPointerException(); - } - if (!hasNext()) { - return false; - } - JsonParser.Event e = next(); - if (e == JsonParser.Event.END_OBJECT) { - return false; - } - if (e != JsonParser.Event.KEY_NAME) { - throw new JsonException(JsonMessages.INTERNAL_ERROR()); - } - String key = getString(); - if (!hasNext()) { - throw new JsonException(JsonMessages.INTERNAL_ERROR()); - } - next(); - JsonValue value = getValue(); - action.accept(new AbstractMap.SimpleImmutableEntry<>(key, value)); - return true; - } - }; + new Spliterators.AbstractSpliterator>(Long.MAX_VALUE, Spliterator.ORDERED) { + @Override + public Spliterator> trySplit() { + return null; + } + + @Override + public boolean tryAdvance(Consumer> action) { + if (action == null) { + throw new NullPointerException(); + } + if (!hasNext()) { + return false; + } + JsonParser.Event e = next(); + if (e == JsonParser.Event.END_OBJECT) { + return false; + } + if (e != JsonParser.Event.KEY_NAME) { + throw new JsonException(JsonMessages.INTERNAL_ERROR()); + } + String key = getString(); + if (!hasNext()) { + throw new JsonException(JsonMessages.INTERNAL_ERROR()); + } + next(); + JsonValue value = getValue(); + action.accept(new AbstractMap.SimpleImmutableEntry<>(key, value)); + return true; + } + }; return StreamSupport.stream(spliterator, false); } @@ -271,25 +271,25 @@ public Stream getValueStream() { JsonMessages.PARSER_GETVALUESTREAM_ERR()); } Spliterator spliterator = - new Spliterators.AbstractSpliterator(Long.MAX_VALUE, Spliterator.ORDERED) { - @Override - public Spliterator trySplit() { - return null; - } - - @Override - public boolean tryAdvance(Consumer action) { - if (action == null) { - throw new NullPointerException(); - } - if (!hasNext()) { - return false; - } - next(); - action.accept(getValue()); - return true; - } - }; + new Spliterators.AbstractSpliterator(Long.MAX_VALUE, Spliterator.ORDERED) { + @Override + public Spliterator trySplit() { + return null; + } + + @Override + public boolean tryAdvance(Consumer action) { + if (action == null) { + throw new NullPointerException(); + } + if (!hasNext()) { + return false; + } + next(); + action.accept(getValue()); + return true; + } + }; return StreamSupport.stream(spliterator, false); } @@ -439,7 +439,7 @@ private abstract class Context { protected Event nextEventIfValueOrObjectOrArrayStart(JsonToken token) { if (token.isValue()) { return token.getEvent(); - } else if (token == CURLYOPEN) { + } else if (token == JsonToken.CURLYOPEN) { stack.push(currentContext); currentContext = new ObjectContext(); return Event.START_OBJECT; @@ -505,7 +505,7 @@ private final class ObjectContext extends SkippingContext { private boolean firstValue = true; private ObjectContext() { - super(CURLYOPEN, CURLYCLOSE); + super(JsonToken.CURLYOPEN, JsonToken.CURLYCLOSE); } /* @@ -565,7 +565,7 @@ private final class ArrayContext extends SkippingContext { private boolean firstValue = true; private ArrayContext() { - super(SQUAREOPEN, SQUARECLOSE); + super(JsonToken.SQUAREOPEN, JsonToken.SQUARECLOSE); } // Handle 1. ] 2. value 3. ,value diff --git a/pom.xml b/pom.xml index 02f29f9..02dc20c 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ ${config.dir}/exclude.xml false Low - 4.7.3.6 + 4.8.1.0 2.1.3 @@ -323,7 +323,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.0 + 3.6.2 org.apache.maven.plugins @@ -343,7 +343,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.6.0 + 3.6.1 org.apache.maven.plugins @@ -353,7 +353,7 @@ org.apache.maven.plugins maven-clean-plugin - 3.3.1 + 3.3.2 org.apache.maven.plugins @@ -368,7 +368,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.2 + 3.2.2 org.apache.maven.plugins @@ -458,7 +458,7 @@ com.sun.xml.bind jaxb-impl - 3.0.1 + 4.0.4