From a01e867a58ff00dd1e4be00c71692ed5c112a4d9 Mon Sep 17 00:00:00 2001 From: Lasse Westh-Nielsen Date: Thu, 11 Apr 2024 11:08:52 +0200 Subject: [PATCH] rearranging classes to make them reusable --- .../gds/ml/pipeline/stubs/AbstractStub.java | 2 +- .../ml/pipeline/stubs/BellmanFordStub.java | 2 +- .../stubs/BreadthFirstSearchStub.java | 2 +- .../pipeline/stubs/DepthFirstSearchStub.java | 2 +- .../SinglePairShortestPathAStarStub.java | 2 +- .../SinglePairShortestPathDijkstraStub.java | 2 +- .../stubs/SinglePairShortestPathYensStub.java | 2 +- .../SingleSourceShortestPathDeltaStub.java | 2 +- .../SingleSourceShortestPathDijkstraStub.java | 2 +- .../ml/pipeline/stubs/SpanningTreeStub.java | 2 +- .../ml/pipeline/stubs/SteinerTreeStub.java | 2 +- .../{pathfinding => }/AlgorithmHandle.java | 2 +- .../PathFindingProcedureFacade.java | 3 ++- .../stubs/BellmanFordMutateStub.java | 3 ++- .../stubs/BreadthFirstSearchMutateStub.java | 3 ++- .../stubs/DeltaSteppingMutateStub.java | 3 ++- .../stubs/DepthFirstSearchMutateStub.java | 3 ++- ...SinglePairShortestPathAStarMutateStub.java | 3 ++- ...glePairShortestPathDijkstraMutateStub.java | 3 ++- .../SinglePairShortestPathYensMutateStub.java | 3 ++- ...eSourceShortestPathDijkstraMutateStub.java | 3 ++- .../stubs/SpanningTreeMutateStub.java | 3 ++- .../stubs/SteinerTreeMutateStub.java | 3 ++- .../{pathfinding => }/stubs/GenericStub.java | 24 +++++++++---------- .../{pathfinding => stubs}/MutateStub.java | 2 +- 25 files changed, 47 insertions(+), 36 deletions(-) rename procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/{pathfinding => }/AlgorithmHandle.java (95%) rename procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/{pathfinding => }/stubs/GenericStub.java (81%) rename procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/{pathfinding => stubs}/MutateStub.java (97%) diff --git a/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/AbstractStub.java b/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/AbstractStub.java index 04e76b3121..a953a5fcc2 100644 --- a/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/AbstractStub.java +++ b/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/AbstractStub.java @@ -23,7 +23,7 @@ import org.neo4j.gds.exceptions.MemoryEstimationNotImplementedException; import org.neo4j.gds.ml.pipeline.Stub; import org.neo4j.gds.procedures.algorithms.AlgorithmsProcedureFacade; -import org.neo4j.gds.procedures.algorithms.pathfinding.MutateStub; +import org.neo4j.gds.procedures.algorithms.stubs.MutateStub; import java.util.Map; diff --git a/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/BellmanFordStub.java b/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/BellmanFordStub.java index e43bb3c75a..95e152bfc5 100644 --- a/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/BellmanFordStub.java +++ b/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/BellmanFordStub.java @@ -22,7 +22,7 @@ import org.neo4j.gds.paths.bellmanford.BellmanFordMutateConfig; import org.neo4j.gds.procedures.algorithms.AlgorithmsProcedureFacade; import org.neo4j.gds.procedures.algorithms.pathfinding.BellmanFordMutateResult; -import org.neo4j.gds.procedures.algorithms.pathfinding.MutateStub; +import org.neo4j.gds.procedures.algorithms.stubs.MutateStub; public class BellmanFordStub extends AbstractStub { protected MutateStub stub(AlgorithmsProcedureFacade facade) { diff --git a/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/BreadthFirstSearchStub.java b/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/BreadthFirstSearchStub.java index 585c8267e0..bb5aba8f05 100644 --- a/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/BreadthFirstSearchStub.java +++ b/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/BreadthFirstSearchStub.java @@ -21,7 +21,7 @@ import org.neo4j.gds.paths.traverse.BfsMutateConfig; import org.neo4j.gds.procedures.algorithms.AlgorithmsProcedureFacade; -import org.neo4j.gds.procedures.algorithms.pathfinding.MutateStub; +import org.neo4j.gds.procedures.algorithms.stubs.MutateStub; import org.neo4j.gds.procedures.algorithms.pathfinding.PathFindingMutateResult; public class BreadthFirstSearchStub extends AbstractStub { diff --git a/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/DepthFirstSearchStub.java b/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/DepthFirstSearchStub.java index c124a71023..82a0af2d7b 100644 --- a/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/DepthFirstSearchStub.java +++ b/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/DepthFirstSearchStub.java @@ -21,7 +21,7 @@ import org.neo4j.gds.paths.traverse.DfsMutateConfig; import org.neo4j.gds.procedures.algorithms.AlgorithmsProcedureFacade; -import org.neo4j.gds.procedures.algorithms.pathfinding.MutateStub; +import org.neo4j.gds.procedures.algorithms.stubs.MutateStub; import org.neo4j.gds.procedures.algorithms.pathfinding.PathFindingMutateResult; public class DepthFirstSearchStub extends AbstractStub { diff --git a/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/SinglePairShortestPathAStarStub.java b/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/SinglePairShortestPathAStarStub.java index e263396aeb..5d4c127723 100644 --- a/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/SinglePairShortestPathAStarStub.java +++ b/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/SinglePairShortestPathAStarStub.java @@ -21,7 +21,7 @@ import org.neo4j.gds.paths.astar.config.ShortestPathAStarMutateConfig; import org.neo4j.gds.procedures.algorithms.AlgorithmsProcedureFacade; -import org.neo4j.gds.procedures.algorithms.pathfinding.MutateStub; +import org.neo4j.gds.procedures.algorithms.stubs.MutateStub; import org.neo4j.gds.procedures.algorithms.pathfinding.PathFindingMutateResult; public class SinglePairShortestPathAStarStub extends AbstractStub { diff --git a/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/SinglePairShortestPathDijkstraStub.java b/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/SinglePairShortestPathDijkstraStub.java index f808bc92f2..f5f80d516f 100644 --- a/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/SinglePairShortestPathDijkstraStub.java +++ b/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/SinglePairShortestPathDijkstraStub.java @@ -21,7 +21,7 @@ import org.neo4j.gds.paths.dijkstra.config.ShortestPathDijkstraMutateConfig; import org.neo4j.gds.procedures.algorithms.AlgorithmsProcedureFacade; -import org.neo4j.gds.procedures.algorithms.pathfinding.MutateStub; +import org.neo4j.gds.procedures.algorithms.stubs.MutateStub; import org.neo4j.gds.procedures.algorithms.pathfinding.PathFindingMutateResult; public class SinglePairShortestPathDijkstraStub extends AbstractStub { diff --git a/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/SinglePairShortestPathYensStub.java b/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/SinglePairShortestPathYensStub.java index b23f93a5da..93a8a42a14 100644 --- a/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/SinglePairShortestPathYensStub.java +++ b/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/SinglePairShortestPathYensStub.java @@ -21,7 +21,7 @@ import org.neo4j.gds.paths.yens.config.ShortestPathYensMutateConfig; import org.neo4j.gds.procedures.algorithms.AlgorithmsProcedureFacade; -import org.neo4j.gds.procedures.algorithms.pathfinding.MutateStub; +import org.neo4j.gds.procedures.algorithms.stubs.MutateStub; import org.neo4j.gds.procedures.algorithms.pathfinding.PathFindingMutateResult; public class SinglePairShortestPathYensStub extends AbstractStub { diff --git a/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/SingleSourceShortestPathDeltaStub.java b/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/SingleSourceShortestPathDeltaStub.java index 46652851d1..ba37b8f5eb 100644 --- a/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/SingleSourceShortestPathDeltaStub.java +++ b/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/SingleSourceShortestPathDeltaStub.java @@ -21,7 +21,7 @@ import org.neo4j.gds.paths.delta.config.AllShortestPathsDeltaMutateConfig; import org.neo4j.gds.procedures.algorithms.AlgorithmsProcedureFacade; -import org.neo4j.gds.procedures.algorithms.pathfinding.MutateStub; +import org.neo4j.gds.procedures.algorithms.stubs.MutateStub; import org.neo4j.gds.procedures.algorithms.pathfinding.PathFindingMutateResult; public class SingleSourceShortestPathDeltaStub extends AbstractStub { diff --git a/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/SingleSourceShortestPathDijkstraStub.java b/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/SingleSourceShortestPathDijkstraStub.java index ce0c000e6d..c69377b521 100644 --- a/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/SingleSourceShortestPathDijkstraStub.java +++ b/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/SingleSourceShortestPathDijkstraStub.java @@ -21,7 +21,7 @@ import org.neo4j.gds.paths.dijkstra.config.AllShortestPathsDijkstraMutateConfig; import org.neo4j.gds.procedures.algorithms.AlgorithmsProcedureFacade; -import org.neo4j.gds.procedures.algorithms.pathfinding.MutateStub; +import org.neo4j.gds.procedures.algorithms.stubs.MutateStub; import org.neo4j.gds.procedures.algorithms.pathfinding.PathFindingMutateResult; public class SingleSourceShortestPathDijkstraStub extends AbstractStub { diff --git a/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/SpanningTreeStub.java b/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/SpanningTreeStub.java index bddb4a951d..0df497c506 100644 --- a/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/SpanningTreeStub.java +++ b/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/SpanningTreeStub.java @@ -20,7 +20,7 @@ package org.neo4j.gds.ml.pipeline.stubs; import org.neo4j.gds.procedures.algorithms.AlgorithmsProcedureFacade; -import org.neo4j.gds.procedures.algorithms.pathfinding.MutateStub; +import org.neo4j.gds.procedures.algorithms.stubs.MutateStub; import org.neo4j.gds.procedures.algorithms.pathfinding.SpanningTreeMutateResult; import org.neo4j.gds.spanningtree.SpanningTreeMutateConfig; diff --git a/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/SteinerTreeStub.java b/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/SteinerTreeStub.java index d6f5a59f21..2da38d3695 100644 --- a/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/SteinerTreeStub.java +++ b/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/SteinerTreeStub.java @@ -20,7 +20,7 @@ package org.neo4j.gds.ml.pipeline.stubs; import org.neo4j.gds.procedures.algorithms.AlgorithmsProcedureFacade; -import org.neo4j.gds.procedures.algorithms.pathfinding.MutateStub; +import org.neo4j.gds.procedures.algorithms.stubs.MutateStub; import org.neo4j.gds.procedures.algorithms.pathfinding.SteinerMutateResult; import org.neo4j.gds.steiner.SteinerTreeMutateConfig; diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/AlgorithmHandle.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/AlgorithmHandle.java similarity index 95% rename from procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/AlgorithmHandle.java rename to procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/AlgorithmHandle.java index fddaa609b6..970c654143 100644 --- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/AlgorithmHandle.java +++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/AlgorithmHandle.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.gds.procedures.algorithms.pathfinding; +package org.neo4j.gds.procedures.algorithms; import org.neo4j.gds.api.GraphName; import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder; diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/PathFindingProcedureFacade.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/PathFindingProcedureFacade.java index 9dcf349ec3..a6d2f8bdce 100644 --- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/PathFindingProcedureFacade.java +++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/PathFindingProcedureFacade.java @@ -57,13 +57,14 @@ import org.neo4j.gds.paths.traverse.DfsStreamConfig; import org.neo4j.gds.paths.yens.config.ShortestPathYensStreamConfig; import org.neo4j.gds.paths.yens.config.ShortestPathYensWriteConfig; +import org.neo4j.gds.procedures.algorithms.AlgorithmHandle; import org.neo4j.gds.procedures.algorithms.configuration.ConfigurationCreator; import org.neo4j.gds.procedures.algorithms.configuration.ConfigurationParser; import org.neo4j.gds.procedures.algorithms.pathfinding.stubs.BellmanFordMutateStub; import org.neo4j.gds.procedures.algorithms.pathfinding.stubs.BreadthFirstSearchMutateStub; import org.neo4j.gds.procedures.algorithms.pathfinding.stubs.DeltaSteppingMutateStub; import org.neo4j.gds.procedures.algorithms.pathfinding.stubs.DepthFirstSearchMutateStub; -import org.neo4j.gds.procedures.algorithms.pathfinding.stubs.GenericStub; +import org.neo4j.gds.procedures.algorithms.stubs.GenericStub; import org.neo4j.gds.procedures.algorithms.pathfinding.stubs.SinglePairShortestPathAStarMutateStub; import org.neo4j.gds.procedures.algorithms.pathfinding.stubs.SinglePairShortestPathDijkstraMutateStub; import org.neo4j.gds.procedures.algorithms.pathfinding.stubs.SinglePairShortestPathYensMutateStub; diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/BellmanFordMutateStub.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/BellmanFordMutateStub.java index 289b5780bd..80657728fc 100644 --- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/BellmanFordMutateStub.java +++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/BellmanFordMutateStub.java @@ -24,7 +24,8 @@ import org.neo4j.gds.core.utils.mem.MemoryEstimation; import org.neo4j.gds.paths.bellmanford.BellmanFordMutateConfig; import org.neo4j.gds.procedures.algorithms.pathfinding.BellmanFordMutateResult; -import org.neo4j.gds.procedures.algorithms.pathfinding.MutateStub; +import org.neo4j.gds.procedures.algorithms.stubs.GenericStub; +import org.neo4j.gds.procedures.algorithms.stubs.MutateStub; import org.neo4j.gds.results.MemoryEstimateResult; import java.util.Map; diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/BreadthFirstSearchMutateStub.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/BreadthFirstSearchMutateStub.java index 56f6fe3af1..d6ffcefb63 100644 --- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/BreadthFirstSearchMutateStub.java +++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/BreadthFirstSearchMutateStub.java @@ -23,7 +23,8 @@ import org.neo4j.gds.applications.algorithms.pathfinding.PathFindingAlgorithmsEstimationModeBusinessFacade; import org.neo4j.gds.core.utils.mem.MemoryEstimation; import org.neo4j.gds.paths.traverse.BfsMutateConfig; -import org.neo4j.gds.procedures.algorithms.pathfinding.MutateStub; +import org.neo4j.gds.procedures.algorithms.stubs.GenericStub; +import org.neo4j.gds.procedures.algorithms.stubs.MutateStub; import org.neo4j.gds.procedures.algorithms.pathfinding.PathFindingMutateResult; import org.neo4j.gds.results.MemoryEstimateResult; diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/DeltaSteppingMutateStub.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/DeltaSteppingMutateStub.java index 6eb696394b..2fe30b9137 100644 --- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/DeltaSteppingMutateStub.java +++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/DeltaSteppingMutateStub.java @@ -23,7 +23,8 @@ import org.neo4j.gds.applications.algorithms.pathfinding.PathFindingAlgorithmsEstimationModeBusinessFacade; import org.neo4j.gds.core.utils.mem.MemoryEstimation; import org.neo4j.gds.paths.delta.config.AllShortestPathsDeltaMutateConfig; -import org.neo4j.gds.procedures.algorithms.pathfinding.MutateStub; +import org.neo4j.gds.procedures.algorithms.stubs.GenericStub; +import org.neo4j.gds.procedures.algorithms.stubs.MutateStub; import org.neo4j.gds.procedures.algorithms.pathfinding.PathFindingMutateResult; import org.neo4j.gds.procedures.algorithms.pathfinding.PathFindingResultBuilderForMutateMode; import org.neo4j.gds.results.MemoryEstimateResult; diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/DepthFirstSearchMutateStub.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/DepthFirstSearchMutateStub.java index 1b718d9778..28ef51aa9c 100644 --- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/DepthFirstSearchMutateStub.java +++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/DepthFirstSearchMutateStub.java @@ -23,7 +23,8 @@ import org.neo4j.gds.applications.algorithms.pathfinding.PathFindingAlgorithmsEstimationModeBusinessFacade; import org.neo4j.gds.core.utils.mem.MemoryEstimation; import org.neo4j.gds.paths.traverse.DfsMutateConfig; -import org.neo4j.gds.procedures.algorithms.pathfinding.MutateStub; +import org.neo4j.gds.procedures.algorithms.stubs.GenericStub; +import org.neo4j.gds.procedures.algorithms.stubs.MutateStub; import org.neo4j.gds.procedures.algorithms.pathfinding.PathFindingMutateResult; import org.neo4j.gds.results.MemoryEstimateResult; diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SinglePairShortestPathAStarMutateStub.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SinglePairShortestPathAStarMutateStub.java index a715402f52..e9cb20f414 100644 --- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SinglePairShortestPathAStarMutateStub.java +++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SinglePairShortestPathAStarMutateStub.java @@ -24,7 +24,8 @@ import org.neo4j.gds.core.utils.mem.MemoryEstimation; import org.neo4j.gds.paths.astar.config.ShortestPathAStarMutateConfig; import org.neo4j.gds.paths.dijkstra.config.ShortestPathDijkstraMutateConfig; -import org.neo4j.gds.procedures.algorithms.pathfinding.MutateStub; +import org.neo4j.gds.procedures.algorithms.stubs.GenericStub; +import org.neo4j.gds.procedures.algorithms.stubs.MutateStub; import org.neo4j.gds.procedures.algorithms.pathfinding.PathFindingMutateResult; import org.neo4j.gds.procedures.algorithms.pathfinding.PathFindingResultBuilderForMutateMode; import org.neo4j.gds.results.MemoryEstimateResult; diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SinglePairShortestPathDijkstraMutateStub.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SinglePairShortestPathDijkstraMutateStub.java index f6202b1712..de7a35e7dd 100644 --- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SinglePairShortestPathDijkstraMutateStub.java +++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SinglePairShortestPathDijkstraMutateStub.java @@ -23,7 +23,8 @@ import org.neo4j.gds.applications.algorithms.pathfinding.PathFindingAlgorithmsEstimationModeBusinessFacade; import org.neo4j.gds.core.utils.mem.MemoryEstimation; import org.neo4j.gds.paths.dijkstra.config.ShortestPathDijkstraMutateConfig; -import org.neo4j.gds.procedures.algorithms.pathfinding.MutateStub; +import org.neo4j.gds.procedures.algorithms.stubs.GenericStub; +import org.neo4j.gds.procedures.algorithms.stubs.MutateStub; import org.neo4j.gds.procedures.algorithms.pathfinding.PathFindingMutateResult; import org.neo4j.gds.procedures.algorithms.pathfinding.PathFindingResultBuilderForMutateMode; import org.neo4j.gds.results.MemoryEstimateResult; diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SinglePairShortestPathYensMutateStub.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SinglePairShortestPathYensMutateStub.java index 021a3e1c23..7c645b731a 100644 --- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SinglePairShortestPathYensMutateStub.java +++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SinglePairShortestPathYensMutateStub.java @@ -23,7 +23,8 @@ import org.neo4j.gds.applications.algorithms.pathfinding.PathFindingAlgorithmsEstimationModeBusinessFacade; import org.neo4j.gds.core.utils.mem.MemoryEstimation; import org.neo4j.gds.paths.yens.config.ShortestPathYensMutateConfig; -import org.neo4j.gds.procedures.algorithms.pathfinding.MutateStub; +import org.neo4j.gds.procedures.algorithms.stubs.GenericStub; +import org.neo4j.gds.procedures.algorithms.stubs.MutateStub; import org.neo4j.gds.procedures.algorithms.pathfinding.PathFindingMutateResult; import org.neo4j.gds.procedures.algorithms.pathfinding.PathFindingResultBuilderForMutateMode; import org.neo4j.gds.results.MemoryEstimateResult; diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SingleSourceShortestPathDijkstraMutateStub.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SingleSourceShortestPathDijkstraMutateStub.java index a323d6b736..152d532310 100644 --- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SingleSourceShortestPathDijkstraMutateStub.java +++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SingleSourceShortestPathDijkstraMutateStub.java @@ -23,7 +23,8 @@ import org.neo4j.gds.applications.algorithms.pathfinding.PathFindingAlgorithmsEstimationModeBusinessFacade; import org.neo4j.gds.core.utils.mem.MemoryEstimation; import org.neo4j.gds.paths.dijkstra.config.AllShortestPathsDijkstraMutateConfig; -import org.neo4j.gds.procedures.algorithms.pathfinding.MutateStub; +import org.neo4j.gds.procedures.algorithms.stubs.GenericStub; +import org.neo4j.gds.procedures.algorithms.stubs.MutateStub; import org.neo4j.gds.procedures.algorithms.pathfinding.PathFindingMutateResult; import org.neo4j.gds.procedures.algorithms.pathfinding.PathFindingResultBuilderForMutateMode; import org.neo4j.gds.results.MemoryEstimateResult; diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SpanningTreeMutateStub.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SpanningTreeMutateStub.java index 9508004586..c8a663c3c5 100644 --- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SpanningTreeMutateStub.java +++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SpanningTreeMutateStub.java @@ -22,7 +22,8 @@ import org.neo4j.gds.applications.ApplicationsFacade; import org.neo4j.gds.applications.algorithms.pathfinding.PathFindingAlgorithmsEstimationModeBusinessFacade; import org.neo4j.gds.core.utils.mem.MemoryEstimation; -import org.neo4j.gds.procedures.algorithms.pathfinding.MutateStub; +import org.neo4j.gds.procedures.algorithms.stubs.GenericStub; +import org.neo4j.gds.procedures.algorithms.stubs.MutateStub; import org.neo4j.gds.procedures.algorithms.pathfinding.SpanningTreeMutateResult; import org.neo4j.gds.results.MemoryEstimateResult; import org.neo4j.gds.spanningtree.SpanningTreeMutateConfig; diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SteinerTreeMutateStub.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SteinerTreeMutateStub.java index 45bd18fcef..662920f8da 100644 --- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SteinerTreeMutateStub.java +++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SteinerTreeMutateStub.java @@ -22,7 +22,8 @@ import org.neo4j.gds.applications.ApplicationsFacade; import org.neo4j.gds.applications.algorithms.pathfinding.PathFindingAlgorithmsEstimationModeBusinessFacade; import org.neo4j.gds.core.utils.mem.MemoryEstimation; -import org.neo4j.gds.procedures.algorithms.pathfinding.MutateStub; +import org.neo4j.gds.procedures.algorithms.stubs.GenericStub; +import org.neo4j.gds.procedures.algorithms.stubs.MutateStub; import org.neo4j.gds.procedures.algorithms.pathfinding.SteinerMutateResult; import org.neo4j.gds.results.MemoryEstimateResult; import org.neo4j.gds.steiner.SteinerTreeMutateConfig; diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/GenericStub.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/stubs/GenericStub.java similarity index 81% rename from procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/GenericStub.java rename to procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/stubs/GenericStub.java index b47a75cd88..3a51960d78 100644 --- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/GenericStub.java +++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/stubs/GenericStub.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.gds.procedures.algorithms.pathfinding.stubs; +package org.neo4j.gds.procedures.algorithms.stubs; import org.neo4j.gds.api.GraphName; import org.neo4j.gds.api.User; @@ -31,7 +31,7 @@ import org.neo4j.gds.core.utils.mem.MemoryEstimation; import org.neo4j.gds.procedures.algorithms.configuration.ConfigurationCreator; import org.neo4j.gds.procedures.algorithms.configuration.ConfigurationParser; -import org.neo4j.gds.procedures.algorithms.pathfinding.AlgorithmHandle; +import org.neo4j.gds.procedures.algorithms.AlgorithmHandle; import org.neo4j.gds.results.MemoryEstimateResult; import java.util.Map; @@ -63,9 +63,9 @@ public GenericStub( } /** - * @see org.neo4j.gds.procedures.algorithms.pathfinding.MutateStub#validateConfiguration(java.util.Map) + * @see org.neo4j.gds.procedures.algorithms.stubs.MutateStub#validateConfiguration(java.util.Map) */ - void validateConfiguration( + public void validateConfiguration( Function parser, Map configuration ) { @@ -79,9 +79,9 @@ void validateConfiguration( } /** - * @see org.neo4j.gds.procedures.algorithms.pathfinding.MutateStub#parseConfiguration(java.util.Map) + * @see org.neo4j.gds.procedures.algorithms.stubs.MutateStub#parseConfiguration(java.util.Map) */ - CONFIGURATION parseConfiguration( + public CONFIGURATION parseConfiguration( Function parser, Map configuration ) { @@ -95,9 +95,9 @@ CONFIGURATION parseConfiguration( } /** - * @see org.neo4j.gds.procedures.algorithms.pathfinding.MutateStub#getMemoryEstimation(String, java.util.Map) + * @see org.neo4j.gds.procedures.algorithms.stubs.MutateStub#getMemoryEstimation(String, java.util.Map) */ - MemoryEstimation getMemoryEstimation( + public MemoryEstimation getMemoryEstimation( String username, Map rawConfiguration, Function parser, @@ -115,9 +115,9 @@ MemoryEstimation getMemoryEstimation( } /** - * @see org.neo4j.gds.procedures.algorithms.pathfinding.MutateStub#estimate(Object, java.util.Map) + * @see org.neo4j.gds.procedures.algorithms.stubs.MutateStub#estimate(Object, java.util.Map) */ - Stream estimate( + public Stream estimate( Object graphName, Map rawConfiguration, Function parser, @@ -137,9 +137,9 @@ Stream estimate( } /** - * @see org.neo4j.gds.procedures.algorithms.pathfinding.MutateStub#execute(String, java.util.Map) + * @see org.neo4j.gds.procedures.algorithms.stubs.MutateStub#execute(String, java.util.Map) */ - Stream execute( + public Stream execute( String graphNameAsString, Map rawConfiguration, Function parser, diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/MutateStub.java b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/stubs/MutateStub.java similarity index 97% rename from procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/MutateStub.java rename to procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/stubs/MutateStub.java index 528cf7019c..7eb145e418 100644 --- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/MutateStub.java +++ b/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/stubs/MutateStub.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.gds.procedures.algorithms.pathfinding; +package org.neo4j.gds.procedures.algorithms.stubs; import org.neo4j.gds.core.utils.mem.MemoryEstimation; import org.neo4j.gds.results.MemoryEstimateResult;