Apply usage of RelationshipType to new features after rebase

Author: soerenreichardt

core/src/main/java/org/neo4j/graphalgo/config/DeleteRelationshipsConfig.java

@@ -19,6 +19,7 @@
  */
 package org.neo4j.graphalgo.config;
 
+import org.neo4j.graphalgo.RelationshipType;
 import org.neo4j.graphalgo.annotation.Configuration;
 import org.neo4j.graphalgo.annotation.ValueClass;
 import org.neo4j.graphalgo.core.loading.GraphStore;
@@ -49,7 +50,7 @@ static DeleteRelationshipsConfig of(
     @Configuration.Ignore
     default void validate(GraphStore graphStore) {
 
-        Set<String> relationshipTypes = graphStore.relationshipTypes();
+        Set<RelationshipType> relationshipTypes = graphStore.relationshipTypes();
 
         if (relationshipTypes.size() == 1) {
             throw new IllegalArgumentException(String.format(
@@ -60,7 +61,7 @@ default void validate(GraphStore graphStore) {
             ));
         }
 
-        if (!relationshipTypes.contains(relationshipType())) {
+        if (!relationshipTypes.contains(RelationshipType.of(relationshipType()))) {
             throw new IllegalArgumentException(String.format(
                 "No relationship type '%s' found in graph '%s'.",
                 relationshipType(),

core/src/main/java/org/neo4j/graphalgo/core/loading/GraphStore.java

@@ -23,8 +23,8 @@
 import org.immutables.builder.Builder.AccessibleFields;
 import org.neo4j.graphalgo.ElementIdentifier;
 import org.neo4j.graphalgo.NodeLabel;
-import org.neo4j.graphalgo.annotation.ValueClass;
 import org.neo4j.graphalgo.RelationshipType;
+import org.neo4j.graphalgo.annotation.ValueClass;
 import org.neo4j.graphalgo.api.Graph;
 import org.neo4j.graphalgo.api.IdMapGraph;
 import org.neo4j.graphalgo.api.NodeProperties;
@@ -341,7 +341,7 @@ private void addRelationshipProperty(
         });
     }
 
-    public DeletionResult deleteRelationships(String relationshipType) {
+    public DeletionResult deleteRelationships(RelationshipType relationshipType) {
         return DeletionResult.of(builder ->
             updateGraphStore(graphStore -> {
                 builder.deletedRelationships(graphStore.relationships.get(relationshipType).elementCount());

core/src/test/java/org/neo4j/graphalgo/core/loading/GraphStoreTest.java

@@ -20,7 +20,6 @@
 package org.neo4j.graphalgo.core.loading;
 
 import org.jetbrains.annotations.NotNull;
-import org.hamcrest.Matcher;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -47,27 +46,25 @@
 import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.List;
 import java.util.HashSet;
-import java.util.Map;
+import java.util.List;
 import java.util.Optional;
 import java.util.stream.Stream;
 
 import static java.util.Collections.singletonList;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.greaterThan;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.neo4j.graphalgo.NodeLabel.ALL_NODES;
 import static org.neo4j.graphalgo.QueryRunner.runQuery;
 import static org.neo4j.graphalgo.TestGraph.Builder.fromGdl;
 import static org.neo4j.graphalgo.TestSupport.assertGraphEquals;
-import static org.neo4j.graphalgo.config.AlgoBaseConfig.ALL_RELATIONSHIP_TYPE_IDENTIFIERS;
-import static org.neo4j.values.storable.NumberType.FLOATING_POINT;
 import static org.neo4j.graphalgo.TestSupport.mapEquals;
 import static org.neo4j.graphalgo.compat.MapUtil.map;
+import static org.neo4j.graphalgo.config.AlgoBaseConfig.ALL_RELATIONSHIP_TYPE_IDENTIFIERS;
+import static org.neo4j.values.storable.NumberType.FLOATING_POINT;
 
 class GraphStoreTest {
 
@@ -246,10 +243,10 @@ void deleteRelationshipsAndProperties() throws InterruptedException {
         // relationshipTypes containing properties from other relationshipTypes
         assertThat(graphStore.relationshipPropertyCount(), equalTo(8L));
 
-        DeletionResult deletionResult = graphStore.deleteRelationships("LER");
+        DeletionResult deletionResult = graphStore.deleteRelationships(RelationshipType.of("LER"));
 
-        assertEquals(new HashSet<>(singletonList("REL")), graphStore.relationshipTypes());
-        assertFalse(graphStore.hasRelationshipType("LER"));
+        assertEquals(new HashSet<>(singletonList(RelationshipType.of("REL"))), graphStore.relationshipTypes());
+        assertFalse(graphStore.hasRelationshipType(RelationshipType.of("LER")));
         assertEquals(1, graphStore.relationshipCount());
         // should expect 1 instead of two, but currently properties are global across relationship types
         assertEquals(2, graphStore.relationshipPropertyCount());

proc/catalog/src/main/java/org/neo4j/graphalgo/catalog/GraphDeleteRelationshipProc.java

@@ -53,7 +53,9 @@ public Stream<Result> delete(
 
         DeleteRelationshipsConfig.of(graphName, relationshipType).validate(graphStoreWithConfig.graphStore());
 
-        DeletionResult deletionResult = graphStoreWithConfig.graphStore().deleteRelationships(relationshipType);
+        DeletionResult deletionResult = graphStoreWithConfig
+            .graphStore()
+            .deleteRelationships(RelationshipType.of(relationshipType));
 
         return Stream.of(new Result(
             graphName,