Fix bug that used an empty list of transactions to check for nodes

xenit-eu · Dec 19, 2024 · 70be3c3 · 70be3c3
1 parent 0b2ebf5
commit 70be3c3
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ---
 title: Changelog - Alfred Health Processor
-date: 31 May 2021
+date: 19 December 2024
 report: true
 colorlinks: true
 ---
@@ -22,7 +22,12 @@ Version template:
 
 # Alfresco Health Processor Changelog
 
-## [0.5.6] - UNRELEASED
+## [0.5.6] - 2024-12-19
+
+### Fixed
+
+*[[#60](https://github.com/xenit-eu/alfresco-health-processor/pull/60)] Fix exception when searching for an empty list of transactions for nodes in Solr
+
 
 ## [0.5.5] - 2024-12-16
 

diff --git a/.../src/main/java/eu/xenit/alfresco/healthprocessor/indexing/Alfresco7TrackingComponent.java b/.../src/main/java/eu/xenit/alfresco/healthprocessor/indexing/Alfresco7TrackingComponent.java
@@ -5,6 +5,7 @@
 import java.util.Set;
 import lombok.AllArgsConstructor;
 import org.alfresco.repo.search.SearchTrackingComponent;
+import org.alfresco.repo.solr.NodeParameters;
 
 @AllArgsConstructor
 public class Alfresco7TrackingComponent implements TrackingComponent {
@@ -18,9 +19,12 @@ public long getMaxTxnId() {
 
     @Override
     public Set<NodeInfo> getNodesForTxnIds(List<Long> txnIds) {
+        if(txnIds.isEmpty()) {
+            return new HashSet<>();
+        }
         Set<NodeInfo> ret = new HashSet<>();
-
-        trackingComponent.getNodes(toNodeParameters(txnIds), node -> {
+        NodeParameters parameters = toNodeParameters(txnIds);
+        trackingComponent.getNodes(parameters, node -> {
             // TODO filter out deleted nodes?
             ret.add(new NodeInfo(node.getTransaction().getId(), node.getId(), node.getNodeRef()));
             return true;

diff --git a/.../test/java/eu/xenit/alfresco/healthprocessor/indexing/Alfresco7TrackingComponentTest.java b/.../test/java/eu/xenit/alfresco/healthprocessor/indexing/Alfresco7TrackingComponentTest.java
@@ -8,6 +8,8 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import eu.xenit.alfresco.healthprocessor.indexing.TrackingComponent.NodeInfo;
@@ -61,6 +63,11 @@ void getNodesForTxnIds() {
                         new NodeInfo(1L, 102L, new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, "xyz-987"))));
     }
 
+    @Test
+    void getNodesForEmptyTxnIdList() {
+        trackingComponent.getNodesForTxnIds(Collections.emptyList());
+        verify(searchTrackingComponent, never()).getNodes(any(), any());
+    }
 
     private Node nodeEntity(long txnId, long nodeId, String uuid) {
         Node ret = mock(Node.class);
@@ -73,4 +80,4 @@ private Node nodeEntity(long txnId, long nodeId, String uuid) {
     }
 
 
-}
+}
diff --git a/...m/src/main/java/eu/xenit/alfresco/healthprocessor/indexing/AlfrescoTrackingComponent.java b/...m/src/main/java/eu/xenit/alfresco/healthprocessor/indexing/AlfrescoTrackingComponent.java
@@ -4,6 +4,7 @@
 import java.util.List;
 import java.util.Set;
 import lombok.RequiredArgsConstructor;
+import org.alfresco.repo.solr.NodeParameters;
 import org.alfresco.repo.solr.SOLRTrackingComponent;
 
 @RequiredArgsConstructor
@@ -18,9 +19,12 @@ public long getMaxTxnId() {
 
     @Override
     public Set<NodeInfo> getNodesForTxnIds(List<Long> txnIds) {
+        if(txnIds.isEmpty()) {
+            return new HashSet<>();
+        }
         Set<NodeInfo> ret = new HashSet<>();
-
-        trackingComponent.getNodes(toNodeParameters(txnIds), node -> {
+        NodeParameters parameters = toNodeParameters(txnIds);
+        trackingComponent.getNodes(parameters, node -> {
             // TODO filter out deleted nodes?
             ret.add(new NodeInfo(node.getTransaction().getId(), node.getId(), node.getNodeRef()));
             return true;

diff --git a/...c/test/java/eu/xenit/alfresco/healthprocessor/indexing/AlfrescoTrackingComponentTest.java b/...c/test/java/eu/xenit/alfresco/healthprocessor/indexing/AlfrescoTrackingComponentTest.java
@@ -7,6 +7,8 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import eu.xenit.alfresco.healthprocessor.indexing.TrackingComponent.NodeInfo;
@@ -60,6 +62,11 @@ void getNodesForTxnIds() {
                         new NodeInfo(1L, 102L, new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, "xyz-987"))));
     }
 
+    @Test
+    void getNodesForEmptyTxnIdList() {
+        trackingComponent.getNodesForTxnIds(Collections.emptyList());
+        verify(solrTrackingComponent, never()).getNodes(any(), any());
+    }
 
     private Node nodeEntity(long txnId, long nodeId, String uuid) {
         Node ret = mock(Node.class);
@@ -72,4 +79,4 @@ private Node nodeEntity(long txnId, long nodeId, String uuid) {
     }
 
 
-}
+}