Merge pull request #342 from rashtao/tinkerpop-default-id-field-name

 jnosql-tinkerpop: use ~id as default id field name

Author: otaviojava

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

@@ -57,6 +57,11 @@ class DefaultArangoDBDocumentManager implements ArangoDBDocumentManager {
         db = arangoDB.db(database);
     }
 
+    @Override
+    public Optional<String> defaultIdFieldName() {
+        return Optional.of(KEY);
+    }
+
     @Override
     public String name() {
         return db.name();

jnosql-arangodb/src/main/java/org/eclipse/jnosql/databases/arangodb/mapping/DefaultArangoDBTemplate.java

@@ -25,6 +25,7 @@
 import org.eclipse.jnosql.mapping.graph.AbstractGraphTemplate;
 import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;
 import org.eclipse.jnosql.mapping.semistructured.EntityConverter;
+import org.eclipse.jnosql.mapping.semistructured.EntityConverterFactory;
 import org.eclipse.jnosql.mapping.semistructured.EventPersistManager;
 
 import java.util.Map;
@@ -51,12 +52,12 @@ class DefaultArangoDBTemplate extends AbstractGraphTemplate implements ArangoDBT
 
     @Inject
     DefaultArangoDBTemplate(Instance<ArangoDBDocumentManager> manager,
-                            EntityConverter converter,
+                            EntityConverterFactory converter,
                             EventPersistManager eventManager,
                             EntitiesMetadata entities,
                             Converters converters) {
         this.manager = manager;
-        this.converter = converter;
+        this.converter = converter.create(manager.get());
         this.eventManager = eventManager;
         this.entities = entities;
         this.converters = converters;

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

@@ -140,7 +140,7 @@ void shouldUpdateNullValues() {
         var book = new Magazine(randomUUID().toString(), "Effective Java", 1);
         template.insert(book);
         template.update(new Magazine(book.id(), null, 2));
-        Optional<Magazine> optional = template.select(Magazine.class).where("id")
+        Optional<Magazine> optional = template.select(Magazine.class).where("_key")
                 .eq(book.id()).singleResult();
         SoftAssertions.assertSoftly(softly -> {
             softly.assertThat(optional).isPresent();

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

@@ -140,7 +140,7 @@ void shouldUpdateNullValues() {
         var article = new Article(randomUUID().toString(), "Effective Java", 1);
         template.insert(article);
         template.update(new Article(article.id(), null, 2));
-        Optional<Article> optional = template.select(Article.class).where("id")
+        Optional<Article> optional = template.select(Article.class).where("_key")
                 .eq(article.id()).singleResult();
         SoftAssertions.assertSoftly(softly -> {
             softly.assertThat(optional).isPresent();

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

@@ -19,5 +19,5 @@
 import jakarta.nosql.Id;
 
 @Entity
-public record Magazine(@Id("_key") String id, @Column("title") String title, @Column("edition") int edition) {
+public record Magazine(@Id String id, @Column("title") String title, @Column("edition") int edition) {
 }

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

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

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

@@ -29,6 +29,7 @@
 import org.eclipse.jnosql.mapping.reflection.Reflections;
 import org.eclipse.jnosql.mapping.reflection.spi.ReflectionEntityMetadataExtension;
 import org.eclipse.jnosql.mapping.semistructured.EntityConverter;
+import org.eclipse.jnosql.mapping.semistructured.EntityConverterFactory;
 import org.eclipse.jnosql.mapping.semistructured.EventPersistManager;
 import org.jboss.weld.junit5.auto.AddExtensions;
 import org.jboss.weld.junit5.auto.AddPackages;
@@ -55,7 +56,7 @@
 public class DefaultArangoDBTemplateTest {
 
     @Inject
-    private EntityConverter converter;
+    private EntityConverterFactory converter;
 
     @Inject
     private EventPersistManager persistManager;

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

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

jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/DefaultTinkerpopGraphDatabaseManager.java

@@ -60,6 +60,11 @@ public class DefaultTinkerpopGraphDatabaseManager implements TinkerpopGraphDatab
         this.graph = graph;
     }
 
+    @Override
+    public Optional<String> defaultIdFieldName() {
+        return Optional.of(T.id.getAccessor());
+    }
+
     @Override
     public Graph get() {
         return graph;

jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultTinkerpopTemplate.java

@@ -25,6 +25,7 @@
 import org.eclipse.jnosql.mapping.core.Converters;
 import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;
 import org.eclipse.jnosql.mapping.semistructured.EntityConverter;
+import org.eclipse.jnosql.mapping.semistructured.EntityConverterFactory;
 import org.eclipse.jnosql.mapping.semistructured.EventPersistManager;
 
 import static org.eclipse.jnosql.mapping.DatabaseType.GRAPH;
@@ -43,15 +44,15 @@ class DefaultTinkerpopTemplate extends AbstractTinkerpopTemplate {
     private Graph graph;
 
     @Inject
-    DefaultTinkerpopTemplate(EntityConverter converter, Graph graph,
+    DefaultTinkerpopTemplate(EntityConverterFactory converter, Graph graph,
                              EventPersistManager eventManager,
                              EntitiesMetadata entities, Converters converters) {
-        this.converter = converter;
         this.graph = graph;
         this.eventManager = eventManager;
         this.entities = entities;
         this.converters = converters;
         this.manager = TinkerpopGraphDatabaseManager.of(graph);
+        this.converter = converter.create(manager);
     }
 
     /**