Replace DataClass in NodeProjections

This also avoids accessing static base class members via derived types. Also makes the code more aligned to other immutable classes in our code base.

Author: FlorentinD

core/src/main/java/org/neo4j/gds/config/GraphProjectFromStoreConfig.java

@@ -52,8 +52,8 @@ public interface GraphProjectFromStoreConfig extends GraphProjectConfig {
     String RELATIONSHIP_PROPERTIES_KEY = "relationshipProperties";
 
     @Key(NODE_PROJECTION_KEY)
-    @ConvertWith(method = "org.neo4j.gds.AbstractNodeProjections#fromObject")
-    @Configuration.ToMapValue("org.neo4j.gds.AbstractNodeProjections#toObject")
+    @ConvertWith(method = "org.neo4j.gds.NodeProjections#fromObject")
+    @Configuration.ToMapValue("org.neo4j.gds.NodeProjections#toObject")
     NodeProjections nodeProjections();
 
     @Key(RELATIONSHIP_PROJECTION_KEY)

core/src/main/java/org/neo4j/gds/config/RandomGraphGeneratorConfig.java

@@ -21,6 +21,7 @@
 
 import org.immutables.value.Value;
 import org.jetbrains.annotations.Nullable;
+import org.neo4j.gds.ImmutableNodeProjections;
 import org.neo4j.gds.ImmutableRelationshipProjections;
 import org.neo4j.gds.NodeLabel;
 import org.neo4j.gds.NodeProjection;
@@ -97,9 +98,9 @@ default Map<String, Object> relationshipProperty() {
     }
 
     @Value.Default
-    @Configuration.ToMapValue("org.neo4j.gds.AbstractNodeProjections#toObject")
+    @Configuration.ToMapValue("org.neo4j.gds.NodeProjections#toObject")
     default NodeProjections nodeProjections() {
-        return NodeProjections.builder()
+        return ImmutableNodeProjections.builder()
             .putProjection(
                 NodeLabel.of(nodeCount() + "_Nodes"),
                 NodeProjection.of(nodeCount() + "_Nodes"))

graph-projection-api/src/main/java/org/neo4j/gds/AbstractNodeProjections.java renamed to graph-projection-api/src/main/java/org/neo4j/gds/NodeProjections.java

@@ -21,7 +21,7 @@
 
 import org.immutables.value.Value;
 import org.jetbrains.annotations.Nullable;
-import org.neo4j.gds.annotation.DataClass;
+import org.neo4j.gds.annotation.ValueClass;
 import org.neo4j.gds.utils.StringFormatting;
 
 import java.util.HashMap;
@@ -37,9 +37,9 @@
 import static org.neo4j.gds.NodeLabel.ALL_NODES;
 import static org.neo4j.gds.utils.StringFormatting.formatWithLocale;
 
-@DataClass
+@ValueClass
 @Value.Immutable(singleton = true)
-public abstract class AbstractNodeProjections extends AbstractProjections<NodeLabel, NodeProjection> {
+public abstract class NodeProjections extends AbstractProjections<NodeLabel, NodeProjection> {
 
     public static final NodeProjections ALL = create(singletonMap(ALL_NODES, NodeProjection.all()));
 
@@ -112,11 +112,11 @@ public static NodeProjections create(Map<NodeLabel, NodeProjection> projections)
                 "An empty node projection was given; at least one node label must be projected."
             );
         }
-        return NodeProjections.of(unmodifiableMap(projections));
+        return ImmutableNodeProjections.of(unmodifiableMap(projections));
     }
 
     public static NodeProjections single(NodeLabel label, NodeProjection projection) {
-        return NodeProjections.of(Map.of(label, projection));
+        return ImmutableNodeProjections.of(Map.of(label, projection));
     }
 
     public static NodeProjections all() {
@@ -125,7 +125,7 @@ public static NodeProjections all() {
 
     public NodeProjections addPropertyMappings(PropertyMappings mappings) {
         if (!mappings.hasMappings()) {
-            return NodeProjections.copyOf(this);
+            return ImmutableNodeProjections.copyOf(this);
         }
         Map<NodeLabel, NodeProjection> newProjections = projections().entrySet().stream().collect(toMap(
             Map.Entry::getKey,
@@ -150,7 +150,7 @@ public String labelProjection() {
     }
 
     public boolean isEmpty() {
-        return this == NodeProjections.of();
+        return this == ImmutableNodeProjections.of();
     }
 
     public Map<String, Object> toObject() {
@@ -161,7 +161,7 @@ public Map<String, Object> toObject() {
         return value;
     }
 
-    public static Map<String, Object> toObject(AbstractNodeProjections nodeProjections) {
+    public static Map<String, Object> toObject(NodeProjections nodeProjections) {
         return nodeProjections.toObject();
     }
 

proc/test/src/main/java/org/neo4j/gds/AlgoBaseProcTest.java

@@ -321,7 +321,7 @@ default void testRunOnEmptyGraph() {
             GraphProjectConfig graphProjectConfig = withNameAndProjections(
                 "",
                 loadedGraphName,
-                NodeProjections.of(
+                ImmutableNodeProjections.of(
                     Map.of(
                         NodeLabel.of("X"), ImmutableNodeProjection.of("X", PropertyMappings.of(propertyMappings))
                     )

proc/test/src/main/java/org/neo4j/gds/GraphProjectConfigSupport.java

@@ -58,7 +58,7 @@ default GraphProjectFromStoreConfig withNameAndRelationshipProjections(
         return ImmutableGraphProjectFromStoreConfig.of(
             userName,
             graphName,
-            AbstractNodeProjections.create(singletonMap(
+            NodeProjections.create(singletonMap(
                 ALL_NODES,
                 ImmutableNodeProjection.of(PROJECT_ALL, PropertyMappings.of(propertyMappings))
             )),

test-utils/src/main/java/org/neo4j/gds/GraphProjectConfigBuilders.java

@@ -111,7 +111,7 @@ public static GraphProjectFromStoreConfig storeConfig(
             .withDefaultAggregation(aggregation)
             .build();
 
-        NodeProjections np = NodeProjections.of(tempNP.entrySet().stream().collect(Collectors.toMap(
+        NodeProjections np = ImmutableNodeProjections.of(tempNP.entrySet().stream().collect(Collectors.toMap(
             e -> NodeLabel.of(e.getKey()),
             Map.Entry::getValue
         )));