From 01e80c21d55c7a639100fd701b6c36dd0e958c2e Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Tue, 10 Dec 2024 19:20:29 +0000 Subject: [PATCH 01/19] update apache tinkerpop structure Signed-off-by: Otavio Santana --- .../graph/CommunicationEntityConverter.java | 2 +- .../graph/DefaultGraphDatabaseManager.java | 2 +- .../communication/graph/GraphConfiguration.java | 2 +- .../communication/graph/GraphDatabaseManager.java | 2 +- .../communication/graph/GraphTransactionUtil.java | 2 +- .../communication/graph/TraversalExecutor.java | 2 +- .../tinkerpop}/communication/graph/package-info.java | 4 ++-- .../mapping/graph/AbstractEdgeTraversal.java | 2 +- .../mapping/graph/AbstractGraphTemplate.java | 8 ++++---- .../mapping/graph/AbstractVertexTraversal.java | 2 +- .../tinkerpop}/mapping/graph/DefaultEdgeEntity.java | 4 ++-- .../graph/DefaultEdgeRepeatStepTraversal.java | 2 +- .../mapping/graph/DefaultEdgeRepeatTraversal.java | 2 +- .../mapping/graph/DefaultEdgeTraversal.java | 2 +- .../mapping/graph/DefaultEdgeTraversalOrder.java | 2 +- .../mapping/graph/DefaultEdgeUntilTraversal.java | 2 +- .../mapping/graph/DefaultGraphTemplate.java | 4 ++-- .../mapping/graph/DefaultPreparedStatement.java | 2 +- .../mapping/graph/DefaultValueMapTraversal.java | 2 +- .../graph/DefaultVertexRepeatStepTraversal.java | 2 +- .../mapping/graph/DefaultVertexRepeatTraversal.java | 2 +- .../mapping/graph/DefaultVertexTraversal.java | 4 ++-- .../mapping/graph/DefaultVertexTraversalOrder.java | 2 +- .../mapping/graph/DefaultVertexUntilTraversal.java | 2 +- .../mapping/graph/EdgeConditionTraversal.java | 2 +- .../tinkerpop}/mapping/graph/EdgeEntity.java | 4 ++-- .../mapping/graph/EdgeRepeatStepTraversal.java | 2 +- .../mapping/graph/EdgeRepeatTraversal.java | 2 +- .../tinkerpop}/mapping/graph/EdgeTraversal.java | 2 +- .../tinkerpop}/mapping/graph/EdgeTraversalOrder.java | 2 +- .../tinkerpop}/mapping/graph/EdgeUntilTraversal.java | 2 +- .../mapping/graph/GraphEntityConverter.java | 4 ++-- .../tinkerpop}/mapping/graph/GraphTemplate.java | 2 +- .../mapping/graph/GraphTemplateProducer.java | 4 ++-- .../tinkerpop}/mapping/graph/GremlinExecutor.java | 4 ++-- .../tinkerpop}/mapping/graph/GremlinParamParser.java | 2 +- .../mapping/graph/GremlinQueryException.java | 2 +- .../tinkerpop}/mapping/graph/Transactional.java | 4 ++-- .../mapping/graph/TransactionalInterceptor.java | 4 ++-- .../tinkerpop}/mapping/graph/ValueMapTraversal.java | 2 +- .../mapping/graph/VertexConditionTraversal.java | 2 +- .../mapping/graph/VertexRepeatStepTraversal.java | 2 +- .../mapping/graph/VertexRepeatTraversal.java | 2 +- .../tinkerpop}/mapping/graph/VertexTraversal.java | 2 +- .../mapping/graph/VertexTraversalOrder.java | 2 +- .../mapping/graph/VertexUntilTraversal.java | 2 +- .../mapping/graph/configuration/GraphSupplier.java | 4 ++-- .../mapping/graph/query/RepositoryGraphBean.java | 6 +++--- .../mapping/graph/spi/CustomRepositoryGraphBean.java | 6 +++--- .../tinkerpop}/mapping/graph/spi/GraphExtension.java | 4 ++-- .../tinkerpop}/mapping/graph/spi/TemplateBean.java | 6 +++--- .../services/jakarta.enterprise.inject.spi.Extension | 2 +- .../graph/DefaultGraphDatabaseManagerTest.java | 4 ++-- .../communication/graph/GraphSupplier.java | 2 +- .../mapping/graph/AbstractGraphTemplateTest.java | 9 ++++----- .../mapping/graph/AbstractTraversalTest.java | 6 +++--- .../tinkerpop}/mapping/graph/BookRepository.java | 4 ++-- .../tinkerpop}/mapping/graph/BookTemplateTest.java | 8 ++++---- .../mapping/graph/DefaultEdgeTraversalTest.java | 12 ++++++------ .../graph/DefaultGraphTemplateProducerTest.java | 5 ++--- .../DefaultGraphTraversalSourceTemplateTest.java | 6 +++--- .../mapping/graph/DefaultValueMapTraversalTest.java | 8 ++++---- .../mapping/graph/DefaultVertexTraversalTest.java | 12 ++++++------ .../tinkerpop}/mapping/graph/EdgeEntityTest.java | 8 ++++---- .../tinkerpop}/mapping/graph/GraphProducer.java | 2 +- .../mapping/graph/GraphTemplateProducerTest.java | 6 +++--- .../tinkerpop}/mapping/graph/GraphTemplateTest.java | 4 ++-- .../graph/configuration/GraphConfigurationMock.java | 4 ++-- .../graph/configuration/GraphConfigurationMock2.java | 4 ++-- .../graph/configuration/GraphSupplierTest.java | 12 +++++------- .../tinkerpop}/mapping/graph/entities/Animal.java | 2 +- .../tinkerpop}/mapping/graph/entities/Book.java | 2 +- .../mapping/graph/entities/BookTemplate.java | 7 +++---- .../tinkerpop}/mapping/graph/entities/People.java | 2 +- .../tinkerpop}/mapping/graph/entities/Person.java | 2 +- .../mapping/graph/entities/PersonBuilder.java | 4 ++-- .../mapping/graph/entities/PersonRepository.java | 2 +- .../mapping/graph/entities/WrongEntity.java | 2 +- .../mapping/graph/spi/GraphCustomExtensionTest.java | 10 +++++----- .../mapping/graph/spi/GraphExtensionTest.java | 10 +++++----- .../META-INF/microprofile-config.properties | 2 +- ...pse.jnosql.communication.graph.GraphConfiguration | 1 - ....tinkerpop.communication.graph.GraphConfiguration | 1 + 83 files changed, 152 insertions(+), 157 deletions(-) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/communication/graph/CommunicationEntityConverter.java (94%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/communication/graph/DefaultGraphDatabaseManager.java (98%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/communication/graph/GraphConfiguration.java (97%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/communication/graph/GraphDatabaseManager.java (96%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/communication/graph/GraphTransactionUtil.java (97%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/communication/graph/TraversalExecutor.java (98%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/communication/graph/package-info.java (91%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/AbstractEdgeTraversal.java (96%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/AbstractGraphTemplate.java (97%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/AbstractVertexTraversal.java (96%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/DefaultEdgeEntity.java (96%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/DefaultEdgeRepeatStepTraversal.java (96%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/DefaultEdgeRepeatTraversal.java (98%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/DefaultEdgeTraversal.java (99%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/DefaultEdgeTraversalOrder.java (96%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/DefaultEdgeUntilTraversal.java (98%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/DefaultGraphTemplate.java (94%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/DefaultPreparedStatement.java (97%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/DefaultValueMapTraversal.java (97%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/DefaultVertexRepeatStepTraversal.java (96%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/DefaultVertexRepeatTraversal.java (98%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/DefaultVertexTraversal.java (98%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/DefaultVertexTraversalOrder.java (96%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/DefaultVertexUntilTraversal.java (98%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/EdgeConditionTraversal.java (98%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/EdgeEntity.java (96%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/EdgeRepeatStepTraversal.java (94%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/EdgeRepeatTraversal.java (98%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/EdgeTraversal.java (98%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/EdgeTraversalOrder.java (93%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/EdgeUntilTraversal.java (92%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/GraphEntityConverter.java (85%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/GraphTemplate.java (99%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/GraphTemplateProducer.java (96%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/GremlinExecutor.java (95%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/GremlinParamParser.java (97%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/GremlinQueryException.java (95%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/Transactional.java (94%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/TransactionalInterceptor.java (92%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/ValueMapTraversal.java (96%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/VertexConditionTraversal.java (99%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/VertexRepeatStepTraversal.java (94%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/VertexRepeatTraversal.java (98%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/VertexTraversal.java (99%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/VertexTraversalOrder.java (93%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/VertexUntilTraversal.java (93%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/configuration/GraphSupplier.java (92%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/query/RepositoryGraphBean.java (96%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/spi/CustomRepositoryGraphBean.java (96%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/spi/GraphExtension.java (95%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/spi/TemplateBean.java (91%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/{ => databases/tinkerpop}/communication/graph/DefaultGraphDatabaseManagerTest.java (99%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/{ => databases/tinkerpop}/communication/graph/GraphSupplier.java (95%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/AbstractGraphTemplateTest.java (98%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/AbstractTraversalTest.java (93%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/BookRepository.java (84%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/BookTemplateTest.java (91%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/DefaultEdgeTraversalTest.java (97%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/DefaultGraphTemplateProducerTest.java (91%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/DefaultGraphTraversalSourceTemplateTest.java (92%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/DefaultValueMapTraversalTest.java (94%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/DefaultVertexTraversalTest.java (97%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/EdgeEntityTest.java (97%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/GraphProducer.java (98%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/GraphTemplateProducerTest.java (93%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/GraphTemplateTest.java (92%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/configuration/GraphConfigurationMock.java (93%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/configuration/GraphConfigurationMock2.java (93%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/configuration/GraphSupplierTest.java (89%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/entities/Animal.java (95%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/entities/Book.java (97%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/entities/BookTemplate.java (83%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/entities/People.java (91%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/entities/Person.java (97%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/entities/PersonBuilder.java (95%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/entities/PersonRepository.java (91%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/entities/WrongEntity.java (95%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/spi/GraphCustomExtensionTest.java (87%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/{ => databases/tinkerpop}/mapping/graph/spi/GraphExtensionTest.java (86%) delete mode 100644 jnosql-tinkerpop/src/test/resources/META-INF/services/org.eclipse.jnosql.communication.graph.GraphConfiguration create mode 100644 jnosql-tinkerpop/src/test/resources/META-INF/services/org.eclipse.jnosql.databases.tinkerpop.communication.graph.GraphConfiguration diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/communication/graph/CommunicationEntityConverter.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/CommunicationEntityConverter.java similarity index 94% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/communication/graph/CommunicationEntityConverter.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/CommunicationEntityConverter.java index 8f6a3893a..9d0fabf1b 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/communication/graph/CommunicationEntityConverter.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/CommunicationEntityConverter.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.communication.graph; +package org.eclipse.jnosql.databases.tinkerpop.communication.graph; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.eclipse.jnosql.communication.semistructured.CommunicationEntity; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/communication/graph/DefaultGraphDatabaseManager.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/DefaultGraphDatabaseManager.java similarity index 98% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/communication/graph/DefaultGraphDatabaseManager.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/DefaultGraphDatabaseManager.java index 62e99d3fb..f9d15cf61 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/communication/graph/DefaultGraphDatabaseManager.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/DefaultGraphDatabaseManager.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.communication.graph; +package org.eclipse.jnosql.databases.tinkerpop.communication.graph; import jakarta.data.exceptions.EmptyResultException; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/communication/graph/GraphConfiguration.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/GraphConfiguration.java similarity index 97% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/communication/graph/GraphConfiguration.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/GraphConfiguration.java index db0e9cc20..faf1c7740 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/communication/graph/GraphConfiguration.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/GraphConfiguration.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.communication.graph; +package org.eclipse.jnosql.databases.tinkerpop.communication.graph; import org.apache.tinkerpop.gremlin.structure.Graph; import org.eclipse.jnosql.communication.CommunicationException; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/communication/graph/GraphDatabaseManager.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/GraphDatabaseManager.java similarity index 96% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/communication/graph/GraphDatabaseManager.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/GraphDatabaseManager.java index ee9422390..9e64109ba 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/communication/graph/GraphDatabaseManager.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/GraphDatabaseManager.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.communication.graph; +package org.eclipse.jnosql.databases.tinkerpop.communication.graph; import org.apache.tinkerpop.gremlin.structure.Graph; import org.eclipse.jnosql.communication.semistructured.DatabaseManager; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/communication/graph/GraphTransactionUtil.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/GraphTransactionUtil.java similarity index 97% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/communication/graph/GraphTransactionUtil.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/GraphTransactionUtil.java index 89de00f84..70523f362 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/communication/graph/GraphTransactionUtil.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/GraphTransactionUtil.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.communication.graph; +package org.eclipse.jnosql.databases.tinkerpop.communication.graph; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Transaction; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/communication/graph/TraversalExecutor.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/TraversalExecutor.java similarity index 98% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/communication/graph/TraversalExecutor.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/TraversalExecutor.java index 461ab8835..36da28581 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/communication/graph/TraversalExecutor.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/TraversalExecutor.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.communication.graph; +package org.eclipse.jnosql.databases.tinkerpop.communication.graph; import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/communication/graph/package-info.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/package-info.java similarity index 91% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/communication/graph/package-info.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/package-info.java index 11ea3780b..ba7d48bec 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/communication/graph/package-info.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/package-info.java @@ -18,7 +18,7 @@ * in the JNoSQL project. It contains interfaces, classes, and utilities that enable developers to * communicate with and manage graph databases. *

- * The core interface in this package is {@link org.eclipse.jnosql.communication.graph.GraphDatabaseManager}, + * The core interface in this package is {@link org.eclipse.jnosql.databases.tinkerpop.communication.graph.GraphDatabaseManager}, * which extends {@link org.eclipse.jnosql.communication.semistructured.DatabaseManager} * and acts as a specialized extension for managing graph databases. Implementations of this interface * provide methods for interacting with the underlying graph database, executing graph traversals, @@ -28,4 +28,4 @@ * for working with different graph database technologies supported by JNoSQL. *

*/ -package org.eclipse.jnosql.communication.graph; \ No newline at end of file +package org.eclipse.jnosql.databases.tinkerpop.communication.graph; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/AbstractEdgeTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/AbstractEdgeTraversal.java similarity index 96% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/AbstractEdgeTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/AbstractEdgeTraversal.java index 36930fc7f..955884a8e 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/AbstractEdgeTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/AbstractEdgeTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.structure.Edge; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/AbstractGraphTemplate.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/AbstractGraphTemplate.java similarity index 97% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/AbstractGraphTemplate.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/AbstractGraphTemplate.java index 6b2ac1a6e..8bf7e1297 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/AbstractGraphTemplate.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/AbstractGraphTemplate.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import jakarta.data.exceptions.EmptyResultException; import jakarta.data.exceptions.NonUniqueResultException; @@ -25,9 +25,9 @@ import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Transaction; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.eclipse.jnosql.communication.graph.CommunicationEntityConverter; -import org.eclipse.jnosql.communication.graph.GraphDatabaseManager; -import org.eclipse.jnosql.communication.graph.GraphTransactionUtil; +import org.eclipse.jnosql.databases.tinkerpop.communication.graph.CommunicationEntityConverter; +import org.eclipse.jnosql.databases.tinkerpop.communication.graph.GraphDatabaseManager; +import org.eclipse.jnosql.databases.tinkerpop.communication.graph.GraphTransactionUtil; import org.eclipse.jnosql.mapping.IdNotFoundException; import org.eclipse.jnosql.mapping.metadata.EntityMetadata; import org.eclipse.jnosql.mapping.metadata.FieldMetadata; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/AbstractVertexTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/AbstractVertexTraversal.java similarity index 96% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/AbstractVertexTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/AbstractVertexTraversal.java index 465dab0dc..dd75b7aea 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/AbstractVertexTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/AbstractVertexTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.structure.Vertex; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultEdgeEntity.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeEntity.java similarity index 96% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultEdgeEntity.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeEntity.java index 6d4f33413..8555d5991 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultEdgeEntity.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeEntity.java @@ -12,12 +12,12 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Property; import org.eclipse.jnosql.communication.Value; -import org.eclipse.jnosql.communication.graph.CommunicationEntityConverter; +import org.eclipse.jnosql.databases.tinkerpop.communication.graph.CommunicationEntityConverter; import org.eclipse.jnosql.communication.semistructured.Element; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultEdgeRepeatStepTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeRepeatStepTraversal.java similarity index 96% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultEdgeRepeatStepTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeRepeatStepTraversal.java index 2d4f3207d..e81ef4ff4 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultEdgeRepeatStepTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeRepeatStepTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.structure.Edge; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultEdgeRepeatTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeRepeatTraversal.java similarity index 98% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultEdgeRepeatTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeRepeatTraversal.java index ad9767a81..4c3f87528 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultEdgeRepeatTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeRepeatTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.process.traversal.Traversal; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultEdgeTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeTraversal.java similarity index 99% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultEdgeTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeTraversal.java index 4397c8020..d387f77d7 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultEdgeTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import jakarta.data.exceptions.NonUniqueResultException; import org.apache.tinkerpop.gremlin.process.traversal.P; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultEdgeTraversalOrder.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeTraversalOrder.java similarity index 96% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultEdgeTraversalOrder.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeTraversalOrder.java index 88d4e445b..543416e62 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultEdgeTraversalOrder.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeTraversalOrder.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.structure.Edge; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultEdgeUntilTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeUntilTraversal.java similarity index 98% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultEdgeUntilTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeUntilTraversal.java index dbd2e190c..79fb8152d 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultEdgeUntilTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeUntilTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.process.traversal.Traversal; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTemplate.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultGraphTemplate.java similarity index 94% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTemplate.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultGraphTemplate.java index e4c981d05..75ea00f90 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTemplate.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultGraphTemplate.java @@ -12,14 +12,14 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Default; import jakarta.inject.Inject; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Graph; -import org.eclipse.jnosql.communication.graph.GraphDatabaseManager; +import org.eclipse.jnosql.databases.tinkerpop.communication.graph.GraphDatabaseManager; import org.eclipse.jnosql.mapping.Database; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultPreparedStatement.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultPreparedStatement.java similarity index 97% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultPreparedStatement.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultPreparedStatement.java index dde6c862e..094909987 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultPreparedStatement.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultPreparedStatement.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import jakarta.data.exceptions.NonUniqueResultException; import org.eclipse.jnosql.mapping.PreparedStatement; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultValueMapTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultValueMapTraversal.java similarity index 97% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultValueMapTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultValueMapTraversal.java index 838ff1a4a..93d2ac173 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultValueMapTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultValueMapTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import jakarta.data.exceptions.NonUniqueResultException; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultVertexRepeatStepTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexRepeatStepTraversal.java similarity index 96% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultVertexRepeatStepTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexRepeatStepTraversal.java index f9b7eb011..5cf87867d 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultVertexRepeatStepTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexRepeatStepTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.structure.Vertex; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultVertexRepeatTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexRepeatTraversal.java similarity index 98% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultVertexRepeatTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexRepeatTraversal.java index 15227d6f5..78eeab5f9 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultVertexRepeatTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexRepeatTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.process.traversal.Traversal; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultVertexTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexTraversal.java similarity index 98% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultVertexTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexTraversal.java index c81ebd1a9..7fd94bb81 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultVertexTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import jakarta.data.exceptions.NonUniqueResultException; import jakarta.nosql.Entity; @@ -21,7 +21,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.eclipse.jnosql.communication.graph.CommunicationEntityConverter; +import org.eclipse.jnosql.databases.tinkerpop.communication.graph.CommunicationEntityConverter; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import java.util.Iterator; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultVertexTraversalOrder.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexTraversalOrder.java similarity index 96% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultVertexTraversalOrder.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexTraversalOrder.java index 2cfd8543b..8e4c0f06a 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultVertexTraversalOrder.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexTraversalOrder.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.structure.Vertex; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultVertexUntilTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexUntilTraversal.java similarity index 98% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultVertexUntilTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexUntilTraversal.java index da9b28377..4f014dd74 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultVertexUntilTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexUntilTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import jakarta.nosql.Entity; import org.apache.tinkerpop.gremlin.process.traversal.P; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/EdgeConditionTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeConditionTraversal.java similarity index 98% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/EdgeConditionTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeConditionTraversal.java index 1971422af..8717e0d6e 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/EdgeConditionTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeConditionTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.structure.T; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/EdgeEntity.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeEntity.java similarity index 96% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/EdgeEntity.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeEntity.java index 1395ae87c..ca9e418c9 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/EdgeEntity.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeEntity.java @@ -12,11 +12,11 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import org.apache.tinkerpop.gremlin.structure.Edge; import org.eclipse.jnosql.communication.Value; -import org.eclipse.jnosql.communication.graph.CommunicationEntityConverter; +import org.eclipse.jnosql.databases.tinkerpop.communication.graph.CommunicationEntityConverter; import org.eclipse.jnosql.communication.semistructured.Element; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/EdgeRepeatStepTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeRepeatStepTraversal.java similarity index 94% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/EdgeRepeatStepTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeRepeatStepTraversal.java index 343af8070..a80229730 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/EdgeRepeatStepTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeRepeatStepTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; /** * After the {@link EdgeRepeatTraversal} condition the next step is diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/EdgeRepeatTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeRepeatTraversal.java similarity index 98% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/EdgeRepeatTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeRepeatTraversal.java index 661177497..d93fa3b85 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/EdgeRepeatTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeRepeatTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.structure.T; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/EdgeTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeTraversal.java similarity index 98% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/EdgeTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeTraversal.java index 0f45ce897..75024d706 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/EdgeTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import org.apache.tinkerpop.gremlin.process.traversal.step.filter.DedupGlobalStep; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/EdgeTraversalOrder.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeTraversalOrder.java similarity index 93% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/EdgeTraversalOrder.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeTraversalOrder.java index abfa3000e..271bd3fed 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/EdgeTraversalOrder.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeTraversalOrder.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; /** * The traversal order to Edge diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/EdgeUntilTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeUntilTraversal.java similarity index 92% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/EdgeUntilTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeUntilTraversal.java index d6902c8bf..737532862 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/EdgeUntilTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeUntilTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; /** diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/GraphEntityConverter.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphEntityConverter.java similarity index 85% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/GraphEntityConverter.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphEntityConverter.java index ea722bb51..e4eea6593 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/GraphEntityConverter.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphEntityConverter.java @@ -12,10 +12,10 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.eclipse.jnosql.communication.graph.CommunicationEntityConverter; +import org.eclipse.jnosql.databases.tinkerpop.communication.graph.CommunicationEntityConverter; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; enum GraphEntityConverter { diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/GraphTemplate.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphTemplate.java similarity index 99% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/GraphTemplate.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphTemplate.java index 7416b1d53..c436d9f76 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/GraphTemplate.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphTemplate.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import org.eclipse.jnosql.mapping.PreparedStatement; import org.apache.tinkerpop.gremlin.structure.Direction; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/GraphTemplateProducer.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphTemplateProducer.java similarity index 96% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/GraphTemplateProducer.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphTemplateProducer.java index dc2603221..371b8d8fc 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/GraphTemplateProducer.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphTemplateProducer.java @@ -12,14 +12,14 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Vetoed; import jakarta.inject.Inject; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Graph; -import org.eclipse.jnosql.communication.graph.GraphDatabaseManager; +import org.eclipse.jnosql.databases.tinkerpop.communication.graph.GraphDatabaseManager; import org.eclipse.jnosql.communication.semistructured.DatabaseManager; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/GremlinExecutor.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GremlinExecutor.java similarity index 95% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/GremlinExecutor.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GremlinExecutor.java index bafbc4c39..48082e56c 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/GremlinExecutor.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GremlinExecutor.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import org.apache.tinkerpop.gremlin.jsr223.GremlinLangScriptEngine; import org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngine; @@ -20,7 +20,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.eclipse.jnosql.communication.graph.CommunicationEntityConverter; +import org.eclipse.jnosql.databases.tinkerpop.communication.graph.CommunicationEntityConverter; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import javax.script.Bindings; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/GremlinParamParser.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GremlinParamParser.java similarity index 97% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/GremlinParamParser.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GremlinParamParser.java index f50897290..43e521198 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/GremlinParamParser.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GremlinParamParser.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import java.util.ArrayList; import java.util.List; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/GremlinQueryException.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GremlinQueryException.java similarity index 95% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/GremlinQueryException.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GremlinQueryException.java index f72835550..fec9dde67 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/GremlinQueryException.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GremlinQueryException.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import jakarta.data.exceptions.MappingException; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/Transactional.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/Transactional.java similarity index 94% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/Transactional.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/Transactional.java index 5fa099c78..39691257b 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/Transactional.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/Transactional.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import jakarta.interceptor.InterceptorBinding; @@ -31,4 +31,4 @@ @Target({METHOD, TYPE}) @Retention(RUNTIME) public @interface Transactional { -} \ No newline at end of file +} diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/TransactionalInterceptor.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/TransactionalInterceptor.java similarity index 92% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/TransactionalInterceptor.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/TransactionalInterceptor.java index 5eece4be2..4367b19f6 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/TransactionalInterceptor.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/TransactionalInterceptor.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Transaction; @@ -24,7 +24,7 @@ import jakarta.interceptor.AroundInvoke; import jakarta.interceptor.Interceptor; import jakarta.interceptor.InvocationContext; -import org.eclipse.jnosql.communication.graph.GraphTransactionUtil; +import org.eclipse.jnosql.databases.tinkerpop.communication.graph.GraphTransactionUtil; @Transactional diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/ValueMapTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/ValueMapTraversal.java similarity index 96% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/ValueMapTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/ValueMapTraversal.java index eb556edb5..d9768bbb7 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/ValueMapTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/ValueMapTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import java.util.List; import java.util.Map; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/VertexConditionTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexConditionTraversal.java similarity index 99% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/VertexConditionTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexConditionTraversal.java index e4b66a52c..58dfd7b93 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/VertexConditionTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexConditionTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import org.apache.tinkerpop.gremlin.process.traversal.P; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/VertexRepeatStepTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexRepeatStepTraversal.java similarity index 94% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/VertexRepeatStepTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexRepeatStepTraversal.java index 78f3e4b98..314e757d2 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/VertexRepeatStepTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexRepeatStepTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; /** * After the {@link VertexRepeatTraversal} condition the next step is diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/VertexRepeatTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexRepeatTraversal.java similarity index 98% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/VertexRepeatTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexRepeatTraversal.java index f1ae9e23f..5c8d7e20b 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/VertexRepeatTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexRepeatTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.structure.T; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/VertexTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexTraversal.java similarity index 99% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/VertexTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexTraversal.java index e71f95146..8ea5c004e 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/VertexTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import org.apache.tinkerpop.gremlin.process.traversal.step.filter.DedupGlobalStep; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/VertexTraversalOrder.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexTraversalOrder.java similarity index 93% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/VertexTraversalOrder.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexTraversalOrder.java index bfc023bc9..6776ada50 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/VertexTraversalOrder.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexTraversalOrder.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; /** * The traversal order to Vertex diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/VertexUntilTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexUntilTraversal.java similarity index 93% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/VertexUntilTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexUntilTraversal.java index 0850da007..85196a3e3 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/VertexUntilTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexUntilTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; /** * The Vertex until wrapper of diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/configuration/GraphSupplier.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/configuration/GraphSupplier.java similarity index 92% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/configuration/GraphSupplier.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/configuration/GraphSupplier.java index 26389f875..6dba508e6 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/configuration/GraphSupplier.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/configuration/GraphSupplier.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph.configuration; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.configuration; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Disposes; @@ -21,7 +21,7 @@ import org.apache.tinkerpop.gremlin.structure.Graph; import org.eclipse.jnosql.communication.Settings; import org.eclipse.jnosql.mapping.core.config.MicroProfileSettings; -import org.eclipse.jnosql.communication.graph.GraphConfiguration; +import org.eclipse.jnosql.databases.tinkerpop.communication.graph.GraphConfiguration; import org.eclipse.jnosql.mapping.reflection.Reflections; import java.util.function.Supplier; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/query/RepositoryGraphBean.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/query/RepositoryGraphBean.java similarity index 96% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/query/RepositoryGraphBean.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/query/RepositoryGraphBean.java index 263f582c1..163108c6d 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/query/RepositoryGraphBean.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/query/RepositoryGraphBean.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph.query; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.query; import jakarta.data.repository.DataRepository; import jakarta.enterprise.context.spi.CreationalContext; @@ -21,7 +21,7 @@ import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.AbstractBean; import org.eclipse.jnosql.mapping.core.util.AnnotationLiteralUtil; -import org.eclipse.jnosql.mapping.graph.GraphTemplate; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.GraphTemplate; import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata; import org.eclipse.jnosql.mapping.semistructured.query.SemiStructuredRepositoryProxy; @@ -112,4 +112,4 @@ public String getId() { return type.getName() + '@' + DatabaseType.GRAPH + "-" + provider; } -} \ No newline at end of file +} diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/spi/CustomRepositoryGraphBean.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/spi/CustomRepositoryGraphBean.java similarity index 96% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/spi/CustomRepositoryGraphBean.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/spi/CustomRepositoryGraphBean.java index 59f89d70e..666f8d256 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/spi/CustomRepositoryGraphBean.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/spi/CustomRepositoryGraphBean.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph.spi; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi; import jakarta.enterprise.context.spi.CreationalContext; import org.eclipse.jnosql.mapping.DatabaseQualifier; @@ -20,7 +20,7 @@ import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.AbstractBean; import org.eclipse.jnosql.mapping.core.util.AnnotationLiteralUtil; -import org.eclipse.jnosql.mapping.graph.GraphTemplate; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.GraphTemplate; import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata; import org.eclipse.jnosql.mapping.semistructured.query.CustomRepositoryHandler; @@ -116,4 +116,4 @@ public String getId() { return type.getName() + '@' + DatabaseType.GRAPH + "-" + provider; } -} \ No newline at end of file +} diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/spi/GraphExtension.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/spi/GraphExtension.java similarity index 95% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/spi/GraphExtension.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/spi/GraphExtension.java index 88dc3e6cf..6c7cb5d0c 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/spi/GraphExtension.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/spi/GraphExtension.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph.spi; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi; import jakarta.enterprise.event.Observes; import jakarta.enterprise.inject.spi.AfterBeanDiscovery; @@ -21,7 +21,7 @@ import org.apache.tinkerpop.gremlin.structure.Graph; import org.eclipse.jnosql.mapping.DatabaseMetadata; import org.eclipse.jnosql.mapping.Databases; -import org.eclipse.jnosql.mapping.graph.query.RepositoryGraphBean; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.query.RepositoryGraphBean; import org.eclipse.jnosql.mapping.metadata.ClassScanner; import java.util.HashSet; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/spi/TemplateBean.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/spi/TemplateBean.java similarity index 91% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/spi/TemplateBean.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/spi/TemplateBean.java index cfbcd1e44..88cc3c2c1 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/mapping/graph/spi/TemplateBean.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/spi/TemplateBean.java @@ -12,14 +12,14 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph.spi; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi; import jakarta.nosql.Template; import org.apache.tinkerpop.gremlin.structure.Graph; import org.eclipse.jnosql.mapping.DatabaseQualifier; import org.eclipse.jnosql.mapping.DatabaseType; -import org.eclipse.jnosql.mapping.graph.GraphTemplate; -import org.eclipse.jnosql.mapping.graph.GraphTemplateProducer; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.GraphTemplate; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.GraphTemplateProducer; import org.eclipse.jnosql.mapping.core.spi.AbstractBean; import jakarta.enterprise.context.spi.CreationalContext; diff --git a/jnosql-tinkerpop/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension b/jnosql-tinkerpop/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension index 6f10bdf2d..e8beb5c89 100644 --- a/jnosql-tinkerpop/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension +++ b/jnosql-tinkerpop/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension @@ -12,4 +12,4 @@ # # Otavio Santana # -org.eclipse.jnosql.mapping.graph.spi.GraphExtension \ No newline at end of file +org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi.GraphExtension diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/communication/graph/DefaultGraphDatabaseManagerTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/DefaultGraphDatabaseManagerTest.java similarity index 99% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/communication/graph/DefaultGraphDatabaseManagerTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/DefaultGraphDatabaseManagerTest.java index c829cbc62..ec746911d 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/communication/graph/DefaultGraphDatabaseManagerTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/DefaultGraphDatabaseManagerTest.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.communication.graph; +package org.eclipse.jnosql.databases.tinkerpop.communication.graph; import net.datafaker.Faker; import org.apache.tinkerpop.gremlin.structure.Graph; @@ -462,4 +462,4 @@ private List getEntitiesWithValues() { return asList(lucas, otavio, luna); } -} \ No newline at end of file +} diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/communication/graph/GraphSupplier.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/GraphSupplier.java similarity index 95% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/communication/graph/GraphSupplier.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/GraphSupplier.java index b87bf999e..75a4128f7 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/communication/graph/GraphSupplier.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/GraphSupplier.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.communication.graph; +package org.eclipse.jnosql.databases.tinkerpop.communication.graph; import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph; import org.apache.tinkerpop.gremlin.structure.Graph; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/AbstractGraphTemplateTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/AbstractGraphTemplateTest.java similarity index 98% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/AbstractGraphTemplateTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/AbstractGraphTemplateTest.java index 629d1c219..a0e4d9a1b 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/AbstractGraphTemplateTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/AbstractGraphTemplateTest.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import jakarta.data.exceptions.EmptyResultException; import jakarta.data.exceptions.NonUniqueResultException; @@ -24,10 +24,9 @@ import org.apache.tinkerpop.gremlin.structure.Vertex; import org.assertj.core.api.SoftAssertions; import org.eclipse.jnosql.mapping.IdNotFoundException; -import org.eclipse.jnosql.mapping.graph.entities.Animal; -import org.eclipse.jnosql.mapping.graph.entities.Book; -import org.eclipse.jnosql.mapping.graph.entities.Person; -import org.eclipse.jnosql.mapping.graph.entities.WrongEntity; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Animal; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Book; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Person; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/AbstractTraversalTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/AbstractTraversalTest.java similarity index 93% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/AbstractTraversalTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/AbstractTraversalTest.java index 6b379ce51..9336b4fd3 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/AbstractTraversalTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/AbstractTraversalTest.java @@ -14,14 +14,14 @@ * Otavio Santana * */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import jakarta.inject.Inject; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.eclipse.jnosql.mapping.graph.entities.Book; -import org.eclipse.jnosql.mapping.graph.entities.Person; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Book; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Person; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/BookRepository.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/BookRepository.java similarity index 84% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/BookRepository.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/BookRepository.java index 5fd67689b..7aa3a8216 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/BookRepository.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/BookRepository.java @@ -12,12 +12,12 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import jakarta.data.repository.BasicRepository; import jakarta.data.repository.Repository; -import org.eclipse.jnosql.mapping.graph.entities.Book; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Book; @Repository public interface BookRepository extends BasicRepository { diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/BookTemplateTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/BookTemplateTest.java similarity index 91% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/BookTemplateTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/BookTemplateTest.java index f44e44e89..17160316b 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/BookTemplateTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/BookTemplateTest.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import jakarta.inject.Inject; import org.apache.tinkerpop.gremlin.structure.Graph; @@ -20,9 +20,9 @@ import org.apache.tinkerpop.gremlin.structure.Transaction.Status; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; -import org.eclipse.jnosql.mapping.graph.entities.Book; -import org.eclipse.jnosql.mapping.graph.entities.BookTemplate; -import org.eclipse.jnosql.mapping.graph.spi.GraphExtension; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Book; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.BookTemplate; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import org.jboss.weld.junit5.auto.AddExtensions; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultEdgeTraversalTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeTraversalTest.java similarity index 97% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultEdgeTraversalTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeTraversalTest.java index 44acf592d..033aee46b 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultEdgeTraversalTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeTraversalTest.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import jakarta.data.exceptions.NonUniqueResultException; import org.apache.tinkerpop.gremlin.process.traversal.P; @@ -20,10 +20,10 @@ import org.assertj.core.api.SoftAssertions; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; -import org.eclipse.jnosql.mapping.graph.entities.Animal; -import org.eclipse.jnosql.mapping.graph.entities.Book; -import org.eclipse.jnosql.mapping.graph.entities.Person; -import org.eclipse.jnosql.mapping.graph.spi.GraphExtension; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Animal; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Book; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Person; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import org.jboss.weld.junit5.auto.AddExtensions; @@ -537,4 +537,4 @@ void shouldDedup() { assertEquals(6, edges.size()); } -} \ No newline at end of file +} diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTemplateProducerTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultGraphTemplateProducerTest.java similarity index 91% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTemplateProducerTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultGraphTemplateProducerTest.java index 2cc000699..e6d68efd9 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTemplateProducerTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultGraphTemplateProducerTest.java @@ -12,14 +12,13 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import jakarta.inject.Inject; import org.apache.tinkerpop.gremlin.structure.Graph; -import org.eclipse.jnosql.communication.graph.GraphDatabaseManager; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; -import org.eclipse.jnosql.mapping.graph.spi.GraphExtension; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import org.jboss.weld.junit5.auto.AddExtensions; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTraversalSourceTemplateTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultGraphTraversalSourceTemplateTest.java similarity index 92% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTraversalSourceTemplateTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultGraphTraversalSourceTemplateTest.java index 2df77ec7b..aaa560fc3 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTraversalSourceTemplateTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultGraphTraversalSourceTemplateTest.java @@ -12,13 +12,13 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import jakarta.inject.Inject; import org.apache.tinkerpop.gremlin.structure.Graph; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; -import org.eclipse.jnosql.mapping.graph.spi.GraphExtension; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import org.jboss.weld.junit5.auto.AddExtensions; @@ -46,4 +46,4 @@ protected Graph getGraph() { protected GraphTemplate getGraphTemplate() { return graphTemplate; } -} \ No newline at end of file +} diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultValueMapTraversalTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultValueMapTraversalTest.java similarity index 94% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultValueMapTraversalTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultValueMapTraversalTest.java index b6eaa0d14..d7f3af2e1 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultValueMapTraversalTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultValueMapTraversalTest.java @@ -12,13 +12,13 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import jakarta.data.exceptions.NonUniqueResultException; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; -import org.eclipse.jnosql.mapping.graph.entities.Person; -import org.eclipse.jnosql.mapping.graph.spi.GraphExtension; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Person; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import org.jboss.weld.junit5.auto.AddExtensions; @@ -104,4 +104,4 @@ void shouldReturnSingleResult() { has("name", name).valueMap("name").singleResult(); assertEquals(name, poliana.map(m -> ((List) m.get("name")).get(0)).orElse("")); } -} \ No newline at end of file +} diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultVertexTraversalTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexTraversalTest.java similarity index 97% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultVertexTraversalTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexTraversalTest.java index efceae962..108542f16 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultVertexTraversalTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexTraversalTest.java @@ -12,17 +12,17 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import jakarta.data.exceptions.NonUniqueResultException; import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.structure.T; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; -import org.eclipse.jnosql.mapping.graph.entities.Animal; -import org.eclipse.jnosql.mapping.graph.entities.Book; -import org.eclipse.jnosql.mapping.graph.entities.Person; -import org.eclipse.jnosql.mapping.graph.spi.GraphExtension; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Animal; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Book; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Person; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import org.jboss.weld.junit5.auto.AddExtensions; @@ -516,4 +516,4 @@ void shouldDedup() { } -} \ No newline at end of file +} diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/EdgeEntityTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeEntityTest.java similarity index 97% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/EdgeEntityTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeEntityTest.java index ee3d14b87..c87253799 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/EdgeEntityTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeEntityTest.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import jakarta.data.exceptions.EmptyResultException; import jakarta.inject.Inject; @@ -20,9 +20,9 @@ import org.eclipse.jnosql.communication.semistructured.Element; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; -import org.eclipse.jnosql.mapping.graph.entities.Book; -import org.eclipse.jnosql.mapping.graph.entities.Person; -import org.eclipse.jnosql.mapping.graph.spi.GraphExtension; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Book; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Person; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import org.jboss.weld.junit5.auto.AddExtensions; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/GraphProducer.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphProducer.java similarity index 98% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/GraphProducer.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphProducer.java index d4840a224..9308d259b 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/GraphProducer.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphProducer.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import jakarta.annotation.PostConstruct; import jakarta.annotation.Priority; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/GraphTemplateProducerTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphTemplateProducerTest.java similarity index 93% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/GraphTemplateProducerTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphTemplateProducerTest.java index 743775b61..4b3c1dc0e 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/GraphTemplateProducerTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphTemplateProducerTest.java @@ -12,13 +12,13 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import jakarta.inject.Inject; import org.apache.tinkerpop.gremlin.structure.Graph; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; -import org.eclipse.jnosql.mapping.graph.spi.GraphExtension; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import org.jboss.weld.junit5.auto.AddExtensions; @@ -53,4 +53,4 @@ void shouldReturnGraphTemplateWhenGetGraph() { } -} \ No newline at end of file +} diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/GraphTemplateTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphTemplateTest.java similarity index 92% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/GraphTemplateTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphTemplateTest.java index 59afb07d8..3bdd5e6c0 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/GraphTemplateTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphTemplateTest.java @@ -12,14 +12,14 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; import jakarta.inject.Inject; import jakarta.nosql.Template; import org.eclipse.jnosql.mapping.Database; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; -import org.eclipse.jnosql.mapping.graph.spi.GraphExtension; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import org.jboss.weld.junit5.auto.AddExtensions; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/configuration/GraphConfigurationMock.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/configuration/GraphConfigurationMock.java similarity index 93% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/configuration/GraphConfigurationMock.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/configuration/GraphConfigurationMock.java index 6af9d061c..74b2302d2 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/configuration/GraphConfigurationMock.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/configuration/GraphConfigurationMock.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph.configuration; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.configuration; import org.apache.commons.configuration2.Configuration; import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; @@ -21,7 +21,7 @@ import org.apache.tinkerpop.gremlin.structure.Transaction; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.eclipse.jnosql.communication.Settings; -import org.eclipse.jnosql.communication.graph.GraphConfiguration; +import org.eclipse.jnosql.databases.tinkerpop.communication.graph.GraphConfiguration; import java.util.Iterator; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/configuration/GraphConfigurationMock2.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/configuration/GraphConfigurationMock2.java similarity index 93% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/configuration/GraphConfigurationMock2.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/configuration/GraphConfigurationMock2.java index 0a6241803..f73ff5142 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/configuration/GraphConfigurationMock2.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/configuration/GraphConfigurationMock2.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph.configuration; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.configuration; import org.apache.commons.configuration2.Configuration; import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; @@ -21,7 +21,7 @@ import org.apache.tinkerpop.gremlin.structure.Transaction; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.eclipse.jnosql.communication.Settings; -import org.eclipse.jnosql.communication.graph.GraphConfiguration; +import org.eclipse.jnosql.databases.tinkerpop.communication.graph.GraphConfiguration; import java.util.Iterator; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/configuration/GraphSupplierTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/configuration/GraphSupplierTest.java similarity index 89% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/configuration/GraphSupplierTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/configuration/GraphSupplierTest.java index 798cc093b..806808725 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/configuration/GraphSupplierTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/configuration/GraphSupplierTest.java @@ -12,17 +12,15 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph.configuration; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.configuration; import jakarta.inject.Inject; import org.apache.tinkerpop.gremlin.structure.Graph; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; -import org.eclipse.jnosql.mapping.graph.BookRepository; -import org.eclipse.jnosql.mapping.graph.GraphProducer; -import org.eclipse.jnosql.mapping.graph.GraphTemplate; -import org.eclipse.jnosql.mapping.graph.Transactional; -import org.eclipse.jnosql.mapping.graph.spi.GraphExtension; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.GraphProducer; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.GraphTemplate; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import org.jboss.weld.junit5.auto.AddExtensions; @@ -81,4 +79,4 @@ void shouldClose() throws Exception { supplier.close(graph); Mockito.verify(graph).close(); } -} \ No newline at end of file +} diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/entities/Animal.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/Animal.java similarity index 95% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/entities/Animal.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/Animal.java index 4d9d124a2..59acef2df 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/entities/Animal.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/Animal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph.entities; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities; import jakarta.nosql.Column; import jakarta.nosql.Entity; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/entities/Book.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/Book.java similarity index 97% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/entities/Book.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/Book.java index 11fb6f850..1543ef052 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/entities/Book.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/Book.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph.entities; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities; import jakarta.nosql.Column; import jakarta.nosql.Entity; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/entities/BookTemplate.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/BookTemplate.java similarity index 83% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/entities/BookTemplate.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/BookTemplate.java index 45198effe..7d50c88b0 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/entities/BookTemplate.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/BookTemplate.java @@ -12,13 +12,12 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph.entities; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; -import org.eclipse.jnosql.mapping.graph.GraphTemplate; -import org.eclipse.jnosql.mapping.graph.Transactional; -import org.eclipse.jnosql.mapping.graph.entities.Book; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.GraphTemplate; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.Transactional; @ApplicationScoped public class BookTemplate { diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/entities/People.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/People.java similarity index 91% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/entities/People.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/People.java index 56e35d37d..03571cc27 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/entities/People.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/People.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph.entities; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities; import jakarta.data.repository.Insert; import jakarta.data.repository.Repository; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/entities/Person.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/Person.java similarity index 97% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/entities/Person.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/Person.java index c14a87ec8..cb13cb1d5 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/entities/Person.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/Person.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph.entities; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities; import jakarta.nosql.Column; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/entities/PersonBuilder.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/PersonBuilder.java similarity index 95% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/entities/PersonBuilder.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/PersonBuilder.java index 207666f46..6560f7bde 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/entities/PersonBuilder.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/PersonBuilder.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph.entities; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities; import java.util.List; @@ -57,4 +57,4 @@ public PersonBuilder withIgnore() { public Person build() { return new Person(id, name, age, phones, ignore); } -} \ No newline at end of file +} diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/entities/PersonRepository.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/PersonRepository.java similarity index 91% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/entities/PersonRepository.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/PersonRepository.java index 9f31428d1..4021790e2 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/entities/PersonRepository.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/PersonRepository.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph.entities; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities; import jakarta.data.repository.BasicRepository; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/entities/WrongEntity.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/WrongEntity.java similarity index 95% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/entities/WrongEntity.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/WrongEntity.java index 6475eba8f..8a0c87b4d 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/entities/WrongEntity.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/WrongEntity.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph.entities; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities; import java.util.Objects; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/spi/GraphCustomExtensionTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/spi/GraphCustomExtensionTest.java similarity index 87% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/spi/GraphCustomExtensionTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/spi/GraphCustomExtensionTest.java index abdd3c1cb..f3ef77ef9 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/spi/GraphCustomExtensionTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/spi/GraphCustomExtensionTest.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph.spi; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi; import jakarta.inject.Inject; import org.assertj.core.api.SoftAssertions; @@ -20,10 +20,10 @@ import org.eclipse.jnosql.mapping.DatabaseType; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; -import org.eclipse.jnosql.mapping.graph.GraphProducer; -import org.eclipse.jnosql.mapping.graph.GraphTemplate; -import org.eclipse.jnosql.mapping.graph.entities.People; -import org.eclipse.jnosql.mapping.graph.entities.Person; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.GraphProducer; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.GraphTemplate; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.People; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Person; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import org.jboss.weld.junit5.auto.AddExtensions; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/spi/GraphExtensionTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/spi/GraphExtensionTest.java similarity index 86% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/spi/GraphExtensionTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/spi/GraphExtensionTest.java index c558a65c7..8fe1749c9 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/mapping/graph/spi/GraphExtensionTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/spi/GraphExtensionTest.java @@ -12,17 +12,17 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph.spi; +package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi; import jakarta.inject.Inject; import org.eclipse.jnosql.mapping.Database; import org.eclipse.jnosql.mapping.DatabaseType; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; -import org.eclipse.jnosql.mapping.graph.GraphProducer; -import org.eclipse.jnosql.mapping.graph.GraphTemplate; -import org.eclipse.jnosql.mapping.graph.entities.Person; -import org.eclipse.jnosql.mapping.graph.entities.PersonRepository; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.GraphProducer; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.GraphTemplate; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Person; +import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.PersonRepository; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import org.jboss.weld.junit5.auto.AddExtensions; diff --git a/jnosql-tinkerpop/src/test/resources/META-INF/microprofile-config.properties b/jnosql-tinkerpop/src/test/resources/META-INF/microprofile-config.properties index 1b47fe614..166d90edd 100644 --- a/jnosql-tinkerpop/src/test/resources/META-INF/microprofile-config.properties +++ b/jnosql-tinkerpop/src/test/resources/META-INF/microprofile-config.properties @@ -1,4 +1,4 @@ graph=graph graph.settings.key=value graph.settings.key2=value2 -graph.provider=org.eclipse.jnosql.mapping.graph.configuration.GraphConfigurationMock \ No newline at end of file +graph.provider=configuration.graph.mapping.org.eclipse.jnosql.databases.tinkerpop.GraphConfigurationMock diff --git a/jnosql-tinkerpop/src/test/resources/META-INF/services/org.eclipse.jnosql.communication.graph.GraphConfiguration b/jnosql-tinkerpop/src/test/resources/META-INF/services/org.eclipse.jnosql.communication.graph.GraphConfiguration deleted file mode 100644 index 36f74a08a..000000000 --- a/jnosql-tinkerpop/src/test/resources/META-INF/services/org.eclipse.jnosql.communication.graph.GraphConfiguration +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.jnosql.mapping.graph.configuration.GraphConfigurationMock2 \ No newline at end of file diff --git a/jnosql-tinkerpop/src/test/resources/META-INF/services/org.eclipse.jnosql.databases.tinkerpop.communication.graph.GraphConfiguration b/jnosql-tinkerpop/src/test/resources/META-INF/services/org.eclipse.jnosql.databases.tinkerpop.communication.graph.GraphConfiguration new file mode 100644 index 000000000..252ad24ad --- /dev/null +++ b/jnosql-tinkerpop/src/test/resources/META-INF/services/org.eclipse.jnosql.databases.tinkerpop.communication.graph.GraphConfiguration @@ -0,0 +1 @@ +configuration.graph.mapping.org.eclipse.jnosql.databases.tinkerpop.GraphConfigurationMock2 From 87d4f90ec7600568e43fb7b01bd2e47c8bdce8d6 Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Tue, 10 Dec 2024 19:21:48 +0000 Subject: [PATCH 02/19] feat: update apache tinkerpop api Signed-off-by: Otavio Santana --- .../{graph => }/CommunicationEntityConverter.java | 2 +- .../{graph => }/DefaultGraphDatabaseManager.java | 2 +- .../communication/{graph => }/GraphConfiguration.java | 2 +- .../{graph => }/GraphDatabaseManager.java | 2 +- .../{graph => }/GraphTransactionUtil.java | 2 +- .../communication/{graph => }/TraversalExecutor.java | 2 +- .../communication/{graph => }/package-info.java | 4 ++-- .../mapping/{graph => }/AbstractEdgeTraversal.java | 2 +- .../mapping/{graph => }/AbstractGraphTemplate.java | 8 ++++---- .../mapping/{graph => }/AbstractVertexTraversal.java | 2 +- .../mapping/{graph => }/DefaultEdgeEntity.java | 4 ++-- .../{graph => }/DefaultEdgeRepeatStepTraversal.java | 2 +- .../{graph => }/DefaultEdgeRepeatTraversal.java | 2 +- .../mapping/{graph => }/DefaultEdgeTraversal.java | 2 +- .../mapping/{graph => }/DefaultEdgeTraversalOrder.java | 2 +- .../mapping/{graph => }/DefaultEdgeUntilTraversal.java | 2 +- .../mapping/{graph => }/DefaultGraphTemplate.java | 4 ++-- .../mapping/{graph => }/DefaultPreparedStatement.java | 2 +- .../mapping/{graph => }/DefaultValueMapTraversal.java | 2 +- .../{graph => }/DefaultVertexRepeatStepTraversal.java | 2 +- .../{graph => }/DefaultVertexRepeatTraversal.java | 2 +- .../mapping/{graph => }/DefaultVertexTraversal.java | 4 ++-- .../{graph => }/DefaultVertexTraversalOrder.java | 2 +- .../{graph => }/DefaultVertexUntilTraversal.java | 2 +- .../mapping/{graph => }/EdgeConditionTraversal.java | 2 +- .../tinkerpop/mapping/{graph => }/EdgeEntity.java | 4 ++-- .../mapping/{graph => }/EdgeRepeatStepTraversal.java | 2 +- .../mapping/{graph => }/EdgeRepeatTraversal.java | 2 +- .../tinkerpop/mapping/{graph => }/EdgeTraversal.java | 2 +- .../mapping/{graph => }/EdgeTraversalOrder.java | 2 +- .../mapping/{graph => }/EdgeUntilTraversal.java | 2 +- .../mapping/{graph => }/GraphEntityConverter.java | 4 ++-- .../tinkerpop/mapping/{graph => }/GraphTemplate.java | 2 +- .../mapping/{graph => }/GraphTemplateProducer.java | 4 ++-- .../tinkerpop/mapping/{graph => }/GremlinExecutor.java | 4 ++-- .../mapping/{graph => }/GremlinParamParser.java | 2 +- .../mapping/{graph => }/GremlinQueryException.java | 2 +- .../tinkerpop/mapping/{graph => }/Transactional.java | 2 +- .../mapping/{graph => }/TransactionalInterceptor.java | 4 ++-- .../mapping/{graph => }/ValueMapTraversal.java | 2 +- .../mapping/{graph => }/VertexConditionTraversal.java | 2 +- .../mapping/{graph => }/VertexRepeatStepTraversal.java | 2 +- .../mapping/{graph => }/VertexRepeatTraversal.java | 2 +- .../tinkerpop/mapping/{graph => }/VertexTraversal.java | 2 +- .../mapping/{graph => }/VertexTraversalOrder.java | 2 +- .../mapping/{graph => }/VertexUntilTraversal.java | 2 +- .../{graph => }/configuration/GraphSupplier.java | 4 ++-- .../mapping/{graph => }/query/RepositoryGraphBean.java | 4 ++-- .../{graph => }/spi/CustomRepositoryGraphBean.java | 4 ++-- .../mapping/{graph => }/spi/GraphExtension.java | 4 ++-- .../mapping/{graph => }/spi/TemplateBean.java | 6 +++--- .../services/jakarta.enterprise.inject.spi.Extension | 2 +- .../{graph => }/DefaultGraphDatabaseManagerTest.java | 2 +- .../communication/{graph => }/GraphSupplier.java | 2 +- .../mapping/{graph => }/AbstractGraphTemplateTest.java | 8 ++++---- .../mapping/{graph => }/AbstractTraversalTest.java | 6 +++--- .../tinkerpop/mapping/{graph => }/BookRepository.java | 4 ++-- .../mapping/{graph => }/BookTemplateTest.java | 8 ++++---- .../mapping/{graph => }/DefaultEdgeTraversalTest.java | 10 +++++----- .../{graph => }/DefaultGraphTemplateProducerTest.java | 4 ++-- .../DefaultGraphTraversalSourceTemplateTest.java | 4 ++-- .../{graph => }/DefaultValueMapTraversalTest.java | 6 +++--- .../{graph => }/DefaultVertexTraversalTest.java | 10 +++++----- .../tinkerpop/mapping/{graph => }/EdgeEntityTest.java | 8 ++++---- .../tinkerpop/mapping/{graph => }/GraphProducer.java | 2 +- .../mapping/{graph => }/GraphTemplateProducerTest.java | 4 ++-- .../mapping/{graph => }/GraphTemplateTest.java | 4 ++-- .../configuration/GraphConfigurationMock.java | 4 ++-- .../configuration/GraphConfigurationMock2.java | 4 ++-- .../{graph => }/configuration/GraphSupplierTest.java | 8 ++++---- .../tinkerpop/mapping/{graph => }/entities/Animal.java | 2 +- .../tinkerpop/mapping/{graph => }/entities/Book.java | 2 +- .../mapping/{graph => }/entities/BookTemplate.java | 6 +++--- .../tinkerpop/mapping/{graph => }/entities/People.java | 2 +- .../tinkerpop/mapping/{graph => }/entities/Person.java | 2 +- .../mapping/{graph => }/entities/PersonBuilder.java | 2 +- .../mapping/{graph => }/entities/PersonRepository.java | 2 +- .../mapping/{graph => }/entities/WrongEntity.java | 2 +- .../{graph => }/spi/GraphCustomExtensionTest.java | 10 +++++----- .../mapping/{graph => }/spi/GraphExtensionTest.java | 10 +++++----- ...tabases.tinkerpop.communication.GraphConfiguration} | 0 81 files changed, 139 insertions(+), 139 deletions(-) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/{graph => }/CommunicationEntityConverter.java (94%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/{graph => }/DefaultGraphDatabaseManager.java (98%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/{graph => }/GraphConfiguration.java (97%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/{graph => }/GraphDatabaseManager.java (96%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/{graph => }/GraphTransactionUtil.java (97%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/{graph => }/TraversalExecutor.java (98%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/{graph => }/package-info.java (91%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/AbstractEdgeTraversal.java (96%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/AbstractGraphTemplate.java (97%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/AbstractVertexTraversal.java (96%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/DefaultEdgeEntity.java (96%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/DefaultEdgeRepeatStepTraversal.java (96%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/DefaultEdgeRepeatTraversal.java (98%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/DefaultEdgeTraversal.java (99%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/DefaultEdgeTraversalOrder.java (96%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/DefaultEdgeUntilTraversal.java (98%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/DefaultGraphTemplate.java (94%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/DefaultPreparedStatement.java (97%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/DefaultValueMapTraversal.java (97%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/DefaultVertexRepeatStepTraversal.java (96%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/DefaultVertexRepeatTraversal.java (98%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/DefaultVertexTraversal.java (98%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/DefaultVertexTraversalOrder.java (96%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/DefaultVertexUntilTraversal.java (98%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/EdgeConditionTraversal.java (98%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/EdgeEntity.java (96%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/EdgeRepeatStepTraversal.java (94%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/EdgeRepeatTraversal.java (98%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/EdgeTraversal.java (98%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/EdgeTraversalOrder.java (93%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/EdgeUntilTraversal.java (92%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/GraphEntityConverter.java (85%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/GraphTemplate.java (99%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/GraphTemplateProducer.java (96%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/GremlinExecutor.java (95%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/GremlinParamParser.java (97%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/GremlinQueryException.java (95%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/Transactional.java (95%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/TransactionalInterceptor.java (92%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/ValueMapTraversal.java (96%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/VertexConditionTraversal.java (99%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/VertexRepeatStepTraversal.java (94%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/VertexRepeatTraversal.java (98%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/VertexTraversal.java (99%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/VertexTraversalOrder.java (93%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/VertexUntilTraversal.java (93%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/configuration/GraphSupplier.java (92%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/query/RepositoryGraphBean.java (96%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/spi/CustomRepositoryGraphBean.java (96%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/spi/GraphExtension.java (95%) rename jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/spi/TemplateBean.java (91%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/communication/{graph => }/DefaultGraphDatabaseManagerTest.java (99%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/communication/{graph => }/GraphSupplier.java (95%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/AbstractGraphTemplateTest.java (98%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/AbstractTraversalTest.java (93%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/BookRepository.java (84%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/BookTemplateTest.java (91%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/DefaultEdgeTraversalTest.java (97%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/DefaultGraphTemplateProducerTest.java (93%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/DefaultGraphTraversalSourceTemplateTest.java (92%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/DefaultValueMapTraversalTest.java (94%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/DefaultVertexTraversalTest.java (97%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/EdgeEntityTest.java (97%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/GraphProducer.java (98%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/GraphTemplateProducerTest.java (93%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/GraphTemplateTest.java (92%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/configuration/GraphConfigurationMock.java (93%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/configuration/GraphConfigurationMock2.java (93%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/configuration/GraphSupplierTest.java (90%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/entities/Animal.java (95%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/entities/Book.java (97%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/entities/BookTemplate.java (83%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/entities/People.java (91%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/entities/Person.java (97%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/entities/PersonBuilder.java (95%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/entities/PersonRepository.java (91%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/entities/WrongEntity.java (95%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/spi/GraphCustomExtensionTest.java (87%) rename jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/{graph => }/spi/GraphExtensionTest.java (86%) rename jnosql-tinkerpop/src/test/resources/META-INF/services/{org.eclipse.jnosql.databases.tinkerpop.communication.graph.GraphConfiguration => org.eclipse.jnosql.databases.tinkerpop.communication.GraphConfiguration} (100%) diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/CommunicationEntityConverter.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/CommunicationEntityConverter.java similarity index 94% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/CommunicationEntityConverter.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/CommunicationEntityConverter.java index 9d0fabf1b..116c7f151 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/CommunicationEntityConverter.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/CommunicationEntityConverter.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.communication.graph; +package org.eclipse.jnosql.databases.tinkerpop.communication; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.eclipse.jnosql.communication.semistructured.CommunicationEntity; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/DefaultGraphDatabaseManager.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/DefaultGraphDatabaseManager.java similarity index 98% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/DefaultGraphDatabaseManager.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/DefaultGraphDatabaseManager.java index f9d15cf61..d1eb5ee04 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/DefaultGraphDatabaseManager.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/DefaultGraphDatabaseManager.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.communication.graph; +package org.eclipse.jnosql.databases.tinkerpop.communication; import jakarta.data.exceptions.EmptyResultException; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/GraphConfiguration.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/GraphConfiguration.java similarity index 97% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/GraphConfiguration.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/GraphConfiguration.java index faf1c7740..2757c2d75 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/GraphConfiguration.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/GraphConfiguration.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.communication.graph; +package org.eclipse.jnosql.databases.tinkerpop.communication; import org.apache.tinkerpop.gremlin.structure.Graph; import org.eclipse.jnosql.communication.CommunicationException; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/GraphDatabaseManager.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/GraphDatabaseManager.java similarity index 96% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/GraphDatabaseManager.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/GraphDatabaseManager.java index 9e64109ba..19f9415ee 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/GraphDatabaseManager.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/GraphDatabaseManager.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.communication.graph; +package org.eclipse.jnosql.databases.tinkerpop.communication; import org.apache.tinkerpop.gremlin.structure.Graph; import org.eclipse.jnosql.communication.semistructured.DatabaseManager; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/GraphTransactionUtil.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/GraphTransactionUtil.java similarity index 97% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/GraphTransactionUtil.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/GraphTransactionUtil.java index 70523f362..13158306f 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/GraphTransactionUtil.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/GraphTransactionUtil.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.communication.graph; +package org.eclipse.jnosql.databases.tinkerpop.communication; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Transaction; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/TraversalExecutor.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/TraversalExecutor.java similarity index 98% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/TraversalExecutor.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/TraversalExecutor.java index 36da28581..cf1085151 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/TraversalExecutor.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/TraversalExecutor.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.communication.graph; +package org.eclipse.jnosql.databases.tinkerpop.communication; import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/package-info.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/package-info.java similarity index 91% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/package-info.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/package-info.java index ba7d48bec..bcd663d8e 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/package-info.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/package-info.java @@ -18,7 +18,7 @@ * in the JNoSQL project. It contains interfaces, classes, and utilities that enable developers to * communicate with and manage graph databases. *

- * The core interface in this package is {@link org.eclipse.jnosql.databases.tinkerpop.communication.graph.GraphDatabaseManager}, + * The core interface in this package is {@link org.eclipse.jnosql.databases.tinkerpop.communication.GraphDatabaseManager}, * which extends {@link org.eclipse.jnosql.communication.semistructured.DatabaseManager} * and acts as a specialized extension for managing graph databases. Implementations of this interface * provide methods for interacting with the underlying graph database, executing graph traversals, @@ -28,4 +28,4 @@ * for working with different graph database technologies supported by JNoSQL. *

*/ -package org.eclipse.jnosql.databases.tinkerpop.communication.graph; +package org.eclipse.jnosql.databases.tinkerpop.communication; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/AbstractEdgeTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractEdgeTraversal.java similarity index 96% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/AbstractEdgeTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractEdgeTraversal.java index 955884a8e..9e2a1b96e 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/AbstractEdgeTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractEdgeTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.structure.Edge; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/AbstractGraphTemplate.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractGraphTemplate.java similarity index 97% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/AbstractGraphTemplate.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractGraphTemplate.java index 8bf7e1297..34a39ecc5 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/AbstractGraphTemplate.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractGraphTemplate.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import jakarta.data.exceptions.EmptyResultException; import jakarta.data.exceptions.NonUniqueResultException; @@ -25,9 +25,9 @@ import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Transaction; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.eclipse.jnosql.databases.tinkerpop.communication.graph.CommunicationEntityConverter; -import org.eclipse.jnosql.databases.tinkerpop.communication.graph.GraphDatabaseManager; -import org.eclipse.jnosql.databases.tinkerpop.communication.graph.GraphTransactionUtil; +import org.eclipse.jnosql.databases.tinkerpop.communication.CommunicationEntityConverter; +import org.eclipse.jnosql.databases.tinkerpop.communication.GraphDatabaseManager; +import org.eclipse.jnosql.databases.tinkerpop.communication.GraphTransactionUtil; import org.eclipse.jnosql.mapping.IdNotFoundException; import org.eclipse.jnosql.mapping.metadata.EntityMetadata; import org.eclipse.jnosql.mapping.metadata.FieldMetadata; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/AbstractVertexTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractVertexTraversal.java similarity index 96% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/AbstractVertexTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractVertexTraversal.java index dd75b7aea..4b2081081 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/AbstractVertexTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractVertexTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.structure.Vertex; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeEntity.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeEntity.java similarity index 96% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeEntity.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeEntity.java index 8555d5991..913bd88d2 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeEntity.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeEntity.java @@ -12,12 +12,12 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Property; import org.eclipse.jnosql.communication.Value; -import org.eclipse.jnosql.databases.tinkerpop.communication.graph.CommunicationEntityConverter; +import org.eclipse.jnosql.databases.tinkerpop.communication.CommunicationEntityConverter; import org.eclipse.jnosql.communication.semistructured.Element; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeRepeatStepTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeRepeatStepTraversal.java similarity index 96% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeRepeatStepTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeRepeatStepTraversal.java index e81ef4ff4..ab7a585dc 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeRepeatStepTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeRepeatStepTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.structure.Edge; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeRepeatTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeRepeatTraversal.java similarity index 98% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeRepeatTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeRepeatTraversal.java index 4c3f87528..c42d26e67 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeRepeatTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeRepeatTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.process.traversal.Traversal; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeTraversal.java similarity index 99% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeTraversal.java index d387f77d7..c5d92d867 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import jakarta.data.exceptions.NonUniqueResultException; import org.apache.tinkerpop.gremlin.process.traversal.P; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeTraversalOrder.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeTraversalOrder.java similarity index 96% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeTraversalOrder.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeTraversalOrder.java index 543416e62..0435df63b 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeTraversalOrder.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeTraversalOrder.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.structure.Edge; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeUntilTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeUntilTraversal.java similarity index 98% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeUntilTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeUntilTraversal.java index 79fb8152d..00023d859 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeUntilTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeUntilTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.process.traversal.Traversal; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultGraphTemplate.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultGraphTemplate.java similarity index 94% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultGraphTemplate.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultGraphTemplate.java index 75ea00f90..8cb811ef3 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultGraphTemplate.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultGraphTemplate.java @@ -12,14 +12,14 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Default; import jakarta.inject.Inject; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Graph; -import org.eclipse.jnosql.databases.tinkerpop.communication.graph.GraphDatabaseManager; +import org.eclipse.jnosql.databases.tinkerpop.communication.GraphDatabaseManager; import org.eclipse.jnosql.mapping.Database; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultPreparedStatement.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultPreparedStatement.java similarity index 97% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultPreparedStatement.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultPreparedStatement.java index 094909987..bb5c76dd3 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultPreparedStatement.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultPreparedStatement.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import jakarta.data.exceptions.NonUniqueResultException; import org.eclipse.jnosql.mapping.PreparedStatement; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultValueMapTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultValueMapTraversal.java similarity index 97% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultValueMapTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultValueMapTraversal.java index 93d2ac173..aae94ce98 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultValueMapTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultValueMapTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import jakarta.data.exceptions.NonUniqueResultException; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexRepeatStepTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexRepeatStepTraversal.java similarity index 96% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexRepeatStepTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexRepeatStepTraversal.java index 5cf87867d..efdfd966a 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexRepeatStepTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexRepeatStepTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.structure.Vertex; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexRepeatTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexRepeatTraversal.java similarity index 98% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexRepeatTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexRepeatTraversal.java index 78eeab5f9..2ce6512ae 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexRepeatTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexRepeatTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.process.traversal.Traversal; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexTraversal.java similarity index 98% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexTraversal.java index 7fd94bb81..e62e6614b 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import jakarta.data.exceptions.NonUniqueResultException; import jakarta.nosql.Entity; @@ -21,7 +21,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.eclipse.jnosql.databases.tinkerpop.communication.graph.CommunicationEntityConverter; +import org.eclipse.jnosql.databases.tinkerpop.communication.CommunicationEntityConverter; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import java.util.Iterator; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexTraversalOrder.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexTraversalOrder.java similarity index 96% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexTraversalOrder.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexTraversalOrder.java index 8e4c0f06a..9c1d6fa99 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexTraversalOrder.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexTraversalOrder.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.structure.Vertex; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexUntilTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexUntilTraversal.java similarity index 98% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexUntilTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexUntilTraversal.java index 4f014dd74..bd151a1fd 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexUntilTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexUntilTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import jakarta.nosql.Entity; import org.apache.tinkerpop.gremlin.process.traversal.P; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeConditionTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeConditionTraversal.java similarity index 98% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeConditionTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeConditionTraversal.java index 8717e0d6e..4cb8fb26b 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeConditionTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeConditionTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.structure.T; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeEntity.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeEntity.java similarity index 96% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeEntity.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeEntity.java index ca9e418c9..5574b993b 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeEntity.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeEntity.java @@ -12,11 +12,11 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import org.apache.tinkerpop.gremlin.structure.Edge; import org.eclipse.jnosql.communication.Value; -import org.eclipse.jnosql.databases.tinkerpop.communication.graph.CommunicationEntityConverter; +import org.eclipse.jnosql.databases.tinkerpop.communication.CommunicationEntityConverter; import org.eclipse.jnosql.communication.semistructured.Element; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeRepeatStepTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeRepeatStepTraversal.java similarity index 94% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeRepeatStepTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeRepeatStepTraversal.java index a80229730..087d74609 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeRepeatStepTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeRepeatStepTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; /** * After the {@link EdgeRepeatTraversal} condition the next step is diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeRepeatTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeRepeatTraversal.java similarity index 98% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeRepeatTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeRepeatTraversal.java index d93fa3b85..38ba9338d 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeRepeatTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeRepeatTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.structure.T; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeTraversal.java similarity index 98% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeTraversal.java index 75024d706..45bc12f64 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import org.apache.tinkerpop.gremlin.process.traversal.step.filter.DedupGlobalStep; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeTraversalOrder.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeTraversalOrder.java similarity index 93% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeTraversalOrder.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeTraversalOrder.java index 271bd3fed..e2ff71627 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeTraversalOrder.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeTraversalOrder.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; /** * The traversal order to Edge diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeUntilTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeUntilTraversal.java similarity index 92% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeUntilTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeUntilTraversal.java index 737532862..4cdb90005 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeUntilTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeUntilTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; /** diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphEntityConverter.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GraphEntityConverter.java similarity index 85% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphEntityConverter.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GraphEntityConverter.java index e4eea6593..64870f375 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphEntityConverter.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GraphEntityConverter.java @@ -12,10 +12,10 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.eclipse.jnosql.databases.tinkerpop.communication.graph.CommunicationEntityConverter; +import org.eclipse.jnosql.databases.tinkerpop.communication.CommunicationEntityConverter; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; enum GraphEntityConverter { diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphTemplate.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GraphTemplate.java similarity index 99% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphTemplate.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GraphTemplate.java index c436d9f76..6b6f27811 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphTemplate.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GraphTemplate.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import org.eclipse.jnosql.mapping.PreparedStatement; import org.apache.tinkerpop.gremlin.structure.Direction; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphTemplateProducer.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GraphTemplateProducer.java similarity index 96% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphTemplateProducer.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GraphTemplateProducer.java index 371b8d8fc..dc4840d08 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphTemplateProducer.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GraphTemplateProducer.java @@ -12,14 +12,14 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Vetoed; import jakarta.inject.Inject; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Graph; -import org.eclipse.jnosql.databases.tinkerpop.communication.graph.GraphDatabaseManager; +import org.eclipse.jnosql.databases.tinkerpop.communication.GraphDatabaseManager; import org.eclipse.jnosql.communication.semistructured.DatabaseManager; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GremlinExecutor.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GremlinExecutor.java similarity index 95% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GremlinExecutor.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GremlinExecutor.java index 48082e56c..ce1eb449e 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GremlinExecutor.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GremlinExecutor.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import org.apache.tinkerpop.gremlin.jsr223.GremlinLangScriptEngine; import org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngine; @@ -20,7 +20,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.eclipse.jnosql.databases.tinkerpop.communication.graph.CommunicationEntityConverter; +import org.eclipse.jnosql.databases.tinkerpop.communication.CommunicationEntityConverter; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import javax.script.Bindings; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GremlinParamParser.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GremlinParamParser.java similarity index 97% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GremlinParamParser.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GremlinParamParser.java index 43e521198..a7f5641a7 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GremlinParamParser.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GremlinParamParser.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import java.util.ArrayList; import java.util.List; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GremlinQueryException.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GremlinQueryException.java similarity index 95% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GremlinQueryException.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GremlinQueryException.java index fec9dde67..05ac272fa 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GremlinQueryException.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GremlinQueryException.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import jakarta.data.exceptions.MappingException; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/Transactional.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/Transactional.java similarity index 95% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/Transactional.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/Transactional.java index 39691257b..b7f86b363 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/Transactional.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/Transactional.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import jakarta.interceptor.InterceptorBinding; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/TransactionalInterceptor.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/TransactionalInterceptor.java similarity index 92% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/TransactionalInterceptor.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/TransactionalInterceptor.java index 4367b19f6..1d98a5729 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/TransactionalInterceptor.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/TransactionalInterceptor.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Transaction; @@ -24,7 +24,7 @@ import jakarta.interceptor.AroundInvoke; import jakarta.interceptor.Interceptor; import jakarta.interceptor.InvocationContext; -import org.eclipse.jnosql.databases.tinkerpop.communication.graph.GraphTransactionUtil; +import org.eclipse.jnosql.databases.tinkerpop.communication.GraphTransactionUtil; @Transactional diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/ValueMapTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/ValueMapTraversal.java similarity index 96% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/ValueMapTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/ValueMapTraversal.java index d9768bbb7..eff957311 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/ValueMapTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/ValueMapTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import java.util.List; import java.util.Map; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexConditionTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/VertexConditionTraversal.java similarity index 99% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexConditionTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/VertexConditionTraversal.java index 58dfd7b93..b8ae71997 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexConditionTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/VertexConditionTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import org.apache.tinkerpop.gremlin.process.traversal.P; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexRepeatStepTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/VertexRepeatStepTraversal.java similarity index 94% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexRepeatStepTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/VertexRepeatStepTraversal.java index 314e757d2..49b0cf5a3 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexRepeatStepTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/VertexRepeatStepTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; /** * After the {@link VertexRepeatTraversal} condition the next step is diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexRepeatTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/VertexRepeatTraversal.java similarity index 98% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexRepeatTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/VertexRepeatTraversal.java index 5c8d7e20b..fae5edeb7 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexRepeatTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/VertexRepeatTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.structure.T; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/VertexTraversal.java similarity index 99% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/VertexTraversal.java index 8ea5c004e..c2156fc48 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/VertexTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import org.apache.tinkerpop.gremlin.process.traversal.step.filter.DedupGlobalStep; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexTraversalOrder.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/VertexTraversalOrder.java similarity index 93% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexTraversalOrder.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/VertexTraversalOrder.java index 6776ada50..cf3aa0e0e 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexTraversalOrder.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/VertexTraversalOrder.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; /** * The traversal order to Vertex diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexUntilTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/VertexUntilTraversal.java similarity index 93% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexUntilTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/VertexUntilTraversal.java index 85196a3e3..97e07f971 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/VertexUntilTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/VertexUntilTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; /** * The Vertex until wrapper of diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/configuration/GraphSupplier.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/configuration/GraphSupplier.java similarity index 92% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/configuration/GraphSupplier.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/configuration/GraphSupplier.java index 6dba508e6..f707af581 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/configuration/GraphSupplier.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/configuration/GraphSupplier.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.configuration; +package org.eclipse.jnosql.databases.tinkerpop.mapping.configuration; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Disposes; @@ -21,7 +21,7 @@ import org.apache.tinkerpop.gremlin.structure.Graph; import org.eclipse.jnosql.communication.Settings; import org.eclipse.jnosql.mapping.core.config.MicroProfileSettings; -import org.eclipse.jnosql.databases.tinkerpop.communication.graph.GraphConfiguration; +import org.eclipse.jnosql.databases.tinkerpop.communication.GraphConfiguration; import org.eclipse.jnosql.mapping.reflection.Reflections; import java.util.function.Supplier; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/query/RepositoryGraphBean.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/query/RepositoryGraphBean.java similarity index 96% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/query/RepositoryGraphBean.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/query/RepositoryGraphBean.java index 163108c6d..2ecda73f0 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/query/RepositoryGraphBean.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/query/RepositoryGraphBean.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.query; +package org.eclipse.jnosql.databases.tinkerpop.mapping.query; import jakarta.data.repository.DataRepository; import jakarta.enterprise.context.spi.CreationalContext; @@ -21,7 +21,7 @@ import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.AbstractBean; import org.eclipse.jnosql.mapping.core.util.AnnotationLiteralUtil; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.GraphTemplate; +import org.eclipse.jnosql.databases.tinkerpop.mapping.GraphTemplate; import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata; import org.eclipse.jnosql.mapping.semistructured.query.SemiStructuredRepositoryProxy; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/spi/CustomRepositoryGraphBean.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/CustomRepositoryGraphBean.java similarity index 96% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/spi/CustomRepositoryGraphBean.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/CustomRepositoryGraphBean.java index 666f8d256..79df141ae 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/spi/CustomRepositoryGraphBean.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/CustomRepositoryGraphBean.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi; +package org.eclipse.jnosql.databases.tinkerpop.mapping.spi; import jakarta.enterprise.context.spi.CreationalContext; import org.eclipse.jnosql.mapping.DatabaseQualifier; @@ -20,7 +20,7 @@ import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.AbstractBean; import org.eclipse.jnosql.mapping.core.util.AnnotationLiteralUtil; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.GraphTemplate; +import org.eclipse.jnosql.databases.tinkerpop.mapping.GraphTemplate; import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata; import org.eclipse.jnosql.mapping.semistructured.query.CustomRepositoryHandler; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/spi/GraphExtension.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/GraphExtension.java similarity index 95% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/spi/GraphExtension.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/GraphExtension.java index 6c7cb5d0c..20146d491 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/spi/GraphExtension.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/GraphExtension.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi; +package org.eclipse.jnosql.databases.tinkerpop.mapping.spi; import jakarta.enterprise.event.Observes; import jakarta.enterprise.inject.spi.AfterBeanDiscovery; @@ -21,7 +21,7 @@ import org.apache.tinkerpop.gremlin.structure.Graph; import org.eclipse.jnosql.mapping.DatabaseMetadata; import org.eclipse.jnosql.mapping.Databases; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.query.RepositoryGraphBean; +import org.eclipse.jnosql.databases.tinkerpop.mapping.query.RepositoryGraphBean; import org.eclipse.jnosql.mapping.metadata.ClassScanner; import java.util.HashSet; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/spi/TemplateBean.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/TemplateBean.java similarity index 91% rename from jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/spi/TemplateBean.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/TemplateBean.java index 88cc3c2c1..73e420945 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/spi/TemplateBean.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/TemplateBean.java @@ -12,14 +12,14 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi; +package org.eclipse.jnosql.databases.tinkerpop.mapping.spi; import jakarta.nosql.Template; import org.apache.tinkerpop.gremlin.structure.Graph; import org.eclipse.jnosql.mapping.DatabaseQualifier; import org.eclipse.jnosql.mapping.DatabaseType; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.GraphTemplate; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.GraphTemplateProducer; +import org.eclipse.jnosql.databases.tinkerpop.mapping.GraphTemplate; +import org.eclipse.jnosql.databases.tinkerpop.mapping.GraphTemplateProducer; import org.eclipse.jnosql.mapping.core.spi.AbstractBean; import jakarta.enterprise.context.spi.CreationalContext; diff --git a/jnosql-tinkerpop/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension b/jnosql-tinkerpop/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension index e8beb5c89..7464d6835 100644 --- a/jnosql-tinkerpop/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension +++ b/jnosql-tinkerpop/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension @@ -12,4 +12,4 @@ # # Otavio Santana # -org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi.GraphExtension +org.eclipse.jnosql.databases.tinkerpop.mapping.spi.GraphExtension diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/DefaultGraphDatabaseManagerTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/communication/DefaultGraphDatabaseManagerTest.java similarity index 99% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/DefaultGraphDatabaseManagerTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/communication/DefaultGraphDatabaseManagerTest.java index ec746911d..a5f5d954f 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/DefaultGraphDatabaseManagerTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/communication/DefaultGraphDatabaseManagerTest.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.communication.graph; +package org.eclipse.jnosql.databases.tinkerpop.communication; import net.datafaker.Faker; import org.apache.tinkerpop.gremlin.structure.Graph; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/GraphSupplier.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/communication/GraphSupplier.java similarity index 95% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/GraphSupplier.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/communication/GraphSupplier.java index 75a4128f7..dcf55743b 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/communication/graph/GraphSupplier.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/communication/GraphSupplier.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.communication.graph; +package org.eclipse.jnosql.databases.tinkerpop.communication; import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph; import org.apache.tinkerpop.gremlin.structure.Graph; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/AbstractGraphTemplateTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractGraphTemplateTest.java similarity index 98% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/AbstractGraphTemplateTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractGraphTemplateTest.java index a0e4d9a1b..a0c9197ba 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/AbstractGraphTemplateTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractGraphTemplateTest.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import jakarta.data.exceptions.EmptyResultException; import jakarta.data.exceptions.NonUniqueResultException; @@ -24,9 +24,9 @@ import org.apache.tinkerpop.gremlin.structure.Vertex; import org.assertj.core.api.SoftAssertions; import org.eclipse.jnosql.mapping.IdNotFoundException; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Animal; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Book; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Person; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Animal; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Book; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Person; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/AbstractTraversalTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractTraversalTest.java similarity index 93% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/AbstractTraversalTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractTraversalTest.java index 9336b4fd3..ff03d624a 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/AbstractTraversalTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractTraversalTest.java @@ -14,14 +14,14 @@ * Otavio Santana * */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import jakarta.inject.Inject; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Book; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Person; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Book; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Person; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/BookRepository.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/BookRepository.java similarity index 84% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/BookRepository.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/BookRepository.java index 7aa3a8216..89aa7415a 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/BookRepository.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/BookRepository.java @@ -12,12 +12,12 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import jakarta.data.repository.BasicRepository; import jakarta.data.repository.Repository; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Book; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Book; @Repository public interface BookRepository extends BasicRepository { diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/BookTemplateTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/BookTemplateTest.java similarity index 91% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/BookTemplateTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/BookTemplateTest.java index 17160316b..88d37958f 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/BookTemplateTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/BookTemplateTest.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import jakarta.inject.Inject; import org.apache.tinkerpop.gremlin.structure.Graph; @@ -20,9 +20,9 @@ import org.apache.tinkerpop.gremlin.structure.Transaction.Status; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Book; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.BookTemplate; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi.GraphExtension; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Book; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.BookTemplate; +import org.eclipse.jnosql.databases.tinkerpop.mapping.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import org.jboss.weld.junit5.auto.AddExtensions; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeTraversalTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeTraversalTest.java similarity index 97% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeTraversalTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeTraversalTest.java index 033aee46b..cb325d7b8 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultEdgeTraversalTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeTraversalTest.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import jakarta.data.exceptions.NonUniqueResultException; import org.apache.tinkerpop.gremlin.process.traversal.P; @@ -20,10 +20,10 @@ import org.assertj.core.api.SoftAssertions; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Animal; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Book; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Person; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi.GraphExtension; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Animal; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Book; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Person; +import org.eclipse.jnosql.databases.tinkerpop.mapping.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import org.jboss.weld.junit5.auto.AddExtensions; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultGraphTemplateProducerTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultGraphTemplateProducerTest.java similarity index 93% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultGraphTemplateProducerTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultGraphTemplateProducerTest.java index e6d68efd9..66862c080 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultGraphTemplateProducerTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultGraphTemplateProducerTest.java @@ -12,13 +12,13 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import jakarta.inject.Inject; import org.apache.tinkerpop.gremlin.structure.Graph; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi.GraphExtension; +import org.eclipse.jnosql.databases.tinkerpop.mapping.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import org.jboss.weld.junit5.auto.AddExtensions; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultGraphTraversalSourceTemplateTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultGraphTraversalSourceTemplateTest.java similarity index 92% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultGraphTraversalSourceTemplateTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultGraphTraversalSourceTemplateTest.java index aaa560fc3..4db988aa0 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultGraphTraversalSourceTemplateTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultGraphTraversalSourceTemplateTest.java @@ -12,13 +12,13 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import jakarta.inject.Inject; import org.apache.tinkerpop.gremlin.structure.Graph; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi.GraphExtension; +import org.eclipse.jnosql.databases.tinkerpop.mapping.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import org.jboss.weld.junit5.auto.AddExtensions; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultValueMapTraversalTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultValueMapTraversalTest.java similarity index 94% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultValueMapTraversalTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultValueMapTraversalTest.java index d7f3af2e1..511a192f4 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultValueMapTraversalTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultValueMapTraversalTest.java @@ -12,13 +12,13 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import jakarta.data.exceptions.NonUniqueResultException; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Person; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi.GraphExtension; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Person; +import org.eclipse.jnosql.databases.tinkerpop.mapping.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import org.jboss.weld.junit5.auto.AddExtensions; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexTraversalTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexTraversalTest.java similarity index 97% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexTraversalTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexTraversalTest.java index 108542f16..03527f98d 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/DefaultVertexTraversalTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexTraversalTest.java @@ -12,17 +12,17 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import jakarta.data.exceptions.NonUniqueResultException; import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.structure.T; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Animal; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Book; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Person; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi.GraphExtension; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Animal; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Book; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Person; +import org.eclipse.jnosql.databases.tinkerpop.mapping.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import org.jboss.weld.junit5.auto.AddExtensions; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeEntityTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeEntityTest.java similarity index 97% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeEntityTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeEntityTest.java index c87253799..0dd918f82 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/EdgeEntityTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeEntityTest.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import jakarta.data.exceptions.EmptyResultException; import jakarta.inject.Inject; @@ -20,9 +20,9 @@ import org.eclipse.jnosql.communication.semistructured.Element; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Book; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Person; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi.GraphExtension; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Book; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Person; +import org.eclipse.jnosql.databases.tinkerpop.mapping.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import org.jboss.weld.junit5.auto.AddExtensions; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphProducer.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GraphProducer.java similarity index 98% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphProducer.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GraphProducer.java index 9308d259b..baa62ae8a 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphProducer.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GraphProducer.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import jakarta.annotation.PostConstruct; import jakarta.annotation.Priority; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphTemplateProducerTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GraphTemplateProducerTest.java similarity index 93% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphTemplateProducerTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GraphTemplateProducerTest.java index 4b3c1dc0e..df1d91335 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphTemplateProducerTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GraphTemplateProducerTest.java @@ -12,13 +12,13 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import jakarta.inject.Inject; import org.apache.tinkerpop.gremlin.structure.Graph; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi.GraphExtension; +import org.eclipse.jnosql.databases.tinkerpop.mapping.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import org.jboss.weld.junit5.auto.AddExtensions; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphTemplateTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GraphTemplateTest.java similarity index 92% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphTemplateTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GraphTemplateTest.java index 3bdd5e6c0..cd716afa8 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/GraphTemplateTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GraphTemplateTest.java @@ -12,14 +12,14 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import jakarta.inject.Inject; import jakarta.nosql.Template; import org.eclipse.jnosql.mapping.Database; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi.GraphExtension; +import org.eclipse.jnosql.databases.tinkerpop.mapping.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import org.jboss.weld.junit5.auto.AddExtensions; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/configuration/GraphConfigurationMock.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/configuration/GraphConfigurationMock.java similarity index 93% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/configuration/GraphConfigurationMock.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/configuration/GraphConfigurationMock.java index 74b2302d2..dea176ce3 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/configuration/GraphConfigurationMock.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/configuration/GraphConfigurationMock.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.configuration; +package org.eclipse.jnosql.databases.tinkerpop.mapping.configuration; import org.apache.commons.configuration2.Configuration; import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; @@ -21,7 +21,7 @@ import org.apache.tinkerpop.gremlin.structure.Transaction; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.eclipse.jnosql.communication.Settings; -import org.eclipse.jnosql.databases.tinkerpop.communication.graph.GraphConfiguration; +import org.eclipse.jnosql.databases.tinkerpop.communication.GraphConfiguration; import java.util.Iterator; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/configuration/GraphConfigurationMock2.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/configuration/GraphConfigurationMock2.java similarity index 93% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/configuration/GraphConfigurationMock2.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/configuration/GraphConfigurationMock2.java index f73ff5142..a0bd6adbf 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/configuration/GraphConfigurationMock2.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/configuration/GraphConfigurationMock2.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.configuration; +package org.eclipse.jnosql.databases.tinkerpop.mapping.configuration; import org.apache.commons.configuration2.Configuration; import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; @@ -21,7 +21,7 @@ import org.apache.tinkerpop.gremlin.structure.Transaction; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.eclipse.jnosql.communication.Settings; -import org.eclipse.jnosql.databases.tinkerpop.communication.graph.GraphConfiguration; +import org.eclipse.jnosql.databases.tinkerpop.communication.GraphConfiguration; import java.util.Iterator; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/configuration/GraphSupplierTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/configuration/GraphSupplierTest.java similarity index 90% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/configuration/GraphSupplierTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/configuration/GraphSupplierTest.java index 806808725..d9c9528a1 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/configuration/GraphSupplierTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/configuration/GraphSupplierTest.java @@ -12,15 +12,15 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.configuration; +package org.eclipse.jnosql.databases.tinkerpop.mapping.configuration; import jakarta.inject.Inject; import org.apache.tinkerpop.gremlin.structure.Graph; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.GraphProducer; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.GraphTemplate; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi.GraphExtension; +import org.eclipse.jnosql.databases.tinkerpop.mapping.GraphProducer; +import org.eclipse.jnosql.databases.tinkerpop.mapping.GraphTemplate; +import org.eclipse.jnosql.databases.tinkerpop.mapping.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import org.jboss.weld.junit5.auto.AddExtensions; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/Animal.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Animal.java similarity index 95% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/Animal.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Animal.java index 59acef2df..ae1b09a88 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/Animal.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Animal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities; +package org.eclipse.jnosql.databases.tinkerpop.mapping.entities; import jakarta.nosql.Column; import jakarta.nosql.Entity; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/Book.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Book.java similarity index 97% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/Book.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Book.java index 1543ef052..edb1cecd5 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/Book.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Book.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities; +package org.eclipse.jnosql.databases.tinkerpop.mapping.entities; import jakarta.nosql.Column; import jakarta.nosql.Entity; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/BookTemplate.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/BookTemplate.java similarity index 83% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/BookTemplate.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/BookTemplate.java index 7d50c88b0..c01d0d028 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/BookTemplate.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/BookTemplate.java @@ -12,12 +12,12 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities; +package org.eclipse.jnosql.databases.tinkerpop.mapping.entities; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.GraphTemplate; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.Transactional; +import org.eclipse.jnosql.databases.tinkerpop.mapping.GraphTemplate; +import org.eclipse.jnosql.databases.tinkerpop.mapping.Transactional; @ApplicationScoped public class BookTemplate { diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/People.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/People.java similarity index 91% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/People.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/People.java index 03571cc27..7a40eaad8 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/People.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/People.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities; +package org.eclipse.jnosql.databases.tinkerpop.mapping.entities; import jakarta.data.repository.Insert; import jakarta.data.repository.Repository; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/Person.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Person.java similarity index 97% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/Person.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Person.java index cb13cb1d5..5ee2489c7 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/Person.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Person.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities; +package org.eclipse.jnosql.databases.tinkerpop.mapping.entities; import jakarta.nosql.Column; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/PersonBuilder.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/PersonBuilder.java similarity index 95% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/PersonBuilder.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/PersonBuilder.java index 6560f7bde..301c0163c 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/PersonBuilder.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/PersonBuilder.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities; +package org.eclipse.jnosql.databases.tinkerpop.mapping.entities; import java.util.List; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/PersonRepository.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/PersonRepository.java similarity index 91% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/PersonRepository.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/PersonRepository.java index 4021790e2..a31acb440 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/PersonRepository.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/PersonRepository.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities; +package org.eclipse.jnosql.databases.tinkerpop.mapping.entities; import jakarta.data.repository.BasicRepository; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/WrongEntity.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/WrongEntity.java similarity index 95% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/WrongEntity.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/WrongEntity.java index 8a0c87b4d..4ca2d506f 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/entities/WrongEntity.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/WrongEntity.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities; +package org.eclipse.jnosql.databases.tinkerpop.mapping.entities; import java.util.Objects; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/spi/GraphCustomExtensionTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/GraphCustomExtensionTest.java similarity index 87% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/spi/GraphCustomExtensionTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/GraphCustomExtensionTest.java index f3ef77ef9..8b322b837 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/spi/GraphCustomExtensionTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/GraphCustomExtensionTest.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi; +package org.eclipse.jnosql.databases.tinkerpop.mapping.spi; import jakarta.inject.Inject; import org.assertj.core.api.SoftAssertions; @@ -20,10 +20,10 @@ import org.eclipse.jnosql.mapping.DatabaseType; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.GraphProducer; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.GraphTemplate; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.People; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Person; +import org.eclipse.jnosql.databases.tinkerpop.mapping.GraphProducer; +import org.eclipse.jnosql.databases.tinkerpop.mapping.GraphTemplate; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.People; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Person; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import org.jboss.weld.junit5.auto.AddExtensions; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/spi/GraphExtensionTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/GraphExtensionTest.java similarity index 86% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/spi/GraphExtensionTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/GraphExtensionTest.java index 8fe1749c9..6f83ecb30 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/graph/spi/GraphExtensionTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/GraphExtensionTest.java @@ -12,17 +12,17 @@ * * Otavio Santana */ -package org.eclipse.jnosql.databases.tinkerpop.mapping.graph.spi; +package org.eclipse.jnosql.databases.tinkerpop.mapping.spi; import jakarta.inject.Inject; import org.eclipse.jnosql.mapping.Database; import org.eclipse.jnosql.mapping.DatabaseType; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.GraphProducer; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.GraphTemplate; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.Person; -import org.eclipse.jnosql.databases.tinkerpop.mapping.graph.entities.PersonRepository; +import org.eclipse.jnosql.databases.tinkerpop.mapping.GraphProducer; +import org.eclipse.jnosql.databases.tinkerpop.mapping.GraphTemplate; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Person; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.PersonRepository; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import org.jboss.weld.junit5.auto.AddExtensions; diff --git a/jnosql-tinkerpop/src/test/resources/META-INF/services/org.eclipse.jnosql.databases.tinkerpop.communication.graph.GraphConfiguration b/jnosql-tinkerpop/src/test/resources/META-INF/services/org.eclipse.jnosql.databases.tinkerpop.communication.GraphConfiguration similarity index 100% rename from jnosql-tinkerpop/src/test/resources/META-INF/services/org.eclipse.jnosql.databases.tinkerpop.communication.graph.GraphConfiguration rename to jnosql-tinkerpop/src/test/resources/META-INF/services/org.eclipse.jnosql.databases.tinkerpop.communication.GraphConfiguration From 03e5d924bd48e8b39efb09a5799c065512aa9364 Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Tue, 10 Dec 2024 19:24:40 +0000 Subject: [PATCH 03/19] chore: update structure to mapping Signed-off-by: Otavio Santana --- jnosql-tinkerpop/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jnosql-tinkerpop/pom.xml b/jnosql-tinkerpop/pom.xml index 72d9037e9..89689fbd1 100644 --- a/jnosql-tinkerpop/pom.xml +++ b/jnosql-tinkerpop/pom.xml @@ -18,8 +18,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.eclipse.jnosql.mapping - jnosql-mapping-parent + org.eclipse.jnosql.databases + jnosql-databases-parent 1.1.4-SNAPSHOT From fe392d6dbbaff5d58ed8ad56ade1fb1d686591da Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Tue, 10 Dec 2024 19:25:49 +0000 Subject: [PATCH 04/19] chore: update pom.xml structure at graph Signed-off-by: Otavio Santana --- jnosql-tinkerpop/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jnosql-tinkerpop/pom.xml b/jnosql-tinkerpop/pom.xml index 89689fbd1..1e1a58bf1 100644 --- a/jnosql-tinkerpop/pom.xml +++ b/jnosql-tinkerpop/pom.xml @@ -36,7 +36,7 @@ - ${project.groupId} + org.eclipse.jnosql.mapping jnosql-mapping-semistructured ${project.version} From 850fbc0c0eeb144f8c228d0dbd5ac024a52f5199 Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Tue, 10 Dec 2024 19:28:31 +0000 Subject: [PATCH 05/19] test: update commons test Signed-off-by: Otavio Santana --- ....jnosql.databases.tinkerpop.communication.GraphConfiguration | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jnosql-tinkerpop/src/test/resources/META-INF/services/org.eclipse.jnosql.databases.tinkerpop.communication.GraphConfiguration b/jnosql-tinkerpop/src/test/resources/META-INF/services/org.eclipse.jnosql.databases.tinkerpop.communication.GraphConfiguration index 252ad24ad..eef0dd915 100644 --- a/jnosql-tinkerpop/src/test/resources/META-INF/services/org.eclipse.jnosql.databases.tinkerpop.communication.GraphConfiguration +++ b/jnosql-tinkerpop/src/test/resources/META-INF/services/org.eclipse.jnosql.databases.tinkerpop.communication.GraphConfiguration @@ -1 +1 @@ -configuration.graph.mapping.org.eclipse.jnosql.databases.tinkerpop.GraphConfigurationMock2 +org.eclipse.jnosql.databases.tinkerpop.mapping.configuration.GraphConfigurationMock2 From f3e671962d84d560fbcdd42ea8d0660c601ec7a8 Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Tue, 10 Dec 2024 19:30:05 +0000 Subject: [PATCH 06/19] feat: update graph configuration Signed-off-by: Otavio Santana --- .../databases/tinkerpop/communication/GraphConfiguration.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/GraphConfiguration.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/GraphConfiguration.java index 2757c2d75..c0fd5719c 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/GraphConfiguration.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/GraphConfiguration.java @@ -33,6 +33,7 @@ public interface GraphConfiguration extends Function { * @param the configuration type * @return {@link GraphConfiguration} instance */ + @SuppressWarnings("unchecked") static T getConfiguration() { return (T) ServiceLoader.load(GraphConfiguration.class) .stream() @@ -48,6 +49,7 @@ static T getConfiguration() { * @param type the particular provider * @return {@link GraphConfiguration} instance */ + @SuppressWarnings("unchecked") static T getConfiguration(Class type) { return (T) ServiceLoader.load(GraphConfiguration.class) .stream() From 37dde710f2fc8fd6bf219de871f393939e473e9b Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Tue, 10 Dec 2024 19:33:38 +0000 Subject: [PATCH 07/19] feat: update default edge traversal Signed-off-by: Otavio Santana --- .../databases/tinkerpop/mapping/DefaultEdgeTraversal.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeTraversal.java index c5d92d867..be5c8c196 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeTraversal.java @@ -168,7 +168,7 @@ public Stream next(int limit) { @Override public ValueMapTraversal valueMap(String... propertyKeys) { - return new DefaultValueMapTraversal(supplier, flow.andThen(g -> g.valueMap(false, propertyKeys))); + return new DefaultValueMapTraversal(supplier, flow.andThen(g -> g.elementMap(propertyKeys))); } @Override From e190205be69c7446801b5a8803c83b049cd1d0bc Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Tue, 10 Dec 2024 19:36:19 +0000 Subject: [PATCH 08/19] feat: update api using neo4jgraph Signed-off-by: Otavio Santana --- .../databases/tinkerpop/mapping/DefaultVertexTraversal.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexTraversal.java index e62e6614b..36298e9fc 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexTraversal.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexTraversal.java @@ -221,7 +221,7 @@ public Stream next(int limit) { @Override public ValueMapTraversal valueMap(String... propertyKeys) { - return new DefaultValueMapTraversal(supplier, flow.andThen(g -> g.valueMap(false, propertyKeys))); + return new DefaultValueMapTraversal(supplier, flow.andThen(g -> g.elementMap(propertyKeys))); } @Override From d046a000a79063fed6cf28f6e426196fab948d48 Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Tue, 10 Dec 2024 19:37:59 +0000 Subject: [PATCH 09/19] test: update graph producer Signed-off-by: Otavio Santana --- .../databases/tinkerpop/mapping/AbstractGraphTemplate.java | 2 ++ .../databases/tinkerpop/mapping/AbstractGraphTemplateTest.java | 1 - .../jnosql/databases/tinkerpop/mapping/BookTemplateTest.java | 1 - .../jnosql/databases/tinkerpop/mapping/GraphProducer.java | 1 - .../databases/tinkerpop/mapping/spi/GraphExtensionTest.java | 1 - 5 files changed, 2 insertions(+), 4 deletions(-) diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractGraphTemplate.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractGraphTemplate.java index 34a39ecc5..017f94ffe 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractGraphTemplate.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractGraphTemplate.java @@ -52,9 +52,11 @@ abstract class AbstractGraphTemplate extends AbstractSemiStructuredTemplate implements GraphTemplate { + @SuppressWarnings("unchecked") private static final Function, GraphTraversal> INITIAL_VERTEX = g -> (GraphTraversal) g; + @SuppressWarnings("unchecked") private static final Function, GraphTraversal> INITIAL_EDGE = g -> (GraphTraversal) g; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractGraphTemplateTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractGraphTemplateTest.java index a0c9197ba..8281170da 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractGraphTemplateTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractGraphTemplateTest.java @@ -23,7 +23,6 @@ import org.apache.tinkerpop.gremlin.structure.Transaction; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.assertj.core.api.SoftAssertions; -import org.eclipse.jnosql.mapping.IdNotFoundException; import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Animal; import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Book; import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Person; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/BookTemplateTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/BookTemplateTest.java index 88d37958f..be5662fef 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/BookTemplateTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/BookTemplateTest.java @@ -37,7 +37,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; @EnableAutoWeld @AddPackages(value = {Converters.class, EntityConverter.class, GraphTemplate.class}) diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GraphProducer.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GraphProducer.java index baa62ae8a..e93101c3f 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GraphProducer.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GraphProducer.java @@ -18,7 +18,6 @@ import jakarta.annotation.Priority; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Alternative; -import jakarta.enterprise.inject.Default; import jakarta.enterprise.inject.Disposes; import jakarta.enterprise.inject.Produces; import jakarta.interceptor.Interceptor; diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/GraphExtensionTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/GraphExtensionTest.java index 6f83ecb30..2906eec97 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/GraphExtensionTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/GraphExtensionTest.java @@ -30,7 +30,6 @@ import org.jboss.weld.junit5.auto.EnableAutoWeld; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; From 133eec6defd77304ef5bfcb3dfeab5892ae53ea3 Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Tue, 10 Dec 2024 19:39:03 +0000 Subject: [PATCH 10/19] update api to java 21 Signed-off-by: Otavio Santana --- .../jnosql/databases/tinkerpop/mapping/entities/Animal.java | 3 +-- .../jnosql/databases/tinkerpop/mapping/entities/Book.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Animal.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Animal.java index ae1b09a88..693b75d3e 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Animal.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Animal.java @@ -50,10 +50,9 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof Animal)) { + if (!(o instanceof Animal animal)) { return false; } - Animal animal = (Animal) o; return Objects.equals(id, animal.id) && Objects.equals(name, animal.name); } diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Book.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Book.java index edb1cecd5..7ad701fbb 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Book.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Book.java @@ -59,10 +59,9 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof Book)) { + if (!(o instanceof Book book)) { return false; } - Book book = (Book) o; return Objects.equals(id, book.id); } From 24ec6191c7ab811804f20043affe5b040b64fbc9 Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Tue, 10 Dec 2024 19:39:48 +0000 Subject: [PATCH 11/19] update graph database Signed-off-by: Otavio Santana --- .../tinkerpop/mapping/configuration/GraphConfigurationMock.java | 2 +- .../mapping/configuration/GraphConfigurationMock2.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/configuration/GraphConfigurationMock.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/configuration/GraphConfigurationMock.java index dea176ce3..d78c232f4 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/configuration/GraphConfigurationMock.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/configuration/GraphConfigurationMock.java @@ -65,7 +65,7 @@ public Transaction tx() { } @Override - public void close() throws Exception { + public void close() { } diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/configuration/GraphConfigurationMock2.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/configuration/GraphConfigurationMock2.java index a0bd6adbf..c08c302f7 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/configuration/GraphConfigurationMock2.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/configuration/GraphConfigurationMock2.java @@ -65,7 +65,7 @@ public Transaction tx() { } @Override - public void close() throws Exception { + public void close() { } From 82cc7aa1c5ebbe7797eb151479a36f485761e9ae Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Tue, 10 Dec 2024 19:40:45 +0000 Subject: [PATCH 12/19] test: update graph and database update-graph database Signed-off-by: Otavio Santana --- .../mapping/spi/GraphCustomExtensionTest.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/GraphCustomExtensionTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/GraphCustomExtensionTest.java index 8b322b837..ce8cc3fdf 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/GraphCustomExtensionTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/GraphCustomExtensionTest.java @@ -56,9 +56,7 @@ class GraphCustomExtensionTest { void shouldInitiate() { assertNotNull(people); Person person = people.insert(Person.builder().build()); - SoftAssertions.assertSoftly(soft -> { - soft.assertThat(person).isNotNull(); - }); + SoftAssertions.assertSoftly(soft -> soft.assertThat(person).isNotNull()); } @Test @@ -66,9 +64,7 @@ void shouldUseMock(){ assertNotNull(pepoleMock); Person person = pepoleMock.insert(Person.builder().build()); - SoftAssertions.assertSoftly(soft -> { - soft.assertThat(person).isNotNull(); - }); + SoftAssertions.assertSoftly(soft -> soft.assertThat(person).isNotNull()); } @Test @@ -76,8 +72,6 @@ void shouldUseDefault(){ assertNotNull(repository); Person person = repository.insert(Person.builder().build()); - SoftAssertions.assertSoftly(soft -> { - soft.assertThat(person).isNotNull(); - }); + SoftAssertions.assertSoftly(soft -> soft.assertThat(person).isNotNull()); } } From 74265898b59e4c9ce82640760f4e587477f9c81b Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Tue, 10 Dec 2024 19:41:56 +0000 Subject: [PATCH 13/19] test: update api to graph database Signed-off-by: Otavio Santana --- .../mapping/DefaultEdgeTraversalTest.java | 8 ++++---- .../mapping/DefaultVertexTraversalTest.java | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeTraversalTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeTraversalTest.java index cb325d7b8..be7fed6bd 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeTraversalTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeTraversalTest.java @@ -94,7 +94,7 @@ void shouldReturnOutEWithSupplier() { void shouldReturnErrorOutEWhenIsNull() { assertThrows(NullPointerException.class, () -> graphTemplate.traversalVertex().outE((String) null) .stream() - .collect(toList())); + .toList()); } @Test @@ -122,7 +122,7 @@ void shouldReturnInEWitSupplier() { void shouldReturnErrorWhenInEIsNull() { assertThrows(NullPointerException.class, () -> graphTemplate.traversalVertex().inE((String) null) .stream() - .collect(toList())); + .toList()); } @@ -148,7 +148,7 @@ void shouldReturnBothEWithSupplier() { void shouldReturnErrorWhenBothEIsNull() { assertThrows(NullPointerException.class, () -> graphTemplate.traversalVertex().bothE((String) null) .stream() - .collect(toList())); + .toList()); } @@ -533,7 +533,7 @@ void shouldDedup() { .inE("knows") .dedup() .result() - .collect(Collectors.toList()); + .toList(); assertEquals(6, edges.size()); } diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexTraversalTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexTraversalTest.java index 03527f98d..13b894c7d 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexTraversalTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexTraversalTest.java @@ -161,7 +161,7 @@ void shouldReturnErrorWhenHasPredicateIsNull() { P gt = null; graphTemplate.traversalVertex().has("age", gt) .result() - .collect(toList()); + .toList(); }); } @@ -170,7 +170,7 @@ void shouldReturnErrorWhenHasKeyIsNull() { assertThrows(NullPointerException.class, () -> graphTemplate.traversalVertex().has((String) null, P.gt(26)) .result() - .collect(toList())); + .toList()); } @Test @@ -192,7 +192,7 @@ void shouldHaveLabel2() { @Test void shouldReturnErrorWhenHasLabelHasNull() { assertThrows(NullPointerException.class, () -> graphTemplate.traversalVertex().hasLabel((String) null) - .result().collect(toList())); + .result().toList()); } @Test @@ -204,7 +204,7 @@ void shouldIn() { @Test void shouldReturnErrorWhenInIsNull() { - assertThrows(NullPointerException.class, () -> graphTemplate.traversalVertex().out((String) null).result().collect(toList())); + assertThrows(NullPointerException.class, () -> graphTemplate.traversalVertex().out((String) null).result().toList()); } @Test @@ -216,7 +216,7 @@ void shouldOut() { @Test void shouldReturnErrorWhenOutIsNull() { - assertThrows(NullPointerException.class, () -> graphTemplate.traversalVertex().in((String) null).result().collect(toList())); + assertThrows(NullPointerException.class, () -> graphTemplate.traversalVertex().in((String) null).result().toList()); } @Test @@ -229,7 +229,7 @@ void shouldBoth() { @Test void shouldReturnErrorWhenBothIsNull() { assertThrows(NullPointerException.class, () -> graphTemplate.traversalVertex().both((String) null) - .result().collect(toList())); + .result().toList()); } @Test @@ -241,7 +241,7 @@ void shouldNot() { @Test void shouldReturnErrorWhenHasNotIsNull() { assertThrows(NullPointerException.class, () -> graphTemplate.traversalVertex().hasNot((String) null) - .result().collect(toList())); + .result().toList()); } @Test @@ -510,7 +510,7 @@ void shouldDedup() { people = graphTemplate.traversalVertex() .hasLabel(Person.class) .in("knows").dedup().result() - .collect(Collectors.toList()); + .toList(); assertEquals(3, people.size()); } From 687be47112c329a3a41be3d3540ae9da17e4fa4f Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Tue, 10 Dec 2024 19:49:16 +0000 Subject: [PATCH 14/19] test: create default map value Signed-off-by: Otavio Santana --- .../tinkerpop/mapping/DefaultValueMapTraversalTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultValueMapTraversalTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultValueMapTraversalTest.java index 511a192f4..be4430f88 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultValueMapTraversalTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultValueMapTraversalTest.java @@ -62,7 +62,7 @@ void shouldReturnMapValues() { .map(m -> m.getOrDefault("name", "").toString()).collect(Collectors.toList()); - assertThat(names).contains("[Poliana]", "[Otavio]", "[Paulo]"); + assertThat(names).contains("Poliana", "Otavio", "Paulo"); } @Test From 7c41a91d95c08ec25cf48753d406ecf1ab5c7d7e Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Tue, 10 Dec 2024 19:59:08 +0000 Subject: [PATCH 15/19] test: update test on apache tinkerpop Signed-off-by: Otavio Santana --- .../tinkerpop/mapping/DefaultValueMapTraversalTest.java | 2 +- .../databases/tinkerpop/mapping/DefaultVertexTraversalTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultValueMapTraversalTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultValueMapTraversalTest.java index be4430f88..4e7402f21 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultValueMapTraversalTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultValueMapTraversalTest.java @@ -102,6 +102,6 @@ void shouldReturnSingleResult() { String name = "Poliana"; Optional> poliana = graphTemplate.traversalVertex().hasLabel("Person"). has("name", name).valueMap("name").singleResult(); - assertEquals(name, poliana.map(m -> ((List) m.get("name")).get(0)).orElse("")); + assertEquals(name, poliana.map(m -> m.get("name")).orElse("")); } } diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexTraversalTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexTraversalTest.java index 13b894c7d..8dd132f33 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexTraversalTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexTraversalTest.java @@ -280,7 +280,7 @@ void shouldMapValuesAsStream() { List names = new ArrayList<>(); - maps.forEach(m -> names.add(((List) m.get("name")).get(0).toString())); + maps.forEach(m -> names.add(m.get("name").toString())); assertThat(names).contains("Otavio", "Poliana", "Paulo"); } From 68e3e2c213456cdf5ebbaacd5487443f452bd458 Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Tue, 10 Dec 2024 20:05:15 +0000 Subject: [PATCH 16/19] feat: include varargs Signed-off-by: Otavio Santana --- .../jnosql/databases/tinkerpop/mapping/GraphTemplate.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GraphTemplate.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GraphTemplate.java index 6b6f27811..eabe39081 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GraphTemplate.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GraphTemplate.java @@ -131,6 +131,7 @@ default EdgeEntity edge(O outgoing, Supplier label, I incoming) { * @return the Edges * @throws NullPointerException where there is any parameter null */ + @SuppressWarnings("unchecked") Collection edgesById(K id, Direction direction, Supplier... labels); /** @@ -166,6 +167,7 @@ default EdgeEntity edge(O outgoing, Supplier label, I incoming) { * @return the Edges * @throws NullPointerException where there is any parameter null */ + @SuppressWarnings("unchecked") Collection edges(T entity, Direction direction, Supplier... labels); /** From 44f7ea7127709fcfa4dafb5f9a54430cd13961d4 Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Tue, 10 Dec 2024 20:07:31 +0000 Subject: [PATCH 17/19] feat: update graph supplier Signed-off-by: Otavio Santana --- .../jnosql/databases/tinkerpop/mapping/DefaultEdgeEntity.java | 2 ++ .../tinkerpop/mapping/configuration/GraphSupplier.java | 1 + 2 files changed, 3 insertions(+) diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeEntity.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeEntity.java index 913bd88d2..3356a8dc7 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeEntity.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeEntity.java @@ -60,11 +60,13 @@ public String label() { return edge.label(); } + @SuppressWarnings("unchecked") @Override public I incoming() { return incoming; } + @SuppressWarnings("unchecked") @Override public O outgoing() { return outgoing; diff --git a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/configuration/GraphSupplier.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/configuration/GraphSupplier.java index f707af581..4dd8ab30e 100644 --- a/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/configuration/GraphSupplier.java +++ b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/configuration/GraphSupplier.java @@ -32,6 +32,7 @@ @ApplicationScoped class GraphSupplier implements Supplier { + @SuppressWarnings("unchecked") @Override @Produces @ApplicationScoped From 4450e828c8404147cdc0c31c2cf0b76d0ca31e99 Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Tue, 10 Dec 2024 20:08:24 +0000 Subject: [PATCH 18/19] feat: update pom.xml using tinkerpop Signed-off-by: Otavio Santana --- jnosql-tinkerpop/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jnosql-tinkerpop/pom.xml b/jnosql-tinkerpop/pom.xml index 1e1a58bf1..a2271cd7f 100644 --- a/jnosql-tinkerpop/pom.xml +++ b/jnosql-tinkerpop/pom.xml @@ -23,7 +23,7 @@ 1.1.4-SNAPSHOT - jnosql-mapping-graph + jnosql-tinkerpop 3.7.3 From 823ee2a4b15f7051be5d3a321f3056f25049f9af Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Tue, 10 Dec 2024 20:09:35 +0000 Subject: [PATCH 19/19] docs: update changeslogs Signed-off-by: Otavio Santana --- CHANGELOG.adoc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 7e59bef7d..77a9a944c 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -8,6 +8,11 @@ and this project adheres to https://semver.org/spec/v2.0.0.html[Semantic Version == [Unreleased] +== Changes + +- Update API using Apache Tinkerpop +- Update package name of Graph to Tinkerpop + == [1.1.3] - 2024-10-24 === Added