Merge pull request #201 from complex1ty/replace-reflection

replace reflection in ValidatorTypeCode

Author: stevehu

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

@@ -27,47 +27,47 @@
 
 public enum ValidatorTypeCode implements Keyword, ErrorMessageType {
     ADDITIONAL_PROPERTIES("additionalProperties", "1001", new MessageFormat(
-            "{0}.{1}: is not defined in the schema and the schema does not allow additional properties")),
-    ALL_OF("allOf", "1002", new MessageFormat("{0}: should be valid to all the schemas {1}")),
-    ANY_OF("anyOf", "1003", new MessageFormat("{0}: should be valid to any of the schemas {1}")),
-    CROSS_EDITS("crossEdits", "1004", new MessageFormat("{0}: has an error with 'cross edits'")),
-    DEPENDENCIES("dependencies", "1007", new MessageFormat("{0}: has an error with dependencies {1}")),
-    EDITS("edits", "1005", new MessageFormat("{0}: has an error with 'edits'")),
-    ENUM("enum", "1008", new MessageFormat("{0}: does not have a value in the enumeration {1}")),
-    FORMAT("format", "1009", new MessageFormat("{0}: does not match the {1} pattern {2}")){
+            "{0}.{1}: is not defined in the schema and the schema does not allow additional properties"), AdditionalPropertiesValidator.class),
+    ALL_OF("allOf", "1002", new MessageFormat("{0}: should be valid to all the schemas {1}"), AllOfValidator.class),
+    ANY_OF("anyOf", "1003", new MessageFormat("{0}: should be valid to any of the schemas {1}"), AnyOfValidator.class),
+    CROSS_EDITS("crossEdits", "1004", new MessageFormat("{0}: has an error with 'cross edits'"), null),
+    DEPENDENCIES("dependencies", "1007", new MessageFormat("{0}: has an error with dependencies {1}"), DependenciesValidator.class),
+    EDITS("edits", "1005", new MessageFormat("{0}: has an error with 'edits'"), null),
+    ENUM("enum", "1008", new MessageFormat("{0}: does not have a value in the enumeration {1}"), EnumValidator.class),
+    FORMAT("format", "1009", new MessageFormat("{0}: does not match the {1} pattern {2}"), null){
         @Override
         public JsonValidator newValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext)
                 throws Exception {
             throw new UnsupportedOperationException("Use FormatKeyword instead");
         }
     },
-    ITEMS("items", "1010", new MessageFormat("{0}[{1}]: no validator found at this index")),
-    MAXIMUM("maximum", "1011", new MessageFormat("{0}: must have a maximum value of {1}")),
-    MAX_ITEMS("maxItems", "1012", new MessageFormat("{0}: there must be a maximum of {1} items in the array")),
-    MAX_LENGTH("maxLength", "1013", new MessageFormat("{0}: may only be {1} characters long")),
-    MAX_PROPERTIES("maxProperties", "1014", new MessageFormat("{0}: may only have a maximum of {1} properties")),
-    MINIMUM("minimum", "1015", new MessageFormat("{0}: must have a minimum value of {1}")),
-    MIN_ITEMS("minItems", "1016", new MessageFormat("{0}: there must be a minimum of {1} items in the array")),
-    MIN_LENGTH("minLength", "1017", new MessageFormat("{0}: must be at least {1} characters long")),
-    MIN_PROPERTIES("minProperties", "1018", new MessageFormat("{0}: should have a minimum of {1} properties")),
-    MULTIPLE_OF("multipleOf", "1019", new MessageFormat("{0}: must be multiple of {1}")),
-    NOT_ALLOWED("notAllowed", "1033", new MessageFormat("{0}.{1}: is not allowed but it is in the data")),
-    NOT("not", "1020", new MessageFormat("{0}: should not be valid to the schema {1}")),
-    ONE_OF("oneOf", "1022", new MessageFormat("{0}: should be valid to one and only one of the schemas {1}")),
-    PATTERN_PROPERTIES("patternProperties", "1024", new MessageFormat("{0}: has some error with 'pattern properties'")),
-    PATTERN("pattern", "1023", new MessageFormat("{0}: does not match the regex pattern {1}")),
-    PROPERTIES("properties", "1025", new MessageFormat("{0}: has an error with 'properties'")),
-    READ_ONLY("readOnly", "1032", new MessageFormat("{0}: is a readonly field, it cannot be changed")),
-    REF("$ref", "1026", new MessageFormat("{0}: has an error with 'refs'")),
-    REQUIRED("required", "1028", new MessageFormat("{0}.{1}: is missing but it is required")),
-    TYPE("type", "1029", new MessageFormat("{0}: {1} found, {2} expected")),
-    UNION_TYPE("unionType", "1030", new MessageFormat("{0}: {1} found, but {2} is required")),
-    UNIQUE_ITEMS("uniqueItems", "1031", new MessageFormat("{0}: the items in the array must be unique")),
-    DATETIME("date-time", "1034", new MessageFormat("{0}: {1} is an invalid {2}")),
-    UUID("uuid", "1035", new MessageFormat("{0}: {1} is an invalid {2}")),
-    ID("id", "1036", new MessageFormat("{0}: {1} is an invalid segment for URI {2}"));
-
-	private static Map<String, ValidatorTypeCode> constants = new HashMap<String, ValidatorTypeCode>();
+    ITEMS("items", "1010", new MessageFormat("{0}[{1}]: no validator found at this index"), ItemsValidator.class),
+    MAXIMUM("maximum", "1011", new MessageFormat("{0}: must have a maximum value of {1}"), MaximumValidator.class),
+    MAX_ITEMS("maxItems", "1012", new MessageFormat("{0}: there must be a maximum of {1} items in the array"), MaxItemsValidator.class),
+    MAX_LENGTH("maxLength", "1013", new MessageFormat("{0}: may only be {1} characters long"), MaxLengthValidator.class),
+    MAX_PROPERTIES("maxProperties", "1014", new MessageFormat("{0}: may only have a maximum of {1} properties"), MaxPropertiesValidator.class),
+    MINIMUM("minimum", "1015", new MessageFormat("{0}: must have a minimum value of {1}"), MinimumValidator.class),
+    MIN_ITEMS("minItems", "1016", new MessageFormat("{0}: there must be a minimum of {1} items in the array"), MinItemsValidator.class),
+    MIN_LENGTH("minLength", "1017", new MessageFormat("{0}: must be at least {1} characters long"), MinLengthValidator.class),
+    MIN_PROPERTIES("minProperties", "1018", new MessageFormat("{0}: should have a minimum of {1} properties"), MinPropertiesValidator.class),
+    MULTIPLE_OF("multipleOf", "1019", new MessageFormat("{0}: must be multiple of {1}"), MultipleOfValidator.class),
+    NOT_ALLOWED("notAllowed", "1033", new MessageFormat("{0}.{1}: is not allowed but it is in the data"), NotAllowedValidator.class),
+    NOT("not", "1020", new MessageFormat("{0}: should not be valid to the schema {1}"), NotValidator.class),
+    ONE_OF("oneOf", "1022", new MessageFormat("{0}: should be valid to one and only one of the schemas {1}"), OneOfValidator.class),
+    PATTERN_PROPERTIES("patternProperties", "1024", new MessageFormat("{0}: has some error with 'pattern properties'"), PatternPropertiesValidator.class),
+    PATTERN("pattern", "1023", new MessageFormat("{0}: does not match the regex pattern {1}"), PatternValidator.class),
+    PROPERTIES("properties", "1025", new MessageFormat("{0}: has an error with 'properties'"), PropertiesValidator.class),
+    READ_ONLY("readOnly", "1032", new MessageFormat("{0}: is a readonly field, it cannot be changed"), ReadOnlyValidator.class),
+    REF("$ref", "1026", new MessageFormat("{0}: has an error with 'refs'"), RefValidator.class),
+    REQUIRED("required", "1028", new MessageFormat("{0}.{1}: is missing but it is required"), RequiredValidator.class),
+    TYPE("type", "1029", new MessageFormat("{0}: {1} found, {2} expected"), TypeValidator.class),
+    UNION_TYPE("unionType", "1030", new MessageFormat("{0}: {1} found, but {2} is required"), UnionTypeValidator.class),
+    UNIQUE_ITEMS("uniqueItems", "1031", new MessageFormat("{0}: the items in the array must be unique"), UniqueItemsValidator.class),
+    DATETIME("date-time", "1034", new MessageFormat("{0}: {1} is an invalid {2}"), null),
+    UUID("uuid", "1035", new MessageFormat("{0}: {1} is an invalid {2}"), null),
+    ID("id", "1036", new MessageFormat("{0}: {1} is an invalid segment for URI {2}"), null);
+
+    private static Map<String, ValidatorTypeCode> constants = new HashMap<String, ValidatorTypeCode>();
 
     static {
         for (ValidatorTypeCode c : values()) {
@@ -79,12 +79,14 @@ public JsonValidator newValidator(String schemaPath, JsonNode schemaNode, JsonSc
     private final String errorCode;
     private final MessageFormat messageFormat;
     private final String errorCodeKey;
+    private final Class validator;
 
-    private ValidatorTypeCode(String value, String errorCode, MessageFormat messageFormat) {
+    private ValidatorTypeCode(String value, String errorCode, MessageFormat messageFormat, Class validator) {
         this.value = value;
         this.errorCode = errorCode;
         this.messageFormat = messageFormat;
         this.errorCodeKey = value + "ErrorCode";
+        this.validator = validator;
     }
 
     public static List<ValidatorTypeCode> getNonFormatKeywords() {
@@ -107,21 +109,13 @@ public static ValidatorTypeCode fromValue(String value) {
     }
 
     public JsonValidator newValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext) throws Exception {
-            String shortClassName = getValue();
-            if (shortClassName.startsWith("$")) {
-                // remove "$" from class name for $ref schema
-                shortClassName = shortClassName.substring(1);
-            }
-
-            final String className = Character.toUpperCase(shortClassName.charAt(0)) + shortClassName.substring(1)
-                    + "Validator";
-            @SuppressWarnings("unchecked")
-            final Class<JsonValidator> clazz = (Class<JsonValidator>) Class
-                    .forName("com.networknt.schema." + className);
-            Constructor<JsonValidator> c = null;
-            c = clazz.getConstructor(
-                    new Class[] { String.class, JsonNode.class, JsonSchema.class, ValidationContext.class });
-            return c.newInstance(schemaPath + "/" + getValue(), schemaNode, parentSchema, validationContext);
+        if (validator == null) {
+            throw new UnsupportedOperationException("No suitable validator for " + getValue());
+        }
+        @SuppressWarnings("unchecked")
+        Constructor<JsonValidator> c = ((Class<JsonValidator>) validator).getConstructor(
+                new Class[] { String.class, JsonNode.class, JsonSchema.class, ValidationContext.class });
+        return c.newInstance(schemaPath + "/" + getValue(), schemaNode, parentSchema, validationContext);
     }
 
     @Override