You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by jk...@apache.org on 2023/02/03 16:59:42 UTC
[unomi] 02/03: fix bad merge
This is an automated email from the ASF dual-hosted git repository.
jkevan pushed a commit to branch reduceIndicesItems2
in repository https://gitbox.apache.org/repos/asf/unomi.git
commit e0583a889b262be711c652b5ba312e87ce7685c7
Author: Kevan <ke...@jahia.com>
AuthorDate: Wed Feb 1 10:25:11 2023 +0100
fix bad merge
---
.../elasticsearch/ElasticSearchPersistenceServiceImpl.java | 9 ++-------
1 file changed, 2 insertions(+), 7 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 9d9a2abeb..a4a8f7019 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
@@ -868,7 +868,7 @@ public class ElasticSearchPersistenceServiceImpl implements PersistenceService,
GetResponse response = client.get(getRequest, RequestOptions.DEFAULT);
if (response.isExists()) {
String sourceAsString = response.getSourceAsString();
- -final T value = ESCustomObjectMapper.getObjectMapper().readValue(sourceAsString, clazz);
+ final T value = ESCustomObjectMapper.getObjectMapper().readValue(sourceAsString, clazz);
setMetadata(value, response.getId(), response.getVersion(), response.getSeqNo(), response.getPrimaryTerm(), response.getIndex());
return value;
} else {
@@ -2629,14 +2629,9 @@ public class ElasticSearchPersistenceServiceImpl implements PersistenceService,
private String getIndexNameForQuery(String itemType) {
return isItemTypeRollingOver(itemType) ? getRolloverIndexForQuery(itemType) : getIndex(itemType);
}
-
-<<<<<<< Updated upstream
+
private String getRolloverIndexForQuery(String itemType) {
return indexPrefix + "-" + itemType.toLowerCase() + "-*";
-=======
- private String getMonthlyIndexForQuery(String itemType) {
- return indexPrefix + "-" + getIndexNameForItemType(itemType) + "-*";
->>>>>>> Stashed changes
}
private String getIndex(String itemType) {