Refactor and optimize source code

zhossain-info · zhossain-info · commit 0553bb120310 · 2023-12-21T19:32:15.000+06:00
diff --git a/src/main/java/com/relogiclabs/json/schema/function/CoreFunctions2.java b/src/main/java/com/relogiclabs/json/schema/function/CoreFunctions2.java
@@ -15,7 +15,7 @@
 import java.util.Arrays;
 import java.util.function.Supplier;
 
-import static com.relogiclabs.json.schema.internal.util.StringHelper.join;
+import static com.relogiclabs.json.schema.internal.util.StringHelper.joinWith;
 import static com.relogiclabs.json.schema.message.ErrorCode.ENUM01;
 import static com.relogiclabs.json.schema.message.ErrorCode.ENUM02;
 import static com.relogiclabs.json.schema.message.ErrorCode.MAXI01;
@@ -46,7 +46,7 @@ public boolean _enum(JString target, JString... items) {
         var list = Arrays.asList(items);
         if(!list.contains(target)) return failWith(new JsonSchemaException(
                 new ErrorDetail(ENUM01, "String is not in enum list"),
-                new ExpectedDetail(function, "string in list ", join(list, ", ", "[", "]")),
+                new ExpectedDetail(function, "string in list ", joinWith(list, ", ", "[", "]")),
                 new ActualDetail(target, "string ", target, " is not found in list")));
         return true;
     }
@@ -55,7 +55,7 @@ public boolean _enum(JNumber target, JNumber... items) {
         var list = Arrays.asList(items);
         if(!list.contains(target)) return failWith(new JsonSchemaException(
                 new ErrorDetail(ENUM02, "Number is not in enum list"),
-                new ExpectedDetail(function, "number in list ", join(list, ", ", "[", "]")),
+                new ExpectedDetail(function, "number in list ", joinWith(list, ", ", "[", "]")),
                 new ActualDetail(target, "number ", target, " is not found in list")));
         return true;
     }
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,6 +22,10 @@ public static ActualDetail asValueMismatch(JNode node) {
         return new ActualDetail(node, "found ", node.getOutline());
     }
 
+    public static ActualDetail asGeneralValueMismatch(JNode node) {
+        return new ActualDetail(node, "found ", node.getOutline());
+    }
+
     public static ActualDetail asInvalidNonCompositeType(JNode node) {
         return new ActualDetail(node, "found non-composite ", getTypeName(node),
                 " value ", node.getOutline());
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
@@ -24,6 +24,10 @@ public static ExpectedDetail asValueMismatch(JNode node) {
         return new ExpectedDetail(node, "value ", node.getOutline());
     }
 
+    public static ExpectedDetail asGeneralValueMismatch(JNode node) {
+        return new ExpectedDetail(node, "a value of ", node.getOutline());
+    }
+
     public static ExpectedDetail asDataTypeMismatch(JDataType dataType) {
         return new ExpectedDetail(dataType, "data type ", dataType.toString(true));
     }
diff --git a/src/main/java/com/relogiclabs/json/schema/internal/tree/JsonTreeVisitor.java b/src/main/java/com/relogiclabs/json/schema/internal/tree/JsonTreeVisitor.java
@@ -20,7 +20,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static com.relogiclabs.json.schema.internal.tree.TreeHelper.checkForDuplicate;
+import static com.relogiclabs.json.schema.internal.tree.TreeHelper.requireUniqueness;
 import static com.relogiclabs.json.schema.internal.util.StringHelper.toEncoded;
 import static com.relogiclabs.json.schema.internal.util.StringHelper.unquote;
 import static com.relogiclabs.json.schema.message.ErrorCode.PROP03;
@@ -56,7 +56,7 @@ public JNode visitObject(JsonParser.ObjectContext ctx) {
         return new JObjectBuilder()
                 .relations(relations)
                 .context(new Context(ctx, runtime))
-                .properties(checkForDuplicate(ctx.property().stream()
+                .properties(requireUniqueness(ctx.property().stream()
                         .map(p -> (JProperty) visit(p)).toList(), PROP03))
                 .build();
     }
diff --git a/src/main/java/com/relogiclabs/json/schema/internal/tree/SchemaTreeVisitor.java b/src/main/java/com/relogiclabs/json/schema/internal/tree/SchemaTreeVisitor.java
@@ -46,7 +46,7 @@
 import java.util.List;
 import java.util.Map;
 
-import static com.relogiclabs.json.schema.internal.tree.TreeHelper.checkForDuplicate;
+import static com.relogiclabs.json.schema.internal.tree.TreeHelper.requireUniqueness;
 import static com.relogiclabs.json.schema.internal.util.StringHelper.toEncoded;
 import static com.relogiclabs.json.schema.internal.util.StringHelper.unquote;
 import static com.relogiclabs.json.schema.message.ErrorCode.PROP04;
@@ -187,7 +187,7 @@ public JNode visitObject(SchemaParser.ObjectContext ctx) {
         return new JObjectBuilder()
                 .relations(relations)
                 .context(new Context(ctx, runtime))
-                .properties(checkForDuplicate(ctx.property().stream()
+                .properties(requireUniqueness(ctx.property().stream()
                         .map(c -> (JProperty) visit(c)).toList(), PROP04))
                 .build();
     }
diff --git a/src/main/java/com/relogiclabs/json/schema/internal/tree/TreeHelper.java b/src/main/java/com/relogiclabs/json/schema/internal/tree/TreeHelper.java
@@ -13,7 +13,7 @@
 import static java.util.stream.Collectors.toMap;
 
 public final class TreeHelper {
-    public static List<JProperty> checkForDuplicate(List<JProperty> list, String errorCode) {
+    public static List<JProperty> requireUniqueness(List<JProperty> list, String errorCode) {
         list.stream().collect(toMap(JProperty::getKey, Function.identity(),
                 (p1, p2) -> halt(new DuplicatePropertyKeyException(formatForJson(errorCode,
                         concat("Multiple key with name ", quote(p2.getKey()), " found"), p2)))
diff --git a/src/main/java/com/relogiclabs/json/schema/internal/util/CollectionHelper.java b/src/main/java/com/relogiclabs/json/schema/internal/util/CollectionHelper.java
@@ -54,7 +54,7 @@ public static <T> void addToList(Collection<T> source, Collection<? extends T>..
         for(var c : collections) if(c != null) source.addAll(c);
     }
 
-    public static <T> T getLast(List<T> list) {
-        return list != null && !list.isEmpty() ? list.get(list.size() - 1) : null;
+    public static <T> T tryGetLast(List<T> list) {
+        return list.isEmpty() ? null : list.get(list.size() - 1);
     }
 }
diff --git a/src/main/java/com/relogiclabs/json/schema/internal/util/StreamHelper.java b/src/main/java/com/relogiclabs/json/schema/internal/util/StreamHelper.java
@@ -1,30 +1,21 @@
 package com.relogiclabs.json.schema.internal.util;
 
-import java.util.function.Predicate;
 import java.util.stream.Stream;
 
 public final class StreamHelper {
     public static <T> T halt(RuntimeException exception) {
         throw exception;
     }
 
-    public static Predicate<Boolean> allTrue() {
-        return t -> t;
-    }
-
-    public static boolean allTrue(Stream<Boolean> stream) {
-        // When eagerly check all, no early return
+    public static boolean forEachTrue(Stream<Boolean> stream) {
+        // When no short-circuit evaluation with no early return
         boolean result = true;
         for(var r : iterable(stream)) result &= r;
         return result;
     }
 
-    public static Predicate<Boolean> anyTrue() {
-        return t -> t;
-    }
-
     public static <T> int count(Stream<T> stream) {
-        // When Java stream count is not applicable
+        // Java stream count ignore exceptions
         int counter = 0;
         for(var ignored : iterable(stream)) counter++;
         return counter;
diff --git a/src/main/java/com/relogiclabs/json/schema/internal/util/StringHelper.java b/src/main/java/com/relogiclabs/json/schema/internal/util/StringHelper.java
@@ -6,21 +6,12 @@
 import java.util.Collection;
 
 import static java.util.stream.Collectors.joining;
-import static org.apache.commons.lang3.StringUtils.left;
-import static org.apache.commons.lang3.StringUtils.right;
 
 public final class StringHelper {
     private StringHelper() {
         throw new UnsupportedOperationException();
     }
 
-    public static String createOutline(String target, int length) {
-        int front = 2 * length / 3;
-        int back = 1 * length / 3;
-        if(front + back >= target.length()) return target;
-        return left(target, front) + "..." + right(target, back);
-    }
-
     public static String toEncoded(String target)
     {
         var builder = new StringBuilder();
@@ -65,6 +56,12 @@ public static String join(Collection<? extends JNode> list, String delimiter,
         return result;
     }
 
+    public static String joinWith(Collection<? extends JNode> list, String delimiter,
+                              String prefix, String suffix) {
+        String result = list.stream().map(JNode::toString).collect(joining(delimiter));
+        return prefix + result + suffix;
+    }
+
     public static String join(Collection<? extends JNode> list, String delimiter, String prefix) {
         return join(list, delimiter, prefix, "");
     }
diff --git a/src/main/java/com/relogiclabs/json/schema/message/MessageFormatter.java b/src/main/java/com/relogiclabs/json/schema/message/MessageFormatter.java
@@ -7,6 +7,8 @@
 import lombok.Setter;
 
 import static org.apache.commons.lang3.StringUtils.capitalize;
+import static org.apache.commons.lang3.StringUtils.left;
+import static org.apache.commons.lang3.StringUtils.right;
 
 @Getter
 public abstract class MessageFormatter {
@@ -47,6 +49,13 @@ protected MessageFormatter(String summary, String expected, String actual) {
 
     public abstract String format(ErrorDetail error, ExpectedDetail expected, ActualDetail actual);
 
+    public String createOutline(String target) {
+        int front = 2 * outlineLength / 3;
+        int back = 1 * outlineLength / 3;
+        if(front + back >= target.length()) return target;
+        return left(target, front) + "..." + right(target, back);
+    }
+
     private static final class ValidationFormatter extends MessageFormatter {
         private ValidationFormatter(String summary, String expected, String actual) {
             super(summary, expected, actual);
diff --git a/src/main/java/com/relogiclabs/json/schema/time/JsonDateTime.java b/src/main/java/com/relogiclabs/json/schema/time/JsonDateTime.java
@@ -12,6 +12,7 @@
 
 import static com.relogiclabs.json.schema.time.DateTimeType.DATE_TYPE;
 import static com.relogiclabs.json.schema.time.DateTimeType.TIME_TYPE;
+import static com.relogiclabs.json.schema.time.JsonUtcOffset.DEFAULT_UTC_OFFSET;
 import static lombok.AccessLevel.PACKAGE;
 import static org.apache.commons.lang3.StringUtils.removeEnd;
 
@@ -45,7 +46,7 @@ public JsonDateTime(DateTimeType type, int year, int month, int day) {
     public JsonDateTime(DateTimeType type, int year, int month,
                         int day, int hour, int minute, int second,
                         int fraction, JsonUtcOffset utcOffset) {
-        if(utcOffset == null) utcOffset = new JsonUtcOffset();
+        if(utcOffset == null) utcOffset = DEFAULT_UTC_OFFSET;
         this.type = type;
         this.year = year;
         this.month = month;
diff --git a/src/main/java/com/relogiclabs/json/schema/time/JsonUtcOffset.java b/src/main/java/com/relogiclabs/json/schema/time/JsonUtcOffset.java
@@ -11,6 +11,7 @@
 
 
 public class JsonUtcOffset {
+    static final JsonUtcOffset DEFAULT_UTC_OFFSET = new JsonUtcOffset();
     private static final int DEFAULT_UTC_OFFSET_HOUR = 0;
     private static final int DEFAULT_UTC_OFFSET_MINUTE = 0;
 
diff --git a/src/main/java/com/relogiclabs/json/schema/tree/ExceptionRegistry.java b/src/main/java/com/relogiclabs/json/schema/tree/ExceptionRegistry.java
@@ -5,14 +5,14 @@
 
 import java.util.Iterator;
 import java.util.LinkedList;
-import java.util.Queue;
+import java.util.List;
 import java.util.function.Supplier;
 
 public class ExceptionRegistry implements Iterable<Exception> {
     private int disableException;
 
-    private final Queue<Exception> exceptions;
-    @Getter private final Queue<Exception> tryBuffer;
+    private final List<Exception> exceptions;
+    @Getter private final List<Exception> tryBuffer;
     @Getter @Setter private boolean throwException;
     @Getter @Setter private int cutoffLimit = 500;
 
@@ -22,8 +22,8 @@ public ExceptionRegistry(boolean throwException) {
         this.tryBuffer = new LinkedList<>();
     }
 
-    private boolean addException(Queue<Exception> queue, Exception exception) {
-        if(queue.size() <= cutoffLimit) queue.add(exception);
+    private boolean addException(List<Exception> list, Exception exception) {
+        if(list.size() <= cutoffLimit) list.add(exception);
         return false;
     }
 
@@ -44,12 +44,17 @@ public <T> T tryExecute(Supplier<T> function) {
         }
     }
 
+    public int getCount() {
+        return exceptions.size();
+    }
+
     @Override
     public Iterator<Exception> iterator() {
         return exceptions.iterator();
     }
 
     public void clear() {
         exceptions.clear();
+        tryBuffer.clear();
     }
 }
diff --git a/src/main/java/com/relogiclabs/json/schema/type/JArray.java b/src/main/java/com/relogiclabs/json/schema/type/JArray.java
@@ -13,7 +13,7 @@
 import java.util.List;
 
 import static com.relogiclabs.json.schema.internal.message.MessageHelper.ArrayElementNotFound;
-import static com.relogiclabs.json.schema.internal.util.StringHelper.join;
+import static com.relogiclabs.json.schema.internal.util.StringHelper.joinWith;
 import static com.relogiclabs.json.schema.message.ErrorCode.ARRY01;
 import static com.relogiclabs.json.schema.message.ErrorCode.ARRY02;
 import static com.relogiclabs.json.schema.message.MessageFormatter.formatForSchema;
@@ -51,11 +51,10 @@ public boolean match(JNode node) {
         boolean result = true, restOptional = false;
         for(var i = 0; i < elements.size(); i++) {
             var optional = isOptional(elements.get(i));
-            if((restOptional |= optional) != optional) {
+            if((restOptional |= optional) != optional)
                 return failWith(new MisplacedOptionalException(formatForSchema(ARRY02,
                         "Mandatory array element cannot appear after optional element",
                         elements.get(i))));
-            }
             if(i >= other.elements.size() && !optional)
                 return failWith(new JsonSchemaException(
                         new ErrorDetail(ARRY01, ArrayElementNotFound),
@@ -75,6 +74,6 @@ private static boolean isOptional(JNode node) {
 
     @Override
     public String toString() {
-        return "[" + join(elements, ", ") + "]";
+        return joinWith(elements, ", ", "[", "]");
     }
 }
diff --git a/src/main/java/com/relogiclabs/json/schema/type/JFunction.java b/src/main/java/com/relogiclabs/json/schema/type/JFunction.java
@@ -14,7 +14,7 @@
 
 import static com.relogiclabs.json.schema.internal.message.MessageHelper.InvalidNestedFunction;
 import static com.relogiclabs.json.schema.internal.util.MiscellaneousHelper.nonNull;
-import static com.relogiclabs.json.schema.internal.util.StreamHelper.allTrue;
+import static com.relogiclabs.json.schema.internal.util.StreamHelper.forEachTrue;
 import static com.relogiclabs.json.schema.internal.util.StringHelper.join;
 import static com.relogiclabs.json.schema.message.ErrorCode.FUNC06;
 import static java.util.Objects.requireNonNull;
@@ -49,7 +49,7 @@ public boolean match(JNode node) {
                     new ErrorDetail(FUNC06, InvalidNestedFunction),
                     ExpectedHelper.asInvalidFunction(this),
                     ActualHelper.asInvalidFunction(node)));
-        return allTrue(composite.components().stream().map(this::invokeFunction));
+        return forEachTrue(composite.components().stream().map(this::invokeFunction));
     }
 
     private boolean invokeFunction(JNode node) {
diff --git a/src/main/java/com/relogiclabs/json/schema/type/JNode.java b/src/main/java/com/relogiclabs/json/schema/type/JNode.java
@@ -13,7 +13,6 @@
 import java.util.Map;
 
 import static com.relogiclabs.json.schema.internal.message.MessageHelper.DataTypeMismatch;
-import static com.relogiclabs.json.schema.internal.util.StringHelper.createOutline;
 import static com.relogiclabs.json.schema.message.ErrorCode.DTYP02;
 import static java.util.Collections.emptyList;
 import static java.util.Objects.requireNonNull;
@@ -67,8 +66,7 @@ <T> boolean checkType(JNode node, Class<T> type) {
     public abstract String toString();
 
     public String getOutline() {
-        return createOutline(toString(), getRuntime()
-                .getMessageFormatter().getOutlineLength());
+        return getRuntime().getMessageFormatter().createOutline(toString());
     }
 
     boolean failWith(RuntimeException exception) {
diff --git a/src/main/java/com/relogiclabs/json/schema/type/JObject.java b/src/main/java/com/relogiclabs/json/schema/type/JObject.java
@@ -17,7 +17,7 @@
 import static com.relogiclabs.json.schema.internal.message.MessageHelper.PropertyOrderMismatch;
 import static com.relogiclabs.json.schema.internal.message.MessageHelper.UndefinedPropertyFound;
 import static com.relogiclabs.json.schema.internal.util.MiscellaneousHelper.nonNull;
-import static com.relogiclabs.json.schema.internal.util.StringHelper.join;
+import static com.relogiclabs.json.schema.internal.util.StringHelper.joinWith;
 import static com.relogiclabs.json.schema.message.ErrorCode.PROP05;
 import static com.relogiclabs.json.schema.message.ErrorCode.PROP06;
 import static com.relogiclabs.json.schema.message.ErrorCode.PROP07;
@@ -104,7 +104,7 @@ private static boolean areKeysEqual(JProperty p1, JProperty p2) {
 
     @Override
     public String toString() {
-        return "{" + join(properties.values(), ", ") + "}";
+        return joinWith(properties.values(), ", ", "{", "}");
     }
 
     @Override
diff --git a/src/main/java/com/relogiclabs/json/schema/type/JReceiver.java b/src/main/java/com/relogiclabs/json/schema/type/JReceiver.java
@@ -47,9 +47,9 @@ public <T extends JNode> T getValueNode() {
         var list = getRuntime().getReceivers().fetch(this);
         if(list == null) throw new ReceiverNotFoundException(
                 formatForSchema(RECV02, concat("Receiver '", name, "' not found"), this));
-        if(list.size() == 0) throw new NoValueReceivedException(
+        if(list.isEmpty()) throw new NoValueReceivedException(
                 formatForSchema(RECV03, concat("No value received for '", name, "'"), this));
-        if(list.size() > 1) throw new UnsupportedOperationException("Multiple values found");
+        if(list.size() > 1) throw new UnsupportedOperationException("Multiple values exist");
         return (T) list.get(0);
     }
 
diff --git a/src/main/java/com/relogiclabs/json/schema/type/JValidator.java b/src/main/java/com/relogiclabs/json/schema/type/JValidator.java

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,10 @@ public static ExpectedDetail asValueMismatch(JNode node) {`
`24`	`24`	`return new ExpectedDetail(node, "value ", node.getOutline());`
`25`	`25`	`}`
`26`	`26`
	`27`	`+ public static ExpectedDetail asGeneralValueMismatch(JNode node) {`
	`28`	`+ return new ExpectedDetail(node, "a value of ", node.getOutline());`
	`29`	`+ }`
	`30`	`+`
`27`	`31`	`public static ExpectedDetail asDataTypeMismatch(JDataType dataType) {`
`28`	`32`	`return new ExpectedDetail(dataType, "data type ", dataType.toString(true));`
`29`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public static <T> void addToList(Collection<T> source, Collection<? extends T>..`
`54`	`54`	`for(var c : collections) if(c != null) source.addAll(c);`
`55`	`55`	`}`
`56`	`56`
`57`		`- public static <T> T getLast(List<T> list) {`
`58`		`- return list != null && !list.isEmpty() ? list.get(list.size() - 1) : null;`
	`57`	`+ public static <T> T tryGetLast(List<T> list) {`
	`58`	`+ return list.isEmpty() ? null : list.get(list.size() - 1);`
`59`	`59`	`}`
`60`	`60`	`}`