File tree Expand file tree Collapse file tree 3 files changed +17
-8
lines changed
core/src/main/java/org/everit/json/schema Expand file tree Collapse file tree 3 files changed +17
-8
lines changed Original file line number Diff line number Diff line change 2
2
3
3
import static java .util .Objects .requireNonNull ;
4
4
5
- import com .google .re2j .Pattern ;
6
5
import java .util .ArrayList ;
7
6
import java .util .Collections ;
8
7
import java .util .HashMap ;
11
10
import java .util .Map ;
12
11
import java .util .Objects ;
13
12
import java .util .Set ;
13
+
14
14
import org .everit .json .schema .internal .JSONPrinter ;
15
15
16
+ import com .google .re2j .Pattern ;
17
+
16
18
/**
17
19
* Object schema validator.
18
20
*/
@@ -87,13 +89,13 @@ public Builder minProperties(Integer minProperties) {
87
89
return this ;
88
90
}
89
91
90
- public Builder patternProperty (Pattern pattern , Schema schema ) {
91
- this .patternProperties .put (pattern , schema );
92
+ public Builder patternProperty (java . util . regex . Pattern pattern , Schema schema ) {
93
+ this .patternProperties .put (Pattern . compile ( pattern . toString ()) , schema );
92
94
return this ;
93
95
}
94
96
95
97
public Builder patternProperty (String pattern , Schema schema ) {
96
- return patternProperty (Pattern .compile (pattern ), schema );
98
+ return patternProperty (java . util . regex . Pattern .compile (pattern ), schema );
97
99
}
98
100
99
101
/**
Original file line number Diff line number Diff line change 3
3
import static java .util .Objects .requireNonNull ;
4
4
import static org .everit .json .schema .FormatValidator .NONE ;
5
5
6
- import com .google .re2j .Pattern ;
7
6
import java .util .Objects ;
7
+
8
8
import org .everit .json .schema .internal .JSONPrinter ;
9
9
10
+ import com .google .re2j .Pattern ;
11
+
10
12
/**
11
13
* {@code String} schema validator.
12
14
*/
@@ -113,10 +115,14 @@ public Integer getMinLength() {
113
115
return minLength ;
114
116
}
115
117
116
- public Pattern getPattern () {
118
+ Pattern getRE2JPattern () {
117
119
return pattern ;
118
120
}
119
121
122
+ public java .util .regex .Pattern getPattern () {
123
+ return java .util .regex .Pattern .compile (pattern .toString ());
124
+ }
125
+
120
126
@ Override void accept (Visitor visitor ) {
121
127
visitor .visitStringSchema (this );
122
128
}
Original file line number Diff line number Diff line change 1
1
package org .everit .json .schema ;
2
2
3
- import com .google .re2j .Pattern ;
4
3
import java .util .List ;
5
4
import java .util .Map ;
6
5
import java .util .Set ;
7
6
7
+ import com .google .re2j .Pattern ;
8
+
8
9
abstract class Visitor {
9
10
10
11
void visitNumberSchema (NumberSchema numberSchema ) {
@@ -165,7 +166,7 @@ void visitRequiredPropertyName(String requiredPropName) {
165
166
void visitStringSchema (StringSchema stringSchema ) {
166
167
visitMinLength (stringSchema .getMinLength ());
167
168
visitMaxLength (stringSchema .getMaxLength ());
168
- visitPattern (stringSchema .getPattern ());
169
+ visitPattern (stringSchema .getRE2JPattern ());
169
170
visitFormat (stringSchema .getFormatValidator ());
170
171
}
171
172
You can’t perform that action at this time.
0 commit comments