Remove special handling of type in anyOf

Author: justin-tay

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

@@ -69,7 +69,6 @@ public class Schema implements Validator {
 
     private boolean validatorsLoaded = false;
     private boolean recursiveAnchor = false;
-    private TypeValidator typeValidator = null;
 
     protected final JsonNode schemaNode;
     protected final Schema parentSchema;
@@ -263,7 +262,6 @@ private Schema(SchemaContext schemaContext, SchemaLocation schemaLocation,
      * @param validators the validators
      * @param validatorsLoaded whether the validators are preloaded
      * @param recursiveAnchor whether this is has a recursive anchor
-     * @param typeValidator the type validator
      * @param id the id
      * @param suppressSubSchemaRetrieval to suppress sub schema retrieval
      * @param schemaNode the schema node
@@ -287,7 +285,6 @@ protected Schema(
         this.validators = validators;
         this.validatorsLoaded = validatorsLoaded;
         this.recursiveAnchor = recursiveAnchor;
-        this.typeValidator = typeValidator;
         this.id = id;
 
         this.schemaContext = schemaContext;
@@ -559,10 +556,6 @@ private List<KeywordValidator> read(JsonNode schemaNode) {
 
                     if ("$ref".equals(pname)) {
                         refValidator = validator;
-                    } else if ("type".equals(pname)) {
-                        if (validator instanceof TypeValidator) {
-                            this.typeValidator = (TypeValidator) validator;
-                        }
                     }
                 }
 
@@ -594,6 +587,9 @@ private List<KeywordValidator> read(JsonNode schemaNode) {
         if (lhsName.equals("discriminator")) return -1;
         if (rhsName.equals("discriminator")) return 1;
 
+        if (lhsName.equals("type")) return -1;
+        if (rhsName.equals("type")) return 1;
+
         if (lhsName.equals("properties")) return -1;
         if (rhsName.equals("properties")) return 1;
         if (lhsName.equals("patternProperties")) return -1;
@@ -1566,19 +1562,6 @@ public String toString() {
         return getSchemaNode().toString();
     }
 
-    public boolean hasTypeValidator() {
-        return getTypeValidator() != null;
-    }
-
-    public TypeValidator getTypeValidator() {
-        // As the validators are lazy loaded the typeValidator is only known if the
-        // validators are not null
-        if (this.validators == null) {
-            getValidators();
-        }
-        return this.typeValidator;
-    }
-
     public List<KeywordValidator> getValidators() {
         if (this.validators == null) {
             this.validators = Collections.unmodifiableList(read(getSchemaNode()));

src/main/java/com/networknt/schema/keyword/AnyOfValidator.java

@@ -75,29 +75,6 @@ protected void validate(ExecutionContext executionContext, JsonNode node, JsonNo
             executionContext.setFailFast(false);
             for (Schema schema : this.schemas) {
                 subSchemaErrors.clear(); // Reuse and clear for each run
-                TypeValidator typeValidator = schema.getTypeValidator();
-                if (typeValidator != null) {
-                    // If schema has type validator and node type doesn't match with schemaType then
-                    // ignore it
-                    // For union type, it is a must to call TypeValidator
-                    executionContext.evaluationPathAddLast(schemaIndex);
-                    executionContext.evaluationPathAddLast("type");
-                    try {
-                        
-                        if (typeValidator.getSchemaType() != JsonType.UNION && !typeValidator.equalsToSchemaType(node, executionContext)) {
-                            typeValidator.validate(executionContext, node, rootNode, instanceLocation);
-                            if (allErrors == null) {
-                                allErrors = new ArrayList<>();
-                            }
-                            allErrors.addAll(subSchemaErrors);
-                            schemaIndex++;
-                            continue;
-                        }
-                    } finally {
-                        executionContext.evaluationPathRemoveLast();
-                        executionContext.evaluationPathRemoveLast();
-                    }
-                }
                 executionContext.evaluationPathAddLast(schemaIndex);
                 try {
                     if (!walk) {