Remove more dependencies from algo module

Author: IoannisPanagiotas

algo/build.gradle

@@ -36,7 +36,6 @@ dependencies {
     implementation project(':community-configs')
     implementation project(':ml-configs')
     implementation project(':node-embeddings-configs')
-    implementation project(':path-finding-configs')
 
     implementation project(':collections-memory-estimation')
     implementation project(':config-api')
@@ -61,7 +60,6 @@ dependencies {
 
     // TEST DEPENDENCIES
     testAnnotationProcessor project(':annotations')
-    testAnnotationProcessor project(':config-generator')
 
     testImplementation project(':edition-api')
     testImplementation project(':test-utils')

algo/src/main/java/org/neo4j/gds/paths/yens/Yens.java

@@ -29,7 +29,6 @@
 import org.neo4j.gds.paths.dijkstra.Dijkstra;
 import org.neo4j.gds.paths.dijkstra.PathFindingResult;
 import org.neo4j.gds.paths.dijkstra.SingleTarget;
-import org.neo4j.gds.paths.yens.config.ShortestPathYensBaseConfig;
 import org.neo4j.gds.termination.TerminationFlag;
 
 import java.util.ArrayList;
@@ -47,34 +46,6 @@ public final class Yens extends Algorithm<PathFindingResult> {
     private final int k;
     private final Concurrency concurrency;
 
-    /**
-     * Configure Yens to compute at most one source-target shortest path.
-     */
-    @Deprecated(forRemoval = true)
-    public static Yens sourceTarget(
-        Graph graph,
-        ShortestPathYensBaseConfig config,
-        ProgressTracker progressTracker,
-        TerminationFlag terminationFlag
-    ) {
-        // If the input graph is a multi-graph, we need to track
-        // parallel relationships ids. This is necessary since shortest
-        // paths can visit the same nodes via different relationships.
-        //If not, we need to track which is the next neighbor.
-        boolean shouldTrackRelationships = graph.isMultiGraph();
-
-        return new Yens(
-            graph,
-            shouldTrackRelationships,
-            graph.toMappedNodeId(config.sourceNode()),
-            graph.toMappedNodeId(config.targetNode()),
-            config.k(),
-            config.concurrency(),
-            progressTracker,
-            terminationFlag
-        );
-    }
-
     /**
      * Configure Yens to compute at most one source-target shortest path.
      */

algo/src/test/java/org/neo4j/gds/embeddings/node2vec/Node2VecMemoryEstimateDefinitionTest.java

@@ -22,7 +22,6 @@
 import org.junit.jupiter.api.Test;
 import org.neo4j.gds.assertions.MemoryEstimationAssert;
 import org.neo4j.gds.core.concurrency.Concurrency;
-import org.neo4j.gds.traversal.WalkParameters;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -31,11 +30,16 @@ class Node2VecMemoryEstimateDefinitionTest {
 
     @Test
     void shouldEstimateMemory() {
-        var configMock = mock(Node2VecBaseConfig.class);
-        when(configMock.embeddingDimension()).thenReturn(128);
-        when(configMock.walkParameters()).thenReturn(new WalkParameters(10, 80, 1.0, 1.0));
 
-        var memoryEstimation = new Node2VecMemoryEstimateDefinition(Node2VecConfigTransformer.node2VecParameters(configMock)).memoryEstimation();
+        var trainParams = mock(TrainParameters.class);
+        when(trainParams.embeddingDimension()).thenReturn(128);
+        var samplingWalkParameters = new SamplingWalkParameters(null,10, 80, 1.0, 1.0,1,1,1);
+
+        var params = mock(Node2VecParameters.class);
+        when(params.samplingWalkParameters()).thenReturn(samplingWalkParameters);
+        when(params.trainParameters()).thenReturn(trainParams);
+
+        var memoryEstimation = new Node2VecMemoryEstimateDefinition(params).memoryEstimation();
 
         MemoryEstimationAssert.assertThat(memoryEstimation)
             .memoryRange(1000, new Concurrency(1))

algo/src/test/java/org/neo4j/gds/embeddings/node2vec/Node2VecTest.java

@@ -482,8 +482,33 @@ void shouldLogProgressForNode2Vec() {
 
         var unweighted = graphStore.getGraph(RelationshipType.of("REL"), Optional.empty());
 
-        var configuration = Node2VecStreamConfigImpl.builder().embeddingDimension(128).build();
-        var params = Node2VecConfigTransformer.node2VecParameters(configuration);
+        var walkParameters = new SamplingWalkParameters(
+            NO_SOURCE_NODES,
+            10,
+            80,
+            1.0,
+            1.0,
+            0.01,
+            0.75,
+            1000
+        );
+
+        var trainParameters = new TrainParameters(
+            0.025,
+            0.0001,
+            1,
+            10,
+            5,
+            10,
+            EmbeddingInitializer.UNIFORM
+        );
+
+        var params = new Node2VecParameters(
+            walkParameters,
+            trainParameters,
+            new Concurrency(4),
+            Optional.empty()
+        );
 
         var progressTrackerWithLog = TestProgressTrackerHelper.create(
             new NodeEmbeddingsAlgorithmTasks().node2Vec(unweighted, params),
@@ -517,8 +542,33 @@ void shouldLogProgressForNode2Vec() {
     @Test
     void shouldLogProgressForNode2VecWithRelationshipWeights() {
 
-        var configuration = Node2VecStreamConfigImpl.builder().embeddingDimension(128).build();
-        var params = Node2VecConfigTransformer.node2VecParameters(configuration);
+        var walkParameters = new SamplingWalkParameters(
+            NO_SOURCE_NODES,
+            10,
+            80,
+            1.0,
+            1.0,
+            0.01,
+            0.75,
+            1000
+        );
+
+        var trainParameters = new TrainParameters(
+            0.025,
+            0.0001,
+            1,
+            10,
+            5,
+            10,
+            EmbeddingInitializer.UNIFORM
+        );
+
+        var params = new Node2VecParameters(
+            walkParameters,
+            trainParameters,
+            new Concurrency(4),
+            Optional.empty()
+        );
 
         var progressTrackerWithLog = TestProgressTrackerHelper.create(
             new NodeEmbeddingsAlgorithmTasks().node2Vec(graph, params),

algo/src/test/java/org/neo4j/gds/paths/bellmanford/BellmanFordTest.java

@@ -37,7 +37,6 @@
 import org.neo4j.gds.extension.Inject;
 import org.neo4j.gds.extension.TestGraph;
 import org.neo4j.gds.logging.GdsTestLog;
-import org.neo4j.gds.paths.delta.config.AllShortestPathsDeltaStreamConfigImpl;
 import org.neo4j.gds.paths.dijkstra.DijkstraFactory;
 import org.neo4j.gds.termination.TerminationFlag;
 
@@ -292,11 +291,6 @@ void shouldGiveSameResultsAsDijkstra() {
             .build()
             .generate();
 
-        var config = AllShortestPathsDeltaStreamConfigImpl.builder()
-            .concurrency(concurrency)
-            .sourceNode(start)
-            .build();
-
         var bellmanFord = new BellmanFord(
             newGraph,
             ProgressTracker.NULL_TRACKER,
@@ -312,7 +306,7 @@ void shouldGiveSameResultsAsDijkstra() {
         var dijkstraAlgo = DijkstraFactory
             .singleSource(
                 newGraph,
-                config.sourceNode(),
+                start,
                 true,
                 Optional.empty(),
                 ProgressTracker.NULL_TRACKER,

algo/src/test/java/org/neo4j/gds/paths/traverse/DFSMemoryEstimateDefinitionTest.java

@@ -23,15 +23,11 @@
 import org.neo4j.gds.assertions.MemoryEstimationAssert;
 import org.neo4j.gds.core.concurrency.Concurrency;
 
-import static org.mockito.Mockito.mock;
-
 class DFSMemoryEstimateDefinitionTest {
 
     @Test
     void testMemoryEstimation(){
 
-        var config = mock(DfsBaseConfig.class);
-
         var memoryEstimation = new DfsMemoryEstimateDefinition();
 
         MemoryEstimationAssert.assertThat(memoryEstimation.memoryEstimation())

algo/src/test/java/org/neo4j/gds/paths/yens/YensParallelEdgesTest.java

@@ -27,16 +27,12 @@
 import org.neo4j.gds.extension.GdlGraph;
 import org.neo4j.gds.extension.IdFunction;
 import org.neo4j.gds.extension.Inject;
-import org.neo4j.gds.paths.yens.config.ShortestPathYensStreamConfigImpl;
 import org.neo4j.gds.termination.TerminationFlag;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 @GdlExtension
 class YensParallelEdgesTest {
-    static ShortestPathYensStreamConfigImpl.Builder defaultSourceTargetConfigBuilder() {
-        return ShortestPathYensStreamConfigImpl.builder().concurrency(1);
-    }
 
     @GdlGraph
     private static final String DB_CYPHER =

algo/src/test/java/org/neo4j/gds/paths/yens/YensTest.java

@@ -41,7 +41,6 @@
 import org.neo4j.gds.logging.GdsTestLog;
 import org.neo4j.gds.paths.ImmutablePathResult;
 import org.neo4j.gds.paths.PathResult;
-import org.neo4j.gds.paths.yens.config.ShortestPathYensStreamConfigImpl;
 import org.neo4j.gds.termination.TerminationFlag;
 import org.s1ck.gdl.GDLHandler;
 import org.s1ck.gdl.model.Edge;
@@ -59,9 +58,6 @@
 
 @GdlExtension
 class YensTest {
-    static ShortestPathYensStreamConfigImpl.Builder defaultSourceTargetConfigBuilder(int concurrency) {
-        return ShortestPathYensStreamConfigImpl.builder().concurrency(concurrency);
-    }
 
     // https://en.wikipedia.org/wiki/Yen%27s_algorithm#/media/File:Yen's_K-Shortest_Path_Algorithm,_K=3,_A_to_F.gif
     @GdlGraph(aggregation = Aggregation.SINGLE)

algo/src/test/java/org/neo4j/gds/wcc/WccBaseConfigTest.java renamed to procedures/facade-api/configs/community-configs/src/test/java/org/neo4j/gds/wcc/WccBaseConfigTest.java

@@ -22,7 +22,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
-import org.neo4j.gds.annotation.Configuration;
 import org.neo4j.gds.core.CypherMapWrapper;
 
 import java.util.Map;
@@ -39,7 +38,7 @@ void testThreshold() {
             "relationshipWeightProperty", "threshold"
         ));
 
-        var config = TestWccBaseConfig.of(map);
+        var config = WccStreamConfig.of(map);
         assertThat(config.threshold()).isEqualTo(3.14);
     }
 
@@ -50,7 +49,7 @@ void testIntegerThreshold() {
             "relationshipWeightProperty", "threshold"
         ));
 
-        var config = TestWccBaseConfig.of(map);
+        var config = WccStreamConfig.of(map);
         assertThat(config.threshold()).isEqualTo(3);
     }
 
@@ -61,7 +60,7 @@ void testConsecutiveIds(boolean consecutiveIds) {
             "consecutiveIds", consecutiveIds
         ));
 
-        var config = TestWccBaseConfig.of(map);
+        var config = WccStreamConfig.of(map);
         assertThat(config.consecutiveIds()).isEqualTo(consecutiveIds);
     }
 
@@ -72,7 +71,7 @@ void testFailSeedingAndConsecutiveIds() {
             "seedProperty", "seed"
         ));
 
-        assertThatThrownBy(() -> TestWccBaseConfig.of(map))
+        assertThatThrownBy(() -> WccStreamConfig.of(map))
             .hasMessageContaining("Seeding and the `consecutiveIds` option cannot be used at the same time.")
             .isInstanceOf(IllegalArgumentException.class);
     }
@@ -83,16 +82,11 @@ void testFailThresholdWithoutRelationshipWeight() {
             "threshold", 3.14
         ));
 
-        assertThatThrownBy(() -> TestWccBaseConfig.of(map))
+        assertThatThrownBy(() -> WccStreamConfig.of(map))
             .hasMessageContaining("Specifying a threshold requires `relationshipWeightProperty` to be set")
             .isInstanceOf(IllegalArgumentException.class);
     }
 
-    @Configuration
-    interface TestWccBaseConfig extends WccBaseConfig {
-        static TestWccBaseConfig of(CypherMapWrapper map) {
-            return new TestWccBaseConfigImpl(map);
-        }
-    }
+
 
 }