Skip to content

fix NPE when calling getPattern() #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 27, 2018
Merged

fix NPE when calling getPattern() #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion core/src/main/java/org/everit/json/schema/StringSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,11 @@ Pattern getRE2JPattern() {
}

public java.util.regex.Pattern getPattern() {
return java.util.regex.Pattern.compile(pattern.toString());
if (pattern == null) {
return null;
} else {
return java.util.regex.Pattern.compile(pattern.toString());
}
}

@Override void accept(Visitor visitor) {
Expand Down
17 changes: 17 additions & 0 deletions core/src/test/java/org/everit/json/schema/StringSchemaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
import java.util.Optional;

import static org.everit.json.schema.TestSupport.buildWithLocation;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;

public class StringSchemaTest {
Expand Down Expand Up @@ -166,4 +168,19 @@ public void requiresString_nullable() {
Schema subject = StringSchema.builder().requiresString(true).nullable(true).build();
subject.validate(JSONObject.NULL);
}

@Test
public void getConvertedPattern() {
StringSchema subject = StringSchema.builder().pattern("my\\\\/[p]a[tt]ern").build();
assertEquals("my\\\\/[p]a[tt]ern", subject.getRE2JPattern().toString());
assertEquals("my\\\\/[p]a[tt]ern", subject.getPattern().toString());
}

@Test
public void getConvertedNullPattern() {
StringSchema subject = StringSchema.builder().build();
assertNull(subject.getRE2JPattern());
assertNull(subject.getPattern());
}

}