From b0ece31032e4c34afb7a63ab248235d2aef0a326 Mon Sep 17 00:00:00 2001
From: sathishk <sathishkumar.thiyagarajan@gmail.com>
Date: Thu, 14 Mar 2024 09:29:06 +0530
Subject: [PATCH] Clean test cases 2

---
 .../java/com/techatpark/sjson/core/Json.java     | 16 ++++++++--------
 .../sjson/core/{ => parser}/ArrayParser.java     |  4 +++-
 .../sjson/core/{ => parser}/BooleanParser.java   |  2 +-
 .../sjson/core/{ => parser}/NullParser.java      |  2 +-
 .../sjson/core/{ => parser}/NumberParser.java    |  4 +++-
 .../sjson/core/{ => parser}/ObjectParser.java    |  6 ++++--
 .../sjson/core/{ => parser}/StringParser.java    |  2 +-
 .../sjson/core/parser/package-info.java          |  4 ++++
 .../techatpark/sjson/schema/BooleanSchema.java   |  4 ++--
 .../techatpark/sjson/schema/StringSchema.java    |  4 ++--
 src/main/java/module-info.java                   |  1 -
 .../techatpark/sjson/core/NumberParserTest.java  | 10 +++-------
 12 files changed, 32 insertions(+), 27 deletions(-)
 rename src/main/java/com/techatpark/sjson/core/{ => parser}/ArrayParser.java (96%)
 rename src/main/java/com/techatpark/sjson/core/{ => parser}/BooleanParser.java (97%)
 rename src/main/java/com/techatpark/sjson/core/{ => parser}/NullParser.java (95%)
 rename src/main/java/com/techatpark/sjson/core/{ => parser}/NumberParser.java (97%)
 rename src/main/java/com/techatpark/sjson/core/{ => parser}/ObjectParser.java (93%)
 rename src/main/java/com/techatpark/sjson/core/{ => parser}/StringParser.java (98%)
 create mode 100644 src/main/java/com/techatpark/sjson/core/parser/package-info.java

diff --git a/src/main/java/com/techatpark/sjson/core/Json.java b/src/main/java/com/techatpark/sjson/core/Json.java
index 4e3382e..58ac088 100644
--- a/src/main/java/com/techatpark/sjson/core/Json.java
+++ b/src/main/java/com/techatpark/sjson/core/Json.java
@@ -6,15 +6,15 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static com.techatpark.sjson.core.ArrayParser.getArray;
-import static com.techatpark.sjson.core.BooleanParser.getFalse;
-import static com.techatpark.sjson.core.BooleanParser.getTrue;
-import static com.techatpark.sjson.core.NullParser.getNull;
-import static com.techatpark.sjson.core.ObjectParser.getObject;
+import static com.techatpark.sjson.core.parser.ArrayParser.getArray;
+import static com.techatpark.sjson.core.parser.BooleanParser.getFalse;
+import static com.techatpark.sjson.core.parser.BooleanParser.getTrue;
+import static com.techatpark.sjson.core.parser.NullParser.getNull;
+import static com.techatpark.sjson.core.parser.ObjectParser.getObject;
 import static com.techatpark.sjson.core.util.ReaderUtil.ILLEGAL_JSON_VALUE;
 import static com.techatpark.sjson.core.util.ReaderUtil.nextClean;
-import static com.techatpark.sjson.core.StringParser.getString;
-import static com.techatpark.sjson.core.NumberParser.getNumber;
+import static com.techatpark.sjson.core.parser.StringParser.getString;
+import static com.techatpark.sjson.core.parser.NumberParser.getNumber;
 
 /**
  * Json parser for server side workloads.
@@ -204,7 +204,7 @@ public ContentExtractor(final Reader theReader) {
          * @return object
          * @throws IOException
          */
-        Object getValue() throws IOException {
+        public Object getValue() throws IOException {
             // 1. move to the first clean character to determine the Data type
             final char character = nextClean(reader);
             setCursor(character);
diff --git a/src/main/java/com/techatpark/sjson/core/ArrayParser.java b/src/main/java/com/techatpark/sjson/core/parser/ArrayParser.java
similarity index 96%
rename from src/main/java/com/techatpark/sjson/core/ArrayParser.java
rename to src/main/java/com/techatpark/sjson/core/parser/ArrayParser.java
index 2d11141..866d95f 100644
--- a/src/main/java/com/techatpark/sjson/core/ArrayParser.java
+++ b/src/main/java/com/techatpark/sjson/core/parser/ArrayParser.java
@@ -1,4 +1,6 @@
-package com.techatpark.sjson.core;
+package com.techatpark.sjson.core.parser;
+
+import com.techatpark.sjson.core.Json;
 
 import java.io.IOException;
 import java.io.Reader;
diff --git a/src/main/java/com/techatpark/sjson/core/BooleanParser.java b/src/main/java/com/techatpark/sjson/core/parser/BooleanParser.java
similarity index 97%
rename from src/main/java/com/techatpark/sjson/core/BooleanParser.java
rename to src/main/java/com/techatpark/sjson/core/parser/BooleanParser.java
index d511f3f..8e19d70 100644
--- a/src/main/java/com/techatpark/sjson/core/BooleanParser.java
+++ b/src/main/java/com/techatpark/sjson/core/parser/BooleanParser.java
@@ -1,4 +1,4 @@
-package com.techatpark.sjson.core;
+package com.techatpark.sjson.core.parser;
 
 import java.io.IOException;
 import java.io.Reader;
diff --git a/src/main/java/com/techatpark/sjson/core/NullParser.java b/src/main/java/com/techatpark/sjson/core/parser/NullParser.java
similarity index 95%
rename from src/main/java/com/techatpark/sjson/core/NullParser.java
rename to src/main/java/com/techatpark/sjson/core/parser/NullParser.java
index 3c80f56..9fa94f4 100644
--- a/src/main/java/com/techatpark/sjson/core/NullParser.java
+++ b/src/main/java/com/techatpark/sjson/core/parser/NullParser.java
@@ -1,4 +1,4 @@
-package com.techatpark.sjson.core;
+package com.techatpark.sjson.core.parser;
 
 import java.io.IOException;
 import java.io.Reader;
diff --git a/src/main/java/com/techatpark/sjson/core/NumberParser.java b/src/main/java/com/techatpark/sjson/core/parser/NumberParser.java
similarity index 97%
rename from src/main/java/com/techatpark/sjson/core/NumberParser.java
rename to src/main/java/com/techatpark/sjson/core/parser/NumberParser.java
index 6f841f2..18b95d3 100644
--- a/src/main/java/com/techatpark/sjson/core/NumberParser.java
+++ b/src/main/java/com/techatpark/sjson/core/parser/NumberParser.java
@@ -1,4 +1,6 @@
-package com.techatpark.sjson.core;
+package com.techatpark.sjson.core.parser;
+
+import com.techatpark.sjson.core.Json;
 
 import java.io.IOException;
 import java.io.Reader;
diff --git a/src/main/java/com/techatpark/sjson/core/ObjectParser.java b/src/main/java/com/techatpark/sjson/core/parser/ObjectParser.java
similarity index 93%
rename from src/main/java/com/techatpark/sjson/core/ObjectParser.java
rename to src/main/java/com/techatpark/sjson/core/parser/ObjectParser.java
index 3b1674a..3da0395 100644
--- a/src/main/java/com/techatpark/sjson/core/ObjectParser.java
+++ b/src/main/java/com/techatpark/sjson/core/parser/ObjectParser.java
@@ -1,4 +1,6 @@
-package com.techatpark.sjson.core;
+package com.techatpark.sjson.core.parser;
+
+import com.techatpark.sjson.core.Json;
 
 import java.io.IOException;
 import java.io.Reader;
@@ -6,7 +8,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static com.techatpark.sjson.core.StringParser.getString;
+import static com.techatpark.sjson.core.parser.StringParser.getString;
 import static com.techatpark.sjson.core.util.ReaderUtil.next;
 import static com.techatpark.sjson.core.util.ReaderUtil.nextClean;
 import static com.techatpark.sjson.core.util.ReaderUtil.getCharacter;
diff --git a/src/main/java/com/techatpark/sjson/core/StringParser.java b/src/main/java/com/techatpark/sjson/core/parser/StringParser.java
similarity index 98%
rename from src/main/java/com/techatpark/sjson/core/StringParser.java
rename to src/main/java/com/techatpark/sjson/core/parser/StringParser.java
index f2ba59d..c77222b 100644
--- a/src/main/java/com/techatpark/sjson/core/StringParser.java
+++ b/src/main/java/com/techatpark/sjson/core/parser/StringParser.java
@@ -1,4 +1,4 @@
-package com.techatpark.sjson.core;
+package com.techatpark.sjson.core.parser;
 
 import java.io.IOException;
 import java.io.Reader;
diff --git a/src/main/java/com/techatpark/sjson/core/parser/package-info.java b/src/main/java/com/techatpark/sjson/core/parser/package-info.java
new file mode 100644
index 0000000..a3767cb
--- /dev/null
+++ b/src/main/java/com/techatpark/sjson/core/parser/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Parsers for JSON Core Data types.
+ */
+package com.techatpark.sjson.core.parser;
diff --git a/src/main/java/com/techatpark/sjson/schema/BooleanSchema.java b/src/main/java/com/techatpark/sjson/schema/BooleanSchema.java
index 0088387..30ca96f 100644
--- a/src/main/java/com/techatpark/sjson/schema/BooleanSchema.java
+++ b/src/main/java/com/techatpark/sjson/schema/BooleanSchema.java
@@ -1,7 +1,7 @@
 package com.techatpark.sjson.schema;
 
-import com.techatpark.sjson.core.BooleanParser;
-import com.techatpark.sjson.core.NullParser;
+import com.techatpark.sjson.core.parser.BooleanParser;
+import com.techatpark.sjson.core.parser.NullParser;
 import com.techatpark.sjson.core.util.ReaderUtil;
 
 import java.io.IOException;
diff --git a/src/main/java/com/techatpark/sjson/schema/StringSchema.java b/src/main/java/com/techatpark/sjson/schema/StringSchema.java
index 31a3e2a..4122cd4 100644
--- a/src/main/java/com/techatpark/sjson/schema/StringSchema.java
+++ b/src/main/java/com/techatpark/sjson/schema/StringSchema.java
@@ -1,8 +1,8 @@
 package com.techatpark.sjson.schema;
 
-import com.techatpark.sjson.core.NullParser;
+import com.techatpark.sjson.core.parser.NullParser;
 import com.techatpark.sjson.core.util.ReaderUtil;
-import com.techatpark.sjson.core.StringParser;
+import com.techatpark.sjson.core.parser.StringParser;
 
 import java.io.IOException;
 import java.io.Reader;
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 1794265..a1a1eaf 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -7,5 +7,4 @@
 
     opens com.techatpark.sjson.core;
     opens com.techatpark.sjson.schema;
-    opens com.techatpark.sjson.schema.generator;
 }
\ No newline at end of file
diff --git a/src/test/java/com/techatpark/sjson/core/NumberParserTest.java b/src/test/java/com/techatpark/sjson/core/NumberParserTest.java
index 054c6d9..2c5d060 100644
--- a/src/test/java/com/techatpark/sjson/core/NumberParserTest.java
+++ b/src/test/java/com/techatpark/sjson/core/NumberParserTest.java
@@ -1,21 +1,17 @@
 package com.techatpark.sjson.core;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.techatpark.sjson.core.util.TestUtil;
+import com.techatpark.sjson.core.parser.NumberParser;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
-import org.junit.jupiter.params.provider.ValueSource;
 
 import java.io.IOException;
 import java.io.StringReader;
 import java.math.BigInteger;
-import java.nio.file.Path;
 import java.util.List;
-import java.util.Set;
 
 import static com.techatpark.sjson.core.util.ReaderUtil.nextClean;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class NumberParserTest {
 
@@ -71,9 +67,9 @@ private void testCursor(final String jsonString, final String suffix) throws IOE
     }
 
     /**
-     * Provides paths to JSON files for parameterized tests.
+     * Provides Numbers to Test.
      *
-     * @return Stream of paths to JSON files
+     * @return Stream of Numbers
      * @throws IOException if there is an issue listing files
      */
     private static List<Number> numbers() {