You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by mm...@apache.org on 2016/10/28 17:56:40 UTC

incubator-metron git commit: METRON-515: Stellar IS_EMPTY() function does not work as expected (merrimanr via mmiklavc) closes apache/incubator-metron#324

Repository: incubator-metron
Updated Branches:
  refs/heads/master 57798e225 -> 6f0d58ce5


METRON-515: Stellar IS_EMPTY() function does not work as expected (merrimanr via mmiklavc) closes apache/incubator-metron#324


Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/6f0d58ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/6f0d58ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/6f0d58ce

Branch: refs/heads/master
Commit: 6f0d58ce55fc765fb01f033bac826001e8b1bedc
Parents: 57798e2
Author: merrimanr <me...@gmail.com>
Authored: Fri Oct 28 13:55:40 2016 -0400
Committer: Michael Miklavcic <mi...@gmail.com>
Committed: Fri Oct 28 13:55:40 2016 -0400

----------------------------------------------------------------------
 metron-platform/metron-common/README.md                      | 4 ++--
 .../metron/common/dsl/functions/DataStructureFunctions.java  | 6 +++---
 .../common/dsl/functions/DataStructureFunctionsTest.java     | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/6f0d58ce/metron-platform/metron-common/README.md
----------------------------------------------------------------------
diff --git a/metron-platform/metron-common/README.md b/metron-platform/metron-common/README.md
index 536449d..09e65b6 100644
--- a/metron-platform/metron-common/README.md
+++ b/metron-platform/metron-common/README.md
@@ -146,9 +146,9 @@ The following functions are supported:
     * address - The String to test
   * Returns: True if the string is a valid email address and false otherwise.
 * `IS_EMPTY`
-  * Description: Returns true if string or collection is empty and false otherwise
+  * Description: Returns true if value is null or if string or collection is empty
   * Input:
-    * input - Object of string or collection type (e.g. list)
+    * input - Object
   * Returns: Boolean
 * `IS_INTEGER`
   * Description: Determine if an object is an integer or not.

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/6f0d58ce/metron-platform/metron-common/src/main/java/org/apache/metron/common/dsl/functions/DataStructureFunctions.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-common/src/main/java/org/apache/metron/common/dsl/functions/DataStructureFunctions.java b/metron-platform/metron-common/src/main/java/org/apache/metron/common/dsl/functions/DataStructureFunctions.java
index 567df88..8691a37 100644
--- a/metron-platform/metron-common/src/main/java/org/apache/metron/common/dsl/functions/DataStructureFunctions.java
+++ b/metron-platform/metron-common/src/main/java/org/apache/metron/common/dsl/functions/DataStructureFunctions.java
@@ -138,8 +138,8 @@ public class DataStructureFunctions {
   }
 
   @Stellar(name="IS_EMPTY"
-          , description="Returns true if string or collection is empty and false otherwise"
-          , params = { "input - Object of string or collection type (e.g. list)"}
+          , description="Returns true if value is null or if string or collection is empty"
+          , params = { "input - Object"}
           , returns = "Boolean"
           )
   public static class IsEmpty extends BaseStellarFunction {
@@ -158,7 +158,7 @@ public class DataStructureFunctions {
         return val == null || val.isEmpty() ? true : false;
       }
       else {
-        return true;
+        return o == null;
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/6f0d58ce/metron-platform/metron-common/src/test/java/org/apache/metron/common/dsl/functions/DataStructureFunctionsTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-common/src/test/java/org/apache/metron/common/dsl/functions/DataStructureFunctionsTest.java b/metron-platform/metron-common/src/test/java/org/apache/metron/common/dsl/functions/DataStructureFunctionsTest.java
index 01c9439..b60e117 100644
--- a/metron-platform/metron-common/src/test/java/org/apache/metron/common/dsl/functions/DataStructureFunctionsTest.java
+++ b/metron-platform/metron-common/src/test/java/org/apache/metron/common/dsl/functions/DataStructureFunctionsTest.java
@@ -36,6 +36,10 @@ public class DataStructureFunctionsTest {
       boolean empty = (boolean) isEmpty.apply(ImmutableList.of(ImmutableList.of("hello", "world")));
       Assert.assertThat("should be false", empty, CoreMatchers.equalTo(false));
     }
+    {
+      boolean empty = (boolean) isEmpty.apply(ImmutableList.of(1));
+      Assert.assertThat("should be false", empty, CoreMatchers.equalTo(false));
+    }
   }
 
   @Test
@@ -53,10 +57,6 @@ public class DataStructureFunctionsTest {
       boolean empty = (boolean) isEmpty.apply(ImmutableList.of(""));
       Assert.assertThat("should be true", empty, CoreMatchers.equalTo(true));
     }
-    {
-      boolean empty = (boolean) isEmpty.apply(ImmutableList.of(new Object()));
-      Assert.assertThat("should be true", empty, CoreMatchers.equalTo(true));
-    }
   }
 
 }