Remove and undo some more things that were added during bug fixing

Author: knutwalker

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

@@ -32,19 +32,16 @@
 import org.neo4j.gds.api.properties.graph.GraphPropertyStore;
 import org.neo4j.gds.api.properties.nodes.NodeProperty;
 import org.neo4j.gds.api.properties.nodes.NodePropertyStore;
-import org.neo4j.gds.api.properties.nodes.NodePropertyValues;
 import org.neo4j.gds.api.schema.Direction;
 import org.neo4j.gds.api.schema.GraphSchema;
 import org.neo4j.gds.api.schema.NodeSchema;
-import org.neo4j.gds.api.schema.PropertySchema;
 import org.neo4j.gds.api.schema.RelationshipPropertySchema;
 import org.neo4j.gds.api.schema.RelationshipSchema;
 import org.neo4j.gds.core.huge.HugeGraph;
 import org.neo4j.values.storable.NumberType;
 
 import java.util.Map;
 import java.util.Optional;
-import java.util.function.Function;
 
 import static org.neo4j.gds.utils.StringFormatting.formatWithLocale;
 
@@ -180,27 +177,6 @@ private static Optional<RelationshipPropertyStore> constructRelationshipProperti
 
     }
 
-    public static void extractNodeProperties(
-        ImmutableNodes.Builder nodeImportResultBuilder,
-        Function<String, PropertySchema> nodeSchema,
-        Map<String, NodePropertyValues> nodeProperties
-    ) {
-        NodePropertyStore.Builder propertyStoreBuilder = NodePropertyStore.builder();
-        nodeProperties.forEach((propertyKey, propertyValues) -> {
-            var propertySchema = nodeSchema.apply(propertyKey);
-            propertyStoreBuilder.putIfAbsent(
-                propertyKey,
-                NodeProperty.of(
-                    propertyKey,
-                    propertySchema.state(),
-                    propertyValues,
-                    propertySchema.defaultValue()
-                )
-            );
-        });
-        nodeImportResultBuilder.properties(propertyStoreBuilder.build());
-    }
-
     // TODO: remove this method
     public static GraphSchema computeGraphSchema(
         Nodes nodes,

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

@@ -23,15 +23,13 @@
 import org.neo4j.gds.api.IdMap;
 import org.neo4j.gds.api.PartialIdMap;
 import org.neo4j.gds.api.properties.nodes.NodePropertyStore;
-import org.neo4j.gds.api.properties.nodes.NodePropertyValues;
 import org.neo4j.gds.api.schema.NodeSchema;
 import org.neo4j.gds.core.loading.construction.GraphFactory;
 import org.neo4j.gds.core.loading.construction.NodeLabelToken;
 import org.neo4j.gds.core.loading.construction.NodesBuilder;
 import org.neo4j.gds.core.loading.construction.PropertyValues;
 import org.neo4j.gds.core.utils.paged.ShardedLongLongMap;
 
-import java.util.Map;
 import java.util.OptionalLong;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -114,10 +112,6 @@ public interface HighLimitIdMapAndProperties {
         NodeSchema schema();
 
         NodePropertyStore propertyStore();
-
-        default Map<String, NodePropertyValues> properties() {
-            return propertyStore().propertyValues();
-        }
     }
 
     public HighLimitIdMapAndProperties build() {

core/src/main/java/org/neo4j/gds/core/loading/construction/GraphFactory.java

@@ -222,10 +222,9 @@ static RelationshipsBuilder relationshipsBuilder(
         Optional<Boolean> validateRelationships,
         Optional<Integer> concurrency,
         Optional<Boolean> indexInverse,
-        Optional<ExecutorService> executorService,
-        Optional<Boolean> loadRelationshipProperties
+        Optional<ExecutorService> executorService
     ) {
-        var doLoadRelationshipProperties = loadRelationshipProperties.orElse(!propertyConfigs.isEmpty());
+        var loadRelationshipProperties = !propertyConfigs.isEmpty();
 
         var aggregations = propertyConfigs.isEmpty()
             ? new Aggregation[]{aggregation.orElse(Aggregation.DEFAULT)}
@@ -291,7 +290,7 @@ static RelationshipsBuilder relationshipsBuilder(
             .bufferSize(bufferSize)
             .propertyConfigs(propertyConfigs)
             .isMultiGraph(isMultiGraph)
-            .loadRelationshipProperty(doLoadRelationshipProperties)
+            .loadRelationshipProperty(loadRelationshipProperties)
             .direction(Direction.fromOrientation(actualOrientation))
             .executorService(executorService.orElse(Pools.DEFAULT))
             .concurrency(finalConcurrency);

cypher-aggregation/src/main/java/org/neo4j/gds/projection/GraphAggregator.java

@@ -518,7 +518,6 @@ private AdjacencyCompressor.ValueMapper buildNodesWithProperties(GraphStoreBuild
                 .properties(idMapAndProperties.propertyStore())
                 .build();
 
-            // graphStoreBuilder.nodes(nodesBuilder.schema(nodeSchema).build());
             graphStoreBuilder.nodes(nodes);
 
             // Relationships are added using their intermediate node ids.

graph-schema-api/src/main/java/org/neo4j/gds/api/schema/RelationshipSchemaEntry.java

@@ -65,7 +65,7 @@ boolean isUndirected() {
     }
 
     @Override
-    public RelationshipSchemaEntry union(RelationshipSchemaEntry other) {
+    RelationshipSchemaEntry union(RelationshipSchemaEntry other) {
         if (!other.identifier().equals(this.identifier())) {
             throw new UnsupportedOperationException(
                 formatWithLocale(