tidying up unused dependency

Author: lassewesth

algo/src/test/java/org/neo4j/gds/pagerank/PageRankTest.java

@@ -112,7 +112,7 @@ void withoutTolerance() {
                 .tolerance(0)
                 .build();
 
-            var centralityAlgorithms = new CentralityAlgorithms(null, TerminationFlag.RUNNING_TRUE);
+            var centralityAlgorithms = new CentralityAlgorithms(TerminationFlag.RUNNING_TRUE);
             var result = centralityAlgorithms.pageRank(graph, config, ProgressTracker.NULL_TRACKER);
             var rankProvider = result.centralityScoreProvider();
 
@@ -135,7 +135,7 @@ void withTolerance(double tolerance, int expectedIterations) {
                 .tolerance(tolerance)
                 .build();
 
-            var centralityAlgorithms = new CentralityAlgorithms(null, TerminationFlag.RUNNING_TRUE);
+            var centralityAlgorithms = new CentralityAlgorithms(TerminationFlag.RUNNING_TRUE);
 
             var pregelResult = centralityAlgorithms.pageRank(graph, config, ProgressTracker.NULL_TRACKER);
 
@@ -161,7 +161,7 @@ void withSourceNodes(String sourceNodesString, String expectedPropertyKey) {
                 .sourceNodes(sourceNodeIds)
                 .build();
 
-            var centralityAlgorithms = new CentralityAlgorithms(null, TerminationFlag.RUNNING_TRUE);
+            var centralityAlgorithms = new CentralityAlgorithms(TerminationFlag.RUNNING_TRUE);
             var result = centralityAlgorithms.pageRank(graph, config, ProgressTracker.NULL_TRACKER);
             var rankProvider = result.centralityScoreProvider();
 
@@ -192,7 +192,7 @@ void withBiasedSourceNodes() {
                 .sourceNodes(sourceNodesMap)
                 .build();
 
-            var centralityAlgorithms = new CentralityAlgorithms(null, TerminationFlag.RUNNING_TRUE);
+            var centralityAlgorithms = new CentralityAlgorithms(TerminationFlag.RUNNING_TRUE);
             var result = centralityAlgorithms.pageRank(graph, config, ProgressTracker.NULL_TRACKER);
             var rankProvider = result.centralityScoreProvider();
 
@@ -214,7 +214,7 @@ void shouldLogProgress() {
                 .userLogRegistryFactory(EmptyUserLogRegistryFactory.INSTANCE)
                 .build();
             var progressTrackerCreator = new ProgressTrackerCreator(new LoggerForProgressTrackingAdapter(log), requestScopedDependencies);
-            var centralityAlgorithms = new CentralityAlgorithms(progressTrackerCreator, TerminationFlag.RUNNING_TRUE);
+            var centralityAlgorithms = new CentralityAlgorithms(TerminationFlag.RUNNING_TRUE);
             var businessAlgorithms = new CentralityBusinessAlgorithms(
                 centralityAlgorithms,
                 progressTrackerCreator
@@ -294,7 +294,7 @@ void shouldLogProgress() {
 
         @Test
         void checkTerminationFlag() {
-            var centralityAlgorithms = new CentralityAlgorithms(null, TerminationFlag.STOP_RUNNING);
+            var centralityAlgorithms = new CentralityAlgorithms(TerminationFlag.STOP_RUNNING);
 
             var config = PageRankStreamConfigImpl.builder()
                 .maxIterations(40)
@@ -380,7 +380,7 @@ void withWeights(String relationshipWeight) {
                 .concurrency(1)
                 .build();
 
-            var centralityAlgorithms = new CentralityAlgorithms(null, TerminationFlag.RUNNING_TRUE);
+            var centralityAlgorithms = new CentralityAlgorithms(TerminationFlag.RUNNING_TRUE);
             var result = centralityAlgorithms.pageRank(graph, config, ProgressTracker.NULL_TRACKER);
             var rankProvider = result.centralityScoreProvider();
 
@@ -403,7 +403,7 @@ void withZeroWeights() {
                 .concurrency(1)
                 .build();
 
-            var centralityAlgorithms = new CentralityAlgorithms(null, TerminationFlag.RUNNING_TRUE);
+            var centralityAlgorithms = new CentralityAlgorithms(TerminationFlag.RUNNING_TRUE);
             var result = centralityAlgorithms.pageRank(zeroWeightsGraph, config, ProgressTracker.NULL_TRACKER);
             var rankProvider = result.centralityScoreProvider();
 
@@ -434,7 +434,7 @@ void withWeightsAndBiasedSourceNodes() {
                 .sourceNodes(sourceNodesMap)
                 .build();
 
-            var centralityAlgorithms = new CentralityAlgorithms(null, TerminationFlag.RUNNING_TRUE);
+            var centralityAlgorithms = new CentralityAlgorithms(TerminationFlag.RUNNING_TRUE);
             var result = centralityAlgorithms.pageRank(graph, config, ProgressTracker.NULL_TRACKER);
             var rankProvider = result.centralityScoreProvider();
 
@@ -516,7 +516,7 @@ void articleRank(SoftAssertions softly) {
                 .concurrency(1)
                 .build();
 
-            var centralityAlgorithms = new CentralityAlgorithms(null, TerminationFlag.RUNNING_TRUE);
+            var centralityAlgorithms = new CentralityAlgorithms(TerminationFlag.RUNNING_TRUE);
 
             var result = centralityAlgorithms.articleRank(graph, config, ProgressTracker.NULL_TRACKER);
 
@@ -540,7 +540,7 @@ void articleRankOnPaperGraphTest(SoftAssertions softly) {
                 .concurrency(1)
                 .build();
 
-            var centralityAlgorithms = new CentralityAlgorithms(null, TerminationFlag.RUNNING_TRUE);
+            var centralityAlgorithms = new CentralityAlgorithms(TerminationFlag.RUNNING_TRUE);
 
             var result = centralityAlgorithms.articleRank(paperGraph, config, ProgressTracker.NULL_TRACKER);
 
@@ -568,7 +568,7 @@ void withBiasedSourceNodes() {
                 .sourceNodes(sourceNodesMap)
                 .build();
 
-            var centralityAlgorithms = new CentralityAlgorithms(null, TerminationFlag.RUNNING_TRUE);
+            var centralityAlgorithms = new CentralityAlgorithms(TerminationFlag.RUNNING_TRUE);
 
             var result = centralityAlgorithms.articleRank(graph, config, ProgressTracker.NULL_TRACKER);
 
@@ -627,7 +627,7 @@ void eigenvector() {
                 .concurrency(1)
                 .build();
 
-            var centralityAlgorithms = new CentralityAlgorithms(null, TerminationFlag.RUNNING_TRUE);
+            var centralityAlgorithms = new CentralityAlgorithms(TerminationFlag.RUNNING_TRUE);
 
             var result = centralityAlgorithms.eigenVector(graph, config, ProgressTracker.NULL_TRACKER);
 
@@ -653,7 +653,7 @@ void weighted() {
                 .concurrency(1)
                 .build();
 
-            var centralityAlgorithms = new CentralityAlgorithms(null, TerminationFlag.RUNNING_TRUE);
+            var centralityAlgorithms = new CentralityAlgorithms(TerminationFlag.RUNNING_TRUE);
 
             var result = centralityAlgorithms.eigenVector(graph, config, ProgressTracker.NULL_TRACKER);
 
@@ -679,7 +679,7 @@ void withSourceNodes() {
                 .sourceNodes(List.of(idFunction.of("d")))
                 .build();
 
-            var centralityAlgorithms = new CentralityAlgorithms(null, TerminationFlag.RUNNING_TRUE);
+            var centralityAlgorithms = new CentralityAlgorithms(TerminationFlag.RUNNING_TRUE);
 
             var result = centralityAlgorithms.eigenVector(graph, config, ProgressTracker.NULL_TRACKER);
 
@@ -736,7 +736,7 @@ void test(String scalerName, String expectedPropertyKey) {
                 .scaler(ScalerFactory.parse(scalerName))
                 .build();
 
-            var centralityAlgorithms = new CentralityAlgorithms(null, TerminationFlag.RUNNING_TRUE);
+            var centralityAlgorithms = new CentralityAlgorithms(TerminationFlag.RUNNING_TRUE);
 
             var result = centralityAlgorithms.pageRank(graph, config, ProgressTracker.NULL_TRACKER);
             var rankProvider = result.centralityScoreProvider();
@@ -764,7 +764,7 @@ void parallelExecution() {
         var configBuilder = PageRankConfigImpl.builder();
 
         PageRankConfig config1 = configBuilder.concurrency(1).build();
-        var centralityAlgorithms = new CentralityAlgorithms(null, TerminationFlag.RUNNING_TRUE);
+        var centralityAlgorithms = new CentralityAlgorithms(TerminationFlag.RUNNING_TRUE);
         var result = centralityAlgorithms.pageRank(graph, config1, ProgressTracker.NULL_TRACKER);
         var singleThreaded = result.centralityScoreProvider();
 

applications/algorithms/centrality/src/main/java/org/neo4j/gds/applications/algorithms/centrality/CentralityAlgorithms.java

@@ -21,7 +21,6 @@
 
 import com.carrotsearch.hppc.LongScatterSet;
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.applications.algorithms.machinery.ProgressTrackerCreator;
 import org.neo4j.gds.articulationPoints.ArticulationPointsParameters;
 import org.neo4j.gds.articulationpoints.ArticulationPoints;
 import org.neo4j.gds.articulationpoints.ArticulationPointsResult;
@@ -71,11 +70,9 @@
 
 public class CentralityAlgorithms {
 
-    private final ProgressTrackerCreator progressTrackerCreator;
     private final TerminationFlag terminationFlag;
 
-    public CentralityAlgorithms(ProgressTrackerCreator progressTrackerCreator, TerminationFlag terminationFlag) {
-        this.progressTrackerCreator = progressTrackerCreator;
+    public CentralityAlgorithms(TerminationFlag terminationFlag) {
         this.terminationFlag = terminationFlag;
     }
 

applications/algorithms/centrality/src/main/java/org/neo4j/gds/applications/algorithms/centrality/CentralityApplications.java

@@ -59,7 +59,6 @@ public static CentralityApplications create(
     ) {
         var estimation = new CentralityAlgorithmsEstimationModeBusinessFacade(estimationTemplate);
         var algorithms = new CentralityAlgorithms(
-            progressTrackerCreator,
             requestScopedDependencies.terminationFlag()
         );