implementing "regex" format

Author: erosb

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

@@ -0,0 +1,20 @@
+package org.everit.json.schema.internal;
+
+import java.util.Optional;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
+import org.everit.json.schema.FormatValidator;
+
+public class RegexFormatValidator implements FormatValidator {
+
+    @Override public Optional<String> validate(String subject) {
+        try {
+            Pattern.compile(subject);
+        } catch (PatternSyntaxException e) {
+            return Optional.of(String.format("[%s] is not a valid regular expression", subject));
+        }
+        return Optional.empty();
+    }
+
+}

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

@@ -18,6 +18,7 @@
 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.RegexFormatValidator;
 import org.everit.json.schema.internal.RelativeJsonPointerFormatValidator;
 import org.everit.json.schema.internal.TimeFormatValidator;
 import org.everit.json.schema.internal.URIFormatValidator;
@@ -158,6 +159,7 @@ private static final List<String> keywords(String... keywords) {
         Map<String, FormatValidator> formatValidators = new HashMap<>(V6_VALIDATORS);
         formatValidators.put("date", new DateFormatValidator());
         formatValidators.put("time", new TimeFormatValidator());
+        formatValidators.put("regex", new RegexFormatValidator());
         formatValidators.put("relative-json-pointer", new RelativeJsonPointerFormatValidator());
         V7_VALIDATORS = unmodifiableMap(formatValidators);
     }

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

@@ -89,7 +89,7 @@ public void dateTimeWithNineDigitsInSecFracSuccess() {
     public void dateTimeWithTenDigitsInSecFracFailure() {
         assertFailure("2015-02-28T11:00:00.1234567890Z", new DateTimeFormatValidator(),
                 "[2015-02-28T11:00:00.1234567890Z] is not a valid date-time. " +
-                "Expected [yyyy-MM-dd'T'HH:mm:ssZ, yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,9}Z, yyyy-MM-dd'T'HH:mm:ss[+-]HH:mm, yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,9}[+-]HH:mm]");
+                        "Expected [yyyy-MM-dd'T'HH:mm:ssZ, yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,9}Z, yyyy-MM-dd'T'HH:mm:ss[+-]HH:mm, yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,9}[+-]HH:mm]");
     }
 
     @Test
@@ -117,7 +117,7 @@ public void dateSuccess() {
     public void timeFailure() {
         assertFailure("08:30:06 PST", new TimeFormatValidator(),
                 "[08:30:06 PST] is not a valid time. " +
-                "Expected [HH:mm:ssZ, HH:mm:ss.[0-9]{1,9}Z, HH:mm:ss[+-]HH:mm, HH:mm:ss.[0-9]{1,9}[+-]HH:mm]");
+                        "Expected [HH:mm:ssZ, HH:mm:ss.[0-9]{1,9}Z, HH:mm:ss[+-]HH:mm, HH:mm:ss.[0-9]{1,9}[+-]HH:mm]");
     }
 
     @Test
@@ -179,7 +179,7 @@ public void timeWithNineDigitsInSecFracSuccess() {
     public void timeWithTenDigitsInSecFracFailure() {
         assertFailure("11:00:00.1234567890Z", new TimeFormatValidator(),
                 "[11:00:00.1234567890Z] is not a valid time. " +
-                "Expected [HH:mm:ssZ, HH:mm:ss.[0-9]{1,9}Z, HH:mm:ss[+-]HH:mm, HH:mm:ss.[0-9]{1,9}[+-]HH:mm]");
+                        "Expected [HH:mm:ssZ, HH:mm:ss.[0-9]{1,9}Z, HH:mm:ss[+-]HH:mm, HH:mm:ss.[0-9]{1,9}[+-]HH:mm]");
     }
 
     @Test
@@ -290,4 +290,13 @@ public void uriSuccess() {
         assertSuccess("http://example.org:8080/example.html", new URIFormatValidator());
     }
 
+    @Test
+    public void regexSuccess() {
+        assertSuccess("([abc])+\\s+$", new RegexFormatValidator());
+    }
+
+    @Test
+    public void regexFailure() {
+        assertFailure("^(abc]", new RegexFormatValidator(), "[^(abc]] is not a valid regular expression");
+    }
 }