- clenaup

folio-org · Sep 9, 2024 · f88b323 · f88b323
1 parent d8a6b31
commit f88b323
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/src/main/java/org/folio/search/service/ResourceService.java b/src/main/java/org/folio/search/service/ResourceService.java
@@ -69,8 +69,7 @@ public FolioIndexOperationResponse indexResources(List<ResourceEvent> resourceEv
       return getSuccessIndexOperationResponse();
     }
 
-    var eventsToIndex = getEventsToIndex(resourceEvents);
-    var elasticsearchDocuments = searchDocumentConverter.convert(eventsToIndex);
+    var elasticsearchDocuments = searchDocumentConverter.convert(resourceEvents);
     var bulkIndexResponse = indexSearchDocuments(elasticsearchDocuments);
     log.info("Records indexed to elasticsearch [indexRequests: {} {}]",
       getNumberOfRequests(elasticsearchDocuments), getErrorMessage(bulkIndexResponse));
@@ -91,9 +90,7 @@ public FolioIndexOperationResponse indexInstancesById(List<ResourceEvent> resour
       return getSuccessIndexOperationResponse();
     }
 
-    var eventsToIndex = getEventsToIndex(resourceIdEvents);
-
-    var groupedByOperation = eventsToIndex.stream().collect(groupingBy(ResourceService::getEventIndexType));
+    var groupedByOperation = resourceIdEvents.stream().collect(groupingBy(ResourceService::getEventIndexType));
     var indexDocuments = processIndexInstanceEvents(groupedByOperation.get(INDEX));
     var removeDocuments = processDeleteInstanceEvents(groupedByOperation.get(DELETE));
 
@@ -104,10 +101,6 @@ public FolioIndexOperationResponse indexInstancesById(List<ResourceEvent> resour
     return bulkIndexResponse;
   }
 
-  private List<ResourceEvent> getEventsToIndex(List<ResourceEvent> events) {
-    return events;
-  }
-
   private Map<String, List<SearchDocumentBody>> processIndexInstanceEvents(List<ResourceEvent> resourceEvents) {
     var indexEvents = extractEventsForDataMove(resourceEvents);
     var fetchedInstances = consortiumTenantExecutor.execute(

diff --git a/src/main/java/org/folio/search/service/converter/MultiTenantSearchDocumentConverter.java b/src/main/java/org/folio/search/service/converter/MultiTenantSearchDocumentConverter.java
@@ -52,7 +52,7 @@ public Map<String, List<SearchDocumentBody>> convert(Collection<ResourceEvent> r
 
     var eventsByTenant = resourceEvents.stream().collect(groupingBy(ResourceEvent::getTenant));
     return eventsByTenant.entrySet().stream()
-      .map(entry -> convertForTenant(entry))
+      .map(this::convertForTenant)
       .flatMap(Collection::stream)
       .collect(groupingBy(SearchDocumentBody::getResource));
   }