Update exception handlers and messages

zhossain-info · zhossain-info · commit d49e3d7f6c2f · 2023-12-15T16:21:11.000+06:00
diff --git a/src/main/java/com/relogiclabs/json/schema/exception/CommonException.java b/src/main/java/com/relogiclabs/json/schema/exception/CommonException.java
@@ -3,11 +3,12 @@
 import com.relogiclabs.json.schema.message.ErrorDetail;
 import lombok.Getter;
 
-public class CommonException extends RuntimeException {
-    @Getter
-    private String code;
+import java.util.HashMap;
+import java.util.Map;
 
-    public CommonException() {}
+public class CommonException extends RuntimeException {
+    @Getter private final String code;
+    private Map<String, String> attributes;
 
     public CommonException(String code, String message, Throwable cause) {
         super(message, cause);
@@ -25,4 +26,14 @@ public CommonException(ErrorDetail detail, Throwable cause) {
     public CommonException(ErrorDetail detail) {
         this(detail, null);
     }
+
+    public String getAttribute(String name) {
+        if(attributes == null) return null;
+        return attributes.get(name);
+    }
+
+    public void setAttribute(String name, String value) {
+        if(attributes == null) attributes = new HashMap<>(5);
+        attributes.put(name, value);
+    }
 }
diff --git a/src/main/java/com/relogiclabs/json/schema/exception/JsonSchemaException.java b/src/main/java/com/relogiclabs/json/schema/exception/JsonSchemaException.java
@@ -10,19 +10,18 @@
 
 @Getter
 public class JsonSchemaException extends CommonException {
-
+    private final ErrorDetail error;
     private final ExpectedDetail expected;
     private final ActualDetail actual;
 
     public JsonSchemaException(ErrorDetail error, ExpectedDetail expected, ActualDetail actual) {
-        super(error.getCode(), format(error, expected, actual));
-        this.expected = expected;
-        this.actual = actual;
+        this(error, expected, actual, null);
     }
 
-    public JsonSchemaException(ErrorDetail error, ExpectedDetail expected, ActualDetail actual,
-                               Throwable cause) {
+    public JsonSchemaException(ErrorDetail error, ExpectedDetail expected,
+                               ActualDetail actual, Throwable cause) {
         super(error.getCode(), format(error, expected, actual), cause);
+        this.error = error;
         this.expected = expected;
         this.actual = actual;
     }
diff --git a/src/main/java/com/relogiclabs/json/schema/function/FunctionBase.java b/src/main/java/com/relogiclabs/json/schema/function/FunctionBase.java
@@ -15,6 +15,6 @@ public FunctionBase(RuntimeContext runtime) {
     }
 
     protected boolean failWith(RuntimeException exception) {
-        return runtime.failWith(exception);
+        return runtime.getExceptions().failWith(exception);
     }
 }
diff --git a/src/main/java/com/relogiclabs/json/schema/internal/function/DateTimeAgent.java b/src/main/java/com/relogiclabs/json/schema/internal/function/DateTimeAgent.java
@@ -9,7 +9,6 @@
 import com.relogiclabs.json.schema.message.ExpectedDetail;
 import com.relogiclabs.json.schema.time.DateTimeType;
 import com.relogiclabs.json.schema.time.JsonDateTime;
-import com.relogiclabs.json.schema.tree.RuntimeContext;
 import com.relogiclabs.json.schema.type.JFunction;
 import com.relogiclabs.json.schema.type.JString;
 
@@ -30,18 +29,18 @@ public DateTimeAgent(DateTimeParser parser) {
     }
 
     public JsonDateTime parse(JFunction function, JString dateTime) {
-        RuntimeContext runtime = function.getRuntime();
+        var exceptions = function.getRuntime().getExceptions();
         try {
             if(parser == null) parser = new DateTimeParser(pattern, type);
             return parser.parse(dateTime.getValue());
         } catch(DateTimeLexerException ex) {
-            runtime.failWith(new JsonSchemaException(
+            exceptions.failWith(new JsonSchemaException(
                     new ErrorDetail(ex.getCode(), ex.getMessage()),
                     new ExpectedDetail(function, "a valid ", type, " pattern"),
                     new ActualDetail(dateTime, "found ", pattern, " that is invalid"),
                     ex));
         } catch(InvalidDateTimeException ex) {
-            runtime.failWith(new JsonSchemaException(
+            exceptions.failWith(new JsonSchemaException(
                     new ErrorDetail(ex.getCode(), ex.getMessage()),
                     new ExpectedDetail(function, "a valid ", type, " formatted as ", pattern),
                     new ActualDetail(dateTime, "found ", dateTime, " that is invalid or malformatted"),
diff --git a/src/main/java/com/relogiclabs/json/schema/internal/message/ActualHelper.java b/src/main/java/com/relogiclabs/json/schema/internal/message/ActualHelper.java
@@ -22,9 +22,9 @@ public static ActualDetail asValueMismatch(JNode node) {
         return new ActualDetail(node, "found ", node.getOutline());
     }
 
-    public static ActualDetail asInvalidNestedDataType(JNode node) {
-        return new ActualDetail(node, "found non-composite type ",
-                getTypeName(node));
+    public static ActualDetail asInvalidNonCompositeType(JNode node) {
+        return new ActualDetail(node, "found non-composite ", getTypeName(node),
+                " value ", node.getOutline());
     }
 
     public static ActualDetail asDataTypeArgumentFailed(JNode node) {
diff --git a/src/main/java/com/relogiclabs/json/schema/internal/message/ExpectedHelper.java b/src/main/java/com/relogiclabs/json/schema/internal/message/ExpectedHelper.java
@@ -28,8 +28,8 @@ public static ExpectedDetail asDataTypeMismatch(JDataType dataType) {
         return new ExpectedDetail(dataType, "data type ", dataType.toString(true));
     }
 
-    public static ExpectedDetail asInvalidNestedDataType(JDataType dataType) {
-        return new ExpectedDetail(dataType, "composite data type");
+    public static ExpectedDetail asInvalidNonCompositeType(JDataType dataType) {
+        return new ExpectedDetail(dataType, "a composite value");
     }
 
     public static ExpectedDetail asDataTypeArgumentFailed(JDataType dataType) {
diff --git a/src/main/java/com/relogiclabs/json/schema/internal/message/MessageHelper.java b/src/main/java/com/relogiclabs/json/schema/internal/message/MessageHelper.java
@@ -9,7 +9,7 @@ public final class MessageHelper {
     public static final String ValidationFailed = "Validation failed";
     public static final String ValueMismatch = "Value mismatch";
     public static final String DataTypeMismatch = "Data type mismatch";
-    public static final String InvalidNestedDataType = "Invalid nested data type";
+    public static final String InvalidNonCompositeType = "Invalid non-composite value type";
     public static final String DataTypeArgumentFailed = "Data type argument failed";
     public static final String InvalidNestedFunction = "Invalid nested function operation";
     public static final String PropertyNotFound = "Mandatory property not found";
diff --git a/src/main/java/com/relogiclabs/json/schema/tree/FunctionRegistry.java b/src/main/java/com/relogiclabs/json/schema/tree/FunctionRegistry.java
@@ -224,6 +224,6 @@ private static Object processVarArgs(Parameter parameter, List<JNode> arguments)
     }
 
     private boolean failWith(RuntimeException exception) {
-        return runtime.failWith(exception);
+        return runtime.getExceptions().failWith(exception);
     }
 }
diff --git a/src/main/java/com/relogiclabs/json/schema/tree/PragmaRegistry.java b/src/main/java/com/relogiclabs/json/schema/tree/PragmaRegistry.java
@@ -24,17 +24,17 @@ public final class PragmaRegistry implements Iterable<Map.Entry<String, JPragma>
     private static final String DATE_DATA_TYPE_FORMAT = "DateDataTypeFormat";
     private static final String TIME_DATA_TYPE_FORMAT = "TimeDataTypeFormat";
 
-    public final Map<String, JPragma> pragmas;
+    private final Map<String, JPragma> pragmas;
 
     private boolean ignoreUndefinedProperties = PragmaDescriptor
             .IGNORE_UNDEFINED_PROPERTIES.getDefaultValue();
     private double floatingPointTolerance = PragmaDescriptor
             .FLOATING_POINT_TOLERANCE.getDefaultValue();
     private boolean ignoreObjectPropertyOrder = PragmaDescriptor
             .IGNORE_OBJECT_PROPERTY_ORDER.getDefaultValue();
-    public String dateDataTypeFormat = PragmaDescriptor
+    private String dateDataTypeFormat = PragmaDescriptor
             .DATE_DATA_TYPE_FORMAT.getDefaultValue();
-    public String timeDataTypeFormat = PragmaDescriptor
+    private String timeDataTypeFormat = PragmaDescriptor
             .TIME_DATA_TYPE_FORMAT.getDefaultValue();
 
     private DateTimeParser dateTypeParser;
diff --git a/src/main/java/com/relogiclabs/json/schema/tree/RuntimeContext.java b/src/main/java/com/relogiclabs/json/schema/tree/RuntimeContext.java
@@ -11,7 +11,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
-import java.util.function.Supplier;
 
 import static com.relogiclabs.json.schema.internal.util.StringHelper.concat;
 import static com.relogiclabs.json.schema.internal.util.StringHelper.quote;
@@ -54,10 +53,6 @@ public boolean areEqual(double value1, double value2) {
         return Math.abs(value1 - value2) < pragmas.getFloatingPointTolerance();
     }
 
-    public <T> T tryExecute(Supplier<T> function) {
-        return exceptions.tryExecute(function);
-    }
-
     public boolean addValidator(FutureValidator validator) {
         return validators.put(UUID.randomUUID().toString(), validator) == null;
     }
@@ -68,12 +63,6 @@ public boolean invokeValidators() {
         return result;
     }
 
-    public boolean failWith(RuntimeException exception) {
-        exceptions.tryThrow(exception);
-        exceptions.tryAdd(exception);
-        return false;
-    }
-
     public void clear() {
         exceptions.clear();
         storage.clear();
diff --git a/src/main/java/com/relogiclabs/json/schema/type/JNode.java b/src/main/java/com/relogiclabs/json/schema/type/JNode.java
@@ -1,6 +1,5 @@
 package com.relogiclabs.json.schema.type;
 
-import com.relogiclabs.json.schema.exception.CommonException;
 import com.relogiclabs.json.schema.exception.JsonSchemaException;
 import com.relogiclabs.json.schema.internal.builder.JNodeBuilder;
 import com.relogiclabs.json.schema.internal.message.ActualHelper;
@@ -72,7 +71,7 @@ public String getOutline() {
                 .getMessageFormatter().getOutlineLength());
     }
 
-    boolean failWith(CommonException exception) {
-        return getRuntime().failWith(exception);
+    boolean failWith(RuntimeException exception) {
+        return getRuntime().getExceptions().failWith(exception);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,6 @@ public FunctionBase(RuntimeContext runtime) {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`protected boolean failWith(RuntimeException exception) {`
`18`		`- return runtime.failWith(exception);`
	`18`	`+ return runtime.getExceptions().failWith(exception);`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,9 @@ public static ActualDetail asValueMismatch(JNode node) {`
`22`	`22`	`return new ActualDetail(node, "found ", node.getOutline());`
`23`	`23`	`}`
`24`	`24`
`25`		`- public static ActualDetail asInvalidNestedDataType(JNode node) {`
`26`		`- return new ActualDetail(node, "found non-composite type ",`
`27`		`- getTypeName(node));`
	`25`	`+ public static ActualDetail asInvalidNonCompositeType(JNode node) {`
	`26`	`+ return new ActualDetail(node, "found non-composite ", getTypeName(node),`
	`27`	`+ " value ", node.getOutline());`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public static ActualDetail asDataTypeArgumentFailed(JNode node) {`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@ public static ExpectedDetail asDataTypeMismatch(JDataType dataType) {`
`28`	`28`	`return new ExpectedDetail(dataType, "data type ", dataType.toString(true));`
`29`	`29`	`}`
`30`	`30`
`31`		`- public static ExpectedDetail asInvalidNestedDataType(JDataType dataType) {`
`32`		`- return new ExpectedDetail(dataType, "composite data type");`
	`31`	`+ public static ExpectedDetail asInvalidNonCompositeType(JDataType dataType) {`
	`32`	`+ return new ExpectedDetail(dataType, "a composite value");`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public static ExpectedDetail asDataTypeArgumentFailed(JDataType dataType) {`
Original file line number	Diff line number	Diff line change
`@@ -224,6 +224,6 @@ private static Object processVarArgs(Parameter parameter, List<JNode> arguments)`
`224`	`224`	`}`
`225`	`225`
`226`	`226`	`private boolean failWith(RuntimeException exception) {`
`227`		`- return runtime.failWith(exception);`
	`227`	`+ return runtime.getExceptions().failWith(exception);`
`228`	`228`	`}`
`229`	`229`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`package com.relogiclabs.json.schema.type;`
`2`	`2`
`3`		`-import com.relogiclabs.json.schema.exception.CommonException;`
`4`	`3`	`import com.relogiclabs.json.schema.exception.JsonSchemaException;`
`5`	`4`	`import com.relogiclabs.json.schema.internal.builder.JNodeBuilder;`
`6`	`5`	`import com.relogiclabs.json.schema.internal.message.ActualHelper;`
`@@ -72,7 +71,7 @@ public String getOutline() {`
`72`	`71`	`.getMessageFormatter().getOutlineLength());`
`73`	`72`	`}`
`74`	`73`
`75`		`- boolean failWith(CommonException exception) {`
`76`		`- return getRuntime().failWith(exception);`
	`74`	`+ boolean failWith(RuntimeException exception) {`
	`75`	`+ return getRuntime().getExceptions().failWith(exception);`
`77`	`76`	`}`
`78`	`77`	`}`