Merge pull request #264 from rzukowski/issue255

stevehu · web-flow · commit 8f3d4fea56f2 · 2020-03-09T15:52:20.000-04:00
Handling JSONPointer (URI fragment identifier) with no base uri
diff --git a/src/main/java/com/networknt/schema/JsonSchema.java b/src/main/java/com/networknt/schema/JsonSchema.java
@@ -82,6 +82,8 @@ private URI combineCurrentUriWithIds(URI currentUri, JsonNode schemaNode) {
         final String id = validationContext.resolveSchemaId(schemaNode);
         if (id == null) {
             return currentUri;
+        } else if (isUriFragmentWithNoContext(currentUri, id)) {
+            return null;
         } else {
             try {
                 return this.validationContext.getURIFactory().create(currentUri, id);
@@ -90,6 +92,10 @@ private URI combineCurrentUriWithIds(URI currentUri, JsonNode schemaNode) {
             }
         }
     }
+
+    private boolean isUriFragmentWithNoContext(URI currentUri, String id) {
+        return id.startsWith("#") && currentUri == null;
+    }
     
     public URI getCurrentUri()
     {

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,8 @@ private URI combineCurrentUriWithIds(URI currentUri, JsonNode schemaNode) {`
`82`	`82`	`final String id = validationContext.resolveSchemaId(schemaNode);`
`83`	`83`	`if (id == null) {`
`84`	`84`	`return currentUri;`
	`85`	`+ } else if (isUriFragmentWithNoContext(currentUri, id)) {`
	`86`	`+ return null;`
`85`	`87`	`} else {`
`86`	`88`	`try {`
`87`	`89`	`return this.validationContext.getURIFactory().create(currentUri, id);`
`@@ -90,6 +92,10 @@ private URI combineCurrentUriWithIds(URI currentUri, JsonNode schemaNode) {`
`90`	`92`	`}`
`91`	`93`	`}`
`92`	`94`	`}`
	`95`	`+`
	`96`	`+ private boolean isUriFragmentWithNoContext(URI currentUri, String id) {`
	`97`	`+ return id.startsWith("#") && currentUri == null;`
	`98`	`+ }`
`93`	`99`
`94`	`100`	`public URI getCurrentUri()`
`95`	`101`	`{`