feat: update to tinkerpop structure

Signed-off-by: Otavio Santana <[email protected]>

Author: otaviojava

jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractGraphTemplate.java renamed to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractTinkerpopTemplate.java

@@ -50,7 +50,7 @@
 import static java.util.Objects.requireNonNull;
 import static org.apache.tinkerpop.gremlin.structure.T.id;
 
-abstract class AbstractGraphTemplate extends AbstractSemiStructuredTemplate implements GraphTemplate {
+abstract class AbstractTinkerpopTemplate extends AbstractSemiStructuredTemplate implements TinkerpopTemplate {
 
     @SuppressWarnings("unchecked")
     private static final Function<GraphTraversal<?, ?>, GraphTraversal<Vertex, Vertex>> INITIAL_VERTEX =

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

@@ -31,7 +31,7 @@
 @Default
 @ApplicationScoped
 @Database(GRAPH)
-class DefaultGraphTemplate extends AbstractGraphTemplate {
+class DefaultTinkerpopTemplate extends AbstractTinkerpopTemplate {
 
     private EntityConverter converter;
     private TinkerpopGraphDatabaseManager manager;
@@ -41,9 +41,9 @@ class DefaultGraphTemplate extends AbstractGraphTemplate {
     private Graph graph;
 
     @Inject
-    DefaultGraphTemplate(EntityConverter converter, Graph graph,
-                         EventPersistManager eventManager,
-                         EntitiesMetadata entities, Converters converters) {
+    DefaultTinkerpopTemplate(EntityConverter converter, Graph graph,
+                             EventPersistManager eventManager,
+                             EntitiesMetadata entities, Converters converters) {
         this.converter = converter;
         this.graph = graph;
         this.eventManager = eventManager;
@@ -56,7 +56,7 @@ class DefaultGraphTemplate extends AbstractGraphTemplate {
      * Constructor for CDI
      */
     @Deprecated
-    DefaultGraphTemplate() {}
+    DefaultTinkerpopTemplate() {}
 
     @Override
     protected EntityConverter converter() {

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

@@ -28,7 +28,7 @@
  * It is a wrapper of {@link org.apache.tinkerpop.gremlin.structure.Edge} that links two Entity.
  * Along with its Property objects, an Edge has both a Direction and a label.
  * Any Change at the Edge is automatically continued in the database. However, any, change in the Entity will be ignored.
- * {@link GraphTemplate#update(Object)}
+ * {@link TinkerpopTemplate#update(Object)}
  *
  * <pre>outVertex ---label---&#62; inVertex.</pre>
  */

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

@@ -30,11 +30,11 @@
 import java.util.function.Function;
 
 /**
- * An {@code ApplicationScoped} producer class responsible for creating instances of {@link GraphTemplate}.
- * It implements the {@link Function} interface with {@link DatabaseManager} as input and {@link GraphTemplate} as output.
+ * An {@code ApplicationScoped} producer class responsible for creating instances of {@link TinkerpopTemplate}.
+ * It implements the {@link Function} interface with {@link DatabaseManager} as input and {@link TinkerpopTemplate} as output.
  */
 @ApplicationScoped
-public class GraphTemplateProducer implements Function<Graph, GraphTemplate> {
+public class GraphTemplateProducer implements Function<Graph, TinkerpopTemplate> {
 
     @Inject
     private EntityConverter converter;
@@ -50,14 +50,14 @@ public class GraphTemplateProducer implements Function<Graph, GraphTemplate> {
 
 
     @Override
-    public GraphTemplate apply(Graph graph) {
+    public TinkerpopTemplate apply(Graph graph) {
         Objects.requireNonNull(graph, "graph is required");
-        return new ProducerGraphTemplate(converter, graph,
+        return new ProducerTinkerpopTemplate(converter, graph,
                 eventManager, entities, converters);
     }
 
     @Vetoed
-    static class ProducerGraphTemplate  extends AbstractGraphTemplate {
+    static class ProducerTinkerpopTemplate extends AbstractTinkerpopTemplate {
 
         private final EntityConverter converter;
 
@@ -72,9 +72,9 @@ static class ProducerGraphTemplate  extends AbstractGraphTemplate {
 
         private final TinkerpopGraphDatabaseManager manager;
 
-        public ProducerGraphTemplate(EntityConverter converter, Graph graph,
-                                     EventPersistManager eventManager,
-                                     EntitiesMetadata entities, Converters converters) {
+        public ProducerTinkerpopTemplate(EntityConverter converter, Graph graph,
+                                         EventPersistManager eventManager,
+                                         EntitiesMetadata entities, Converters converters) {
             this.converter = converter;
             this.graph = graph;
             this.manager = TinkerpopGraphDatabaseManager.of(graph);
@@ -83,7 +83,7 @@ public ProducerGraphTemplate(EntityConverter converter, Graph graph,
             this.converters = converters;
         }
 
-        ProducerGraphTemplate() {
+        ProducerTinkerpopTemplate() {
             this(null, null, null, null, null);
         }
 

jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GraphTemplate.java renamed to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/TinkerpopTemplate.java

@@ -35,7 +35,7 @@
  *
  * @see org.apache.tinkerpop.gremlin.structure.Graph
  */
-public interface GraphTemplate extends SemiStructuredTemplate {
+public interface TinkerpopTemplate extends SemiStructuredTemplate {
 
     /**
      * Deletes a {@link org.apache.tinkerpop.gremlin.structure.Vertex}

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

@@ -16,7 +16,7 @@
 
 import jakarta.data.repository.DataRepository;
 import jakarta.enterprise.context.spi.CreationalContext;
-import org.eclipse.jnosql.databases.tinkerpop.mapping.GraphTemplate;
+import org.eclipse.jnosql.databases.tinkerpop.mapping.TinkerpopTemplate;
 import org.eclipse.jnosql.mapping.DatabaseQualifier;
 import org.eclipse.jnosql.mapping.DatabaseType;
 import org.eclipse.jnosql.mapping.core.Converters;
@@ -84,8 +84,8 @@ public Class<?> getBeanClass() {
     @SuppressWarnings("unchecked")
     public T create(CreationalContext<T> context) {
         EntitiesMetadata entities = getInstance(EntitiesMetadata.class);
-        var template = provider.isEmpty() ? getInstance(GraphTemplate.class) :
-                getInstance(GraphTemplate.class, DatabaseQualifier.ofGraph(provider));
+        var template = provider.isEmpty() ? getInstance(TinkerpopTemplate.class) :
+                getInstance(TinkerpopTemplate.class, DatabaseQualifier.ofGraph(provider));
 
         Converters converters = getInstance(Converters.class);
 

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

@@ -15,7 +15,7 @@
 package org.eclipse.jnosql.databases.tinkerpop.mapping.spi;
 
 import jakarta.enterprise.context.spi.CreationalContext;
-import org.eclipse.jnosql.databases.tinkerpop.mapping.GraphTemplate;
+import org.eclipse.jnosql.databases.tinkerpop.mapping.TinkerpopTemplate;
 import org.eclipse.jnosql.mapping.DatabaseQualifier;
 import org.eclipse.jnosql.mapping.DatabaseType;
 import org.eclipse.jnosql.mapping.core.Converters;
@@ -83,8 +83,8 @@ public Class<?> getBeanClass() {
     @Override
     public T create(CreationalContext<T> context) {
         var entities = getInstance(EntitiesMetadata.class);
-        var template = provider.isEmpty() ? getInstance(GraphTemplate.class) :
-                getInstance(GraphTemplate.class, DatabaseQualifier.ofGraph(provider));
+        var template = provider.isEmpty() ? getInstance(TinkerpopTemplate.class) :
+                getInstance(TinkerpopTemplate.class, DatabaseQualifier.ofGraph(provider));
 
         var converters = getInstance(Converters.class);
 

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

@@ -17,7 +17,7 @@
 import jakarta.enterprise.context.spi.CreationalContext;
 import jakarta.nosql.Template;
 import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.eclipse.jnosql.databases.tinkerpop.mapping.GraphTemplate;
+import org.eclipse.jnosql.databases.tinkerpop.mapping.TinkerpopTemplate;
 import org.eclipse.jnosql.databases.tinkerpop.mapping.GraphTemplateProducer;
 import org.eclipse.jnosql.mapping.DatabaseQualifier;
 import org.eclipse.jnosql.mapping.DatabaseType;
@@ -28,9 +28,9 @@
 import java.util.Collections;
 import java.util.Set;
 
-class TemplateBean extends AbstractBean<GraphTemplate> {
+class TemplateBean extends AbstractBean<TinkerpopTemplate> {
 
-    private static final Set<Type> TYPES = Set.of(GraphTemplate.class, Template.class);
+    private static final Set<Type> TYPES = Set.of(TinkerpopTemplate.class, Template.class);
 
     private final String provider;
 
@@ -48,12 +48,12 @@ public TemplateBean(String provider) {
 
     @Override
     public Class<?> getBeanClass() {
-        return GraphTemplate.class;
+        return TinkerpopTemplate.class;
     }
 
 
     @Override
-    public GraphTemplate create(CreationalContext<GraphTemplate> context) {
+    public TinkerpopTemplate create(CreationalContext<TinkerpopTemplate> context) {
 
         GraphTemplateProducer producer = getInstance(GraphTemplateProducer.class);
         Graph graph = getGraph();
@@ -77,7 +77,7 @@ public Set<Annotation> getQualifiers() {
 
     @Override
     public String getId() {
-        return GraphTemplate.class.getName() + DatabaseType.GRAPH + "-" + provider;
+        return TinkerpopTemplate.class.getName() + DatabaseType.GRAPH + "-" + provider;
     }
 
 }

jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractGraphTemplateTest.java renamed to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractTinkerpopTemplateTest.java

@@ -49,11 +49,11 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public abstract class AbstractGraphTemplateTest {
+public abstract class AbstractTinkerpopTemplateTest {
 
     protected abstract Graph getGraph();
 
-    protected abstract GraphTemplate getGraphTemplate();
+    protected abstract TinkerpopTemplate getGraphTemplate();
 
     @AfterEach
     void after() {

jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractTraversalTest.java

@@ -30,7 +30,7 @@ public abstract class AbstractTraversalTest {
     static final String READS = "reads";
 
     @Inject
-    protected GraphTemplate graphTemplate;
+    protected TinkerpopTemplate tinkerpopTemplate;
 
     @Inject
     protected Graph graph;
@@ -54,21 +54,21 @@ public void setUp() {
         graph.traversal().V().toList().forEach(Vertex::remove);
         graph.traversal().E().toList().forEach(Edge::remove);
 
-        otavio = graphTemplate.insert(Human.builder().withAge(27)
+        otavio = tinkerpopTemplate.insert(Human.builder().withAge(27)
                 .withName("Otavio").build());
-        poliana = graphTemplate.insert(Human.builder().withAge(26)
+        poliana = tinkerpopTemplate.insert(Human.builder().withAge(26)
                 .withName("Poliana").build());
-        paulo = graphTemplate.insert(Human.builder().withAge(50)
+        paulo = tinkerpopTemplate.insert(Human.builder().withAge(50)
                 .withName("Paulo").build());
 
-        shack = graphTemplate.insert(Magazine.builder().withAge(2007).withName("The Shack").build());
-        license = graphTemplate.insert(Magazine.builder().withAge(2013).withName("Software License").build());
-        effectiveJava = graphTemplate.insert(Magazine.builder().withAge(2001).withName("Effective Java").build());
+        shack = tinkerpopTemplate.insert(Magazine.builder().withAge(2007).withName("The Shack").build());
+        license = tinkerpopTemplate.insert(Magazine.builder().withAge(2013).withName("Software License").build());
+        effectiveJava = tinkerpopTemplate.insert(Magazine.builder().withAge(2001).withName("Effective Java").build());
 
 
-        reads = graphTemplate.edge(otavio, READS, effectiveJava);
-        reads2 = graphTemplate.edge(poliana, READS, shack);
-        reads3 = graphTemplate.edge(paulo, READS, license);
+        reads = tinkerpopTemplate.edge(otavio, READS, effectiveJava);
+        reads2 = tinkerpopTemplate.edge(poliana, READS, shack);
+        reads3 = tinkerpopTemplate.edge(paulo, READS, license);
 
         reads.add("motivation", "hobby");
         reads.add("language", "Java");
@@ -78,13 +78,13 @@ public void setUp() {
 
     @AfterEach
     public void after() {
-        graphTemplate.delete(otavio.getId());
-        graphTemplate.delete(poliana.getId());
-        graphTemplate.delete(paulo.getId());
+        tinkerpopTemplate.delete(otavio.getId());
+        tinkerpopTemplate.delete(poliana.getId());
+        tinkerpopTemplate.delete(paulo.getId());
 
-        graphTemplate.deleteEdge(shack.getId());
-        graphTemplate.deleteEdge(license.getId());
-        graphTemplate.deleteEdge(effectiveJava.getId());
+        tinkerpopTemplate.deleteEdge(shack.getId());
+        tinkerpopTemplate.deleteEdge(license.getId());
+        tinkerpopTemplate.deleteEdge(effectiveJava.getId());
 
         reads.delete();
         reads2.delete();