diff --git a/pom.xml b/pom.xml index 2721b9bb3..d1e126de8 100644 --- a/pom.xml +++ b/pom.xml @@ -19,8 +19,7 @@ 4.0.0 com.networknt json-schema-validator - 1.0.29 - bundle + 1.0.30-SNAPSHOT A json schema validator that supports draft v4, v6, v7 and v2019-09 https://github.com/networknt/json-schema-validator JsonSchemaValidator @@ -58,8 +57,8 @@ - 1.8 - 1.8 + 1.7 + 1.7 UTF-8 2.10.0 1.7.25 @@ -68,7 +67,7 @@ 4.12 2.7.21 1.3 - 2.0.28.Final + 1.4.28.Final @@ -139,12 +138,7 @@ - - org.apache.felix - maven-bundle-plugin - 4.2.1 - true - + org.sonatype.plugins nexus-staging-maven-plugin @@ -219,142 +213,7 @@ - - - org.jacoco - jacoco-maven-plugin - 0.7.9 - - - pre-unit-test - - prepare-agent - - - ${project.build.directory}/coverage-reports/jacoco-ut.exec - - - - post-unit-test - test - - report - - - ${project.build.directory}/coverage-reports/jacoco-ut.exec - ${project.reporting.outputDirectory}/jacoco-ut - - - - - - pre-integration-test - pre-integration-test - - prepare-agent - - - ${project.build.directory}/coverage-reports/jacoco-it.exec - - - - post-integration-test - post-integration-test - - report - - - ${project.build.directory}/coverage-reports/jacoco-it.exec - ${project.reporting.outputDirectory}/jacoco-it - - - - - - + - - - - org.apache.maven.plugins - maven-surefire-report-plugin - 2.19.1 - - - - - - dev - - - - org.jacoco - jacoco-maven-plugin - ${version.jacoco} - - - - merge-results - verify - - merge - - - - - ${project.build.directory}/coverage-reports - - *.exec - - - - ${project.build.directory}/coverage-reports/aggregate.exec - - - - post-merge-report - verify - - report - - - ${project.build.directory}/coverage-reports/aggregate.exec - ${project.reporting.outputDirectory}/jacoco-aggregate - - - - - - - - - - release-sign-artifacts - - - performRelease - true - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - - - - - diff --git a/src/main/java/com/networknt/schema/ExclusiveMinimumValidator.java b/src/main/java/com/networknt/schema/ExclusiveMinimumValidator.java index 2c9323e02..d9c4447fd 100644 --- a/src/main/java/com/networknt/schema/ExclusiveMinimumValidator.java +++ b/src/main/java/com/networknt/schema/ExclusiveMinimumValidator.java @@ -34,7 +34,7 @@ public class ExclusiveMinimumValidator extends BaseJsonValidator implements Json */ private final ThresholdMixin typedMinimum; - public ExclusiveMinimumValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext) { + public ExclusiveMinimumValidator(String schemaPath, final JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext) { super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.EXCLUSIVE_MINIMUM, validationContext); if (!schemaNode.isNumber()) { diff --git a/src/main/java/com/networknt/schema/JsonSchemaFactory.java b/src/main/java/com/networknt/schema/JsonSchemaFactory.java index 6987ec467..c9f0b3a39 100644 --- a/src/main/java/com/networknt/schema/JsonSchemaFactory.java +++ b/src/main/java/com/networknt/schema/JsonSchemaFactory.java @@ -313,7 +313,11 @@ public JsonSchema getSchema(final URI schemaUri, final SchemaValidatorsConfig co final URI mappedUri; try { - mappedUri = this.uriFactory.create(map.getOrDefault(schemaUri.toString(), schemaUri.toString())); + String uriString = schemaUri.toString(); + if (map.containsKey(uriString)) { + uriString = map.get(uriString); + } + mappedUri = this.uriFactory.create(uriString); } catch (IllegalArgumentException e) { logger.error("Failed to create URI.", e); throw new JsonSchemaException(e); diff --git a/src/main/java/com/networknt/schema/MinimumValidator.java b/src/main/java/com/networknt/schema/MinimumValidator.java index 15a16d097..5a7761595 100644 --- a/src/main/java/com/networknt/schema/MinimumValidator.java +++ b/src/main/java/com/networknt/schema/MinimumValidator.java @@ -37,7 +37,7 @@ public class MinimumValidator extends BaseJsonValidator implements JsonValidator */ private final ThresholdMixin typedMinimum; - public MinimumValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext) { + public MinimumValidator(String schemaPath, final JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext) { super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.MINIMUM, validationContext); if (!schemaNode.isNumber()) { diff --git a/src/test/java/com/networknt/schema/MaximumValidatorPerfTest.java b/src/test/java/com/networknt/schema/MaximumValidatorPerfTest.java index 338756e56..57f0db363 100644 --- a/src/test/java/com/networknt/schema/MaximumValidatorPerfTest.java +++ b/src/test/java/com/networknt/schema/MaximumValidatorPerfTest.java @@ -14,8 +14,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; - import static org.junit.Assert.assertTrue; @Ignore @@ -47,7 +45,11 @@ public List getTestMethods(String[] methodNames) { List testMethods = new ArrayList(); if(methodNames.length > 0) { for(String name : methodNames) { - testMethods.addAll(Arrays.stream(methods).filter(m -> m.getName().equals(name)).collect(Collectors.toList())); + for (Method method: methods) { + if (method.getName().equals(name)) { + testMethods.add(method); + } + } } return testMethods; } diff --git a/src/test/java/com/networknt/schema/MaximumValidatorTest.java b/src/test/java/com/networknt/schema/MaximumValidatorTest.java index 1f0a1c2ab..8f1986f57 100644 --- a/src/test/java/com/networknt/schema/MaximumValidatorTest.java +++ b/src/test/java/com/networknt/schema/MaximumValidatorTest.java @@ -23,9 +23,8 @@ import java.io.IOException; import java.math.BigDecimal; -import java.util.Arrays; +import java.util.ArrayList; import java.util.Set; -import java.util.stream.Stream; import static java.lang.String.format; import static org.junit.Assert.assertFalse; @@ -46,9 +45,12 @@ public class MaximumValidatorTest extends BaseJsonSchemaValidatorTest { private static ObjectMapper bigIntegerMapper = new ObjectMapper().enable(DeserializationFeature.USE_BIG_INTEGER_FOR_INTS); static String[][] augmentWithQuotes(String[][] values) { - return Arrays.stream(values) - .flatMap(pair -> Stream.of(pair, new String[]{pair[0], format("\"%s\"", pair[1])})) - .toArray(String[][]::new); + ArrayList returnValue = new ArrayList<>(); + for (String[] pair: values) { + returnValue.add(pair); + returnValue.add(new String[]{pair[0], format("\"%s\"", pair[1])}); + } + return returnValue.toArray(new String[returnValue.size()][]); } @Test