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 2020/02/07 09:18:09 UTC
[unomi] branch master updated: fix(elasticsearch-7): remove type
from ids query, type is deprecated
This is an automated email from the ASF dual-hosted git repository.
shuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/unomi.git
The following commit(s) were added to refs/heads/master by this push:
new 37eb1e8 fix(elasticsearch-7): remove type from ids query, type is deprecated
new 949918f Merge pull request #125 from YotpoLtd/fix_elasticsearch7type
37eb1e8 is described below
commit 37eb1e89e3e6f2258abde70c9c069b8eb539a657
Author: lyogev <ly...@yotpo.com>
AuthorDate: Fri Feb 7 09:08:59 2020 +0200
fix(elasticsearch-7): remove type from ids query, type is deprecated
---
.../elasticsearch/ElasticSearchPersistenceServiceImpl.java | 4 ++--
.../baseplugin/conditions/PastEventConditionESQueryBuilder.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java b/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
index 812c184..63ff129 100644
--- a/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
+++ b/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
@@ -647,7 +647,7 @@ public class ElasticSearchPersistenceServiceImpl implements PersistenceService,
return new MetricAdapter<T>(metricsService, ".loadItemWithQuery") {
@Override
public T execute(Object... args) throws Exception {
- PartialList<T> r = query(QueryBuilders.idsQuery(itemType).addIds(itemId), null, clazz, 0, 1, null, null);
+ PartialList<T> r = query(QueryBuilders.idsQuery().addIds(itemId), null, clazz, 0, 1, null, null);
if (r.size() > 0) {
return r.get(0);
}
@@ -1263,7 +1263,7 @@ public class ElasticSearchPersistenceServiceImpl implements PersistenceService,
String itemType = Item.getItemType(clazz);
QueryBuilder builder = QueryBuilders.boolQuery()
- .must(QueryBuilders.idsQuery(itemType).addIds(item.getItemId()))
+ .must(QueryBuilders.idsQuery().addIds(item.getItemId()))
.must(conditionESQueryBuilderDispatcher.buildFilter(query));
return queryCount(builder, itemType) > 0;
} finally {
diff --git a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PastEventConditionESQueryBuilder.java b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PastEventConditionESQueryBuilder.java
index c8aeaca..65d72d1 100644
--- a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PastEventConditionESQueryBuilder.java
+++ b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PastEventConditionESQueryBuilder.java
@@ -114,7 +114,7 @@ public class PastEventConditionESQueryBuilder implements ConditionESQueryBuilder
}
}
- return QueryBuilders.idsQuery(Profile.ITEM_TYPE).addIds(ids.toArray(new String[0]));
+ return QueryBuilders.idsQuery().addIds(ids.toArray(new String[0]));
}
}