[unomi] branch monthlyToRolloverIndicesPOC updated: more cleanup

[jkevan]

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

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


The following commit(s) were added to refs/heads/monthlyToRolloverIndicesPOC by 
this push:
     new 910a0ff7e more cleanup
910a0ff7e is described below

commit 910a0ff7e75b2c7a01b8e281859c111d508d077e
Author: Kevan <ke...@jahia.com>
AuthorDate: Thu Feb 2 17:55:51 2023 +0100

    more cleanup
---
 .../elasticsearch/ElasticSearchPersistenceServiceImpl.java     | 10 +---------
 1 file changed, 1 insertion(+), 9 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 c06732209..69b778d9e 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
@@ -315,7 +315,7 @@ public class ElasticSearchPersistenceServiceImpl implements 
PersistenceService,
 
     @Deprecated
     public void setItemsMonthlyIndexedOverride(String 
itemsMonthlyIndexedOverride) {
-        this.itemsMonthlyIndexedOverride = itemsMonthlyIndexedOverride;
+        this.itemsMonthlyIndexed = 
StringUtils.isNotEmpty(itemsMonthlyIndexedOverride) ? 
Arrays.asList(itemsMonthlyIndexedOverride.split(",").clone()) : 
Collections.emptyList();
     }
 
     public void setNumberOfShards(String numberOfShards) {
@@ -479,14 +479,6 @@ public class ElasticSearchPersistenceServiceImpl 
implements PersistenceService,
         new InClassLoaderExecute<Object>(null, null, this.bundleContext, 
this.fatalIllegalStateErrors, throwExceptions) {
             public Object execute(Object... args) throws Exception {
 
-                // Deprecated will be removed in Unomi 3.0.0
-                bulkProcessorConcurrentRequests = 
System.getProperty(BULK_PROCESSOR_CONCURRENT_REQUESTS, 
bulkProcessorConcurrentRequests);
-                bulkProcessorBulkActions = 
System.getProperty(BULK_PROCESSOR_BULK_ACTIONS, bulkProcessorBulkActions);
-                bulkProcessorBulkSize = 
System.getProperty(BULK_PROCESSOR_BULK_SIZE, bulkProcessorBulkSize);
-                bulkProcessorFlushInterval = 
System.getProperty(BULK_PROCESSOR_FLUSH_INTERVAL, bulkProcessorFlushInterval);
-                bulkProcessorBackoffPolicy = 
System.getProperty(BULK_PROCESSOR_BACKOFF_POLICY, bulkProcessorBackoffPolicy);
-                itemsMonthlyIndexed = 
itemsMonthlyIndexedOverride.equals("none") ? Collections.emptyList() : 
Arrays.asList(System.getProperty(MONTHLY_INDEX_ITEMS_MONTHLY_INDEXED, 
itemsMonthlyIndexedOverride).split(",").clone());
-
                 buildClient();
 
                 MainResponse response = client.info(RequestOptions.DEFAULT);