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:02 UTC
[3/4] incubator-unomi git commit: Reset renaming ‘all’ to ‘hasAllOf’
Reset renaming \u2018all\u2019 to \u2018hasAllOf\u2019
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/cb72a0ea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/cb72a0ea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/cb72a0ea
Branch: refs/heads/master
Commit: cb72a0ea8a855f0a83d69a0bbd323a63e3b5cb40
Parents: 3e85c04
Author: Abdelkader Midani <am...@jahia.com>
Authored: Fri Nov 25 12:25:34 2016 +0100
Committer: Abdelkader Midani <am...@jahia.com>
Committed: Fri Nov 25 12:25:34 2016 +0100
----------------------------------------------------------------------
.../src/test/java/org/apache/unomi/itests/ConditionBuilder.java | 4 ++--
.../java/org/apache/unomi/itests/ConditionEvaluatorTest.java | 4 ++--
.../baseplugin/conditions/PropertyConditionESQueryBuilder.java | 2 +-
.../baseplugin/conditions/PropertyConditionEvaluator.java | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/cb72a0ea/itests/src/test/java/org/apache/unomi/itests/ConditionBuilder.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/unomi/itests/ConditionBuilder.java b/itests/src/test/java/org/apache/unomi/itests/ConditionBuilder.java
index 59eff3e..0fbffcd 100644
--- a/itests/src/test/java/org/apache/unomi/itests/ConditionBuilder.java
+++ b/itests/src/test/java/org/apache/unomi/itests/ConditionBuilder.java
@@ -74,11 +74,11 @@ public class ConditionBuilder {
}
public ComparisonCondition all(Date... values) {
- return op("hasAllOf").dateValues(values);
+ return op("all").dateValues(values);
}
public ComparisonCondition all(Integer... values) {
- return op("hasAllOf").integerValues(values);
+ return op("all").integerValues(values);
}
public ComparisonCondition contains(String value) {
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/cb72a0ea/itests/src/test/java/org/apache/unomi/itests/ConditionEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/unomi/itests/ConditionEvaluatorTest.java b/itests/src/test/java/org/apache/unomi/itests/ConditionEvaluatorTest.java
index cc02c14..c635daf 100644
--- a/itests/src/test/java/org/apache/unomi/itests/ConditionEvaluatorTest.java
+++ b/itests/src/test/java/org/apache/unomi/itests/ConditionEvaluatorTest.java
@@ -151,9 +151,9 @@ public class ConditionEvaluatorTest extends BaseTest {
.parameter("segments", "s10", "s20", "s30").build()));
assertFalse(eval(builder.property("profileSegmentCondition", "segments").parameter("matchType", "notIn")
.parameter("segments", "s10", "s20", "s2").build()));
- assertTrue(eval(builder.property("profileSegmentCondition", "segments").parameter("matchType", "hasAllOf")
+ assertTrue(eval(builder.property("profileSegmentCondition", "segments").parameter("matchType", "all")
.parameter("segments", "s1", "s2").build()));
- assertFalse(eval(builder.property("profileSegmentCondition", "segments").parameter("matchType", "hasAllOf")
+ assertFalse(eval(builder.property("profileSegmentCondition", "segments").parameter("matchType", "all")
.parameter("segments", "s1", "s5").build()));
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/cb72a0ea/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionESQueryBuilder.java
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionESQueryBuilder.java b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionESQueryBuilder.java
index d92734a..d2f77c0 100644
--- a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionESQueryBuilder.java
+++ b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionESQueryBuilder.java
@@ -101,7 +101,7 @@ public class PropertyConditionESQueryBuilder implements ConditionESQueryBuilder
case "notIn":
checkRequiredValue(values, name, op, true);
return FilterBuilders.notFilter(FilterBuilders.inFilter(name, values.toArray()));
- case "hasAllOf":
+ case "all":
checkRequiredValue(values, name, op, true);
return FilterBuilders.termsFilter(name, values.toArray()).execution("and");
case "hasSomeOf":
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/cb72a0ea/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 bb43c00..e317f59 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 "hasAllOf":
+ case "all":
for (Object e : expected) {
if (!actual.contains(e)) {
result = false;
@@ -220,7 +220,7 @@ public class PropertyConditionEvaluator implements ConditionEvaluator {
return actualValue.toString().endsWith(expectedValue);
} else if (op.equals("matchesRegex")) {
return expectedValue != null && Pattern.compile(expectedValue).matcher(actualValue.toString()).matches();
- } else if (op.equals("in") || op.equals("notIn") || op.equals("hasSomeOf") || op.equals("hasNoneOf") || op.equals("hasAllOf")) {
+ } else if (op.equals("in") || op.equals("notIn") || op.equals("hasSomeOf") || op.equals("hasNoneOf") || op.equals("all")) {
List<?> expectedValues = ConditionContextHelper.foldToASCII((List<?>) condition.getParameter("propertyValues"));
List<?> expectedValuesInteger = (List<?>) condition.getParameter("propertyValuesInteger");
List<?> expectedValuesDate = (List<?>) condition.getParameter("propertyValuesDate");