Map nodeProperties/relationships.drop

Author: FlorentinD

applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/DefaultGraphCatalogApplications.java

@@ -26,7 +26,6 @@
 import org.neo4j.gds.api.User;
 import org.neo4j.gds.applications.algorithms.machinery.MemoryEstimateResult;
 import org.neo4j.gds.applications.algorithms.machinery.RequestScopedDependencies;
-import org.neo4j.gds.core.utils.logging.GdsLoggers;
 import org.neo4j.gds.beta.filter.GraphFilterResult;
 import org.neo4j.gds.config.BaseConfig;
 import org.neo4j.gds.core.io.GraphStoreExporterBaseConfig;
@@ -35,6 +34,7 @@
 import org.neo4j.gds.core.loading.GraphDropRelationshipResult;
 import org.neo4j.gds.core.loading.GraphStoreCatalogEntry;
 import org.neo4j.gds.core.loading.GraphStoreCatalogService;
+import org.neo4j.gds.core.utils.logging.GdsLoggers;
 import org.neo4j.gds.core.utils.progress.TaskRegistryFactory;
 import org.neo4j.gds.core.utils.warnings.UserLogRegistryFactory;
 import org.neo4j.gds.core.write.NodeLabelExporterBuilder;
@@ -604,7 +604,9 @@ public GraphDropRelationshipResult dropRelationships(
             relationshipType
         );
 
-        return new GraphDropRelationshipResult(graphName.value(), relationshipType, result);
+        return new GraphDropRelationshipResult(
+            graphName.value(),
+            relationshipType, result.deletedRelationships(), result.deletedProperties());
     }
 
     @Override

core/src/main/java/org/neo4j/gds/core/loading/GraphDropNodePropertiesResult.java

@@ -22,11 +22,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-public class GraphDropNodePropertiesResult {
-    public final String graphName;
-    public final List<String> nodeProperties;
-    public final long propertiesRemoved;
-
+public record GraphDropNodePropertiesResult(String graphName, List<String> nodeProperties, long propertiesRemoved) {
     public GraphDropNodePropertiesResult(String graphName, List<String> nodeProperties, long propertiesRemoved) {
         this.graphName = graphName;
         this.nodeProperties = nodeProperties.stream().sorted().collect(Collectors.toList());

core/src/main/java/org/neo4j/gds/core/loading/GraphDropRelationshipResult.java

@@ -21,18 +21,7 @@
 
 import java.util.Map;
 
-public class GraphDropRelationshipResult {
-    public final String graphName;
-    public final String relationshipType;
-    @SuppressWarnings("WeakerAccess")
-    public final long deletedRelationships;
-    @SuppressWarnings("WeakerAccess")
-    public final Map<String, Long> deletedProperties;
-
-    public GraphDropRelationshipResult(String graphName, String relationshipType, DeletionResult deletionResult) {
-        this.graphName = graphName;
-        this.relationshipType = relationshipType;
-        this.deletedRelationships = deletionResult.deletedRelationships();
-        this.deletedProperties = deletionResult.deletedProperties();
-    }
+public record GraphDropRelationshipResult(String graphName, String relationshipType,
+                                          long deletedRelationships,
+                                          Map<String, Long> deletedProperties) {
 }