Clean

Author: justin-tay

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

@@ -134,13 +134,10 @@ protected boolean hasAdjacentKeywordInEvaluationPath(ExecutionContext executionC
         Iterator<Schema> evaluationSchemaIterator = executionContext.getEvaluationSchema().descendingIterator();
         boolean stop = false;
 
-//        ArrayDeque<Object> current = executionContext.getEvaluationSchemaPath().clone();
-//
         // Skip the first as this is the path pointing to the current keyword eg. properties eg /$ref/properties
         // What is needed is the evaluationPath pointing to the current evaluationSchema eg /$ref
         if (evaluationSchemaPathIterator.hasNext()) {
             evaluationSchemaPathIterator.next(); 
-//            current.removeLast();
         }
 
         while (evaluationSchemaIterator.hasNext()) {
@@ -149,24 +146,11 @@ protected boolean hasAdjacentKeywordInEvaluationPath(ExecutionContext executionC
             if (hasKeyword) {
                 return true;
             }
-//            for (KeywordValidator validator : schema.getValidators()) {
-//                if (keyword.equals(validator.getKeyword())) {
-//                    return true;
-//                }
-//            }
-//            String newPath = new EvaluationPath(current).toString();
-//            String oldPath = schema.getEvaluationPath().toString(); 
-//            if (!oldPath.equals(newPath)) {
-//                System.out.println("OLD: "+oldPath);
-//                System.out.println("NEW: "+newPath);
-//            }
-
             if (stop) {
                 return false;
             }
             if (evaluationSchemaPathIterator.hasNext()) {
                 Object evaluationPath = evaluationSchemaPathIterator.next();
-//                current.removeLast();
                 if ("properties".equals(evaluationPath) || "items".equals(evaluationPath)) {
                     // If there is a change in instance location then after the next schema
                     // stop

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

@@ -78,13 +78,6 @@ static Schema getSchema(Schema parentSchema, ExecutionContext executionContext)
     @Override
     public void validate(ExecutionContext executionContext, JsonNode node, JsonNode rootNode, NodePath instanceLocation) {
         Schema refSchema = getSchemaRef(executionContext).getSchema();
-        /*
-        Schema check = getSchema(this.parentSchema, executionContext);
-        if (refSchema != null && !refSchema.getSchemaLocation().equals(check.getSchemaLocation())) {
-            System.out.println(check);
-            System.out.println(refSchema);
-        }
-        */
         if (refSchema == null) {
             Error error = error().keyword(KeywordType.RECURSIVE_REF.getValue())
                     .messageKey("internal.unresolvedRef").message("Reference {0} cannot be resolved")

src/main/java/com/networknt/schema/utils/JsonNodeTypes.java

@@ -50,7 +50,7 @@ public static boolean equalsToSchemaType(JsonNode node, JsonType schemaType, Sch
 
             // Skip the type validation when the schema is an enum object schema. Since the current type
             // of node itself can be used for type validation.
-            if (isEnumObjectSchema(parentSchema, executionContext) && !config.isStrict("type", Boolean.TRUE)) {
+            if (!config.isStrict("type", Boolean.TRUE) && isEnumObjectSchema(parentSchema, executionContext)) {
                 return true;
             }
             if (config != null && config.isTypeLoose()) {