Move keyword and keyword validators to keyword package

Author: justin-tay

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

@@ -19,6 +19,7 @@
 import java.util.function.Supplier;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.networknt.schema.keyword.FormatValidator;
 
 /**
  * Used to implement the various formats for the format keyword.

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

@@ -18,6 +18,12 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.networknt.schema.SpecVersion.VersionFlag;
+import com.networknt.schema.keyword.FormatKeyword;
+import com.networknt.schema.keyword.Keyword;
+import com.networknt.schema.keyword.KeywordFactory;
+import com.networknt.schema.keyword.KeywordValidator;
+import com.networknt.schema.keyword.UnknownKeywordFactory;
+import com.networknt.schema.keyword.ValidatorTypeCode;
 import com.networknt.schema.utils.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

@@ -32,6 +32,10 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.networknt.schema.SpecVersion.VersionFlag;
+import com.networknt.schema.keyword.DiscriminatorValidator;
+import com.networknt.schema.keyword.KeywordValidator;
+import com.networknt.schema.keyword.TypeValidator;
+import com.networknt.schema.keyword.ValidatorTypeCode;
 import com.networknt.schema.utils.JsonNodes;
 
 /**

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

@@ -626,7 +626,7 @@ public JsonSchema getSchema(final SchemaLocation schemaUri, final SchemaValidato
      * @param config the config
      * @return the schema
      */
-    protected JsonSchema loadSchema(final SchemaLocation schemaUri, final SchemaValidatorsConfig config) {
+    public JsonSchema loadSchema(final SchemaLocation schemaUri, final SchemaValidatorsConfig config) {
         if (enableSchemaCache) {
             // ConcurrentHashMap computeIfAbsent does not allow calls that result in a
             // recursive update to the map.

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

@@ -19,6 +19,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.networknt.schema.i18n.DefaultMessageSource;
 import com.networknt.schema.i18n.MessageSource;
+import com.networknt.schema.keyword.KeywordValidator;
 import com.networknt.schema.regex.ECMAScriptRegularExpressionFactory;
 import com.networknt.schema.regex.JDKRegularExpressionFactory;
 import com.networknt.schema.regex.RegularExpressionFactory;
@@ -325,7 +326,7 @@ public Boolean getFormatAssertionsEnabled() {
         return formatAssertionsEnabled;
     }
 
-    WalkListenerRunner getItemWalkListenerRunner() {
+    public WalkListenerRunner getItemWalkListenerRunner() {
         return this.itemWalkListenerRunner;
     }
 
@@ -384,7 +385,7 @@ public int getPreloadJsonSchemaRefMaxNestingDepth() {
         return preloadJsonSchemaRefMaxNestingDepth;
     }
 
-    WalkListenerRunner getPropertyWalkListenerRunner() {
+    public WalkListenerRunner getPropertyWalkListenerRunner() {
         return this.propertyWalkListenerRunner;
     }
 
@@ -510,7 +511,7 @@ public boolean isReadOnly() {
         return null != this.readOnly && this.readOnly;
     }
 
-    Boolean getReadOnly() {
+    public Boolean getReadOnly() {
         return this.readOnly;
     }
 
@@ -552,7 +553,7 @@ public boolean isWriteOnly() {
         return null != this.writeOnly && this.writeOnly;
     }
 
-    Boolean getWriteOnly() {
+    public Boolean getWriteOnly() {
         return this.writeOnly;
     }
 

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

@@ -22,6 +22,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.networknt.schema.SpecVersion.VersionFlag;
+import com.networknt.schema.keyword.KeywordValidator;
 
 public class ValidationContext {
     private final JsonMetaSchema metaSchema;

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

@@ -4,6 +4,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import com.networknt.schema.keyword.NonValidationKeyword;
+import com.networknt.schema.keyword.ValidatorTypeCode;
+
 /**
  * Draft 2019-09 dialect.
  */

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

@@ -4,6 +4,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import com.networknt.schema.keyword.NonValidationKeyword;
+import com.networknt.schema.keyword.ValidatorTypeCode;
+
 /**
  * Draft 2020-12 dialect.
  */

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

@@ -2,6 +2,10 @@
 
 import java.util.Arrays;
 
+import com.networknt.schema.keyword.AnnotationKeyword;
+import com.networknt.schema.keyword.NonValidationKeyword;
+import com.networknt.schema.keyword.ValidatorTypeCode;
+
 /**
  * Draft 4 dialect.
  */

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

@@ -2,6 +2,10 @@
 
 import java.util.Arrays;
 
+import com.networknt.schema.keyword.AnnotationKeyword;
+import com.networknt.schema.keyword.NonValidationKeyword;
+import com.networknt.schema.keyword.ValidatorTypeCode;
+
 /**
  * Draft 6 dialect.
  */