issue-596 added one more test case and fixed null pointer

zalando · Mar 8, 2017 · 8932f0d · 8932f0d
1 parent b26c2ea
commit 8932f0d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/main/java/org/zalando/nakadi/validation/schema/diff/StringSchemaDiff.java b/src/main/java/org/zalando/nakadi/validation/schema/diff/StringSchemaDiff.java
@@ -17,7 +17,8 @@ static void recursiveCheck(final StringSchema stringSchemaOriginal, final String
             addChange("maxLength", ATTRIBUTE_VALUE_CHANGED, jsonPath, changes);
         } else if (!Objects.equals(stringSchemaOriginal.getMinLength(), stringSchemaUpdate.getMinLength())) {
             addChange("minLength", ATTRIBUTE_VALUE_CHANGED, jsonPath, changes);
-        } else if (!stringSchemaOriginal.getPattern().pattern().equals(stringSchemaUpdate.getPattern().pattern())) {
+        } else if (stringSchemaOriginal.getPattern() != null && stringSchemaUpdate.getPattern() != null
+                && !stringSchemaOriginal.getPattern().pattern().equals(stringSchemaUpdate.getPattern().pattern())) {
             addChange("pattern", ATTRIBUTE_VALUE_CHANGED, jsonPath, changes);
         }
     }

diff --git a/src/test/resources/org/zalando/nakadi/validation/invalid-schema-evolution-examples.json b/src/test/resources/org/zalando/nakadi/validation/invalid-schema-evolution-examples.json
@@ -75,6 +75,18 @@
     },
     "errors": ["ATTRIBUTE_VALUE_CHANGED #/pattern"]
   },
+  {
+    "description": "Correctly identifies changes to pattern",
+    "original_schema": {
+      "type": "string",
+      "pattern": "date-time"
+    },
+    "update_schema": {
+      "type": "string",
+      "pattern": "date-time"
+    },
+    "errors": []
+  },
   {
     "description": "Do not allow changes to maximum number schema",
     "original_schema": {