[DE-1069] Remove collections prefixes (#18)

* removed requiring graph prefix in collection names

* fixed demo

Author: rashtao

README.md

@@ -55,7 +55,7 @@ implementation 'com.arangodb:arangodb-tinkerpop-provider:x.y.z'
 To use the provider in the Gremlin Console, first you need to install it:
 
 ```text
-:install com.arangodb arangodb-tinkerpop-provider 3.0.1
+:install com.arangodb arangodb-tinkerpop-provider 3.1.0-SNAPSHOT
 ```
 
 Then, after restarting the console, you can use it:
@@ -90,7 +90,7 @@ gremlin> g.V().hasLabel("person").values("name")
 To use the provider as Gremlin Server plugin, first you need to install it:
 
 ```text
-./bin/gremlin-server.sh install com.arangodb arangodb-tinkerpop-provider 3.0.1
+./bin/gremlin-server.sh install com.arangodb arangodb-tinkerpop-provider 3.1.0-SNAPSHOT
 ```
 
 Then, you need to create the graph configuration, e.g. in the file 

demo/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.example</groupId>
     <artifactId>arango-tinkerpop-demo</artifactId>
-    <version>3.0.1</version>
+    <version>3.1.0-SNAPSHOT</version>
 
     <properties>
         <maven.compiler.source>21</maven.compiler.source>
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>com.arangodb</groupId>
             <artifactId>arangodb-tinkerpop-provider</artifactId>
-            <version>3.0.1</version>
+            <version>3.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>

demo/src/main/java/org/example/Main.java

@@ -136,7 +136,7 @@ public static void main(String[] args) {
 
             System.out.println("Find \"marko\" in the graph using AQL");
             String query = """
-                    FOR d IN tinkerpop_vertex
+                    FOR d IN vertex
                     FILTER d.name == @name
                     RETURN d
                     """;
@@ -247,13 +247,13 @@ public static void main(String[] args) {
 
             String shortestPathQuery = """
                     LET start = FIRST(
-                      FOR d IN tinkerpop_vertex
+                      FOR d IN vertex
                       FILTER d.code == @start
                       RETURN d
                     )
                     
                     LET target = FIRST(
-                      FOR d IN tinkerpop_vertex
+                      FOR d IN vertex
                       FILTER d.code == @target
                       RETURN d
                     )
@@ -278,7 +278,7 @@ public static void main(String[] args) {
 
             String traversalQuery = """
                     LET start = FIRST(
-                      FOR d IN tinkerpop_vertex
+                      FOR d IN vertex
                       FILTER d.code == @start
                       RETURN d
                     )

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.arangodb</groupId>
     <artifactId>arangodb-tinkerpop-provider</artifactId>
-    <version>3.0.1</version>
+    <version>3.1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>arangodb-tinkerpop-provider</name>

src/main/java/com/arangodb/tinkerpop/gremlin/persistence/ElementId.java

@@ -20,33 +20,28 @@
 
 public abstract class ElementId {
 
-    protected final String prefix;
     protected final String collection;
     protected String key;
 
     public static void validateIdParts(String... names) {
         for (String name : names) {
             if (name == null)
                 continue;
-            if (name.contains("_")) {
-                throw new IllegalArgumentException(String.format("id part (%s) contains invalid character '_'", name));
-            }
             if (name.contains("/")) {
                 throw new IllegalArgumentException(String.format("id part (%s) contains invalid character '/'", name));
             }
         }
     }
 
-    protected ElementId(String prefix, String collection, String key) {
-        this.prefix = prefix;
+    protected ElementId(String collection, String key) {
         this.collection = collection;
         this.key = key;
     }
 
     public abstract String getLabel();
 
     public String getCollection() {
-        return prefix + "_" + collection;
+        return collection;
     }
 
     public abstract String getId();
@@ -64,7 +59,7 @@ public String toJson() {
         if (key == null) {
             return null;
         } else {
-            return prefix + "_" + collection + "/" + key;
+            return collection + "/" + key;
         }
     }
 
@@ -77,12 +72,12 @@ public String toString() {
     public boolean equals(Object o) {
         if (!(o instanceof ElementId)) return false;
         ElementId elementId = (ElementId) o;
-        return Objects.equals(prefix, elementId.prefix) && Objects.equals(collection, elementId.collection) && Objects.equals(key, elementId.key);
+        return Objects.equals(collection, elementId.collection) && Objects.equals(key, elementId.key);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(prefix, collection, key);
+        return Objects.hash(collection, key);
     }
 
 }

src/main/java/com/arangodb/tinkerpop/gremlin/persistence/ElementIdFactory.java

@@ -55,15 +55,15 @@ protected ElementIdFactory(ArangoDBGraphConfig config) {
 
     protected abstract void validateId(String id, String label);
 
-    protected abstract ElementId doCreate(String prefix, String collection, String key);
+    protected abstract ElementId doCreate(String collection, String key);
 
     private String extractKey(final String id) {
         String[] parts = id.split("/");
         return parts[parts.length - 1];
     }
 
     private String extractCollection(final String id) {
-        String[] parts = id.replaceFirst("^" + config.prefix, "").split("/");
+        String[] parts = id.split("/");
         if (parts.length > 2) {
             throw new IllegalArgumentException(String.format("key (%s) contains invalid character '/'", id));
         }
@@ -113,18 +113,18 @@ public List<ElementId> parseEdgeIds(Object[] ids) {
     public ElementId parseId(String id) {
         String collection = extractCollection(id);
         String key = extractKey(id);
-        return of(config.graphName, collection, key);
+        return of(collection, key);
     }
 
     private ElementId parseWithDefaultCollection(String id, String defaultCollection) {
         String collection = inferCollection(extractCollection(id), null, defaultCollection);
         String key = extractKey(id);
-        return of(config.graphName, collection, key);
+        return of(collection, key);
     }
 
     private ElementId createId(String label, Object nullableId, String defaultCollection) {
         if (nullableId == null) {
-            return of(config.graphName, inferCollection(null, label, defaultCollection), null);
+            return of(inferCollection(null, label, defaultCollection), null);
         }
 
         if (!(nullableId instanceof String)) {
@@ -133,13 +133,12 @@ private ElementId createId(String label, Object nullableId, String defaultCollec
 
         String id = (String) nullableId;
         validateId(id, label);
-        return of(config.graphName, inferCollection(extractCollection(id), label, defaultCollection), extractKey(id));
+        return of(inferCollection(extractCollection(id), label, defaultCollection), extractKey(id));
     }
 
-    private ElementId of(String graphName, String collection, String key) {
-        Objects.requireNonNull(graphName);
+    private ElementId of(String collection, String key) {
         Objects.requireNonNull(collection);
-        ElementId.validateIdParts(graphName, collection, key);
-        return doCreate(graphName, collection, key);
+        ElementId.validateIdParts(collection, key);
+        return doCreate(collection, key);
     }
 }

src/main/java/com/arangodb/tinkerpop/gremlin/persistence/complex/ComplexElementIdFactory.java

@@ -55,9 +55,6 @@ protected String inferCollection(final String collection, final String label, fi
 
     @Override
     protected void validateId(String id, String label) {
-        if (id.contains("_")) {
-            throw new IllegalArgumentException(String.format("id (%s) contains invalid character '_'", id));
-        }
         int idx = id.indexOf('/');
         if (idx <= 0) {
             String l = label != null ? label : "<label>";
@@ -72,8 +69,8 @@ protected void validateId(String id, String label) {
     }
 
     @Override
-    protected ElementId doCreate(String prefix, String collection, String key) {
-        return new ComplexId(prefix, collection, key);
+    protected ElementId doCreate(String collection, String key) {
+        return new ComplexId(collection, key);
     }
 
 }

src/main/java/com/arangodb/tinkerpop/gremlin/persistence/complex/ComplexId.java

@@ -20,8 +20,8 @@
 
 public class ComplexId extends ElementId {
 
-    public ComplexId(String prefix, String collection, String key) {
-        super(prefix, collection, key);
+    public ComplexId(String collection, String key) {
+        super(collection, key);
     }
 
     @Override

src/main/java/com/arangodb/tinkerpop/gremlin/persistence/simple/SimpleElementIdFactory.java

@@ -28,10 +28,8 @@ public class SimpleElementIdFactory extends ElementIdFactory {
 
     public SimpleElementIdFactory(ArangoDBGraphConfig config) {
         super(config);
-        defaultVertexCollection = config.vertices.iterator().next()
-                .replaceFirst(config.prefix, "");
-        defaultEdgeCollection = config.edges.iterator().next()
-                .replaceFirst(config.prefix, "");
+        defaultVertexCollection = config.vertices.iterator().next();
+        defaultEdgeCollection = config.edges.iterator().next();
     }
 
     @Override
@@ -51,16 +49,13 @@ protected String inferCollection(final String collection, final String label, fi
 
     @Override
     protected void validateId(String id, String label) {
-        if (id.contains("_")) {
-            throw new IllegalArgumentException(String.format("id (%s) contains invalid character '_'", id));
-        }
         if (id.contains("/")) {
             throw new IllegalArgumentException(String.format("id (%s) contains invalid character '/'", id));
         }
     }
 
     @Override
-    protected ElementId doCreate(String prefix, String collection, String key) {
-        return new SimpleId(prefix, collection, key);
+    protected ElementId doCreate(String collection, String key) {
+        return new SimpleId(collection, key);
     }
 }

src/main/java/com/arangodb/tinkerpop/gremlin/persistence/simple/SimpleId.java

@@ -20,8 +20,8 @@
 
 public class SimpleId extends ElementId {
 
-    public SimpleId(String prefix, String collection, String key) {
-        super(prefix, collection, key);
+    public SimpleId(String collection, String key) {
+        super(collection, key);
     }
 
     @Override