Merge branch 'master' into issue721

Faron Dutton · Faron Dutton · commit aa8b080bc865 · 2023-06-04T18:04:47.000-04:00
diff --git a/src/main/java/com/networknt/schema/uri/URISchemeFactory.java b/src/main/java/com/networknt/schema/uri/URISchemeFactory.java
@@ -40,13 +40,12 @@ public Map<String, URIFactory> getURIFactories() {
         return this.uriFactories;
     }
 
-    private String getScheme(final String uri) {
+    private static String getScheme(final String uri) {
         final Matcher matcher = URI_SCHEME_PATTERN.matcher(uri);
         if (matcher.find()) {
             return matcher.group(1);
-        } else {
-            return null;
         }
+        return null;
     }
 
     private URIFactory getFactory(final String scheme) {
@@ -61,8 +60,9 @@ private URIFactory getFactory(final String scheme) {
      * @param uri String
      * @return URI
      */
+    @Override
     public URI create(final String uri) {
-        final String scheme = this.getScheme(uri);
+        final String scheme = getScheme(uri);
         if (scheme == null) {
             throw new IllegalArgumentException(String.format("Couldn't find URI scheme: %s", uri));
         }
@@ -76,22 +76,27 @@ public URI create(final String uri) {
      * @param segment URI segment
      * @return URI
      */
+    @Override
     public URI create(final URI baseURI, final String segment) {
         if (baseURI == null) {
             return this.create(segment);
-        } else {
-            // We first attempt to get the scheme in case the segment is an absolute URI path.
-            String scheme = this.getScheme(segment);
-            if (scheme == null) {
-                // In this case, the segment is relative to the baseURI.
-                scheme = baseURI.getScheme();
-                final URIFactory uriFactory = this.getFactory(scheme);
-                return uriFactory.create(baseURI, segment);
-            } else {
-                // In this case, the segment is an absolute URI path.
-                final URIFactory uriFactory = this.getFactory(scheme);
-                return uriFactory.create(segment);
-            }
         }
+
+        // We first attempt to get the scheme in case the segment is an absolute URI path.
+        String scheme = getScheme(segment);
+        if (scheme == null) {
+            // In this case, the segment is relative to the baseURI.
+            scheme = baseURI.getScheme();
+            final URIFactory uriFactory = this.getFactory(scheme);
+            return uriFactory.create(baseURI, segment);
+        }
+
+        if ("urn".equals(scheme)) {
+            return URI.create(segment);
+        }
+
+        // In this case, the segment is an absolute URI path.
+        final URIFactory uriFactory = this.getFactory(scheme);
+        return uriFactory.create(segment);
     }
 }
diff --git a/src/test/java/com/networknt/schema/JsonSchemaTestSuiteTest.java b/src/test/java/com/networknt/schema/JsonSchemaTestSuiteTest.java
@@ -75,7 +75,6 @@ private void disableV202012Tests() {
         this.disabled.put(Paths.get("src/test/suite/tests/draft2020-12/id.json"), "Unsupported behavior");
         this.disabled.put(Paths.get("src/test/suite/tests/draft2020-12/optional/format-assertion.json"), "Unsupported behavior");
         this.disabled.put(Paths.get("src/test/suite/tests/draft2020-12/ref.json"), "Unsupported behavior");
-        this.disabled.put(Paths.get("src/test/suite/tests/draft2020-12/refRemote.json"), "Unsupported behavior");
         this.disabled.put(Paths.get("src/test/suite/tests/draft2020-12/vocabulary.json"), "Unsupported behavior");
     }
 
@@ -85,7 +84,6 @@ private void disableV201909Tests() {
         this.disabled.put(Paths.get("src/test/suite/tests/draft2019-09/id.json"), "Unsupported behavior");
         this.disabled.put(Paths.get("src/test/suite/tests/draft2019-09/recursiveRef.json"), "Unsupported behavior");
         this.disabled.put(Paths.get("src/test/suite/tests/draft2019-09/ref.json"), "Unsupported behavior");
-        this.disabled.put(Paths.get("src/test/suite/tests/draft2019-09/refRemote.json"), "Unsupported behavior");
         this.disabled.put(Paths.get("src/test/suite/tests/draft2019-09/vocabulary.json"), "Unsupported behavior");
     }
 
@@ -94,17 +92,14 @@ private void disableV7Tests() {
         this.disabled.put(Paths.get("src/test/suite/tests/draft7/defs.json"), "Unsupported behavior");
         this.disabled.put(Paths.get("src/test/suite/tests/draft7/optional/content.json"), "Unsupported behavior");
         this.disabled.put(Paths.get("src/test/suite/tests/draft7/ref.json"), "Unsupported behavior");
-        this.disabled.put(Paths.get("src/test/suite/tests/draft7/refRemote.json"), "Unsupported behavior");
     }
 
     private void disableV6Tests() {
         this.disabled.put(Paths.get("src/test/suite/tests/draft6/ref.json"), "Unsupported behavior");
-        this.disabled.put(Paths.get("src/test/suite/tests/draft6/refRemote.json"), "Unsupported behavior");
    }
 
     private void disableV4Tests() {
         this.disabled.put(Paths.get("src/test/suite/tests/draft4/ref.json"), "Unsupported behavior");
-        this.disabled.put(Paths.get("src/test/suite/tests/draft4/refRemote.json"), "Unsupported behavior");
     }
 
 }
diff --git a/src/test/suite/tests/draft2019-09/refRemote.json b/src/test/suite/tests/draft2019-09/refRemote.json
@@ -113,6 +113,8 @@
                 }
             }
         },
+        "disabled": true,
+        "reason": "URI resolution does not account for identifiers that are not at the root schema",
         "tests": [
             {
                 "description": "number is valid",
@@ -145,6 +147,8 @@
                 }
             }
         },
+        "disabled": true,
+        "reason": "URI resolution does not account for identifiers that are not at the root schema",
         "tests": [
             {
                 "description": "number is valid",
@@ -298,6 +302,8 @@
     {
         "description": "remote HTTP ref with nested absolute ref",
         "schema": {"$ref": "http://localhost:1234/nested-absolute-ref-to-string.json"},
+        "disabled": true,
+        "reason": "URI resolution does not account for identifiers that are not at the root schema",
         "tests": [
             {
                 "description": "number is invalid",
diff --git a/src/test/suite/tests/draft2020-12/refRemote.json b/src/test/suite/tests/draft2020-12/refRemote.json
@@ -113,6 +113,8 @@
                 }
             }
         },
+        "disabled": true,
+        "reason": "URI resolution does not account for identifiers that are not at the root schema",
         "tests": [
             {
                 "description": "number is valid",
@@ -145,6 +147,8 @@
                 }
             }
         },
+        "disabled": true,
+        "reason": "URI resolution does not account for identifiers that are not at the root schema",
         "tests": [
             {
                 "description": "number is valid",
@@ -298,6 +302,8 @@
     {
         "description": "remote HTTP ref with nested absolute ref",
         "schema": {"$ref": "http://localhost:1234/nested-absolute-ref-to-string.json"},
+        "disabled": true,
+        "reason": "URI resolution does not account for identifiers that are not at the root schema",
         "tests": [
             {
                 "description": "number is invalid",
diff --git a/src/test/suite/tests/draft4/refRemote.json b/src/test/suite/tests/draft4/refRemote.json
@@ -120,6 +120,8 @@
                 }
             }
         },
+        "disabled": true,
+        "reason": "URI resolution does not account for identifiers that are not at the root schema",
         "tests": [
             {
                 "description": "number is valid",
diff --git a/src/test/suite/tests/draft6/refRemote.json b/src/test/suite/tests/draft6/refRemote.json
@@ -120,6 +120,8 @@
                 }
             }
         },
+        "disabled": true,
+        "reason": "URI resolution does not account for identifiers that are not at the root schema",
         "tests": [
             {
                 "description": "number is valid",
diff --git a/src/test/suite/tests/draft7/refRemote.json b/src/test/suite/tests/draft7/refRemote.json
@@ -120,6 +120,8 @@
                 }
             }
         },
+        "disabled": true,
+        "reason": "URI resolution does not account for identifiers that are not at the root schema",
         "tests": [
             {
                 "description": "number is valid",

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,6 @@ private void disableV202012Tests() {`
`75`	`75`	`this.disabled.put(Paths.get("src/test/suite/tests/draft2020-12/id.json"), "Unsupported behavior");`
`76`	`76`	`this.disabled.put(Paths.get("src/test/suite/tests/draft2020-12/optional/format-assertion.json"), "Unsupported behavior");`
`77`	`77`	`this.disabled.put(Paths.get("src/test/suite/tests/draft2020-12/ref.json"), "Unsupported behavior");`
`78`		`- this.disabled.put(Paths.get("src/test/suite/tests/draft2020-12/refRemote.json"), "Unsupported behavior");`
`79`	`78`	`this.disabled.put(Paths.get("src/test/suite/tests/draft2020-12/vocabulary.json"), "Unsupported behavior");`
`80`	`79`	`}`
`81`	`80`
`@@ -85,7 +84,6 @@ private void disableV201909Tests() {`
`85`	`84`	`this.disabled.put(Paths.get("src/test/suite/tests/draft2019-09/id.json"), "Unsupported behavior");`
`86`	`85`	`this.disabled.put(Paths.get("src/test/suite/tests/draft2019-09/recursiveRef.json"), "Unsupported behavior");`
`87`	`86`	`this.disabled.put(Paths.get("src/test/suite/tests/draft2019-09/ref.json"), "Unsupported behavior");`
`88`		`- this.disabled.put(Paths.get("src/test/suite/tests/draft2019-09/refRemote.json"), "Unsupported behavior");`
`89`	`87`	`this.disabled.put(Paths.get("src/test/suite/tests/draft2019-09/vocabulary.json"), "Unsupported behavior");`
`90`	`88`	`}`
`91`	`89`
`@@ -94,17 +92,14 @@ private void disableV7Tests() {`
`94`	`92`	`this.disabled.put(Paths.get("src/test/suite/tests/draft7/defs.json"), "Unsupported behavior");`
`95`	`93`	`this.disabled.put(Paths.get("src/test/suite/tests/draft7/optional/content.json"), "Unsupported behavior");`
`96`	`94`	`this.disabled.put(Paths.get("src/test/suite/tests/draft7/ref.json"), "Unsupported behavior");`
`97`		`- this.disabled.put(Paths.get("src/test/suite/tests/draft7/refRemote.json"), "Unsupported behavior");`
`98`	`95`	`}`
`99`	`96`
`100`	`97`	`private void disableV6Tests() {`
`101`	`98`	`this.disabled.put(Paths.get("src/test/suite/tests/draft6/ref.json"), "Unsupported behavior");`
`102`		`- this.disabled.put(Paths.get("src/test/suite/tests/draft6/refRemote.json"), "Unsupported behavior");`
`103`	`99`	`}`
`104`	`100`
`105`	`101`	`private void disableV4Tests() {`
`106`	`102`	`this.disabled.put(Paths.get("src/test/suite/tests/draft4/ref.json"), "Unsupported behavior");`
`107`		`- this.disabled.put(Paths.get("src/test/suite/tests/draft4/refRemote.json"), "Unsupported behavior");`
`108`	`103`	`}`
`109`	`104`
`110`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,8 @@`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`	`},`
	`116`	`+ "disabled": true,`
	`117`	`+ "reason": "URI resolution does not account for identifiers that are not at the root schema",`
`116`	`118`	`"tests": [`
`117`	`119`	`{`
`118`	`120`	`"description": "number is valid",`
`@@ -145,6 +147,8 @@`
`145`	`147`	`}`
`146`	`148`	`}`
`147`	`149`	`},`
	`150`	`+ "disabled": true,`
	`151`	`+ "reason": "URI resolution does not account for identifiers that are not at the root schema",`
`148`	`152`	`"tests": [`
`149`	`153`	`{`
`150`	`154`	`"description": "number is valid",`
`@@ -298,6 +302,8 @@`
`298`	`302`	`{`
`299`	`303`	`"description": "remote HTTP ref with nested absolute ref",`
`300`	`304`	`"schema": {"$ref": "http://localhost:1234/nested-absolute-ref-to-string.json"},`
	`305`	`+ "disabled": true,`
	`306`	`+ "reason": "URI resolution does not account for identifiers that are not at the root schema",`
`301`	`307`	`"tests": [`
`302`	`308`	`{`
`303`	`309`	`"description": "number is invalid",`
Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,8 @@`
`120`	`120`	`}`
`121`	`121`	`}`
`122`	`122`	`},`
	`123`	`+ "disabled": true,`
	`124`	`+ "reason": "URI resolution does not account for identifiers that are not at the root schema",`
`123`	`125`	`"tests": [`
`124`	`126`	`{`
`125`	`127`	`"description": "number is valid",`