Skip to content

Commit 3a01ebd

Browse files
committed
replacing class Pattern
- use RE2J version of Pattern - include dependency in POM
1 parent d864a79 commit 3a01ebd

File tree

6 files changed

+10
-8
lines changed

6 files changed

+10
-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

0 commit comments

Comments
 (0)