stubs for new format validators

Author: erosb

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

@@ -102,6 +102,7 @@ public SchemaLoaderBuilder addFormatValidator(String formatName,
 
         public SchemaLoaderBuilder draftV6Support() {
             this.specVersion = DRAFT_6;
+            this.formatValidators = new HashMap<>(DRAFT_6.defaultFormatValidators());
             return this;
         }
 
@@ -177,13 +178,6 @@ SchemaLoaderBuilder pointerToCurrentObj(List<String> pointerToCurrentObj) {
             return this;
         }
 
-        private SchemaLoaderBuilder config(LoaderConfig config) {
-            this.formatValidators = config.formatValidators;
-            this.httpClient = config.httpClient;
-            this.specVersion = config.specVersion;
-            return this;
-        }
-
     }
 
     private static final List<String> NUMBER_SCHEMA_PROPS = asList("minimum", "maximum",

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

@@ -16,7 +16,10 @@
 import org.everit.json.schema.internal.HostnameFormatValidator;
 import org.everit.json.schema.internal.IPV4Validator;
 import org.everit.json.schema.internal.IPV6Validator;
+import org.everit.json.schema.internal.JsonPointerFormatValidator;
 import org.everit.json.schema.internal.URIFormatValidator;
+import org.everit.json.schema.internal.URIReferenceFormatValidator;
+import org.everit.json.schema.internal.URITemplateFormatValidator;
 
 /**
  * @author erosb
@@ -41,14 +44,7 @@ enum SpecificationVersion {
         }
 
         @Override Map<String, FormatValidator> defaultFormatValidators() {
-            Map<String, FormatValidator> formatValidators = new HashMap<>();
-            formatValidators.put("date-time", new DateTimeFormatValidator());
-            formatValidators.put("uri", new URIFormatValidator());
-            formatValidators.put("email", new EmailFormatValidator());
-            formatValidators.put("ipv4", new IPV4Validator());
-            formatValidators.put("ipv6", new IPV6Validator());
-            formatValidators.put("hostname", new HostnameFormatValidator());
-            return unmodifiableMap(formatValidators);
+            return V4_VALIDATORS;
         }
 
     }, DRAFT_6 {
@@ -69,7 +65,7 @@ enum SpecificationVersion {
         }
 
         @Override Map<String, FormatValidator> defaultFormatValidators() {
-            throw new UnsupportedOperationException();
+            return V6_VALIDATORS;
         }
 
     };
@@ -108,6 +104,29 @@ private static final List<String> keywords(String... keywords) {
         return unmodifiableList(asList(keywords));
     }
 
+    private static final Map<String, FormatValidator> V4_VALIDATORS;
+
+    static {
+        Map<String, FormatValidator> formatValidators = new HashMap<>();
+        formatValidators.put("date-time", new DateTimeFormatValidator());
+        formatValidators.put("uri", new URIFormatValidator());
+        formatValidators.put("email", new EmailFormatValidator());
+        formatValidators.put("ipv4", new IPV4Validator());
+        formatValidators.put("ipv6", new IPV6Validator());
+        formatValidators.put("hostname", new HostnameFormatValidator());
+        V4_VALIDATORS = unmodifiableMap(formatValidators);
+    }
+
+    private static final Map<String, FormatValidator> V6_VALIDATORS;
+
+    static {
+        Map<String, FormatValidator> v6Validators = new HashMap<>(V4_VALIDATORS);
+        v6Validators.put("json-pointer", new JsonPointerFormatValidator());
+        v6Validators.put("uri-reference", new URIReferenceFormatValidator());
+        v6Validators.put("uri-template", new URITemplateFormatValidator());
+        V6_VALIDATORS = unmodifiableMap(v6Validators);
+    }
+
     abstract List<String> arrayKeywords();
 
     abstract List<String> objectKeywords();

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

@@ -15,6 +15,8 @@
  */
 package org.everit.json.schema.internal;
 
+import static org.junit.Assert.assertTrue;
+
 import java.util.Optional;
 
 import org.everit.json.schema.FormatValidator;
@@ -31,7 +33,7 @@ private void assertFailure(final String subject, final FormatValidator format,
             final String expectedFailure) {
         Optional<String> opt = format.validate(subject);
         Assert.assertNotNull("the optional is not null", opt);
-        Assert.assertTrue("failure exists", opt.isPresent());
+        assertTrue("failure exists", opt.isPresent());
         Assert.assertEquals(expectedFailure, opt.get());
     }