removed FormatValidator#v4Defaults(), replacing with SpecificationVersion#defaultFormatValidators()

Author: erosb

core/src/main/java/org/everit/json/schema/FormatValidator.java

@@ -1,10 +1,7 @@
 package org.everit.json.schema;
 
-import static java.util.Collections.unmodifiableMap;
 import static java.util.Objects.requireNonNull;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Optional;
 
 import org.everit.json.schema.internal.DateTimeFormatValidator;
@@ -21,17 +18,6 @@
 @FunctionalInterface
 public interface FormatValidator {
 
-    static Map<String, FormatValidator> v4Defaults() {
-        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);
-    }
-
     /**
      * No-operation implementation (never throws {always returns {@link Optional#empty()}).
      */

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

@@ -1,11 +1,10 @@
 package org.everit.json.schema.loader;
 
-import org.everit.json.schema.ArraySchema;
-import org.everit.json.schema.FormatValidator;
-
 import static java.util.Objects.requireNonNull;
 import static org.everit.json.schema.loader.SpecificationVersion.DRAFT_6;
 
+import org.everit.json.schema.ArraySchema;
+
 /**
  * @author erosb
  */
@@ -19,7 +18,7 @@ class ArraySchemaLoader {
 
     /**
      * Creates an instance configured with with {@link SpecificationVersion#DRAFT_4 draft 4 settings} and
-     * {@link FormatValidator#v4Defaults() default v4 format validators}.
+     * {@link SpecificationVersion#defaultFormatValidators()}  default v4 format validators}.
      *
      * @deprecated use {@link #ArraySchemaLoader(LoadingState, LoaderConfig, SchemaLoader)} instead.
      */

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

@@ -1,20 +1,20 @@
 package org.everit.json.schema.loader;
 
-import org.everit.json.schema.FormatValidator;
-import org.everit.json.schema.loader.internal.DefaultSchemaClient;
+import static java.util.Objects.requireNonNull;
+import static org.everit.json.schema.loader.SpecificationVersion.DRAFT_4;
 
 import java.util.Map;
 
-import static java.util.Objects.requireNonNull;
-import static org.everit.json.schema.FormatValidator.v4Defaults;
+import org.everit.json.schema.FormatValidator;
+import org.everit.json.schema.loader.internal.DefaultSchemaClient;
 
 /**
  * @author erosb
  */
 class LoaderConfig {
 
     static LoaderConfig defaultV4Config() {
-        return new LoaderConfig(new DefaultSchemaClient(), v4Defaults(), SpecificationVersion.DRAFT_4);
+        return new LoaderConfig(new DefaultSchemaClient(), DRAFT_4.defaultFormatValidators(), DRAFT_4);
     }
 
     final SchemaClient httpClient;

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

@@ -3,7 +3,6 @@
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
 import static java.util.Objects.requireNonNull;
-import static org.everit.json.schema.FormatValidator.v4Defaults;
 import static org.everit.json.schema.loader.SpecificationVersion.DRAFT_4;
 import static org.everit.json.schema.loader.SpecificationVersion.DRAFT_6;
 
@@ -66,7 +65,7 @@ public static class SchemaLoaderBuilder {
 
         List<String> pointerToCurrentObj = emptyList();
 
-        Map<String, FormatValidator> formatValidators = new HashMap<>(v4Defaults());
+        Map<String, FormatValidator> formatValidators = new HashMap<>(DRAFT_4.defaultFormatValidators());
 
         SpecificationVersion specVersion = DRAFT_4;
 

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

@@ -1,19 +1,29 @@
 package org.everit.json.schema.loader;
 
-import java.util.Arrays;
-import java.util.List;
-
 import static java.lang.String.format;
 import static java.util.Arrays.asList;
+import static java.util.Collections.unmodifiableMap;
 import static org.apache.commons.collections.ListUtils.unmodifiableList;
 
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.everit.json.schema.FormatValidator;
+import org.everit.json.schema.internal.DateTimeFormatValidator;
+import org.everit.json.schema.internal.EmailFormatValidator;
+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.URIFormatValidator;
+
 /**
  * @author erosb
  */
 enum SpecificationVersion {
 
     DRAFT_4 {
-
         @Override List<String> arrayKeywords() {
             return V4_ARRAY_KEYWORDS;
         }
@@ -30,6 +40,17 @@ enum SpecificationVersion {
             return "http://json-schema.org/draft-04/schema";
         }
 
+        @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);
+        }
+
     }, DRAFT_6 {
         @Override List<String> arrayKeywords() {
             return V6_ARRAY_KEYWORDS;
@@ -47,6 +68,10 @@ enum SpecificationVersion {
             return "http://json-schema.org/draft-06/schema";
         }
 
+        @Override Map<String, FormatValidator> defaultFormatValidators() {
+            throw new UnsupportedOperationException();
+        }
+
     };
 
     static SpecificationVersion getByMetaSchemaUrl(String metaSchemaUrl) {
@@ -91,4 +116,6 @@ private static final List<String> keywords(String... keywords) {
 
     abstract String metaSchemaUrl();
 
+    abstract Map<String, FormatValidator> defaultFormatValidators();
+
 }

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

@@ -1,12 +1,13 @@
 package org.everit.json.schema.loader;
 
-import org.everit.json.schema.FormatValidator;
-import org.everit.json.schema.StringSchema;
+import static java.util.Collections.unmodifiableMap;
+import static java.util.Objects.requireNonNull;
+import static org.everit.json.schema.loader.SpecificationVersion.DRAFT_4;
 
 import java.util.Map;
 
-import static java.util.Collections.unmodifiableMap;
-import static java.util.Objects.requireNonNull;
+import org.everit.json.schema.FormatValidator;
+import org.everit.json.schema.StringSchema;
 
 /**
  * @author erosb
@@ -18,13 +19,13 @@ public class StringSchemaLoader {
     private Map<String, FormatValidator> formatValidators;
 
     /**
-     * Creates an instance with {@link FormatValidator#v4Defaults() draft v4 format validators}.
+     * Creates an instance with {@link SpecificationVersion#defaultFormatValidators()}  draft v4 format validators}.
      *
      * @deprecated explicitly specify the format validators with {@link #StringSchemaLoader(LoadingState, Map)} instead
      */
     @Deprecated
     public StringSchemaLoader(LoadingState ls) {
-        this(ls, FormatValidator.v4Defaults());
+        this(ls, DRAFT_4.defaultFormatValidators());
     }
 
     StringSchemaLoader(LoadingState ls, Map<String, FormatValidator> formatValidators) {