Merge pull request #337 from metafacture/regexp-ignore-null

Ignore null values in Regexp function.
metafacture · Oct 28, 2020 · 84c0ac1 · 84c0ac1
2 parents b8f5ad5 + e2924b4
commit 84c0ac1
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/metamorph/src/main/java/org/metafacture/metamorph/functions/Regexp.java b/metamorph/src/main/java/org/metafacture/metamorph/functions/Regexp.java
@@ -39,6 +39,9 @@ public final class Regexp extends AbstractFunction {
     public void receive(final String name, final String value,
             final NamedValueSource source, final int recordCount,
             final int entityCount) {
+        if (null == value) {
+            return;
+        }
         matcher.reset(value);
         if (null == format) {
             while (matcher.find()) {

diff --git a/metamorph/src/test/java/org/metafacture/metamorph/functions/RegexpTest.java b/metamorph/src/test/java/org/metafacture/metamorph/functions/RegexpTest.java
@@ -95,4 +95,27 @@ public void shouldIgnoreEmptyMatchGroups() {
     ordered.verify(receiver).endRecord();
     ordered.verifyNoMoreInteractions();
   }
+
+  @Test
+  public void shouldIgnoreNullValues() {
+    metamorph = InlineMorph.in(this)
+        .with("<rules>")
+        .with("  <data source='s'>")
+        .with("    <regexp match='a.*' />")
+        .with("  </data>")
+        .with("</rules>")
+        .createConnectedTo(receiver);
+
+    metamorph.startRecord("1");
+    metamorph.literal("s", "aaccdd");
+    metamorph.literal("s", null);
+    metamorph.endRecord();
+
+    final InOrder ordered = inOrder(receiver);
+    ordered.verify(receiver).startRecord("1");
+    ordered.verify(receiver).literal("s", "aaccdd");
+    ordered.verify(receiver).endRecord();
+    ordered.verifyNoMoreInteractions();
+  }
+
 }