You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by sh...@apache.org on 2016/11/25 13:09:01 UTC
[2/4] incubator-unomi git commit: UNOMI-62 : Add multivalue
comparison operator ('hasAllOf', 'hasNoneOf', 'hasSomeOf')
UNOMI-62 : Add multivalue comparison operator ('hasAllOf', 'hasNoneOf', 'hasSomeOf')
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/3e85c040
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/3e85c040
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/3e85c040
Branch: refs/heads/master
Commit: 3e85c040604146e81685d167a6642de93efa76c0
Parents: a5d12df
Author: Abdelkader Midani <am...@jahia.com>
Authored: Wed Nov 9 15:28:56 2016 +0100
Committer: Abdelkader Midani <am...@jahia.com>
Committed: Wed Nov 9 15:28:56 2016 +0100
----------------------------------------------------------------------
.../baseplugin/conditions/PropertyConditionEvaluator.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3e85c040/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionEvaluator.java
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionEvaluator.java b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionEvaluator.java
index 09c55ec..bb43c00 100644
--- a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionEvaluator.java
+++ b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionEvaluator.java
@@ -106,7 +106,7 @@ public class PropertyConditionEvaluator implements ConditionEvaluator {
}
}
break;
- case "all":
+ case "hasAllOf":
for (Object e : expected) {
if (!actual.contains(e)) {
result = false;
@@ -114,6 +114,11 @@ public class PropertyConditionEvaluator implements ConditionEvaluator {
}
}
break;
+ case "hasNoneOf":
+ if(!Collections.disjoint(actual, expected)){
+ return false;
+ }
+ break;
case "hasSomeOf":
if(Collections.disjoint(actual, expected)){
return false;