MAINT: include null in equality operators

Signed-off-by: Chen <[email protected]>
opensearch-project · Feb 24, 2022 · d175a29 · d175a29
1 parent cc492ea
commit d175a29
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/...prepper-expression/src/main/java/org/opensearch/dataprepper/expression/EqualOperator.java b/...prepper-expression/src/main/java/org/opensearch/dataprepper/expression/EqualOperator.java
@@ -19,6 +19,9 @@ public Integer getSymbol() {
     @Override
     public Boolean eval(Object... args) {
         checkArgument(args.length == 2, "Operands length needs to be 2.");
+        if ((args[0] == null) || (args[1] == null)) {
+            return args[0] == null && args[1] == null;
+        }
         return args[0].equals(args[1]);
     }
 }
diff --git a/...pper-expression/src/main/java/org/opensearch/dataprepper/expression/NotEqualOperator.java b/...pper-expression/src/main/java/org/opensearch/dataprepper/expression/NotEqualOperator.java
@@ -19,6 +19,9 @@ public Integer getSymbol() {
     @Override
     public Boolean eval(Object... args) {
         checkArgument(args.length == 2, "Operands length needs to be 2.");
+        if ((args[0] == null) || (args[1] == null)) {
+            return args[0] != null || args[1] != null;
+        }
         return !args[0].equals(args[1]);
     }
 }
diff --git a/...per-expression/src/test/java/org/opensearch/dataprepper/expression/EqualOperatorTest.java b/...per-expression/src/test/java/org/opensearch/dataprepper/expression/EqualOperatorTest.java
@@ -28,6 +28,9 @@ void testEvalValidArgs() {
         final TestObject testObject3 = new TestObject("2");
         assertThat(objectUnderTest.eval(testObject1, testObject2), is(true));
         assertThat(objectUnderTest.eval(testObject1, testObject3), is(false));
+        assertThat(objectUnderTest.eval(null, testObject1), is(false));
+        assertThat(objectUnderTest.eval(testObject1, null), is(false));
+        assertThat(objectUnderTest.eval(null, null), is(true));
     }
 
     @Test

diff --git a/...-expression/src/test/java/org/opensearch/dataprepper/expression/NotEqualOperatorTest.java b/...-expression/src/test/java/org/opensearch/dataprepper/expression/NotEqualOperatorTest.java
@@ -28,6 +28,9 @@ void testEvalValidArgs() {
         final TestObject testObject3 = new TestObject("2");
         assertThat(objectUnderTest.eval(testObject1, testObject2), is(false));
         assertThat(objectUnderTest.eval(testObject1, testObject3), is(true));
+        assertThat(objectUnderTest.eval(null, testObject1), is(true));
+        assertThat(objectUnderTest.eval(testObject1, null), is(true));
+        assertThat(objectUnderTest.eval(null, null), is(false));
     }
 
     @Test