Fixes after merge

Author: tobias-hotz

core/src/main/java/org/fao/geonet/kernel/search/index/BatchOpsMetadataReindexer.java

@@ -95,7 +95,6 @@ public static boolean isIndexing() {
     private final AtomicInteger inError = new AtomicInteger();
     private CompletableFuture<Void> allCompleted;
     private final MBeanExporter exporter;
-    private final EsSearchManager esSearchManager;
 
     public BatchOpsMetadataReindexer(DataManager dm, Set<Integer> metadata) {
         super(dm);

core/src/test/java/org/fao/geonet/AbstractCoreIntegrationTest.java

@@ -391,7 +391,7 @@ protected AbstractMetadata injectMetadataInDbDoNotRefreshHeader(Element sampleMe
         return injectMetadataOrSubtemplateInDb(sampleMetadataXml, context, MetadataType.METADATA);
     }
 
-    protected AbstractMetadata injectMetadataInDb(Element element, ServiceContext serviceContext, boolean refreshHeader) throws Exception {
+    protected AbstractMetadata injectMetadataInDb(Element element, ServiceContext serviceContext) throws Exception {
         return injectMetadataOrSubtemplateInDb(element, serviceContext, MetadataType.METADATA);
     }
 

harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/sftp/Aligner.java

@@ -49,6 +49,7 @@
 import org.fao.geonet.kernel.harvest.harvester.sftp.client.SftpClient;
 import org.fao.geonet.kernel.harvest.harvester.sftp.client.SftpFileInfo;
 import org.fao.geonet.kernel.search.IndexingMode;
+import org.fao.geonet.kernel.search.submission.batch.BatchingDeletionSubmitter;
 import org.fao.geonet.repository.MetadataRepository;
 import org.fao.geonet.repository.specification.MetadataSpecs;
 import org.fao.geonet.utils.Xml;
@@ -176,14 +177,16 @@ public HarvestResult align(Collection<HarvestError> errors) throws Exception {
             "from the same source if they " +
             " were not in this harvesting result...");
         List<Integer> existingMetadata = context.getBean(MetadataRepository.class).findIdsBy((Specification<Metadata>) MetadataSpecs.hasHarvesterUuid(params.getUuid()));
-        for (Integer existingId : existingMetadata) {
-            if (cancelMonitor.get()) {
-                return this.result;
-            }
-            if (!idsForHarvestingResult.contains(existingId)) {
-                log.debug("  Removing: " + existingId);
-                metadataManager.deleteMetadata(context, existingId.toString());
-                result.locallyRemoved++;
+        try (BatchingDeletionSubmitter deletionSubmitter = new BatchingDeletionSubmitter()) {
+            for (Integer existingId : existingMetadata) {
+                if (cancelMonitor.get()) {
+                    return this.result;
+                }
+                if (!idsForHarvestingResult.contains(existingId)) {
+                    log.debug("  Removing: " + existingId);
+                    metadataManager.deleteMetadata(context, existingId.toString(), deletionSubmitter);
+                    result.locallyRemoved++;
+                }
             }
         }
 
@@ -320,13 +323,13 @@ private void addMetadata(RecordInfo ri, Element md, String uuidToAssign) throws
 
         addCategories(metadata, params.getCategories(), localCateg, context, null, false);
 
-        metadata = metadataManager.insertMetadata(context, metadata, md, IndexingMode.none, false, UpdateDatestamp.NO, false, false);
+        metadata = metadataManager.insertMetadata(context, metadata, md, IndexingMode.none, false, UpdateDatestamp.NO, false, batchingIndexSubmitter);
 
         String id = String.valueOf(metadata.getId());
 
         addPrivileges(id, params.getPrivileges(), localGroups, context);
 
-        metadataIndexer.indexMetadata(id, true, IndexingMode.full);
+        metadataIndexer.indexMetadata(id, batchingIndexSubmitter, IndexingMode.full);
         result.addedMetadata++;
         idsForHarvestingResult.add(metadata.getId());
     }
@@ -343,7 +346,7 @@ private void updateMetadata(RecordInfo ri, String id, Element md, boolean force)
             } else {
                 log.debug("  - Updating local metadata for uuid:" + ri.uuid);
                 if (updatingLocalMetadata(ri, id, md, force)) {
-                    metadataIndexer.indexMetadata(id, true, IndexingMode.full);
+                    metadataIndexer.indexMetadata(id, batchingIndexSubmitter, IndexingMode.full);
                     result.updatedMetadata++;
                 }
             }

harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/simpleurl/Aligner.java

@@ -303,7 +303,7 @@ boolean updateMetadata(Map.Entry<String, Element> ri, String id, Boolean force)
         metadata.getCategories().clear();
         addCategories(metadata, params.getCategories(), localCateg, context, null, true);
 
-        metadataIndexer.indexMetadata(id, true, IndexingMode.full);
+        metadataIndexer.indexMetadata(id, batchingIndexSubmitter, IndexingMode.full);
         result.updatedMetadata++;
         return true;
     }

services/src/test/java/org/fao/geonet/api/processing/ValidateApiTest.java

@@ -31,6 +31,7 @@
 import org.fao.geonet.domain.SchematronCriteriaType;
 import org.fao.geonet.domain.SchematronRequirement;
 import org.fao.geonet.domain.User;
+import org.fao.geonet.kernel.search.submission.DirectIndexSubmitter;
 import org.fao.geonet.kernel.setting.SettingManager;
 import org.fao.geonet.kernel.setting.Settings;
 import org.fao.geonet.repository.MetadataValidationRepository;
@@ -96,7 +97,7 @@ public void initContext() throws Exception {
     @Test
     public void validateMd() throws Exception {
         Element holoceneElem = getSample("kernel/holocene.xml");
-        AbstractMetadata metadata = injectMetadataInDb(holoceneElem, context, true);
+        AbstractMetadata metadata = injectMetadataInDb(holoceneElem, context);
 
         validateAndCheckIsoSchematronOk(context, metadata);
     }
@@ -111,7 +112,7 @@ public void validateMdWithSubtemplate() throws Exception {
             Element extentElem = Xml.selectElement(holoceneElem, "gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent");
             extentElem.setAttribute("href", "local://srv/api/registries/entries/"+ subtemplate.getUuid() + "?lang=ger,fre,ita,eng,roh&schema=iso19139.che", XLINK);
             extentElem.removeChild("EX_Extent", GMD);
-            AbstractMetadata metadata = injectMetadataInDb(holoceneElem, context, true);
+            AbstractMetadata metadata = injectMetadataInDb(holoceneElem, context);
 
             validateAndCheckIsoSchematronOk(context, metadata);
         } finally {

services/src/test/java/org/fao/geonet/api/records/MetadataApiTest.java

@@ -94,7 +94,7 @@ private void createTestData() throws Exception {
         Element metadataWithSubtemplate = getSample("kernel/vicinityMap.xml");
         Attribute href = (Attribute) Xml.selectElement(metadataWithSubtemplate, "gmd:identificationInfo/gmd:MD_DataIdentification/gmd:pointOfContact").getAttributes().get(0);
         href.setValue(href.getValue().replace("@contact_uuid@", subtemplate.getUuid()));
-        mdWithSubtemplateUuid = injectMetadataInDb(metadataWithSubtemplate, context, true).getUuid();
+        mdWithSubtemplateUuid = injectMetadataInDb(metadataWithSubtemplate, context).getUuid();
     }
 
     @Test