Update runtime context handlers

Author: zhossain-info

src/main/java/com/relogiclabs/json/schema/internal/tree/FunctionCache.java

@@ -1,7 +1,7 @@
 package com.relogiclabs.json.schema.internal.tree;
 
-import com.relogiclabs.json.schema.types.JFunction;
-import com.relogiclabs.json.schema.types.JNode;
+import com.relogiclabs.json.schema.type.JFunction;
+import com.relogiclabs.json.schema.type.JNode;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Value;
@@ -10,6 +10,8 @@
 import java.util.Iterator;
 import java.util.List;
 
+import static com.relogiclabs.json.schema.internal.util.MiscellaneousHelper.getDerived;
+
 public class FunctionCache implements Iterable<FunctionCache.Entry> {
 
     @Value
@@ -18,11 +20,11 @@ public static class Entry {
         Object[] arguments;
 
         public boolean isTargetMatch(JNode target) {
-            return methodPointer.getParameter(0).getType().isInstance(target.getDerived());
+            return methodPointer.getParameter(0).getType().isInstance(getDerived(target));
         }
 
         public Object invoke(JFunction function, JNode target) {
-            arguments[0] = target.getDerived();
+            arguments[0] = getDerived(target);
             return methodPointer.invoke(function, arguments);
         }
     }

src/main/java/com/relogiclabs/json/schema/internal/tree/JsonTreeVisitor.java

@@ -2,19 +2,20 @@
 
 import com.relogiclabs.json.schema.internal.antlr.JsonParser;
 import com.relogiclabs.json.schema.internal.antlr.JsonParserBaseVisitor;
+import com.relogiclabs.json.schema.internal.builder.JArrayBuilder;
+import com.relogiclabs.json.schema.internal.builder.JBooleanBuilder;
+import com.relogiclabs.json.schema.internal.builder.JDoubleBuilder;
+import com.relogiclabs.json.schema.internal.builder.JFloatBuilder;
+import com.relogiclabs.json.schema.internal.builder.JIntegerBuilder;
+import com.relogiclabs.json.schema.internal.builder.JNullBuilder;
+import com.relogiclabs.json.schema.internal.builder.JObjectBuilder;
+import com.relogiclabs.json.schema.internal.builder.JPropertyBuilder;
+import com.relogiclabs.json.schema.internal.builder.JRootBuilder;
+import com.relogiclabs.json.schema.internal.builder.JStringBuilder;
 import com.relogiclabs.json.schema.tree.Context;
 import com.relogiclabs.json.schema.tree.RuntimeContext;
-import com.relogiclabs.json.schema.types.JArray;
-import com.relogiclabs.json.schema.types.JBoolean;
-import com.relogiclabs.json.schema.types.JDouble;
-import com.relogiclabs.json.schema.types.JFloat;
-import com.relogiclabs.json.schema.types.JInteger;
-import com.relogiclabs.json.schema.types.JNode;
-import com.relogiclabs.json.schema.types.JNull;
-import com.relogiclabs.json.schema.types.JObject;
-import com.relogiclabs.json.schema.types.JProperty;
-import com.relogiclabs.json.schema.types.JRoot;
-import com.relogiclabs.json.schema.types.JString;
+import com.relogiclabs.json.schema.type.JNode;
+import com.relogiclabs.json.schema.type.JProperty;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -35,7 +36,7 @@ public JsonTreeVisitor(RuntimeContext runtime) {
 
     @Override
     public JNode visitJson(JsonParser.JsonContext ctx) {
-        return new JRoot.Builder()
+        return new JRootBuilder()
                 .relations(relations)
                 .context(new Context(ctx, runtime))
                 .value(visit(ctx.value()))
@@ -52,7 +53,7 @@ public JNode visitValue(JsonParser.ValueContext ctx) {
 
     @Override
     public JNode visitObject(JsonParser.ObjectContext ctx) {
-        return new JObject.Builder()
+        return new JObjectBuilder()
                 .relations(relations)
                 .context(new Context(ctx, runtime))
                 .properties(checkForDuplicate(ctx.property().stream()
@@ -62,7 +63,7 @@ public JNode visitObject(JsonParser.ObjectContext ctx) {
 
     @Override
     public JNode visitProperty(JsonParser.PropertyContext ctx) {
-        return new JProperty.Builder()
+        return new JPropertyBuilder()
                 .relations(relations)
                 .context(new Context(ctx, runtime))
                 .key(unquote(ctx.STRING().getText()))
@@ -72,7 +73,7 @@ public JNode visitProperty(JsonParser.PropertyContext ctx) {
 
     @Override
     public JNode visitArray(JsonParser.ArrayContext ctx) {
-        return new JArray.Builder()
+        return new JArrayBuilder()
                 .relations(relations)
                 .context(new Context(ctx, runtime))
                 .elements(ctx.value().stream().map(this::visit).toList())
@@ -81,23 +82,23 @@ public JNode visitArray(JsonParser.ArrayContext ctx) {
 
     @Override
     public JNode visitPrimitiveTrue(JsonParser.PrimitiveTrueContext ctx) {
-        return new JBoolean.Builder()
+        return new JBooleanBuilder()
                 .relations(relations)
                 .context(new Context(ctx, runtime))
                 .value(true).build();
     }
 
     @Override
     public JNode visitPrimitiveFalse(JsonParser.PrimitiveFalseContext ctx) {
-        return new JBoolean.Builder()
+        return new JBooleanBuilder()
                 .relations(relations)
                 .context(new Context(ctx, runtime))
                 .value(false).build();
     }
 
     @Override
     public JNode visitPrimitiveString(JsonParser.PrimitiveStringContext ctx) {
-        return new JString.Builder()
+        return new JStringBuilder()
                 .relations(relations)
                 .context(new Context(ctx, runtime))
                 .value(toEncoded(ctx.STRING().getText()))
@@ -106,7 +107,7 @@ public JNode visitPrimitiveString(JsonParser.PrimitiveStringContext ctx) {
 
     @Override
     public JNode visitPrimitiveInteger(JsonParser.PrimitiveIntegerContext ctx) {
-        return new JInteger.Builder()
+        return new JIntegerBuilder()
                 .relations(relations)
                 .context(new Context(ctx, runtime))
                 .value(Long.valueOf(ctx.INTEGER().getText()))
@@ -115,7 +116,7 @@ public JNode visitPrimitiveInteger(JsonParser.PrimitiveIntegerContext ctx) {
 
     @Override
     public JNode visitPrimitiveFloat(JsonParser.PrimitiveFloatContext ctx) {
-        return new JFloat.Builder()
+        return new JFloatBuilder()
                 .relations(relations)
                 .context(new Context(ctx, runtime))
                 .value(Double.valueOf(ctx.FLOAT().getText()))
@@ -124,7 +125,7 @@ public JNode visitPrimitiveFloat(JsonParser.PrimitiveFloatContext ctx) {
 
     @Override
     public JNode visitPrimitiveDouble(JsonParser.PrimitiveDoubleContext ctx) {
-        return new JDouble.Builder()
+        return new JDoubleBuilder()
                 .relations(relations)
                 .context(new Context(ctx, runtime))
                 .value(Double.valueOf(ctx.DOUBLE().getText()))
@@ -133,7 +134,7 @@ public JNode visitPrimitiveDouble(JsonParser.PrimitiveDoubleContext ctx) {
 
     @Override
     public JNode visitPrimitiveNull(JsonParser.PrimitiveNullContext ctx) {
-        return new JNull.Builder()
+        return new JNullBuilder()
                 .relations(relations)
                 .context(new Context(ctx, runtime))
                 .build();