Replace buggy .readOne() methods with JsonNodeReader from coreutils

Author: fge

src/main/java/com/github/fge/jsonschema/process/Index.java

@@ -17,16 +17,12 @@
 
 package com.github.fge.jsonschema.process;
 
-import com.fasterxml.jackson.core.JsonLocation;
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.MappingIterator;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.github.fge.jackson.JacksonUtils;
+import com.github.fge.jackson.JsonNodeReader;
 import com.github.fge.jsonschema.constants.ParseError;
 import com.github.fge.jsonschema.core.report.ProcessingReport;
 import com.github.fge.jsonschema.core.util.AsJson;
@@ -56,7 +52,8 @@ public final class Index
     private static final Response OOPS = Response.status(500).build();
     private static final JsonValidator VALIDATOR
         = JsonSchemaFactory.byDefault().getValidator();
-    private static final ObjectMapper MAPPER = JacksonUtils.newMapper();
+    private static final JsonNodeReader NODE_READER
+        = new JsonNodeReader();
 
     @POST
     @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
@@ -117,35 +114,11 @@ private static boolean fillWithData(final ObjectNode node,
         throws IOException
     {
         try {
-            node.put(onSuccess, readOne(raw));
+            node.put(onSuccess, NODE_READER.fromReader(new StringReader(raw)));
             return false;
         } catch (JsonProcessingException e) {
             node.put(onFailure, ParseError.build(e, raw.contains("\r\n")));
             return true;
         }
     }
-
-    private static JsonNode readOne(final String input)
-        throws IOException
-    {
-        final MappingIterator<JsonNode> iterator;
-        final JsonNode ret;
-        final JsonLocation location;
-
-        try (
-            final StringReader reader = new StringReader(input);
-            final JsonParser parser = MAPPER.getFactory().createParser(reader);
-        ) {
-            iterator = MAPPER.readValues(parser, JsonNode.class);
-            if (!iterator.hasNextValue())
-                throw new JsonParseException("no data",
-                    new JsonLocation(reader, 0L, 1, 1));
-            ret = iterator.nextValue();
-            location = parser.getCurrentLocation();
-            if (!iterator.hasNextValue())
-                return ret;
-            throw new JsonParseException("extra data after first node",
-                location);
-        }
-    }
 }

src/main/java/com/github/fge/jsonschema/process/JsonPatch.java

@@ -28,7 +28,7 @@
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.github.fge.jackson.JacksonUtils;
-import com.github.fge.jackson.JsonLoader;
+import com.github.fge.jackson.JsonNodeReader;
 import com.github.fge.jsonpatch.JsonPatchInput;
 import com.github.fge.jsonpatch.JsonPatchProcessor;
 import com.github.fge.jsonschema.constants.ParseError;
@@ -62,6 +62,8 @@ public final class JsonPatch
     private static final JsonPatchProcessor PROCESSOR
         = new JsonPatchProcessor();
     private static final ObjectMapper MAPPER = JacksonUtils.newMapper();
+    private static final JsonNodeReader NODE_READER
+        = new JsonNodeReader();
 
     @POST
     @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
@@ -125,7 +127,7 @@ private static boolean fillWithData(final ObjectNode node,
         throws IOException
     {
         try {
-            node.put(onSuccess, JsonLoader.fromString(raw));
+            node.put(onSuccess, NODE_READER.fromReader(new StringReader(raw)));
             return false;
         } catch (JsonProcessingException e) {
             node.put(onFailure, ParseError.build(e, raw.contains("\r\n")));

src/main/java/com/github/fge/jsonschema/process/Processing.java

@@ -1,17 +1,13 @@
 package com.github.fge.jsonschema.process;
 
 
-import com.fasterxml.jackson.core.JsonLocation;
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.MappingIterator;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.github.fge.jackson.JacksonUtils;
+import com.github.fge.jackson.JsonNodeReader;
 import com.github.fge.jsonschema.constants.ParseError;
 import com.github.fge.jsonschema.core.exceptions.ProcessingException;
 import com.github.fge.jsonschema.core.report.ProcessingMessage;
@@ -32,7 +28,8 @@
 public abstract class Processing
 {
     private static final Response OOPS = Response.status(500).build();
-    private static final ObjectMapper MAPPER = JacksonUtils.newMapper();
+    private static final JsonNodeReader NODE_READER
+        = new JsonNodeReader();
 
     protected static final JsonNodeFactory FACTORY = JacksonUtils.nodeFactory();
 
@@ -69,7 +66,7 @@ protected static boolean fillWithData(final ObjectNode node,
         throws IOException
     {
         try {
-            node.put(onSuccess, readOne(raw));
+            node.put(onSuccess, NODE_READER.fromReader(new StringReader(raw)));
             return false;
         } catch (JsonProcessingException e) {
             node.put(onFailure, ParseError.build(e, raw.contains("\r\n")));
@@ -84,28 +81,4 @@ protected static JsonNode buildReport(final ProcessingReport report)
             ret.add(message.asJson());
         return ret;
     }
-
-    private static JsonNode readOne(final String input)
-        throws IOException
-    {
-        final MappingIterator<JsonNode> iterator;
-        final JsonNode ret;
-        final JsonLocation location;
-
-        try (
-            final StringReader reader = new StringReader(input);
-            final JsonParser parser = MAPPER.getFactory().createParser(reader);
-        ) {
-            iterator = MAPPER.readValues(parser, JsonNode.class);
-            if (!iterator.hasNextValue())
-                throw new JsonParseException("no data",
-                    new JsonLocation(reader, 0L, 1, 1));
-            ret = iterator.nextValue();
-            location = parser.getCurrentLocation();
-            if (!iterator.hasNextValue())
-                return ret;
-            throw new JsonParseException("extra data after first node",
-                location);
-        }
-    }
 }