Merge branch 'master' of https://github.com/everit-org/json-schema

Author: erosb

core/src/main/java/org/everit/json/schema/internal/URIV4FormatValidator.java

@@ -0,0 +1,27 @@
+package org.everit.json.schema.internal;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Optional;
+import org.everit.json.schema.FormatValidator;
+
+public class URIV4FormatValidator implements FormatValidator {
+
+    @Override
+    public Optional<String> validate(final String subject) {
+        try {
+            URI uri = new URI(subject);
+            return Optional.empty();
+        } catch (URISyntaxException | NullPointerException e) {
+            return failure(subject);
+        }
+    }
+
+    protected Optional<String> failure(String subject) {
+        return Optional.of(String.format("[%s] is not a valid URI", subject));
+    }
+
+    @Override public String formatName() {
+        return "uri";
+    }
+}

core/src/main/java/org/everit/json/schema/loader/SpecificationVersion.java

@@ -20,6 +20,7 @@
 import org.everit.json.schema.internal.URIFormatValidator;
 import org.everit.json.schema.internal.URIReferenceFormatValidator;
 import org.everit.json.schema.internal.URITemplateFormatValidator;
+import org.everit.json.schema.internal.URIV4FormatValidator;
 
 /**
  * @author erosb
@@ -109,7 +110,7 @@ private static final List<String> keywords(String... keywords) {
     static {
         Map<String, FormatValidator> formatValidators = new HashMap<>();
         formatValidators.put("date-time", new DateTimeFormatValidator());
-        formatValidators.put("uri", new URIFormatValidator());
+        formatValidators.put("uri", new URIV4FormatValidator());
         formatValidators.put("email", new EmailFormatValidator());
         formatValidators.put("ipv4", new IPV4Validator());
         formatValidators.put("ipv6", new IPV6Validator());
@@ -122,6 +123,7 @@ private static final List<String> keywords(String... keywords) {
     static {
         Map<String, FormatValidator> v6Validators = new HashMap<>(V4_VALIDATORS);
         v6Validators.put("json-pointer", new JsonPointerFormatValidator());
+        v6Validators.put("uri", new URIFormatValidator());
         v6Validators.put("uri-reference", new URIReferenceFormatValidator());
         v6Validators.put("uri-template", new URITemplateFormatValidator());
         V6_VALIDATORS = unmodifiableMap(v6Validators);

core/src/test/java/org/everit/json/schema/internal/DefaultFormatValidatorTest.java

@@ -183,9 +183,14 @@ public void uriFailure() {
     }
 
     @Test
-    public void relativeURIRefFails() {
+    public void relativeURIRefFailsInDraft6() {
         assertFailure("abc", new URIFormatValidator(), "[abc] is not a valid URI");
     }
+
+    @Test
+    public void relativeURIRefSucceedsInDraft4() {
+        assertSuccess("abc", new URIV4FormatValidator());
+    }
     //
     //    @Test
     //    public void protocolRelativeUriSuccess() {

core/src/test/java/org/everit/json/schema/loader/SchemaLoaderTest.java

@@ -4,6 +4,7 @@
 import static org.everit.json.schema.TestSupport.asStream;
 import static org.everit.json.schema.TestSupport.loadAsV6;
 import static org.everit.json.schema.TestSupport.v6Loader;
+import org.everit.json.schema.internal.URIV4FormatValidator;
 import static org.everit.json.schema.loader.SpecificationVersion.DRAFT_6;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -70,7 +71,7 @@ public void booleanSchema() {
     public void builderhasDefaultFormatValidators() {
         SchemaLoader actual = SchemaLoader.builder().schemaJson(get("booleanSchema")).build();
         assertTrue(actual.getFormatValidator("date-time").get() instanceof DateTimeFormatValidator);
-        assertTrue(actual.getFormatValidator("uri").get() instanceof URIFormatValidator);
+        assertTrue(actual.getFormatValidator("uri").get() instanceof URIV4FormatValidator);
         assertTrue(actual.getFormatValidator("email").get() instanceof EmailFormatValidator);
         assertTrue(actual.getFormatValidator("ipv4").get() instanceof IPV4Validator);
         assertTrue(actual.getFormatValidator("ipv6").get() instanceof IPV6Validator);

tests/src/test/resources/org/everit/json/schema/draft4/format.json

@@ -45,8 +45,8 @@
       },
       {
         "data": "abc",
-        "description": "an invalid URI though valid URI reference",
-        "valid": false
+        "description": "a URI that actually is a valid URI reference",
+        "valid": true
       }
     ]
   },