merging master, resolving conflicts

Author: erosb

core/pom.xml

@@ -177,5 +177,10 @@
             <artifactId>handy-uri-templates</artifactId>
             <version>2.1.6</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.re2j</groupId>
+            <artifactId>re2j</artifactId>
+            <version>1.1</version>
+        </dependency>
     </dependencies>
 </project>

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

@@ -10,10 +10,11 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-import java.util.regex.Pattern;
 
 import org.everit.json.schema.internal.JSONPrinter;
 
+import com.google.re2j.Pattern;
+
 /**
  * Object schema validator.
  */
@@ -88,13 +89,13 @@ public Builder minProperties(Integer minProperties) {
             return this;
         }
 
-        public Builder patternProperty(Pattern pattern, Schema schema) {
-            this.patternProperties.put(pattern, schema);
+        public Builder patternProperty(java.util.regex.Pattern pattern, Schema schema) {
+            this.patternProperties.put(Pattern.compile(pattern.toString()), schema);
             return this;
         }
 
         public Builder patternProperty(String pattern, Schema schema) {
-            return patternProperty(Pattern.compile(pattern), schema);
+            return patternProperty(java.util.regex.Pattern.compile(pattern), schema);
         }
 
         /**

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

@@ -3,11 +3,10 @@
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
+import com.google.re2j.Pattern;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-import java.util.regex.Pattern;
-
 import org.json.JSONObject;
 
 class ObjectSchemaValidatingVisitor extends Visitor {

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

@@ -4,10 +4,11 @@
 import static org.everit.json.schema.FormatValidator.NONE;
 
 import java.util.Objects;
-import java.util.regex.Pattern;
 
 import org.everit.json.schema.internal.JSONPrinter;
 
+import com.google.re2j.Pattern;
+
 /**
  * {@code String} schema validator.
  */
@@ -114,10 +115,14 @@ public Integer getMinLength() {
         return minLength;
     }
 
-    public Pattern getPattern() {
+    Pattern getRE2JPattern() {
         return pattern;
     }
 
+    public java.util.regex.Pattern getPattern() {
+        return java.util.regex.Pattern.compile(pattern.toString());
+    }
+
     @Override void accept(Visitor visitor) {
         visitor.visitStringSchema(this);
     }

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

@@ -3,8 +3,8 @@
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
+import com.google.re2j.Pattern;
 import java.util.Optional;
-import java.util.regex.Pattern;
 
 public class StringSchemaValidatingVisitor extends Visitor {
 

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

@@ -3,7 +3,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.regex.Pattern;
+
+import com.google.re2j.Pattern;
 
 abstract class Visitor {
 
@@ -165,7 +166,7 @@ void visitRequiredPropertyName(String requiredPropName) {
     void visitStringSchema(StringSchema stringSchema) {
         visitMinLength(stringSchema.getMinLength());
         visitMaxLength(stringSchema.getMaxLength());
-        visitPattern(stringSchema.getPattern());
+        visitPattern(stringSchema.getRE2JPattern());
         visitFormat(stringSchema.getFormatValidator());
     }
 

core/src/test/java/org/everit/json/schema/ObjectSchemaTest.java

@@ -22,6 +22,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import com.google.re2j.Pattern;
 import java.util.List;
 import java.util.concurrent.Callable;
 
@@ -357,6 +358,7 @@ public void equalsVerifier() {
         EqualsVerifier.forClass(ObjectSchema.class)
                 .withRedefinedSuperclass()
                 .withIgnoredFields("schemaLocation")
+                .withPrefabValues(Pattern.class, Pattern.compile("red"), Pattern.compile("black"))
                 .suppress(Warning.STRICT_INHERITANCE)
                 .verify();
     }

core/src/test/java/org/everit/json/schema/StringSchemaTest.java

@@ -26,6 +26,8 @@
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.google.re2j.Pattern;
+
 import nl.jqno.equalsverifier.EqualsVerifier;
 import nl.jqno.equalsverifier.Warning;
 
@@ -118,6 +120,7 @@ public void equalsVerifier() {
         EqualsVerifier.forClass(StringSchema.class)
                 .withRedefinedSuperclass()
                 .withIgnoredFields("schemaLocation")
+                .withPrefabValues(Pattern.class, Pattern.compile("red"), Pattern.compile("black"))
                 .suppress(Warning.STRICT_INHERITANCE)
                 .verify();
     }

tests/src/test/java/org/everit/json/schema/IssueTest.java

@@ -69,12 +69,19 @@ private void initJetty(final File documentRoot) {
         }
     }
 
+    private static JSONObject fileAsJson(File file) {
+        try {
+            return new JSONObject(new JSONTokener(new FileInputStream(file)));
+        } catch (FileNotFoundException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
     private Schema loadSchema() {
         Optional<File> schemaFile = fileByName("schema.json");
         try {
             if (schemaFile.isPresent()) {
-                JSONObject schemaObj = new JSONObject(
-                        new JSONTokener(new FileInputStream(schemaFile.get())));
+                JSONObject schemaObj = fileAsJson(schemaFile.get());
                 return SchemaLoader.load(schemaObj);
             }
             throw new RuntimeException(issueDir.getCanonicalPath() + "/schema.json is not found");
@@ -99,18 +106,29 @@ public void test() {
         stopJetty();
     }
 
+    private Validator createValidator() {
+        Validator.ValidatorBuilder builder = Validator.builder();
+        fileByName("validator-config.json").map(file -> fileAsJson(file))
+                .map(json -> json.getBoolean("failEarly"))
+                .filter(bool -> Boolean.TRUE.equals(bool))
+                .ifPresent(t -> builder.failEarly());
+        return builder.build();
+    }
+
     private void validate(final File file, final Schema schema, final boolean shouldBeValid) {
         ValidationException thrown = null;
 
         Object subject = loadJsonFile(file);
 
         try {
-            schema.validate(subject);
+            Validator validator = createValidator();
+            validator.performValidation(schema, subject);
         } catch (ValidationException e) {
             thrown = e;
         }
 
         if (shouldBeValid && thrown != null) {
+            thrown.getAllMessages().forEach(System.out::println);
             StringBuilder failureBuilder = new StringBuilder("validation failed with: " + thrown);
             for (ValidationException e : thrown.getCausingExceptions()) {
                 failureBuilder.append("\n\t").append(e.getMessage());

tests/src/test/resources/org/everit/json/schema/issues/issue147/schema.json

@@ -0,0 +1 @@
+{"type":"object", "properties": {"prop": {"pattern": "a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"}}}