Skip to content

Commit d5ff51e

Browse files
authored
Merge pull request #148 from rkeytacked/issue-147
test case for issue #147
2 parents b699c0a + a13ba96 commit d5ff51e

File tree

10 files changed

+16
-8
lines changed

10 files changed

+16
-8
lines changed

core/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,5 +177,10 @@
177177
<artifactId>handy-uri-templates</artifactId>
178178
<version>2.1.6</version>
179179
</dependency>
180+
<dependency>
181+
<groupId>com.google.re2j</groupId>
182+
<artifactId>re2j</artifactId>
183+
<version>1.1</version>
184+
</dependency>
180185
</dependencies>
181186
</project>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import static java.util.Objects.requireNonNull;
44

5+
import com.google.re2j.Pattern;
56
import java.util.ArrayList;
67
import java.util.Collections;
78
import java.util.HashMap;
@@ -10,8 +11,6 @@
1011
import java.util.Map;
1112
import java.util.Objects;
1213
import java.util.Set;
13-
import java.util.regex.Pattern;
14-
1514
import org.everit.json.schema.internal.JSONPrinter;
1615

1716
/**

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
import static java.lang.String.format;
44
import static java.util.Objects.requireNonNull;
55

6+
import com.google.re2j.Pattern;
67
import java.util.ArrayList;
78
import java.util.List;
89
import java.util.Set;
9-
import java.util.regex.Pattern;
10-
1110
import org.json.JSONObject;
1211

1312
class ObjectSchemaValidatingVisitor extends Visitor {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
import static java.util.Objects.requireNonNull;
44
import static org.everit.json.schema.FormatValidator.NONE;
55

6+
import com.google.re2j.Pattern;
67
import java.util.Objects;
7-
import java.util.regex.Pattern;
8-
98
import org.everit.json.schema.internal.JSONPrinter;
109

1110
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import static java.lang.String.format;
44
import static java.util.Objects.requireNonNull;
55

6+
import com.google.re2j.Pattern;
67
import java.util.Optional;
7-
import java.util.regex.Pattern;
88

99
public class StringSchemaValidatingVisitor extends Visitor {
1010

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package org.everit.json.schema;
22

3+
import com.google.re2j.Pattern;
34
import java.util.List;
45
import java.util.Map;
56
import java.util.Set;
6-
import java.util.regex.Pattern;
77

88
abstract class Visitor {
99

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import static org.junit.Assert.assertTrue;
2323
import static org.junit.Assert.fail;
2424

25+
import com.google.re2j.Pattern;
2526
import java.util.List;
2627
import java.util.concurrent.Callable;
2728

@@ -357,6 +358,7 @@ public void equalsVerifier() {
357358
EqualsVerifier.forClass(ObjectSchema.class)
358359
.withRedefinedSuperclass()
359360
.withIgnoredFields("schemaLocation")
361+
.withPrefabValues(Pattern.class, Pattern.compile("red"), Pattern.compile("black"))
360362
.suppress(Warning.STRICT_INHERITANCE)
361363
.verify();
362364
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package org.everit.json.schema;
1717

18+
import com.google.re2j.Pattern;
1819
import nl.jqno.equalsverifier.EqualsVerifier;
1920
import nl.jqno.equalsverifier.Warning;
2021
import org.everit.json.schema.loader.SchemaLoader;
@@ -116,6 +117,7 @@ public void equalsVerifier() {
116117
EqualsVerifier.forClass(StringSchema.class)
117118
.withRedefinedSuperclass()
118119
.withIgnoredFields("schemaLocation")
120+
.withPrefabValues(Pattern.class, Pattern.compile("red"), Pattern.compile("black"))
119121
.suppress(Warning.STRICT_INHERITANCE)
120122
.verify();
121123
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
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"}}}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"prop": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"}

0 commit comments

Comments
 (0)