Remove NodePropertyWriter.java as a copy

Author: IoannisPanagiotas

applications/algorithms/machinery/src/main/java/org/neo4j/gds/applications/algorithms/machinery/Neo4jDatabaseNodePropertyWriter.java

@@ -19,7 +19,6 @@
  */
 package org.neo4j.gds.applications.algorithms.machinery;
 
-import org.apache.commons.lang3.mutable.MutableLong;
 import org.neo4j.gds.api.Graph;
 import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.api.PropertyState;
@@ -46,7 +45,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 import static org.neo4j.gds.utils.StringFormatting.formatWithLocale;
 
@@ -102,7 +100,13 @@ static NodePropertiesWritten writeNodeProperties(
         Log log
     ) {
 
-        var propertiesWritten = new MutableLong();
+
+        validatePropertiesCanBeWritten(
+            graphStore.capabilities().writeMode(),
+            graph.schema().nodeSchema().unionProperties(),
+            nodeProperties,
+            resultStore.isPresent()
+        );
 
         var progressTracker = createProgressTracker(
             taskRegistryFactory,
@@ -111,16 +115,6 @@ static NodePropertiesWritten writeNodeProperties(
             procedureName,
             log
         );
-        var writeMode = graphStore.capabilities().writeMode();
-        var nodePropertySchema = graph.schema().nodeSchema().unionProperties();
-
-
-        validatePropertiesCanBeWritten(
-            writeMode,
-            nodePropertySchema,
-            nodeProperties,
-            resultStore.isPresent()
-        );
 
         var exporter = nodePropertyExporterBuilder
             .withIdMap(graph)
@@ -133,15 +127,13 @@ static NodePropertiesWritten writeNodeProperties(
 
         try {
             exporter.write(nodeProperties);
-            propertiesWritten.setValue(exporter.propertiesWritten());
+             return new NodePropertiesWritten(exporter.propertiesWritten());
         } catch (Exception e) {
             progressTracker.endSubTaskWithFailure();
             throw e;
         } finally {
             progressTracker.release();
         }
-
-        return new NodePropertiesWritten(propertiesWritten.getValue());
     }
 
     private static ProgressTracker createProgressTracker(
@@ -190,7 +182,7 @@ private static void validatePropertiesCanBeWritten(
                     propertySchemas.get(nodeProperty.key()).state()
                 )
             )
-            .collect(Collectors.toList());
+            .toList();
 
         if (!unexpectedProperties.isEmpty()) {
             throw new IllegalStateException(
@@ -204,22 +196,21 @@ private static void validatePropertiesCanBeWritten(
     }
 
     private static Predicate<PropertyState> expectedPropertyStateForWriteMode(Capabilities.WriteMode writeMode) {
-        switch (writeMode) {
-            case LOCAL:
+        return switch (writeMode) {
+            case LOCAL ->
                 // We need to allow persistent and transient as for example algorithms that support seeding will reuse a
                 // mutated (transient) property to write back properties that are in fact backed by a database
-                return state -> state == PropertyState.PERSISTENT || state == PropertyState.TRANSIENT;
-            case REMOTE:
+                state -> state == PropertyState.PERSISTENT || state == PropertyState.TRANSIENT;
+            case REMOTE ->
                 // We allow transient properties for the same reason as above
-                return state -> state == PropertyState.REMOTE || state == PropertyState.TRANSIENT;
-            default:
-                throw new IllegalStateException(
-                    formatWithLocale(
-                        "Graph with write mode `%s` cannot write back to a database",
-                        writeMode
-                    )
-                );
-        }
+                state -> state == PropertyState.REMOTE || state == PropertyState.TRANSIENT;
+            default -> throw new IllegalStateException(
+                formatWithLocale(
+                    "Graph with write mode `%s` cannot write back to a database",
+                    writeMode
+                )
+            );
+        };
     }
 
 }

applications/algorithms/machinery/src/main/java/org/neo4j/gds/applications/algorithms/machinery/NodePropertyWriter.java

@@ -76,15 +76,15 @@ public NodePropertiesWritten perform(
         WriteConfig writeConfiguration,
         Label label,
         JobId jobId,
-        List<NodePropertyRecord> nodePropertes
+        List<NodePropertyRecord> nodeProperties
     ) {
         return Neo4jDatabaseNodePropertyWriter.writeNodeProperties(
             writeContext.nodePropertyExporterBuilder(),
             requestScopedDependencies.taskRegistryFactory(),
             graph,
             graphStore,
             writeConfiguration.writeConcurrency(),
-            nodePropertes,
+            nodeProperties,
             label.asString(),
             writeConfiguration.resolveResultStore(resultStore),
             jobId,

applications/algorithms/machinery/src/main/java/org/neo4j/gds/applications/algorithms/machinery/WriteNodePropertyService.java

@@ -24,6 +24,8 @@
 import org.junit.jupiter.api.Test;
 import org.neo4j.gds.BaseProcTest;
 import org.neo4j.gds.api.User;
+import org.neo4j.gds.applications.algorithms.machinery.RequestScopedDependencies;
+import org.neo4j.gds.applications.algorithms.machinery.WriteContext;
 import org.neo4j.gds.core.utils.logging.GdsLoggers;
 import org.neo4j.gds.core.utils.progress.tasks.LoggerForProgressTracking;
 import org.neo4j.gds.logging.Log;
@@ -46,6 +48,13 @@
 class NodeClassificationPipelineAddStepProcsTest extends BaseProcTest {
     @BeforeEach
     void setUp() {
+
+        var requestScopedDependencies =  RequestScopedDependencies.builder()
+            .user(new User(getUsername(), false))
+            .build();
+
+        var writeContext = WriteContext.builder().build();
+
         LocalPipelinesProcedureFacade.create(
             new GdsLoggers(Log.noOpLog(), LoggerForProgressTracking.noOpLog()),
             null,
@@ -57,13 +66,8 @@ void setUp() {
             null,
             null,
             null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            new User(getUsername(), false),
+            requestScopedDependencies,
+            writeContext,
             null,
             null,
             null,
@@ -321,6 +325,12 @@ void shouldThrowIfAddingFeatureToANonPipeline() {
     }
 
     private GraphDataScienceProcedures buildFacade() {
+        var requestScopedDependencies =  RequestScopedDependencies.builder()
+            .user(new User(getUsername(), false))
+            .build();
+
+        var writeContext = WriteContext.builder().build();
+
         return new GraphDataScienceProceduresBuilder(Log.noOpLog())
             .with(LocalPipelinesProcedureFacade.create(
                 new GdsLoggers(Log.noOpLog(), LoggerForProgressTracking.noOpLog()),
@@ -333,13 +343,8 @@ private GraphDataScienceProcedures buildFacade() {
                 null,
                 null,
                 null,
-                null,
-                null,
-                null,
-                null,
-                null,
-                null,
-                new User(getUsername(), false),
+                requestScopedDependencies,
+                writeContext,
                 null,
                 null,
                 null,