ArangoDB: use _key instead of _id

Author: rashtao

jnosql-arangodb/src/main/java/org/eclipse/jnosql/databases/arangodb/communication/DefaultArangoDBDocumentManager.java

@@ -76,10 +76,9 @@ public CommunicationEntity update(CommunicationEntity entity) {
         requireNonNull(entity, "entity is required");
         String collectionName = entity.name();
         checkCollection(collectionName);
-        String id = entity.find(ID, String.class)
+        entity.find(KEY, String.class)
                 .orElseThrow(() -> new IllegalArgumentException("The document does not provide" +
-                        " the _id column"));
-        feedKey(entity, id);
+                        " the _key column"));
         JsonObject jsonObject = ArangoDBUtil.toJsonObject(entity);
         DocumentUpdateEntity<Void> arangoDocument = arangoDB.db(database)
                 .collection(collectionName).updateDocument(jsonObject.getString(KEY), jsonObject);
@@ -208,17 +207,6 @@ private void updateEntity(CommunicationEntity entity, String key, String id, Str
         entity.add(Element.of(REV, rev));
     }
 
-    private static void feedKey(CommunicationEntity entity, String id) {
-        if (entity.find(KEY).isEmpty()) {
-            String[] values = id.split("/");
-            if (values.length == 2) {
-                entity.add(KEY, values[1]);
-            } else {
-                entity.add(KEY, values[0]);
-            }
-        }
-    }
-
     ArangoDB getArangoDB() {
         return arangoDB;
     }

jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/communication/ArangoDBDocumentManagerTest.java

@@ -36,8 +36,8 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Random;
+import java.util.UUID;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonMap;
@@ -334,8 +334,9 @@ private CommunicationEntity getEntity() {
     }
 
     private CommunicationEntity createDocumentList() {
+        String id = UUID.randomUUID().toString();
         CommunicationEntity entity = CommunicationEntity.of("AppointmentBook");
-        entity.add(Element.of("_id", "ids"));
+        entity.add(Element.of("_key", id));
         List<List<Element>> documents = new ArrayList<>();
 
         documents.add(asList(Element.of("name", "Ada"), Element.of("type", ContactType.EMAIL),

jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/Book.java

@@ -23,7 +23,7 @@
 @Entity
 public class Book {
 
-    @Id
+    @Id("_key")
     private String id;
 
     @Column("title")

jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/TemplateIntegrationTest.java

@@ -35,6 +35,7 @@
 
 import java.util.List;
 import java.util.Optional;
+import java.util.UUID;
 
 import static java.util.UUID.randomUUID;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -114,9 +115,9 @@ void shouldDelete() {
 
     @Test
     void shouldUpdateEmbeddable() {
+        String id = UUID.randomUUID().toString();
         var workflowStep = WorkflowStep.builder()
-                .id("id")
-                .key("key1")
+                .id(id)
                 .workflowSchemaKey("workflowSchemaKey")
                 .stepName("stepName")
                 .mainStepType(MainStepType.MAIN)
@@ -130,8 +131,7 @@ void shouldUpdateEmbeddable() {
 
         SoftAssertions.assertSoftly(soft ->{
             soft.assertThat(result).isNotNull();
-            soft.assertThat(result.id()).isEqualTo("workflow_step/key1");
-            soft.assertThat(result.key()).isEqualTo("key1");
+            soft.assertThat(result.id()).isEqualTo(id);
             soft.assertThat(result.workflowSchemaKey()).isEqualTo("workflowSchemaKey");
             soft.assertThat(result.stepName()).isEqualTo("stepName");
             soft.assertThat(result.mainStepType()).isEqualTo(MainStepType.MAIN);
@@ -149,9 +149,9 @@ void shouldUpdateEmbeddable() {
 
     @Test
     void shouldUpdateEmbeddable2() {
+        String id = UUID.randomUUID().toString();
         var workflowStep = WorkflowStep.builder()
-                .id("id")
-                .key("key2")
+                .id(id)
                 .workflowSchemaKey("workflowSchemaKey")
                 .stepName("stepName")
                 .mainStepType(MainStepType.MAIN)
@@ -164,8 +164,7 @@ void shouldUpdateEmbeddable2() {
 
         SoftAssertions.assertSoftly(soft ->{
             soft.assertThat(result).isNotNull();
-            soft.assertThat(result.id()).isEqualTo("workflow_step/key2");
-            soft.assertThat(result.key()).isEqualTo("key2");
+            soft.assertThat(result.id()).isEqualTo(id);
             soft.assertThat(result.workflowSchemaKey()).isEqualTo("workflowSchemaKey");
             soft.assertThat(result.stepName()).isEqualTo("stepName");
             soft.assertThat(result.mainStepType()).isEqualTo(MainStepType.MAIN);
@@ -192,8 +191,7 @@ void shouldExecuteWithoutKey(){
 
         SoftAssertions.assertSoftly(soft ->{
             soft.assertThat(result).isNotNull();
-            soft.assertThat(result.id()).contains("workflow_step/");
-            soft.assertThat(result.key()).isNotNull();
+            soft.assertThat(result.id()).isEqualTo("id");
             soft.assertThat(result.workflowSchemaKey()).isEqualTo("workflowSchemaKey");
             soft.assertThat(result.stepName()).isEqualTo("stepName");
             soft.assertThat(result.mainStepType()).isEqualTo(MainStepType.MAIN);
@@ -219,8 +217,7 @@ void shouldExecuteWithoutKId(){
 
         SoftAssertions.assertSoftly(soft ->{
             soft.assertThat(result).isNotNull();
-            soft.assertThat(result.id()).contains("workflow_step/");
-            soft.assertThat(result.key()).isNotNull();
+            soft.assertThat(result.id()).isNotNull();
             soft.assertThat(result.workflowSchemaKey()).isEqualTo("workflowSchemaKey");
             soft.assertThat(result.stepName()).isEqualTo("stepName");
             soft.assertThat(result.mainStepType()).isEqualTo(MainStepType.MAIN);

jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/WorkflowStep.java

@@ -23,12 +23,9 @@
 @Entity("workflow_step")
 public class WorkflowStep {
 
-    @Id
+    @Id("_key")
     private String id;
 
-    @Column("_key")
-    private String key;
-
     @Column
     private String workflowSchemaKey;
 
@@ -50,12 +47,11 @@ public class WorkflowStep {
     @Column
     private List<Transition> availableTransitions;
 
-    WorkflowStep(String id, String key, String workflowSchemaKey,
+    WorkflowStep(String id, String workflowSchemaKey,
                  String stepName, MainStepType mainStepType,
                  Integer stepNo, String componentConfigurationKey,
                  String relationTypeKey, List<Transition> availableTransitions) {
         this.id = id;
-        this.key = key;
         this.workflowSchemaKey = workflowSchemaKey;
         this.stepName = stepName;
         this.mainStepType = mainStepType;
@@ -76,10 +72,6 @@ public String id() {
         return id;
     }
 
-    public String key() {
-        return key;
-    }
-
     public String workflowSchemaKey() {
         return workflowSchemaKey;
     }

jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/WorkflowStepBuilder.java

@@ -18,7 +18,6 @@
 
 public class WorkflowStepBuilder {
     private String id;
-    private String key;
     private String workflowSchemaKey;
     private String stepName;
     private MainStepType mainStepType;
@@ -32,11 +31,6 @@ public WorkflowStepBuilder id(String id) {
         return this;
     }
 
-    public WorkflowStepBuilder key(String key) {
-        this.key = key;
-        return this;
-    }
-
     public WorkflowStepBuilder workflowSchemaKey(String workflowSchemaKey) {
         this.workflowSchemaKey = workflowSchemaKey;
         return this;
@@ -73,7 +67,7 @@ public WorkflowStepBuilder availableTransitions(List<Transition> availableTransi
     }
 
     public WorkflowStep build() {
-        return new WorkflowStep(id, key, workflowSchemaKey, stepName, mainStepType,
+        return new WorkflowStep(id, workflowSchemaKey, stepName, mainStepType,
                 stepNo, componentConfigurationKey, relationTypeKey, availableTransitions);
     }
 }

jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/mapping/DefaultArangoDBTemplateTest.java

@@ -78,7 +78,7 @@ public void setup() {
         template = new DefaultArangoDBTemplate(instance, converter, persistManager, entities, converters);
 
         CommunicationEntity entity = CommunicationEntity.of("Person");
-        entity.add(Element.of("_id", "Ada"));
+        entity.add(Element.of("_key", "Ada"));
         entity.add(Element.of("age", 10));
 
     }

jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/mapping/Person.java

@@ -24,7 +24,7 @@
 @Entity
 public class Person {
 
-    @Id
+    @Id("_key")
     private String name;
 
     @Column