Clean

Author: justin-tay

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

@@ -57,12 +57,9 @@ public UnionTypeValidator(SchemaLocation schemaLocation, JsonNode schemaNode, Sc
             sep = ", ";
 
             if (n.isObject()) {
-                // TODO: Check if the evaluation path is really as follows... 
-                schemas.add(schemaContext.newSchema(schemaLocation.append(KeywordType.TYPE.getValue()),
-                        n, parentSchema));
+                schemas.add(schemaContext.newSchema(schemaLocation.append(i), n, parentSchema));
             } else {
-                schemas.add(new TypeValidator(schemaLocation.append(i), n, parentSchema,
-                        schemaContext));
+                schemas.add(new TypeValidator(schemaLocation.append(i), n, parentSchema, schemaContext));
             }
             i++;
         }

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

@@ -17,7 +17,7 @@ public class JsonNodeTypes {
 
     public static boolean isNodeNullable(JsonNode schema){
         JsonNode nullable = schema.get(NULLABLE);
-	    return nullable != null && nullable.asBoolean();
+        return nullable != null && nullable.asBoolean();
     }
 
     public static boolean equalsToSchemaType(JsonNode node, JsonType schemaType, Schema parentSchema, SchemaContext schemaContext, ExecutionContext executionContext) {
@@ -53,18 +53,18 @@ public static boolean equalsToSchemaType(JsonNode node, JsonType schemaType, Sch
             if (!config.isStrict("type", Boolean.TRUE) && isEnumObjectSchema(parentSchema, executionContext)) {
                 return true;
             }
-            if (config != null && config.isTypeLoose()) {
+            if (config.isTypeLoose()) {
                 // if typeLoose is true, everything can be a size 1 array
                 if (schemaType == JsonType.ARRAY) {
                     return true;
                 }
                 if (nodeType == JsonType.STRING) {
                     if (schemaType == JsonType.INTEGER) {
-	                    return Strings.isInteger(node.textValue());
+                        return Strings.isInteger(node.textValue());
                     } else if (schemaType == JsonType.BOOLEAN) {
-	                    return Strings.isBoolean(node.textValue());
+                        return Strings.isBoolean(node.textValue());
                     } else if (schemaType == JsonType.NUMBER) {
-	                    return Strings.isNumeric(node.textValue());
+                        return Strings.isNumeric(node.textValue());
                     }
                 }
             }

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

@@ -18,30 +18,17 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.networknt.schema.serialization.JsonMapperFactory;
-
 class Issue1091Test {
     @Test
     @Disabled // Disabled as this test takes quite long to run for ci
     void testHasAdjacentKeywordInEvaluationPath() throws Exception {
-        SchemaRegistryConfig config = SchemaRegistryConfig.builder().cacheRefs(false).build();
-
-        Schema schema = SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_4, builder -> builder.schemaRegistryConfig(config))
+        Schema schema = SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_4)
                 .getSchema(SchemaLocation.of("classpath:schema/issue1091.json"));
-        JsonNode node = JsonMapperFactory.getInstance()
-                .readTree(Issue1091Test.class.getClassLoader().getResource("data/issue1091.json"));
-
-        List<String> messages = schema.validate(node)
-                .stream()
-                .map(Error::getMessage)
-                .collect(Collectors.toList());
-
-        assertEquals(0, messages.size());
+        List<Error> errors = schema.validate(AbsoluteIri.of("classpath:data/issue1091.json"), InputFormat.JSON);
+        assertEquals(0, errors.size());
     }
 }

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

@@ -135,8 +135,8 @@ void annotation() {
                 + "}";
         OutputUnit outputUnit = schema.validate(inputData, InputFormat.JSON, OutputFormat.HIERARCHICAL, executionContext -> {
             executionContext.executionConfig(executionConfig -> executionConfig
-					.annotationCollectionEnabled(true).annotationCollectionFilter(keyword -> true));
-		});
+                    .annotationCollectionEnabled(true).annotationCollectionFilter(keyword -> true));
+        });
         Set<String> patternProperties = (Set<String>) outputUnit.getAnnotations().get("patternProperties");
         assertTrue(patternProperties.isEmpty());
 
@@ -146,12 +146,12 @@ void annotation() {
                 + "}";
         outputUnit = schema.validate(inputData, InputFormat.JSON, OutputFormat.HIERARCHICAL, executionContext -> {
             executionContext.executionConfig(executionConfig -> executionConfig
-					.annotationCollectionEnabled(true).annotationCollectionFilter(keyword -> true));
-		});
+                    .annotationCollectionEnabled(true).annotationCollectionFilter(keyword -> true));
+        });
         patternProperties = (Set<String>) outputUnit.getAnnotations().get("patternProperties");
         Set<String> all = new HashSet<>();
         all.add("valid_array");
         all.add("valid_string");
-        assertTrue(patternProperties.containsAll(patternProperties));
+        assertTrue(patternProperties.containsAll(all));
     }
 }