#27 code optimization

wanglingsong · wanglingsong · commit 243d2df03e9e · 2017-08-10T23:45:42.000+08:00
diff --git a/jsurfer-all/src/test/java/org/jsfr/json/FastJsonParesrTest.java b/jsurfer-all/src/test/java/org/jsfr/json/FastJsonParesrTest.java
@@ -49,7 +49,7 @@ public void onValue(Object value, ParsingContext context) {
                         context.pause();
                     }
                 }).build();
-        ResumableParser parser = surfer.getResumableParser(read("sample.json"), config);
+        ResumableParser parser = surfer.createResumableParser(read("sample.json"), config);
         assertFalse(parser.resume());
         LOGGER.info("Start parsing");
         parser.parse();
diff --git a/jsurfer-all/src/test/java/org/jsfr/json/GsonParserTest.java b/jsurfer-all/src/test/java/org/jsfr/json/GsonParserTest.java
@@ -114,7 +114,7 @@ public void onValue(Object value, ParsingContext context) {
                         context.pause();
                     }
                 }).build();
-        ResumableParser parser = surfer.getResumableParser(read("sample.json"), config);
+        ResumableParser parser = surfer.createResumableParser(read("sample.json"), config);
         assertFalse(parser.resume());
         LOGGER.info("Start parsing");
         parser.parse();
diff --git a/jsurfer-all/src/test/java/org/jsfr/json/JacksonParserTest.java b/jsurfer-all/src/test/java/org/jsfr/json/JacksonParserTest.java
@@ -119,7 +119,7 @@ public void onValue(Object value, ParsingContext context) {
                         context.pause();
                     }
                 }).build();
-        ResumableParser parser = surfer.getResumableParser(read("sample.json"), config);
+        ResumableParser parser = surfer.createResumableParser(read("sample.json"), config);
         assertFalse(parser.resume());
         LOGGER.info("Start parsing");
         parser.parse();
@@ -141,7 +141,7 @@ public void testNonBlockingParser() throws Exception {
         byte[] part2 = "34, \"bar\": \"ab".getBytes("UTF-8");
         byte[] part3 = "cd\"}".getBytes("UTF-8");
 
-        NonBlockingParser nonBlockingParser = surfer.getNonBlockingParser(config);
+        NonBlockingParser nonBlockingParser = surfer.createNonBlockingParser(config);
         assertTrue(nonBlockingParser.feed(part1, 0, part1.length));
         assertTrue(nonBlockingParser.feed(part2, 0, part2.length));
         assertTrue(nonBlockingParser.feed(part3, 0, part3.length));
diff --git a/jsurfer-core/src/main/java/org/jsfr/json/JsonParserAdapter.java b/jsurfer-core/src/main/java/org/jsfr/json/JsonParserAdapter.java
@@ -54,7 +54,7 @@ public interface JsonParserAdapter {
      * @param context Surfing context
      * @return Resumable Parser
      */
-    ResumableParser createParser(Reader reader, SurfingContext context);
+    ResumableParser createResumableParser(Reader reader, SurfingContext context);
 
     /**
      * Create a resumable parser
@@ -63,7 +63,7 @@ public interface JsonParserAdapter {
      * @param context Surfing context
      * @return Resumable parser
      */
-    ResumableParser createParser(String json, SurfingContext context);
+    ResumableParser createResumableParser(String json, SurfingContext context);
 
     NonBlockingParser createNonBlockingParser(SurfingContext context);
 
diff --git a/jsurfer-core/src/main/java/org/jsfr/json/JsonSurfer.java b/jsurfer-core/src/main/java/org/jsfr/json/JsonSurfer.java
@@ -85,7 +85,7 @@ public SurfingConfiguration.Builder configBuilder() {
      */
     public Iterator<Object> iterator(Reader reader, JsonPath jsonPath) {
         SurfingContext context = createIteratorContext(jsonPath);
-        final ResumableParser resumableParser = jsonParserAdapter.createParser(reader, context);
+        final ResumableParser resumableParser = jsonParserAdapter.createResumableParser(reader, context);
         resumableParser.parse();
         return createIterator(context, resumableParser);
     }
@@ -99,7 +99,7 @@ public Iterator<Object> iterator(Reader reader, JsonPath jsonPath) {
      */
     public Iterator<Object> iterator(String json, JsonPath jsonPath) {
         SurfingContext context = createIteratorContext(jsonPath);
-        final ResumableParser resumableParser = jsonParserAdapter.createParser(json, context);
+        final ResumableParser resumableParser = jsonParserAdapter.createResumableParser(json, context);
         resumableParser.parse();
         return createIterator(context, resumableParser);
     }
@@ -167,17 +167,17 @@ public void surf(Reader json, SurfingConfiguration configuration) {
         jsonParserAdapter.parse(json, new SurfingContext(configuration));
     }
 
-    public ResumableParser getResumableParser(String json, SurfingConfiguration configuration) {
+    public ResumableParser createResumableParser(String json, SurfingConfiguration configuration) {
         ensureSetting(configuration);
-        return jsonParserAdapter.createParser(json, new SurfingContext(configuration));
+        return jsonParserAdapter.createResumableParser(json, new SurfingContext(configuration));
     }
 
-    public ResumableParser getResumableParser(Reader json, SurfingConfiguration configuration) {
+    public ResumableParser createResumableParser(Reader json, SurfingConfiguration configuration) {
         ensureSetting(configuration);
-        return jsonParserAdapter.createParser(json, new SurfingContext(configuration));
+        return jsonParserAdapter.createResumableParser(json, new SurfingContext(configuration));
     }
 
-    public NonBlockingParser getNonBlockingParser(SurfingConfiguration configuration) {
+    public NonBlockingParser createNonBlockingParser(SurfingConfiguration configuration) {
         ensureSetting(configuration);
         return jsonParserAdapter.createNonBlockingParser(new SurfingContext(configuration));
     }
diff --git a/jsurfer-core/src/main/java/org/jsfr/json/NonBlockingParser.java b/jsurfer-core/src/main/java/org/jsfr/json/NonBlockingParser.java
@@ -3,7 +3,7 @@
 /**
  * Created by Leo on 2017/8/10.
  */
-public interface NonBlockingParser {
+public interface NonBlockingParser extends ResumableParser{
 
     boolean feed(byte[] bytes, int start, int end);
 
diff --git a/jsurfer-core/src/main/java/org/jsfr/json/SurfingContext.java b/jsurfer-core/src/main/java/org/jsfr/json/SurfingContext.java
@@ -127,7 +127,7 @@ public boolean endJSON() {
         // clear resources
         currentPosition.clear();
         currentPosition = null;
-        this.stopped = true;
+        this.stop();
         return true;
     }
 
@@ -283,6 +283,7 @@ public boolean shouldBreak() {
     @Override
     public void stop() {
         this.stopped = true;
+        this.paused = false;
     }
 
     @Override
diff --git a/jsurfer-fastjson/src/main/java/org/jsfr/json/FastJsonParser.java b/jsurfer-fastjson/src/main/java/org/jsfr/json/FastJsonParser.java
@@ -35,7 +35,7 @@ public void parse() {
         @Override
         public boolean resume() {
             try {
-                if (context.isStopped() || !context.isPaused()) {
+                if (!context.isPaused()) {
                     return false;
                 }
                 context.resume();
@@ -131,21 +131,21 @@ private FastJsonParser() {
 
     @Override
     public void parse(Reader reader, SurfingContext context) {
-        createParser(reader, context).parse();
+        createResumableParser(reader, context).parse();
     }
 
     @Override
     public void parse(String json, SurfingContext context) {
-        createParser(json, context).parse();
+        createResumableParser(json, context).parse();
     }
 
     @Override
-    public ResumableParser createParser(Reader reader, SurfingContext context) {
+    public ResumableParser createResumableParser(Reader reader, SurfingContext context) {
         return new FastJsonResumableParser(new JSONReaderScanner(reader), context, new StaticPrimitiveHolder());
     }
 
     @Override
-    public ResumableParser createParser(String json, SurfingContext context) {
+    public ResumableParser createResumableParser(String json, SurfingContext context) {
         return new FastJsonResumableParser(new JSONScanner(json), context, new StaticPrimitiveHolder());
     }
 
diff --git a/jsurfer-gson/src/main/java/org/jsfr/json/GsonParser.java b/jsurfer-gson/src/main/java/org/jsfr/json/GsonParser.java
@@ -60,7 +60,7 @@ public void parse() {
         @Override
         public boolean resume() {
             try {
-                if (context.isStopped() || !context.isPaused()) {
+                if (!context.isPaused()) {
                     return false;
                 }
                 context.resume();
@@ -119,7 +119,7 @@ private void doParse() {
                             break;
                         case END_DOCUMENT:
                             context.endJSON();
-                            return;
+                            break;
                     }
                 }
             } catch (Exception e) {
@@ -135,16 +135,16 @@ private GsonParser() {
 
     @Override
     public void parse(Reader reader, SurfingContext context) {
-        createParser(reader, context).parse();
+        createResumableParser(reader, context).parse();
     }
 
     @Override
     public void parse(String json, SurfingContext context) {
-        createParser(json, context).parse();
+        createResumableParser(json, context).parse();
     }
 
     @Override
-    public ResumableParser createParser(Reader reader, SurfingContext context) {
+    public ResumableParser createResumableParser(Reader reader, SurfingContext context) {
         final JsonReader jsonReader = new JsonReader(reader);
         final JsonProvider jsonProvider = context.getConfig().getJsonProvider();
 
@@ -197,8 +197,8 @@ public void doSkipValue() throws IOException {
     }
 
     @Override
-    public ResumableParser createParser(String json, SurfingContext context) {
-        return createParser(new StringReader(json), context);
+    public ResumableParser createResumableParser(String json, SurfingContext context) {
+        return createResumableParser(new StringReader(json), context);
     }
 
     @Override
diff --git a/jsurfer-jackson/src/main/java/org/jsfr/json/JacksonParser.java b/jsurfer-jackson/src/main/java/org/jsfr/json/JacksonParser.java
diff --git a/jsurfer-jsonsimple/src/main/java/org/jsfr/json/JsonSimpleParser.java b/jsurfer-jsonsimple/src/main/java/org/jsfr/json/JsonSimpleParser.java

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public void onValue(Object value, ParsingContext context) {`
`49`	`49`	`context.pause();`
`50`	`50`	`}`
`51`	`51`	`}).build();`
`52`		`- ResumableParser parser = surfer.getResumableParser(read("sample.json"), config);`
	`52`	`+ ResumableParser parser = surfer.createResumableParser(read("sample.json"), config);`
`53`	`53`	`assertFalse(parser.resume());`
`54`	`54`	`LOGGER.info("Start parsing");`
`55`	`55`	`parser.parse();`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public void onValue(Object value, ParsingContext context) {`
`114`	`114`	`context.pause();`
`115`	`115`	`}`
`116`	`116`	`}).build();`
`117`		`- ResumableParser parser = surfer.getResumableParser(read("sample.json"), config);`
	`117`	`+ ResumableParser parser = surfer.createResumableParser(read("sample.json"), config);`
`118`	`118`	`assertFalse(parser.resume());`
`119`	`119`	`LOGGER.info("Start parsing");`
`120`	`120`	`parser.parse();`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public boolean endJSON() {`
`127`	`127`	`// clear resources`
`128`	`128`	`currentPosition.clear();`
`129`	`129`	`currentPosition = null;`
`130`		`- this.stopped = true;`
	`130`	`+ this.stop();`
`131`	`131`	`return true;`
`132`	`132`	`}`
`133`	`133`
`@@ -283,6 +283,7 @@ public boolean shouldBreak() {`
`283`	`283`	`@Override`
`284`	`284`	`public void stop() {`
`285`	`285`	`this.stopped = true;`
	`286`	`+ this.paused = false;`
`286`	`287`	`}`
`287`	`288`
`288`	`289`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public void parse() {`
`35`	`35`	`@Override`
`36`	`36`	`public boolean resume() {`
`37`	`37`	`try {`
`38`		`- if (context.isStopped() \|\| !context.isPaused()) {`
	`38`	`+ if (!context.isPaused()) {`
`39`	`39`	`return false;`
`40`	`40`	`}`
`41`	`41`	`context.resume();`
`@@ -131,21 +131,21 @@ private FastJsonParser() {`
`131`	`131`
`132`	`132`	`@Override`
`133`	`133`	`public void parse(Reader reader, SurfingContext context) {`
`134`		`- createParser(reader, context).parse();`
	`134`	`+ createResumableParser(reader, context).parse();`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`@Override`
`138`	`138`	`public void parse(String json, SurfingContext context) {`
`139`		`- createParser(json, context).parse();`
	`139`	`+ createResumableParser(json, context).parse();`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`@Override`
`143`		`- public ResumableParser createParser(Reader reader, SurfingContext context) {`
	`143`	`+ public ResumableParser createResumableParser(Reader reader, SurfingContext context) {`
`144`	`144`	`return new FastJsonResumableParser(new JSONReaderScanner(reader), context, new StaticPrimitiveHolder());`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`@Override`
`148`		`- public ResumableParser createParser(String json, SurfingContext context) {`
	`148`	`+ public ResumableParser createResumableParser(String json, SurfingContext context) {`
`149`	`149`	`return new FastJsonResumableParser(new JSONScanner(json), context, new StaticPrimitiveHolder());`
`150`	`150`	`}`
`151`	`151`