Support reading multiple JSON syntax blocks in a single input (#269)

Author: QIURC

json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java

@@ -195,12 +195,31 @@ private boolean compareDoublePrecision(String convert, String origin) {
     return j == originArray.length;
   }
 
+  protected boolean hasNext() {
+    return c != EOI;
+  }
+
   /**
+   * parse from the first position
    * use to return Primitive Type, or String, Or JsonObject or JsonArray generated by a
    * ContainerFactory
    */
   protected <T> T parse(JsonReaderI<T> mapper) throws ParseException {
     this.pos = -1;
+    return parseInner(mapper);
+  }
+
+  /**
+   * parse from the last position
+   * use to return Primitive Type, or String, Or JsonObject or JsonArray generated by a
+   * ContainerFactory
+   */
+  protected <T> T parseNext(JsonReaderI<T> mapper) throws ParseException {
+    this.pos = this.pos > 0 ? this.pos : -1;
+    return parseInner(mapper);
+  }
+
+  private <T> T parseInner(JsonReaderI<T> mapper) throws ParseException {
     T result;
     try {
       read();
@@ -594,7 +613,7 @@ protected <T> T readObject(JsonReaderI<T> mapper) throws ParseException, IOExcep
             return mapper.convert(current);
           }
           if (c == EOI) // Fixed on 18/10/2011 reported by vladimir
-          throw new ParseException(pos - 1, ERROR_UNEXPECTED_EOF, null);
+            throw new ParseException(pos - 1, ERROR_UNEXPECTED_EOF, null);
           // if c==, continue
           if (c == ',') acceptData = needData = true;
           else throw new ParseException(pos - 1, ERROR_UNEXPECTED_TOKEN, c);
@@ -603,7 +622,9 @@ protected <T> T readObject(JsonReaderI<T> mapper) throws ParseException, IOExcep
     }
   }
 
-  /** store and read */
+  /**
+   * store and read
+   */
   abstract void readS() throws IOException;
 
   protected abstract void readString() throws ParseException, IOException;

json-smart/src/main/java/net/minidev/json/parser/JSONParserByteArray.java

@@ -33,6 +33,12 @@ public JSONParserByteArray(int permissiveMode) {
     super(permissiveMode);
   }
 
+  public JSONParserByteArray(byte[] in , int permissiveMode) {
+    super(permissiveMode);
+    this.in = in;
+    this.len = in.length;
+  }
+
   /**
    * use to return Primitive Type, or String, Or JsonObject or JsonArray generated by a
    * ContainerFactory
@@ -41,14 +47,6 @@ public Object parse(byte[] in) throws ParseException {
     return parse(in, JSONValue.defaultReader.DEFAULT);
   }
 
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-
   /**
    * use to return Primitive Type, or String, Or JsonObject or JsonArray generated by a
    * ContainerFactory

json-smart/src/main/java/net/minidev/json/parser/JSONParserInputStream.java

@@ -33,6 +33,10 @@ public JSONParserInputStream(int permissiveMode) {
     super(permissiveMode);
   }
 
+  public JSONParserInputStream(InputStream in, int permissiveMode) {
+    super(new InputStreamReader(in, StandardCharsets.UTF_8), permissiveMode);
+  }
+
   /**
    * use to return Primitive Type, or String, Or JsonObject or JsonArray generated by a
    * ContainerFactory
@@ -54,13 +58,4 @@ public <T> T parse(InputStream in, JsonReaderI<T> mapper)
     //
     return super.parse(i2, mapper);
   }
-
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
 }

json-smart/src/main/java/net/minidev/json/parser/JSONParserReader.java

@@ -35,6 +35,11 @@ public JSONParserReader(int permissiveMode) {
     super(permissiveMode);
   }
 
+  public JSONParserReader(Reader in, int permissiveMode) {
+    super(permissiveMode);
+    this.in = in;
+  }
+
   /**
    * use to return Primitive Type, or String, Or JsonObject or JsonArray generated by a
    * ContainerFactory
@@ -51,22 +56,13 @@ public <T> T parse(Reader in, JsonReaderI<T> mapper) throws ParseException {
     this.base = mapper.base;
     //
     this.in = in;
-    return super.parse(mapper);
+     return super.parse(mapper);
   }
 
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-
   protected void read() throws IOException {
     int i = in.read();
     c = (i == -1) ? (char) EOI : (char) i;
     pos++;
-    //
   }
 
   protected void readS() throws IOException {
@@ -84,6 +80,5 @@ protected void readNoEnd() throws ParseException, IOException {
     int i = in.read();
     if (i == -1) throw new ParseException(pos - 1, ERROR_UNEXPECTED_EOF, "EOF");
     c = (char) i;
-    //
   }
 }

json-smart/src/main/java/net/minidev/json/parser/JSONParserStream.java

@@ -28,8 +28,6 @@
  * @see JSONParserReader
  */
 abstract class JSONParserStream extends JSONParserBase {
-  // len
-  //
   public JSONParserStream(int permissiveMode) {
     super(permissiveMode);
   }
@@ -112,26 +110,8 @@ protected void readString() throws ParseException, IOException {
       throw new ParseException(pos, ERROR_UNEXPECTED_CHAR, c);
     }
     sb.clear();
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
+
     /* assert (c == '\"' || c == '\'') */
     readString2();
   }
-
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
 }

json-smart/src/main/java/net/minidev/json/parser/JSONParserString.java

@@ -32,6 +32,12 @@ public JSONParserString(int permissiveMode) {
     super(permissiveMode);
   }
 
+  public JSONParserString(String in, int permissiveMode) {
+    super(permissiveMode);
+    this.in = in;
+    this.len = in.length();
+  }
+
   /**
    * use to return Primitive Type, or String, Or JsonObject or JsonArray generated by a
    * ContainerFactory

json-smart/src/main/java/net/minidev/json/parser/MultipleJsonParser.java

@@ -0,0 +1,71 @@
+package net.minidev.json.parser;
+
+import net.minidev.json.JSONValue;
+import net.minidev.json.writer.JsonReaderI;
+
+import java.io.InputStream;
+import java.io.Reader;
+import java.io.UnsupportedEncodingException;
+
+/**
+ * json-smart will parse multiple json separated by blank or line break character.
+ * <p>
+ * multiple json example: <br>
+ * {"json1": "value1"} {"json2": "value2"} <br>
+ * or <br>
+ * [{"json1-key1": "value1"}]  [{"json2": "value2"}]
+ */
+public class MultipleJsonParser {
+
+  private final JSONParserBase jsonParser;
+
+  public MultipleJsonParser(byte[] in, int permissiveMode) {
+    this.jsonParser = new JSONParserByteArray(in, permissiveMode);
+  }
+
+  public MultipleJsonParser(InputStream in, int permissiveMode) {
+    this.jsonParser = new JSONParserInputStream(in, permissiveMode);
+  }
+
+  public MultipleJsonParser(Reader in, int permissiveMode) {
+    this.jsonParser = new JSONParserReader(in, permissiveMode);
+  }
+
+  public MultipleJsonParser(String in, int permissiveMode) {
+    this.jsonParser = new JSONParserString(in, permissiveMode);
+  }
+
+  /**
+   * Parse next json with defaultReader
+   * use to return Primitive Type, or String, Or JsonObject or JsonArray generated by a
+   * ContainerFactory
+   */
+  public Object parseNext() throws ParseException {
+    return jsonParser.parseNext(JSONValue.defaultReader.DEFAULT);
+  }
+
+  /**
+   * Parse next json with target JsonReaderI
+   * use to return Primitive Type, or String, Or JsonObject or JsonArray generated by a
+   * ContainerFactory
+   */
+  public <T> T parseNext(JsonReaderI<T> mapper) throws ParseException {
+    return this.jsonParser.parseNext(mapper);
+  }
+
+  /**
+   * Parse next json with target Class
+   */
+  public <T> T parseNext(Class<T> mapTo) throws ParseException {
+    return this.jsonParser.parseNext(JSONValue.defaultReader.getMapper(mapTo));
+  }
+
+  /**
+   * Checks if there is another JSON value available in the input.
+   *
+   * @return true if another JSON value exists, false otherwise
+   */
+  public boolean hasNext() {
+    return this.jsonParser.hasNext();
+  }
+}