Remove test-only TaskStore::taskStream

Author: FlorentinD

alpha/alpha-proc/src/test/java/org/neo4j/gds/centrality/HarmonicCentralityProcTest.java

@@ -29,6 +29,7 @@
 import org.neo4j.gds.catalog.GraphProjectProc;
 import org.neo4j.gds.core.utils.progress.GlobalTaskStore;
 import org.neo4j.gds.core.utils.progress.TaskRegistry;
+import org.neo4j.gds.core.utils.progress.TaskStore;
 import org.neo4j.gds.core.utils.progress.tasks.Task;
 import org.neo4j.gds.core.write.NativeNodePropertiesExporterBuilder;
 import org.neo4j.gds.extension.Neo4jGraph;
@@ -125,7 +126,7 @@ void testProgressTracking() {
                 Map.of("writeProperty", "myProp")
             );
 
-            assertThat(taskStore.taskStream().map(Task::description)).containsExactlyInAnyOrder(
+            assertThat(taskStore.query().map(TaskStore.UserTask::task).map(Task::description)).containsExactlyInAnyOrder(
                 "HarmonicCentrality",
                 "HarmonicCentrality :: WriteNodeProperties"
             );

alpha/alpha-proc/src/test/java/org/neo4j/gds/scc/SccProcTest.java

@@ -30,6 +30,7 @@
 import org.neo4j.gds.catalog.GraphProjectProc;
 import org.neo4j.gds.core.utils.progress.GlobalTaskStore;
 import org.neo4j.gds.core.utils.progress.TaskRegistry;
+import org.neo4j.gds.core.utils.progress.TaskStore;
 import org.neo4j.gds.core.utils.progress.tasks.Task;
 import org.neo4j.gds.core.write.NativeNodePropertiesExporterBuilder;
 import org.neo4j.gds.transaction.TransactionContext;
@@ -157,7 +158,7 @@ void testProgressTracking() {
                 Map.of("writeProperty", "myProp")
             );
 
-            assertThat(taskStore.taskStream().map(Task::description)).containsExactlyInAnyOrder(
+            assertThat(taskStore.query().map(TaskStore.UserTask::task).map(Task::description)).containsExactlyInAnyOrder(
                 "Scc",
                 "Scc :: WriteNodeProperties"
             );

core/src/main/java/org/neo4j/gds/core/utils/progress/EmptyTaskStore.java

@@ -22,7 +22,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.neo4j.gds.core.utils.progress.tasks.Task;
 
-import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Stream;
 
@@ -55,11 +54,6 @@ public Optional<UserTask> query(String username, JobId jobId) {
         return Optional.empty();
     }
 
-    @Override
-    public Stream<Task> taskStream() {
-        return Stream.empty();
-    }
-
     @Override
     public boolean isEmpty() {
         return true;

core/src/main/java/org/neo4j/gds/core/utils/progress/GlobalTaskStore.java

@@ -19,14 +19,12 @@
  */
 package org.neo4j.gds.core.utils.progress;
 
-import org.jetbrains.annotations.NotNull;
 import org.neo4j.function.ThrowingFunction;
 import org.neo4j.gds.compat.Neo4jProxy;
 import org.neo4j.gds.core.utils.progress.tasks.Task;
 import org.neo4j.internal.kernel.api.exceptions.ProcedureException;
 import org.neo4j.kernel.api.procedure.Context;
 
-import java.util.Collection;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
@@ -90,13 +88,6 @@ public Optional<UserTask> query(String username, JobId jobId) {
         return Optional.empty();
     }
 
-    @Override
-    public Stream<Task> taskStream() {
-        return registeredTasks.values().stream()
-            .map(Map::values)
-            .flatMap(Collection::stream);
-    }
-
     @Override
     public TaskRegistryFactory apply(Context context) throws ProcedureException {
         var username = Neo4jProxy.username(context.securityContext().subject());

core/src/main/java/org/neo4j/gds/core/utils/progress/TaskStore.java

@@ -42,9 +42,6 @@ public interface TaskStore {
 
     Optional<UserTask> query(String username, JobId jobId);
 
-    @TestOnly
-    Stream<Task> taskStream();
-
     boolean isEmpty();
 
     long taskCount();

proc/catalog/src/test/java/org/neo4j/gds/catalog/GraphProjectProcTest.java

@@ -99,6 +99,7 @@
 import static org.neo4j.gds.config.GraphProjectFromCypherConfig.RELATIONSHIP_QUERY_KEY;
 import static org.neo4j.gds.config.GraphProjectFromStoreConfig.NODE_PROJECTION_KEY;
 import static org.neo4j.gds.config.GraphProjectFromStoreConfig.RELATIONSHIP_PROJECTION_KEY;
+import static org.neo4j.gds.core.utils.progress.TaskStore.UserTask;
 import static org.neo4j.gds.utils.StringFormatting.formatWithLocale;
 
 class GraphProjectProcTest extends BaseProcTest {
@@ -199,7 +200,7 @@ void testNativeProgressTracking() {
 
             proc.project("myGraph", "*", "*", Map.of());
 
-            Assertions.assertThat(taskStore.taskStream().map(Task::description)).contains("Loading");
+            Assertions.assertThat(taskStore.query().map(UserTask::task).map(Task::description)).contains("Loading");
         });
     }
 
@@ -211,7 +212,7 @@ void testCypherProgressTracking() {
 
             proc.projectCypher("myGraph", ALL_NODES_QUERY, ALL_RELATIONSHIPS_QUERY, Map.of());
 
-            Assertions.assertThat(taskStore.taskStream().map(Task::description)).contains("Loading");
+            Assertions.assertThat(taskStore.query().map(UserTask::task).map(Task::description)).contains("Loading");
         });
     }
 

proc/common/src/test/java/org/neo4j/gds/WriteProcCancellationTest.java

@@ -113,7 +113,7 @@ public long size() {
                 .isInstanceOf(IllegalStateException.class)
                 .hasMessageContaining("explicit fail while writing");
             assertThat(taskStore.removeTaskInvocations).isGreaterThanOrEqualTo(1);
-            assertThat(taskStore.taskStream()).isEmpty();
+            assertThat(taskStore.query()).isEmpty();
         }
     }
 }

proc/path-finding/src/test/java/org/neo4j/gds/paths/sourcetarget/ShortestPathDijkstraWriteProcTest.java

@@ -32,6 +32,7 @@
 import org.neo4j.gds.core.CypherMapWrapper;
 import org.neo4j.gds.core.utils.progress.GlobalTaskStore;
 import org.neo4j.gds.core.utils.progress.TaskRegistry;
+import org.neo4j.gds.core.utils.progress.TaskStore;
 import org.neo4j.gds.core.utils.progress.tasks.Task;
 import org.neo4j.gds.paths.dijkstra.Dijkstra;
 import org.neo4j.gds.paths.dijkstra.DijkstraResult;
@@ -195,7 +196,7 @@ void testProgressTracking() {
                 )
             );
 
-            assertThat(taskStore.taskStream().map(Task::description)).containsExactlyInAnyOrder(
+            assertThat(taskStore.query().map(TaskStore.UserTask::task).map(Task::description)).containsExactlyInAnyOrder(
                 "Dijkstra",
                 "Write shortest Paths :: WriteRelationshipStream"
             );

proc/similarity/src/test/java/org/neo4j/gds/similarity/filteredknn/FilteredKnnWriteProcTest.java

@@ -35,6 +35,7 @@
 import org.neo4j.gds.core.loading.GraphStoreCatalog;
 import org.neo4j.gds.core.utils.progress.GlobalTaskStore;
 import org.neo4j.gds.core.utils.progress.TaskRegistry;
+import org.neo4j.gds.core.utils.progress.TaskStore.UserTask;
 import org.neo4j.gds.core.utils.progress.tasks.Task;
 
 import java.util.List;
@@ -192,7 +193,7 @@ void testProgressTracking() {
 
             pathProc.write("undirectedGraph", createMinimalConfig(CypherMapWrapper.empty()).toMap());
 
-            Assertions.assertThat(taskStore.taskStream().map(Task::description)).containsExactlyInAnyOrder(
+            Assertions.assertThat(taskStore.query().map(UserTask::task).map(Task::description)).containsExactlyInAnyOrder(
                 "FilteredKnnWriteProc :: Relationships :: Write",
                 "Knn"
             );

proc/similarity/src/test/java/org/neo4j/gds/similarity/knn/KnnWriteProcTest.java

@@ -35,6 +35,7 @@
 import org.neo4j.gds.core.loading.GraphStoreCatalog;
 import org.neo4j.gds.core.utils.progress.GlobalTaskStore;
 import org.neo4j.gds.core.utils.progress.TaskRegistry;
+import org.neo4j.gds.core.utils.progress.TaskStore;
 import org.neo4j.gds.core.utils.progress.tasks.Task;
 
 import java.util.List;
@@ -192,7 +193,7 @@ void testProgressTracking() {
 
             pathProc.write("undirectedGraph", createMinimalConfig(CypherMapWrapper.empty()).toMap());
 
-            Assertions.assertThat(taskStore.taskStream().map(Task::description)).containsExactlyInAnyOrder(
+            Assertions.assertThat(taskStore.query().map(TaskStore.UserTask::task).map(Task::description)).containsExactlyInAnyOrder(
                 "KnnWriteProc :: Relationships :: Write",
                 "Knn"
             );