This is an automated email from the ASF dual-hosted git repository.
dgriffon pushed a commit to branch unomi-1.6.x
in repository https://gitbox.apache.org/repos/asf/unomi.git
The following commit(s) were added to refs/heads/unomi-1.6.x by this push:
new 1b0ce67 UNOMI-523 : add missing files
1b0ce67 is described below
commit 1b0ce671dea2bbd20b36895dd39958f22b7e4707
Author: David Griffon <[email protected]>
AuthorDate: Tue Nov 9 13:28:21 2021 +0100
UNOMI-523 : add missing files
---
.../PropertyConditionESQueryBuilder.java | 22 ----------------------
.../conditions/PropertyConditionEvaluator.java | 21 +--------------------
2 files changed, 1 insertion(+), 42 deletions(-)
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 994924d..a89ff0c 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
@@ -150,28 +150,6 @@ public class PropertyConditionESQueryBuilder implements
ConditionESQueryBuilder
case "isNotDay":
checkRequiredValue(value, name, comparisonOperator, false);
return
QueryBuilders.boolQuery().mustNot(getIsSameDayRange(getDate(value), name));
- case "distance":
- final String unitString = (String)
condition.getParameter("unit");
- final Object centerObj = condition.getParameter("center");
- final Double distance = (Double)
condition.getParameter("distance");
-
- if (centerObj != null && distance != null) {
- String centerString;
- if (centerObj instanceof org.apache.unomi.api.GeoPoint) {
- centerString = ((org.apache.unomi.api.GeoPoint)
centerObj).asString();
- } else if (centerObj instanceof String) {
- centerString = (String) centerObj;
- } else {
- centerString = centerObj.toString();
- }
- DistanceUnit unit = unitString != null ?
DistanceUnit.fromString(unitString) : DistanceUnit.DEFAULT;
-
- return QueryBuilders.geoDistanceQuery(name)
- .ignoreUnmapped(true)
- .distance(distance, unit)
- .point(new GeoPoint(centerString));
- }
- return
QueryBuilders.boolQuery().mustNot(getIsSameDayRange(value, name));
}
return null;
}
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 2ecd3b7..d65721c 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
@@ -95,7 +95,6 @@ public class PropertyConditionEvaluator implements
ConditionEvaluator {
}
@SuppressWarnings("unchecked")
Collection<?> expected = ObjectUtils.firstNonNull(expectedValues,
expectedValuesDate, expectedValuesInteger, expectedValuesDouble,
expectedDateExpr);
- List<?> expected = ObjectUtils.firstNonNull(expectedValues,
expectedValuesDate, expectedValuesNumber);
if (actualValue == null) {
return expected == null;
} else if (expected == null) {
@@ -211,7 +210,6 @@ public class PropertyConditionEvaluator implements
ConditionEvaluator {
if (op == null) {
return false;
} else if (actualValue == null) {
- return op.equals("missing");
return op.equals("missing") || op.equals("notIn") ||
op.equals("notEquals") || op.equals("hasNoneOf");
} else if (op.equals("exists")) {
return true;
@@ -265,11 +263,7 @@ public class PropertyConditionEvaluator implements
ConditionEvaluator {
} else if (op.equals("matchesRegex")) {
return expectedValue != null &&
Pattern.compile(expectedValue).matcher(actualValue.toString()).matches();
} else if (op.equals("in") || op.equals("inContains") ||
op.equals("notIn") || op.equals("hasSomeOf") || op.equals("hasNoneOf") ||
op.equals("all")) {
- Collection<?> expectedValues =
ConditionContextHelper.foldToASCII((Collection<?>)
condition.getParameter("propertyValues"));
- Collection<?> expectedValuesInteger = (Collection<?>)
condition.getParameter("propertyValuesInteger");
- Collection<?> expectedValuesDate = (Collection<?>)
condition.getParameter("propertyValuesDate");
- Collection<?> expectedValuesDateExpr = (Collection<?>)
condition.getParameter("propertyValuesDateExpr");
- Collection<?> expectedValuesDouble = (Collection<?>)
condition.getParameter("propertyValuesDouble");
+ List<?> expectedValuesDouble = (List<?>)
condition.getParameter("propertyValuesDouble");
List<?> expectedValues =
ConditionContextHelper.foldToASCII((List<?>)
condition.getParameter("propertyValues"));
List<?> expectedValuesInteger = (List<?>)
condition.getParameter("propertyValuesInteger");
List<?> expectedValuesDate = (List<?>)
condition.getParameter("propertyValuesDate");
@@ -282,19 +276,6 @@ public class PropertyConditionEvaluator implements
ConditionEvaluator {
} else if (op.equals("isNotDay") && (expectedValueDate != null ||
expectedValueDateExpr != null)) {
Object expectedDate = expectedValueDate == null ?
expectedValueDateExpr : expectedValueDate;
return
!yearMonthDayDateFormat.format(getDate(actualValue)).equals(yearMonthDayDateFormat.format(getDate(expectedDate)));
- } else if (op.equals("distance")) {
- GeoPoint actualCenter = null;
- if (actualValue instanceof GeoPoint) {
- actualCenter = (GeoPoint) actualValue;
- } else if (actualValue instanceof Map) {
- actualCenter = GeoPoint.fromMap((Map<String, Double>)
actualValue);
- } else if (actualValue instanceof String) {
- actualCenter = GeoPoint.fromString((String) actualValue);
- }
- if (actualCenter == null) {
- return false;
- }
- return compareMultivalue(actualValue, expectedValues,
expectedValuesDate, expectedValuesInteger, expectedValuesDateExpr, op);
} else if (op.equals("isDay") && expectedValueDate != null) {
return
yearMonthDayDateFormat.format(getDate(actualValue)).equals(yearMonthDayDateFormat.format(getDate(expectedValueDate)));
} else if (op.equals("isNotDay") && expectedValueDate != null) {
