Perf

Author: justin-tay

src/main/java/com/networknt/schema/AbsoluteIri.java

@@ -17,6 +17,8 @@
 
 import java.util.Objects;
 
+import com.networknt.schema.utils.Strings;
+
 /**
  * The absolute IRI is an IRI without the fragment.
  * <p>
@@ -131,7 +133,7 @@ public static String resolve(String parent, String iri) {
                 }
                 base = parent(base, scheme);
 
-                String[] iriParts = iri.split("/");
+                String[] iriParts = Strings.split(iri, '/');
                 for (int x = 0; x < iriParts.length; x++) {
                     if ("..".equals(iriParts[x])) {
                         base = parent(base, scheme);
@@ -149,9 +151,6 @@ public static String resolve(String parent, String iri) {
                         }
                     }
                 }
-                if (iri.endsWith("/")) {
-                    base = base + "/";
-                }
                 return base;
             }
         }

src/main/java/com/networknt/schema/SchemaLocation.java

@@ -22,6 +22,7 @@
 
 import com.networknt.schema.path.NodePath;
 import com.networknt.schema.path.PathType;
+import com.networknt.schema.utils.Strings;
 
 /**
  * The schema location is the canonical IRI of the schema object plus a JSON
@@ -219,7 +220,8 @@ public static NodePath of(String fragmentString) {
                 fragmentString = fragmentString.substring(1);
             }
             NodePath fragment = JSON_POINTER;
-            String[] fragmentParts = fragmentString.split("/");
+//            String[] fragmentParts = fragmentString.split("/");
+            String[] fragmentParts = Strings.split(fragmentString, '/');
 
             boolean jsonPointer = false;
             if (fragmentString.startsWith("/")) {
@@ -270,10 +272,6 @@ public static NodePath of(String fragmentString) {
                     fragment = fragment.append(fragmentPartString);
                 }
             }
-            if (index == -1 && fragmentString.endsWith("/")) {
-                // Trailing / in fragment
-                fragment = fragment.append("");
-            }
             return fragment;
         }
 

src/main/java/com/networknt/schema/keyword/RecursiveRefValidator.java

@@ -54,7 +54,7 @@ static Schema getSchema(Schema parentSchema, ExecutionContext executionContext)
         Schema check = null;
         String base = null;
         String baseCheck = null;
-        if (refSchema != null)
+        if (refSchema != null) {
             base = current.getSchemaLocation().getAbsoluteIri() != null ? current.getSchemaLocation().getAbsoluteIri().toString() : "";
             if (current.isRecursiveAnchor()) {
                 // Check dynamic scope
@@ -71,9 +71,6 @@ static Schema getSchema(Schema parentSchema, ExecutionContext executionContext)
                     }
                 }
             }
-        if (refSchema != null) {
-            System.out.println(refSchema);
-            // refSchema = refSchema.fromRef(parentSchema, evaluationPath);
         }
         return refSchema;
     }

src/main/java/com/networknt/schema/keyword/RefValidator.java

@@ -157,14 +157,14 @@ private static Schema getSchema(Schema parent,
                                                   String refValue,
                                                   String refValueOriginal
                                                   ) {
-        // This should be processing json pointer fragments only
-        NodePath fragment = SchemaLocation.Fragment.of(refValue);
         String schemaReference = resolve(parent, refValueOriginal);
         // ConcurrentHashMap computeIfAbsent does not allow calls that result in a
         // recursive update to the map.
         // The getSubSchema potentially recurses to call back to getJsonSchema again
         Schema result = schemaContext.getSchemaReferences().get(schemaReference);
         if (result == null) {
+            // This should be processing json pointer fragments only
+            NodePath fragment = SchemaLocation.Fragment.of(refValue);
             synchronized (schemaContext.getSchemaRegistry()) { // acquire lock on shared factory object to prevent deadlock
                 result = schemaContext.getSchemaReferences().get(schemaReference);
                 if (result == null) {

src/main/java/com/networknt/schema/utils/Strings.java

@@ -16,6 +16,9 @@
 
 package com.networknt.schema.utils;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Utility methods for working with Strings.
  */
@@ -126,4 +129,44 @@ public static boolean isNumeric(String string) {
     public static boolean isBlank(String string) {
         return null == string || string.trim().isEmpty();
     }
+
+    /**
+     * Split text. Unlike the JDK String split using regex trailing delimiters are
+     * preserved.
+     * 
+     * @param text the text to split
+     * @param delimiter the delimiter
+     * @return the fragments
+     */
+    public static String[] split(String text, char delimiter) {
+        if (text == null) {
+            return new String[0];
+        }
+        if (text.isEmpty()) {
+            return new String[]{""};
+        }
+
+        List<String> segments = new ArrayList<>();
+        int start = 0;
+        int end;
+
+        while (start <= text.length()) {
+            end = text.indexOf(delimiter, start);
+
+            if (end == -1) {
+                end = text.length();
+            }
+
+            String segment = text.substring(start, end);
+            segments.add(segment);
+
+            if (end == text.length()) {
+                break;
+            }
+
+            start = end + 1;
+        }
+
+        return segments.toArray(new String[segments.size()]);
+    }
 }