Refactor SchemaRegistry

Author: justin-tay

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

@@ -40,7 +40,7 @@
 
 /**
  * Used for creating a schema with validators for validating inputs. This is
- * created using {@link SchemaRegistry#getInstance(Version, Consumer)}
+ * created using {@link SchemaRegistry#withDefaultSpecificationVersion(Version, Consumer)}
  * and should be cached for performance.
  * <p>
  * This is the core of json constraint implementation. It parses json constraint

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

@@ -75,7 +75,7 @@ public static Optional<Version> detectOptionalVersion(JsonNode jsonNode, boolean
         return Optional.ofNullable(jsonNode.get(SCHEMA_TAG)).map(schemaTag -> {
 
             String schemaTagValue = schemaTag.asText();
-            String schemaUri = SchemaRegistry.normalizeMetaSchemaUri(schemaTagValue);
+            String schemaUri = SchemaRegistry.normalizeDialectId(schemaTagValue);
 
             if (throwIfUnsupported) {
                 return Version.fromDialectId(schemaUri)

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

@@ -17,6 +17,8 @@
 
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.networknt.schema.Error;
@@ -32,12 +34,14 @@
  * Default {@link DialectRegistry}.
  */
 public class DefaultDialectRegistry implements DialectRegistry {
+    private final ConcurrentMap<String, Dialect> dialects = new ConcurrentHashMap<>();
+    
     @Override
     public Dialect getDialect(String dialectId, SchemaRegistry schemaFactory, SchemaValidatorsConfig config) {
         // Is it a well-known dialect?
         return Specification.Version.fromDialectId(dialectId).map(SchemaRegistry::checkVersion).orElseGet(() -> {
             // Custom dialect
-            return loadDialect(dialectId, schemaFactory, config);
+            return dialects.computeIfAbsent(dialectId, id -> loadDialect(id, schemaFactory, config));
         });
     }
 

src/main/java/com/networknt/schema/dialect/DefaultDialectRegistry.java

@@ -29,12 +29,13 @@ public interface DialectRegistry {
      * Gets the dialect given the dialect id which is the IRI that indicates the
      * meta-schema that can be used to validate the schema conforms to the dialect.
      * 
-     * @param dialectId     the dialect id of the dialect which IRI that indicates
-     *                      the meta-schema that can be used to validate the schema
-     *                      conforms to the dialect
-     * @param schemaFactory the schema factory
-     * @param config        the config
+     * @param dialectId      the dialect id of the dialect which IRI that indicates
+     *                       the meta-schema that can be used to validate the schema
+     *                       conforms to the dialect
+     * @param schemaRegistry the schema registry to fetch and load unknown dialect's
+     *                       meta-schema
+     * @param config         the config
      * @return the dialect
      */
-    Dialect getDialect(String dialectId, SchemaRegistry schemaFactory, SchemaValidatorsConfig config);
+    Dialect getDialect(String dialectId, SchemaRegistry schemaRegistry, SchemaValidatorsConfig config);
 }

src/main/java/com/networknt/schema/dialect/DialectRegistry.java

@@ -60,7 +60,7 @@ private JsonNode getJsonNodeFromPath(String dataPath) {
 
     private Schema getJsonSchema(JsonNode schemaNode) {
         return SchemaRegistry
-                .getInstance(SpecificationVersionDetector.detectOptionalVersion(schemaNode, false).orElse(DEFAULT_VERSION_FLAG))
+                .withDefaultSpecificationVersion(SpecificationVersionDetector.detectOptionalVersion(schemaNode, false).orElse(DEFAULT_VERSION_FLAG))
                 .getSchema(schemaNode);
     }
 

src/main/java/com/networknt/schema/dialect/DisallowUnknownDialectFactory.java

@@ -202,7 +202,7 @@ public InputStreamSource getSchema(AbsoluteIri absoluteIri) {
             }
         };
         Version specVersion = detectVersion(testCase.getSchema(), testCase.getSpecification(), defaultVersion, false);
-        SchemaRegistry base = SchemaRegistry.getInstance(specVersion);
+        SchemaRegistry base = SchemaRegistry.withDefaultSpecificationVersion(specVersion);
         return SchemaRegistry
                 .builder(base)
                 .schemaMappers(schemaMappers -> schemaMappers

src/test/java/com/networknt/schema/AbstractJsonSchemaTest.java

@@ -45,7 +45,7 @@ void messageFalse() {
                 + "  },\r\n"
                 + "  \"additionalProperties\": false\r\n"
                 + "}";
-        SchemaRegistry factory = SchemaRegistry.getInstance(Version.DRAFT_2020_12);
+        SchemaRegistry factory = SchemaRegistry.withDefaultSpecificationVersion(Version.DRAFT_2020_12);
         SchemaValidatorsConfig config = SchemaValidatorsConfig.builder().build();
         Schema schema = factory.getSchema(schemaData, config);
         String inputData = "{\r\n"
@@ -80,7 +80,7 @@ void messageSchema() {
                 + "  },\r\n"
                 + "  \"additionalProperties\": { \"type\": \"number\" }\r\n"
                 + "}";
-        SchemaRegistry factory = SchemaRegistry.getInstance(Version.DRAFT_2020_12);
+        SchemaRegistry factory = SchemaRegistry.withDefaultSpecificationVersion(Version.DRAFT_2020_12);
         SchemaValidatorsConfig config = SchemaValidatorsConfig.builder().build();
         Schema schema = factory.getSchema(schemaData, config);
         String inputData = "{\r\n"

src/test/java/com/networknt/schema/AbstractJsonSchemaTestSuite.java

@@ -33,7 +33,7 @@ void invalidTypeShouldThrowJsonSchemaException() {
                 + "    \"$ref\": \"#/defs/User\"\r\n"
                 + "  }\r\n"
                 + "}";
-        SchemaRegistry factory = SchemaRegistry.getInstance(Version.DRAFT_2020_12);
+        SchemaRegistry factory = SchemaRegistry.withDefaultSpecificationVersion(Version.DRAFT_2020_12);
         JsonSchemaException ex = assertThrows(JsonSchemaException.class, () -> factory.getSchema(schemaData));
         assertEquals("type", ex.getError().getMessageKey());
     }
@@ -59,7 +59,7 @@ void walkValidationWithNullNodeShouldNotValidate() {
 
         String jsonContents = "{}";
 
-        SchemaRegistry factory = SchemaRegistry.getInstance(Specification.Version.DRAFT_7);
+        SchemaRegistry factory = SchemaRegistry.withDefaultSpecificationVersion(Specification.Version.DRAFT_7);
         Schema schema = factory.getSchema(schemaContents);
         ValidationResult result = schema.walk(jsonContents, InputFormat.JSON, true);
         assertEquals(true, result.getErrors().isEmpty());