Refactor and optimize code

Author: zhossain-info

src/main/java/com/relogiclabs/json/schema/JsonAssert.java

@@ -1,14 +1,15 @@
 package com.relogiclabs.json.schema;
 
 import com.relogiclabs.json.schema.internal.util.DebugUtilities;
-import com.relogiclabs.json.schema.message.MessageFormatter;
 import com.relogiclabs.json.schema.tree.DataTree;
 import com.relogiclabs.json.schema.tree.JsonTree;
 import com.relogiclabs.json.schema.tree.RuntimeContext;
 import com.relogiclabs.json.schema.tree.SchemaTree;
 import com.relogiclabs.json.schema.tree.TreeType;
 import lombok.Getter;
 
+import static com.relogiclabs.json.schema.message.MessageFormatter.JSON_ASSERTION;
+import static com.relogiclabs.json.schema.message.MessageFormatter.SCHEMA_ASSERTION;
 import static com.relogiclabs.json.schema.tree.TreeType.JSON_TREE;
 import static com.relogiclabs.json.schema.tree.TreeType.SCHEMA_TREE;
 
@@ -40,10 +41,10 @@ public JsonAssert(String schema) {
      */
     public JsonAssert(String expected, TreeType type) {
         if(type == SCHEMA_TREE) {
-            runtime = new RuntimeContext(MessageFormatter.SCHEMA_ASSERTION, true);
+            runtime = new RuntimeContext(SCHEMA_ASSERTION, true);
             expectedTree = new SchemaTree(runtime, expected);
         } else {
-            runtime = new RuntimeContext(MessageFormatter.JSON_ASSERTION, true);
+            runtime = new RuntimeContext(JSON_ASSERTION, true);
             expectedTree = new JsonTree(runtime, expected);
         }
     }
@@ -58,7 +59,7 @@ public void isValid(String json) {
         var jsonTree = new JsonTree(runtime, json);
         DebugUtilities.print(expectedTree, jsonTree);
         if(!expectedTree.match(jsonTree))
-            throw new IllegalStateException("Exception not thrown");
+            throw new IllegalStateException("Invalid runtime state");
     }
 
     /**

src/main/java/com/relogiclabs/json/schema/JsonSchema.java

@@ -1,13 +1,14 @@
 package com.relogiclabs.json.schema;
 
-import com.relogiclabs.json.schema.internal.tree.ExceptionRegistry;
 import com.relogiclabs.json.schema.internal.util.DebugUtilities;
-import com.relogiclabs.json.schema.message.MessageFormatter;
+import com.relogiclabs.json.schema.tree.ExceptionRegistry;
 import com.relogiclabs.json.schema.tree.JsonTree;
 import com.relogiclabs.json.schema.tree.RuntimeContext;
 import com.relogiclabs.json.schema.tree.SchemaTree;
 import lombok.Getter;
 
+import static com.relogiclabs.json.schema.message.MessageFormatter.SCHEMA_VALIDATION;
+
 /**
  * {@code JsonSchema} provides Schema validation functionalities for JSON document.
  */
@@ -23,7 +24,7 @@ public class JsonSchema {
      * @param schema A Schema string for validation
      */
     public JsonSchema(String schema) {
-        runtime = new RuntimeContext(MessageFormatter.SCHEMA_VALIDATION, false);
+        runtime = new RuntimeContext(SCHEMA_VALIDATION, false);
         exceptions = runtime.getExceptions();
         schemaTree = new SchemaTree(runtime, schema);
     }

src/main/java/com/relogiclabs/json/schema/collection/Keyable.java

@@ -2,4 +2,4 @@
 
 public interface Keyable<TK> {
     TK getKey();
-}
+}

src/main/java/com/relogiclabs/json/schema/exception/MisplacedOptionalException.java

@@ -0,0 +1,9 @@
+package com.relogiclabs.json.schema.exception;
+
+import com.relogiclabs.json.schema.message.ErrorDetail;
+
+public class MisplacedOptionalException extends CommonException {
+    public MisplacedOptionalException(ErrorDetail detail) {
+        super(detail);
+    }
+}

src/main/java/com/relogiclabs/json/schema/function/CoreFunctions1.java

@@ -5,11 +5,11 @@
 import com.relogiclabs.json.schema.message.ErrorDetail;
 import com.relogiclabs.json.schema.message.ExpectedDetail;
 import com.relogiclabs.json.schema.tree.RuntimeContext;
-import com.relogiclabs.json.schema.types.JArray;
-import com.relogiclabs.json.schema.types.JInteger;
-import com.relogiclabs.json.schema.types.JObject;
-import com.relogiclabs.json.schema.types.JString;
-import com.relogiclabs.json.schema.types.JUndefined;
+import com.relogiclabs.json.schema.type.JArray;
+import com.relogiclabs.json.schema.type.JInteger;
+import com.relogiclabs.json.schema.type.JObject;
+import com.relogiclabs.json.schema.type.JString;
+import com.relogiclabs.json.schema.type.JUndefined;
 
 import static com.relogiclabs.json.schema.message.ErrorCode.ALEN01;
 import static com.relogiclabs.json.schema.message.ErrorCode.ALEN02;

src/main/java/com/relogiclabs/json/schema/function/CoreFunctions3.java

@@ -5,10 +5,10 @@
 import com.relogiclabs.json.schema.message.ErrorDetail;
 import com.relogiclabs.json.schema.message.ExpectedDetail;
 import com.relogiclabs.json.schema.tree.RuntimeContext;
-import com.relogiclabs.json.schema.types.JArray;
-import com.relogiclabs.json.schema.types.JNode;
-import com.relogiclabs.json.schema.types.JObject;
-import com.relogiclabs.json.schema.types.JString;
+import com.relogiclabs.json.schema.type.JArray;
+import com.relogiclabs.json.schema.type.JNode;
+import com.relogiclabs.json.schema.type.JObject;
+import com.relogiclabs.json.schema.type.JString;
 
 import java.net.URI;
 import java.util.Arrays;

src/main/java/com/relogiclabs/json/schema/function/FunctionBase.java

@@ -1,7 +1,7 @@
 package com.relogiclabs.json.schema.function;
 
 import com.relogiclabs.json.schema.tree.RuntimeContext;
-import com.relogiclabs.json.schema.types.JFunction;
+import com.relogiclabs.json.schema.type.JFunction;
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/relogiclabs/json/schema/internal/builder/JAliasBuilder.java

@@ -0,0 +1,17 @@
+package com.relogiclabs.json.schema.internal.builder;
+
+import com.relogiclabs.json.schema.type.JAlias;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+@Getter @Setter
+@Accessors(fluent = true)
+public class JAliasBuilder extends JNodeBuilder<JAliasBuilder> {
+    private String name;
+
+    @Override
+    public JAlias build() {
+        return JAlias.from(this);
+    }
+}

src/main/java/com/relogiclabs/json/schema/internal/builder/JArrayBuilder.java

@@ -0,0 +1,20 @@
+package com.relogiclabs.json.schema.internal.builder;
+
+import com.relogiclabs.json.schema.type.JArray;
+import com.relogiclabs.json.schema.type.JNode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Getter @Setter
+@Accessors(fluent = true)
+public class JArrayBuilder extends JNodeBuilder<JArrayBuilder> {
+    private List<JNode> elements;
+
+    @Override
+    public JArray build() {
+        return JArray.from(this);
+    }
+}

src/main/java/com/relogiclabs/json/schema/internal/builder/JBooleanBuilder.java

@@ -0,0 +1,10 @@
+package com.relogiclabs.json.schema.internal.builder;
+
+import com.relogiclabs.json.schema.type.JBoolean;
+
+public class JBooleanBuilder extends JPrimitiveBuilder<Boolean> {
+    @Override
+    public JBoolean build() {
+        return JBoolean.from(this);
+    }
+}