[unomi] branch reduceIndicesItems updated: fix bad merge

[jkevan]

This is an automated email from the ASF dual-hosted git repository.

jkevan pushed a commit to branch reduceIndicesItems
in repository https://gitbox.apache.org/repos/asf/unomi.git


The following commit(s) were added to refs/heads/reduceIndicesItems by this 
push:
     new d9634fada fix bad merge
d9634fada is described below

commit d9634fada2916a8b81db07cb4e9a3d0f9218c3c8
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 61e852275..85e8aa18b 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
@@ -890,7 +890,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 {
@@ -2651,14 +2651,9 @@ public class ElasticSearchPersistenceServiceImpl 
implements PersistenceService,
     private String getIndexNameForQuery(String itemType) {
         return rolloverIndices.contains(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) {