Move PrizeCollectingSteinerTreeWriteStep to dedicated module

Author: vnickolov

applications/algorithms/path-finding/src/main/java/org/neo4j/gds/applications/algorithms/pathfinding/PathFindingAlgorithmsWriteModeBusinessFacade.java

@@ -38,6 +38,7 @@
 import org.neo4j.gds.mem.MemoryEstimation;
 import org.neo4j.gds.pathfinding.BellmanFordWriteStep;
 import org.neo4j.gds.pathfinding.KSpanningTreeWriteStep;
+import org.neo4j.gds.pathfinding.PrizeCollectingSteinerTreeWriteStep;
 import org.neo4j.gds.pathfinding.ShortestPathWriteStep;
 import org.neo4j.gds.paths.WritePathOptionsConfig;
 import org.neo4j.gds.paths.astar.config.ShortestPathAStarWriteConfig;
@@ -172,7 +173,13 @@ public <RESULT> RESULT pcst(
         PCSTWriteConfig configuration,
         ResultBuilder<PCSTWriteConfig, PrizeSteinerTreeResult, RESULT, RelationshipsWritten> resultBuilder
     ) {
-        var writeStep = new PrizeCollectingSteinerTreeWriteStep(requestScopedDependencies, writeRelationshipService, configuration);
+        var writeStep = new PrizeCollectingSteinerTreeWriteStep(
+            writeRelationshipService,
+            configuration.writeRelationshipType(),
+            configuration.writeProperty(),
+            configuration::resolveResultStore,
+            configuration.jobId()
+        );
 
         return runAlgorithmAndWrite(
             graphName,

…PrizeCollectingSteinerTreeWriteStep.java …PrizeCollectingSteinerTreeWriteStep.javaapplications/algorithms/path-finding/src/main/java/org/neo4j/gds/applications/algorithms/pathfinding/PrizeCollectingSteinerTreeWriteStep.java renamed to procedures/path-finding-write-steps/src/main/java/org/neo4j/gds/pathfinding/PrizeCollectingSteinerTreeWriteStep.java applications/algorithms/path-finding/src/main/java/org/neo4j/gds/applications/algorithms/pathfinding/PrizeCollectingSteinerTreeWriteStep.java renamed to procedures/path-finding-write-steps/src/main/java/org/neo4j/gds/pathfinding/PrizeCollectingSteinerTreeWriteStep.java

@@ -17,34 +17,42 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.gds.applications.algorithms.pathfinding;
+package org.neo4j.gds.pathfinding;
 
 import org.neo4j.gds.api.Graph;
 import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.api.ResultStore;
-import org.neo4j.gds.applications.algorithms.machinery.RequestScopedDependencies;
 import org.neo4j.gds.applications.algorithms.machinery.WriteRelationshipService;
 import org.neo4j.gds.applications.algorithms.machinery.WriteStep;
 import org.neo4j.gds.applications.algorithms.metadata.RelationshipsWritten;
 import org.neo4j.gds.core.utils.progress.JobId;
-import org.neo4j.gds.pcst.PCSTWriteConfig;
 import org.neo4j.gds.pricesteiner.PrizeSteinerTreeResult;
 import org.neo4j.gds.spanningtree.SpanningGraph;
 import org.neo4j.gds.spanningtree.SpanningTree;
 
-class PrizeCollectingSteinerTreeWriteStep implements WriteStep<PrizeSteinerTreeResult, RelationshipsWritten> {
-    private final RequestScopedDependencies requestScopedDependencies;
-    private final PCSTWriteConfig configuration;
+import java.util.Optional;
+import java.util.function.Function;
+
+public class PrizeCollectingSteinerTreeWriteStep implements WriteStep<PrizeSteinerTreeResult, RelationshipsWritten> {
     private final WriteRelationshipService writeRelationshipService;
+    private final String writeRelationshipType;
+    private final String writeProperty;
+    private final Function<ResultStore, Optional<ResultStore>> resultStoreResolver;
+    private final JobId jobId;
+
 
-    PrizeCollectingSteinerTreeWriteStep(
-        RequestScopedDependencies requestScopedDependencies,
+    public PrizeCollectingSteinerTreeWriteStep(
         WriteRelationshipService writeRelationshipService,
-        PCSTWriteConfig configuration
+        String writeRelationshipType,
+        String writeProperty,
+        Function<ResultStore, Optional<ResultStore>> resultStoreResolver,
+        JobId jobId
     ) {
-        this.requestScopedDependencies = requestScopedDependencies;
-        this.configuration = configuration;
         this.writeRelationshipService = writeRelationshipService;
+        this.writeRelationshipType = writeRelationshipType;
+        this.writeProperty = writeProperty;
+        this.resultStoreResolver = resultStoreResolver;
+        this.jobId = jobId;
     }
 
     @Override
@@ -67,14 +75,14 @@ public RelationshipsWritten execute(
         var spanningGraph = new SpanningGraph(graph, spanningTree);
 
         return writeRelationshipService.writeFromGraph(
-            configuration.writeRelationshipType(),
-            configuration.writeProperty(),
+            writeRelationshipType,
+            writeProperty,
             spanningGraph,
             spanningGraph,
             "PrizeCollectingSteinerWrite",
-            configuration.resolveResultStore(resultStore),
-            (a,b,c)-> true,
-            configuration.jobId()
+            resultStoreResolver.apply(resultStore),
+            (a, b, c) -> true,
+            this.jobId
         );
     }
 }