Adds support for cross-draft validation (#779)

fdutton · Faron Dutton · web-flow · commit 3cf9bb623467 · 2023-05-21T23:26:55.000-04:00
Resolves #778 Co-authored-by: Faron Dutton <faron.dutton@insightglobal.com>
diff --git a/src/main/java/com/networknt/schema/JsonSchemaFactory.java b/src/main/java/com/networknt/schema/JsonSchemaFactory.java
@@ -293,25 +293,15 @@ public static JsonSchemaFactory getInstance(SpecVersion.VersionFlag versionFlag)
     }
 
     public static JsonSchemaVersion checkVersion(SpecVersion.VersionFlag versionFlag){
-        JsonSchemaVersion jsonSchemaVersion = null;
+        if (null == versionFlag) return null;
         switch (versionFlag) {
-            case V202012:
-                jsonSchemaVersion = new Version202012();
-                break;
-            case V201909:
-                jsonSchemaVersion = new Version201909();
-                break;
-            case V7:
-                jsonSchemaVersion = new Version7();
-                break;
-            case V6:
-                jsonSchemaVersion = new Version6();
-                break;
-            case V4:
-                jsonSchemaVersion = new Version4();
-                break;
+            case V202012: return new Version202012();
+            case V201909: return new Version201909();
+            case V7: return new Version7();
+            case V6: return new Version6();
+            case V4: return new Version4();
+            default: throw new IllegalArgumentException("Unsupported value" + versionFlag);
         }
-        return jsonSchemaVersion;
     }
 
     public static Builder builder(final JsonSchemaFactory blueprint) {
@@ -351,13 +341,18 @@ private JsonMetaSchema findMetaSchemaForSchema(final JsonNode schemaNode) {
             throw new JsonSchemaException("Unknown MetaSchema: " + uriNode.toString());
         }
         final String uri = uriNode == null || uriNode.isNull() ? defaultMetaSchemaURI : normalizeMetaSchemaUri(uriNode.textValue(), forceHttps, removeEmptyFragmentSuffix);
-        final JsonMetaSchema jsonMetaSchema = jsonMetaSchemas.get(uri);
-        if (jsonMetaSchema == null) {
-            throw new JsonSchemaException("Unknown MetaSchema: " + uri);
-        }
+        final JsonMetaSchema jsonMetaSchema = jsonMetaSchemas.computeIfAbsent(uri, this::fromId);
         return jsonMetaSchema;
     }
 
+    private JsonMetaSchema fromId(String id) {
+        // Is it a well-known dialect?
+        return SpecVersionDetector.detectOptionalVersion(id)
+            .map(JsonSchemaFactory::checkVersion)
+            .map(JsonSchemaVersion::getInstance)
+            .orElseThrow(() -> new JsonSchemaException("Unknown MetaSchema: " + id));
+    }
+
     /**
      * @return A shared {@link URI} factory that is used for creating the URI references in schemas.
      */
diff --git a/src/main/java/com/networknt/schema/SpecVersion.java b/src/main/java/com/networknt/schema/SpecVersion.java
@@ -15,25 +15,40 @@
  */
 package com.networknt.schema;
 
+import java.util.Optional;
+
 public class SpecVersion {
 
     public enum VersionFlag {
 
-        V4(1 << 0),
-        V6(1 << 1),
-        V7(1 << 2),
-        V201909(1 << 3),
-        V202012(1 << 4);
+        V4(1 << 0, "https://json-schema.org/draft-04/schema"),
+        V6(1 << 1, "https://json-schema.org/draft-06/schema"),
+        V7(1 << 2, "https://json-schema.org/draft-07/schema"),
+        V201909(1 << 3, "https://json-schema.org/draft/2019-09/schema"),
+        V202012(1 << 4, "https://json-schema.org/draft/2020-12/schema");
 
 
         private final long versionFlagValue;
+        private final String id;
 
-        VersionFlag(long versionFlagValue) {
+        VersionFlag(long versionFlagValue, String id) {
             this.versionFlagValue = versionFlagValue;
+            this.id = id;
+        }
+
+        public String getId() {
+            return this.id;
         }
 
         public long getVersionFlagValue() {
-            return versionFlagValue;
+            return this.versionFlagValue;
+        }
+
+        public static Optional<VersionFlag> fromId(String id) {
+            for (VersionFlag v: VersionFlag.values()) {
+                if (v.id.equals(id)) return Optional.of(v);
+            }
+            return Optional.empty();
         }
     }
 
diff --git a/src/main/java/com/networknt/schema/SpecVersionDetector.java b/src/main/java/com/networknt/schema/SpecVersionDetector.java
@@ -65,37 +65,13 @@ public static Optional<VersionFlag> detectOptionalVersion(JsonNode jsonNode) {
             String schemaUri = JsonSchemaFactory.normalizeMetaSchemaUri(schemaTagValue, forceHttps,
                     removeEmptyFragmentSuffix);
 
-            VersionFlag version = detect(schemaUri);
-            if (null == version) {
-                throw new JsonSchemaException("'" + schemaTagValue + "' is unrecognizable schema");
-            }
-            return version;
+            return VersionFlag.fromId(schemaUri)
+                .orElseThrow(() -> new JsonSchemaException("'" + schemaTagValue + "' is unrecognizable schema"));
         });
     }
 
     public static Optional<VersionFlag> detectOptionalVersion(String schemaUri) {
-        return Optional.ofNullable(detect(schemaUri));
-    }
-
-    private static VersionFlag detect(String schemaUri) {
-        if (null != schemaUri) {
-            if (schemaUri.equals(JsonMetaSchema.getV4().getUri())) {
-                return VersionFlag.V4;
-            }
-            if (schemaUri.equals(JsonMetaSchema.getV6().getUri())) {
-                return VersionFlag.V6;
-            }
-            if (schemaUri.equals(JsonMetaSchema.getV7().getUri())) {
-                return VersionFlag.V7;
-            }
-            if (schemaUri.equals(JsonMetaSchema.getV201909().getUri())) {
-                return VersionFlag.V201909;
-            }
-            if (schemaUri.equals(JsonMetaSchema.getV202012().getUri())) {
-                return VersionFlag.V202012;
-            }
-        }
-        return null;
+        return VersionFlag.fromId(schemaUri);
     }
 
 }
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.add(Paths.get("src/test/suite/tests/draft2020-12/defs.json"));
         this.disabled.add(Paths.get("src/test/suite/tests/draft2020-12/dynamicRef.json"));
         this.disabled.add(Paths.get("src/test/suite/tests/draft2020-12/id.json"));
-        this.disabled.add(Paths.get("src/test/suite/tests/draft2020-12/optional/cross-draft.json"));
         this.disabled.add(Paths.get("src/test/suite/tests/draft2020-12/optional/format-assertion.json"));
         this.disabled.add(Paths.get("src/test/suite/tests/draft2020-12/ref.json"));
         this.disabled.add(Paths.get("src/test/suite/tests/draft2020-12/refRemote.json"));
@@ -86,7 +85,6 @@ private void disableV201909Tests() {
         this.disabled.add(Paths.get("src/test/suite/tests/draft2019-09/anchor.json"));
         this.disabled.add(Paths.get("src/test/suite/tests/draft2019-09/defs.json"));
         this.disabled.add(Paths.get("src/test/suite/tests/draft2019-09/id.json"));
-        this.disabled.add(Paths.get("src/test/suite/tests/draft2019-09/optional/cross-draft.json"));
         this.disabled.add(Paths.get("src/test/suite/tests/draft2019-09/recursiveRef.json"));
         this.disabled.add(Paths.get("src/test/suite/tests/draft2019-09/ref.json"));
         this.disabled.add(Paths.get("src/test/suite/tests/draft2019-09/refRemote.json"));
@@ -97,13 +95,11 @@ private void disableV7Tests() {
         this.disabled.add(Paths.get("src/test/suite/tests/draft7/anchor.json"));
         this.disabled.add(Paths.get("src/test/suite/tests/draft7/defs.json"));
         this.disabled.add(Paths.get("src/test/suite/tests/draft7/optional/content.json"));
-        this.disabled.add(Paths.get("src/test/suite/tests/draft7/optional/cross-draft.json"));
         this.disabled.add(Paths.get("src/test/suite/tests/draft7/ref.json"));
         this.disabled.add(Paths.get("src/test/suite/tests/draft7/refRemote.json"));
     }
 
     private void disableV6Tests() {
-        this.disabled.add(Paths.get("src/test/suite/tests/draft6/optional/format.json"));
         this.disabled.add(Paths.get("src/test/suite/tests/draft6/ref.json"));
         this.disabled.add(Paths.get("src/test/suite/tests/draft6/refRemote.json"));
    }
