Address review comments

Co-authored-by: Max Kießling <max.kiessling@neotechnology.com>
Co-authored-by: Ioannis Panagiotas <ioannis.panagiotas@neotechnology.com>

Author: 3 people

proc/community/src/main/java/org/neo4j/gds/leiden/LeidenStreamProc.java

@@ -19,11 +19,7 @@
  */
 package org.neo4j.gds.leiden;
 
-import org.neo4j.gds.AlgoBaseProc;
-import org.neo4j.gds.AlgorithmFactory;
-import org.neo4j.gds.core.CypherMapWrapper;
-import org.neo4j.gds.core.utils.paged.HugeLongArray;
-import org.neo4j.gds.executor.ComputationResultConsumer;
+import org.neo4j.gds.BaseProc;
 import org.neo4j.gds.executor.ProcedureExecutor;
 import org.neo4j.procedure.Description;
 import org.neo4j.procedure.Name;
@@ -34,15 +30,7 @@
 
 import static org.neo4j.procedure.Mode.READ;
 
-public class LeidenStreamProc extends AlgoBaseProc<Leiden, HugeLongArray, LeidenStreamConfig, LeidenStreamProc.StreamResult> {
-    // Config
-    // relationshipWeightProperty
-    // maxIterations
-
-    // Output
-    // nodeId
-    // communityId
-
+public class LeidenStreamProc extends BaseProc {
     static final String DESCRIPTION =
         "Leiden is a community detection algorithm, which guarantees that communities are well connected";
 
@@ -52,37 +40,9 @@ public Stream<StreamResult> stream(
         @Name(value = "graphName") String graphName,
         @Name(value = "configuration", defaultValue = "{}") Map<String, Object> configuration
     ) {
-        var streamSpec = new LeidenStreamSpec();
-
         return new ProcedureExecutor<>(
-            streamSpec,
+            new LeidenStreamSpec(),
             executionContext()
         ).compute(graphName, configuration, true, true);
     }
-
-    @Override
-    public AlgorithmFactory<?, Leiden, LeidenStreamConfig> algorithmFactory() {
-        return new LeidenStreamSpec().algorithmFactory();
-    }
-
-    @Override
-    public ComputationResultConsumer<Leiden, HugeLongArray, LeidenStreamConfig, Stream<StreamResult>> computationResultConsumer() {
-        return new LeidenStreamSpec().computationResultConsumer();
-    }
-
-    @Override
-    protected LeidenStreamConfig newConfig(String username, CypherMapWrapper config) {
-        return new LeidenStreamSpec().newConfigFunction().apply(username, config);
-    }
-
-    public static class StreamResult {
-
-        public final long nodeId;
-        public final long communityId;
-
-        StreamResult(long nodeId, long communityId) {
-            this.nodeId = nodeId;
-            this.communityId = communityId;
-        }
-    }
 }

proc/community/src/main/java/org/neo4j/gds/leiden/LeidenStreamSpec.java

@@ -32,7 +32,7 @@
 import static org.neo4j.gds.leiden.LeidenStreamProc.DESCRIPTION;
 
 @GdsCallable(name = "gds.alpha.leiden.stream", description = DESCRIPTION, executionMode = STREAM)
-public class LeidenStreamSpec implements AlgorithmSpec<Leiden, HugeLongArray, LeidenStreamConfig, Stream<LeidenStreamProc.StreamResult>, LeidenAlgorithmFactory<LeidenStreamConfig>> {
+public class LeidenStreamSpec implements AlgorithmSpec<Leiden, HugeLongArray, LeidenStreamConfig, Stream<StreamResult>, LeidenAlgorithmFactory<LeidenStreamConfig>> {
     @Override
     public String name() {
         return "LeidenStream";
@@ -49,12 +49,12 @@ public NewConfigFunction<LeidenStreamConfig> newConfigFunction() {
     }
 
     @Override
-    public ComputationResultConsumer<Leiden, HugeLongArray, LeidenStreamConfig, Stream<LeidenStreamProc.StreamResult>> computationResultConsumer() {
+    public ComputationResultConsumer<Leiden, HugeLongArray, LeidenStreamConfig, Stream<StreamResult>> computationResultConsumer() {
         return (computationResult, executionContext) -> {
             var graph = computationResult.graph();
             var communities = computationResult.result();
             return LongStream.range(0, graph.nodeCount())
-                .mapToObj(nodeId -> new LeidenStreamProc.StreamResult(graph.toOriginalNodeId(nodeId), communities.get(nodeId)));
+                .mapToObj(nodeId -> new StreamResult(graph.toOriginalNodeId(nodeId), communities.get(nodeId)));
         };
     }
 }

proc/community/src/main/java/org/neo4j/gds/leiden/StreamResult.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) "Neo4j"
+ * Neo4j Sweden AB [http://neo4j.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Neo4j is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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.leiden;
+
+public final class StreamResult {
+
+    public final long nodeId;
+    public final long communityId;
+
+    StreamResult(long nodeId, long communityId) {
+        this.nodeId = nodeId;
+        this.communityId = communityId;
+    }
+}