merging master, resolving conflict

Author: erosb

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

@@ -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) {

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

@@ -1,22 +1,9 @@
-/*
- * Copyright (C) 2011 Everit Kft. (http://www.everit.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.everit.json.schema;
 
 import static org.everit.json.schema.ObjectComparator.deepEquals;
 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;
 
 import java.util.Optional;
@@ -178,4 +165,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());
+    }
+
 }