Small Clean Fix 2 2

Author: sathishk

src/main/java/com/techatpark/sjson/Json.java

@@ -32,7 +32,7 @@
 public sealed interface Json<T>
         permits JsonString, JsonNumber, JsonTrue, JsonFalse,
             JsonNull, JsonArray, JsonObject,
-            Json.ContextExtractor {
+        Json.Parser {
 
     /**
      * Length of Unicode.
@@ -80,7 +80,7 @@ static Object read(final Reader reader) throws IOException {
      */
     private static Json<?> parse(final Reader reader) throws IOException {
         try (reader) {
-            return new ContextExtractor(reader).parse();
+            return new Parser(reader).parse();
         }
     }
 
@@ -196,10 +196,10 @@ private static void escape(final String s, final StringBuilder sb) {
     }
 
     /**
-     * ContextExtractor is responsible to interact with underlying reader to
+     * Parser is responsible to interact with underlying reader to
      * extract the content.
      */
-    final class ContextExtractor implements Json<Object> {
+    final class Parser implements Json<Object> {
 
         /**
          * Max Depth of an nested Object.
@@ -226,7 +226,7 @@ final class ContextExtractor implements Json<Object> {
          *
          * @param theReader
          */
-        ContextExtractor(final Reader theReader) {
+        Parser(final Reader theReader) {
             this.reader = theReader;
             this.objectDepth = 0;
         }

src/main/java/com/techatpark/sjson/element/JsonArray.java

@@ -16,49 +16,49 @@ public final class JsonArray implements Json<List<?>> {
 
     /**
      * Reads an Array. Reader stops at next clean character.
-     * @param contextExtractor
+     * @param parser
      * @throws IOException
      */
     public JsonArray(
-                     final Json.ContextExtractor
-                               contextExtractor) throws IOException {
-        contextExtractor.startArray();
-        final Json<?> value = contextExtractor.parse();
+                     final Parser
+                             parser) throws IOException {
+        parser.startArray();
+        final Json<?> value = parser.parse();
         // If not Empty Array
-        if (value == contextExtractor) {
-            contextExtractor.setCursorToNextClean();
+        if (value == parser) {
+            parser.setCursorToNextClean();
             jsonElements = Collections.emptyList();
         } else {
             jsonElements = new ArrayList<>();
             jsonElements.add(value);
-            while (!endOfArray(contextExtractor)) {
-                jsonElements.add(contextExtractor.parse());
+            while (!endOfArray(parser)) {
+                jsonElements.add(parser.parse());
             }
-            contextExtractor.setCursorToNextClean();
+            parser.setCursorToNextClean();
         }
 
-        contextExtractor.endArray();
+        parser.endArray();
     }
 
 
     /**
      * Determine array close character.
-     * @param contextExtractor
+     * @param parser
      * @return flag
      * @throws IOException
      */
     private static boolean endOfArray(
-                              final Json.ContextExtractor
-                                      contextExtractor) throws IOException {
+                              final Parser
+                                      parser) throws IOException {
         char character;
-        if (contextExtractor.getCursor() == ',') {
+        if (parser.getCursor() == ',') {
             return false;
         }
-        if (contextExtractor.getCursor() == ']') {
+        if (parser.getCursor() == ']') {
             return true;
         }
 
-        while ((character = contextExtractor.getCharacter()) != ','
+        while ((character = parser.getCharacter()) != ','
                 && character != ']') {
             continue;
         }

src/main/java/com/techatpark/sjson/element/JsonFalse.java

@@ -21,13 +21,13 @@ public final class JsonFalse implements  Json<Boolean> {
 
     /**
      * Reads False from Reader. Reader will strip at the "e" symbol.
-     * @param contextExtractor
+     * @param parser
      * @throws IOException
      */
     public JsonFalse(
-                     final Json.ContextExtractor
-                               contextExtractor) throws IOException {
-        char[] charBuffer = contextExtractor.next(FOUR);
+                     final Parser
+                             parser) throws IOException {
+        char[] charBuffer = parser.next(FOUR);
         if (charBuffer[0] != 'a'
             || charBuffer[1] != 'l'
             || charBuffer[2] != 's'

src/main/java/com/techatpark/sjson/element/JsonNull.java

@@ -16,13 +16,13 @@ public final class JsonNull implements  Json<Object> {
 
     /**
      * Reads Null from Reader. Reader will stip at the "l" symbol.
-     * @param contextExtractor
+     * @param parser
      * @throws IOException
      */
     public JsonNull(
-                    final Json.ContextExtractor
-                               contextExtractor) throws IOException {
-        char[] charBuffer = contextExtractor.next(LENGTH);
+                    final Parser
+                            parser) throws IOException {
+        char[] charBuffer = parser.next(LENGTH);
         if (charBuffer[0] != 'u'
             || charBuffer[1] != 'l'
             || charBuffer[2] != 'l') {

src/main/java/com/techatpark/sjson/element/JsonNumber.java

@@ -30,13 +30,13 @@ public final class JsonNumber implements Json<Number> {
      * Reads the number from reader.
      * Reader will stop at the next to the end of number.
      *
-     * @param contextExtractor
+     * @param parser
      * @param reader
      * @param startingChar
      * @throws IOException
      */
     public JsonNumber(
-            final Json.ContextExtractor contextExtractor,
+            final Parser parser,
             final Reader reader,
             final char startingChar)
             throws IOException {
@@ -53,7 +53,7 @@ public JsonNumber(
             charactor = (char) read;
         }
 
-        contextExtractor.setCursor(charactor);
+        parser.setCursor(charactor);
     }
 
 

src/main/java/com/techatpark/sjson/element/JsonObject.java

@@ -18,55 +18,55 @@ public final class JsonObject implements Json<Map<String, Object>> {
     /**
      * Reads Object from a reader. Reader will
      * stop at the next clean char after object.
-     * @param contextExtractor
+     * @param parser
      * @throws IOException
      */
     public JsonObject(
-                      final Json.ContextExtractor
-                                contextExtractor) throws IOException {
-        contextExtractor.startObject();
-        boolean eoo = endOfObject(contextExtractor);
+                      final Parser
+                              parser) throws IOException {
+        parser.startObject();
+        boolean eoo = endOfObject(parser);
         // This is Empty Object
         if (eoo) {
-            contextExtractor.setCursorToNextClean();
+            parser.setCursorToNextClean();
             jsonObject = Collections.emptyMap();
         } else {
             jsonObject = new HashMap<>();
             String key;
             while (!eoo) {
-                key = new JsonString(contextExtractor).read();
-                contextExtractor.next(':');
+                key = new JsonString(parser).read();
+                parser.next(':');
                 jsonObject.put(key,
-                        contextExtractor.parse());
-                eoo = endOfObject(contextExtractor);
+                        parser.parse());
+                eoo = endOfObject(parser);
             }
-            contextExtractor.setCursorToNextClean();
+            parser.setCursorToNextClean();
         }
 
-        contextExtractor.endObject();
+        parser.endObject();
     }
 
     /**
      * Determines the Object End. By moving till " or }.
-     * @param contextExtractor
+     * @param parser
      * @return flag
      * @throws IOException
      */
-    private static boolean endOfObject(final Json.ContextExtractor
-                               contextExtractor) throws IOException {
+    private static boolean endOfObject(final Parser
+                                               parser) throws IOException {
         char character;
-        if (contextExtractor.getCursor() == ',') {
-            while (contextExtractor.getCharacter() != '"') {
+        if (parser.getCursor() == ',') {
+            while (parser.getCharacter() != '"') {
                 continue;
             }
             return false;
         }
 
-        if (contextExtractor.getCursor() == '}') {
+        if (parser.getCursor() == '}') {
             return true;
         }
 
-        while ((character = contextExtractor.getCharacter()) != '"'
+        while ((character = parser.getCharacter()) != '"'
                 && character != '}') {
             continue;
         }

src/main/java/com/techatpark/sjson/element/JsonString.java

@@ -28,23 +28,23 @@ public final class JsonString implements Json<String> {
 
     /**
      * Reads String from Reader. Reader will stop at the " symbol
-     * @param contextExtractor
+     * @param parser
      * @throws IOException
      */
     public JsonString(
-                      final Json.ContextExtractor
-                               contextExtractor) throws IOException {
-        jsonString = getString(contextExtractor);
+                      final Parser
+                              parser) throws IOException {
+        jsonString = getString(parser);
     }
 
     private static StringBuilder getString(
-                        final Json.ContextExtractor contextExtractor)
+                        final Parser parser)
             throws IOException {
         final StringBuilder sb = new StringBuilder();
         char character;
 
         while (
-            (character = contextExtractor.getCharacter()) != '\\'
+            (character = parser.getCharacter()) != '\\'
                 && character != '"'
         ) {
             sb.append(character);
@@ -59,11 +59,11 @@ private static StringBuilder getString(
         for (;;) {
             switch (character) {
                 case '\\':
-                    character = contextExtractor.getCharacter();
+                    character = parser.getCharacter();
                     switch (character) {
                         case '"', '\'', '\\', '/' -> sb.append(character);
                         case 'u' -> sb.append((char) Integer
-                            .parseInt(new String(contextExtractor.next(LENGTH)),
+                            .parseInt(new String(parser.next(LENGTH)),
                                     RADIX));
                         case 'b' -> sb.append('\b');
                         case 't' -> sb.append('\t');
@@ -82,7 +82,7 @@ private static StringBuilder getString(
                     }
                     sb.append(character);
             }
-            character = contextExtractor.getCharacter();
+            character = parser.getCharacter();
         }
     }
 

src/main/java/com/techatpark/sjson/element/JsonTrue.java

@@ -17,13 +17,13 @@ public final class JsonTrue implements  Json<Boolean> {
 
     /**
      * Reads True from Reader. Reader will stip at the "e" symbol.
-     * @param contextExtractor
+     * @param parser
      * @throws IOException
      */
     public JsonTrue(
-                    final Json.ContextExtractor
-                              contextExtractor) throws IOException {
-        char[] charBuffer = contextExtractor.next(THREE);
+                    final Parser
+                            parser) throws IOException {
+        char[] charBuffer = parser.next(THREE);
         if (charBuffer[0] != 'r'
                 || charBuffer[1] != 'u'
                 || charBuffer[2] != 'e') {

src/test/java/com/techatpark/sjson/NumberTest.java

@@ -160,11 +160,11 @@ void testCursor(final Number originalValue) throws IOException {
 
     private void testCursor(final String jsonString, final String suffix) throws IOException {
         final StringReader reader = new StringReader(jsonString + suffix);
-        final Json.ContextExtractor contextExtractor = new Json.ContextExtractor(reader);
-        final char firstChar = contextExtractor.nextClean(); // Move to First Digit
-        new JsonNumber(contextExtractor,reader,  firstChar);
+        final Json.Parser parser = new Json.Parser(reader);
+        final char firstChar = parser.nextClean(); // Move to First Digit
+        new JsonNumber(parser,reader,  firstChar);
         assertEquals('1',
-                contextExtractor.nextClean());
+                parser.nextClean());
     }
 }