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 diff --git a/jnosql-tinkerpop/pom.xml b/jnosql-tinkerpop/pom.xml index 72d9037e9..a2271cd7f 100644 --- a/jnosql-tinkerpop/pom.xml +++ b/jnosql-tinkerpop/pom.xml @@ -18,12 +18,12 @@ 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 - jnosql-mapping-graph + jnosql-tinkerpop 3.7.3 @@ -36,7 +36,7 @@ - ${project.groupId} + org.eclipse.jnosql.mapping jnosql-mapping-semistructured ${project.version} 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/CommunicationEntityConverter.java similarity index 95% 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/CommunicationEntityConverter.java index 8f6a3893a..116c7f151 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/CommunicationEntityConverter.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/communication/graph/DefaultGraphDatabaseManager.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/DefaultGraphDatabaseManager.java similarity index 99% 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/DefaultGraphDatabaseManager.java index 62e99d3fb..d1eb5ee04 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/DefaultGraphDatabaseManager.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/communication/graph/GraphConfiguration.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/GraphConfiguration.java similarity index 94% 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/GraphConfiguration.java index db0e9cc20..c0fd5719c 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/GraphConfiguration.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.communication.graph; +package org.eclipse.jnosql.databases.tinkerpop.communication; import org.apache.tinkerpop.gremlin.structure.Graph; import org.eclipse.jnosql.communication.CommunicationException; @@ -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() 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/GraphDatabaseManager.java similarity index 97% 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/GraphDatabaseManager.java index ee9422390..19f9415ee 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/GraphDatabaseManager.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/communication/graph/GraphTransactionUtil.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/GraphTransactionUtil.java similarity index 98% 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/GraphTransactionUtil.java index 89de00f84..13158306f 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/GraphTransactionUtil.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/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/communication/graph/TraversalExecutor.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/TraversalExecutor.java index 461ab8835..cf1085151 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/TraversalExecutor.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/communication/graph/package-info.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/communication/package-info.java similarity index 92% 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/package-info.java index 11ea3780b..bcd663d8e 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/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.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; 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/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/AbstractEdgeTraversal.java index 36930fc7f..9e2a1b96e 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/AbstractEdgeTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/mapping/graph/AbstractGraphTemplate.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractGraphTemplate.java similarity index 96% 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/AbstractGraphTemplate.java index 6b2ac1a6e..017f94ffe 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/AbstractGraphTemplate.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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.communication.graph.CommunicationEntityConverter; -import org.eclipse.jnosql.communication.graph.GraphDatabaseManager; -import org.eclipse.jnosql.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; @@ -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/main/java/org/eclipse/jnosql/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/mapping/graph/AbstractVertexTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractVertexTraversal.java index 465dab0dc..4b2081081 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/AbstractVertexTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/mapping/graph/DefaultEdgeEntity.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeEntity.java similarity index 95% 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/DefaultEdgeEntity.java index 6d4f33413..3356a8dc7 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/DefaultEdgeEntity.java @@ -12,12 +12,12 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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.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; @@ -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/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/mapping/graph/DefaultEdgeRepeatStepTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeRepeatStepTraversal.java index 2d4f3207d..ab7a585dc 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/DefaultEdgeRepeatStepTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/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/mapping/graph/DefaultEdgeRepeatTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeRepeatTraversal.java index ad9767a81..c42d26e67 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/DefaultEdgeRepeatTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/mapping/graph/DefaultEdgeTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeTraversal.java similarity index 98% 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/DefaultEdgeTraversal.java index 4397c8020..be5c8c196 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/DefaultEdgeTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import jakarta.data.exceptions.NonUniqueResultException; import org.apache.tinkerpop.gremlin.process.traversal.P; @@ -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 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/DefaultEdgeTraversalOrder.java similarity index 97% 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/DefaultEdgeTraversalOrder.java index 88d4e445b..0435df63b 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/DefaultEdgeTraversalOrder.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/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/mapping/graph/DefaultEdgeUntilTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeUntilTraversal.java index dbd2e190c..00023d859 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/DefaultEdgeUntilTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/mapping/graph/DefaultGraphTemplate.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultGraphTemplate.java similarity index 95% 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/DefaultGraphTemplate.java index e4c981d05..8cb811ef3 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/DefaultGraphTemplate.java @@ -12,14 +12,14 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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.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/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/mapping/graph/DefaultPreparedStatement.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultPreparedStatement.java index dde6c862e..bb5c76dd3 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/DefaultPreparedStatement.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/mapping/graph/DefaultValueMapTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultValueMapTraversal.java similarity index 98% 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/DefaultValueMapTraversal.java index 838ff1a4a..aae94ce98 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/DefaultValueMapTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/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/mapping/graph/DefaultVertexRepeatStepTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexRepeatStepTraversal.java index f9b7eb011..efdfd966a 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/DefaultVertexRepeatStepTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/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/mapping/graph/DefaultVertexRepeatTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexRepeatTraversal.java index 15227d6f5..2ce6512ae 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/DefaultVertexRepeatTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/mapping/graph/DefaultVertexTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexTraversal.java similarity index 97% 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/DefaultVertexTraversal.java index c81ebd1a9..36298e9fc 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/DefaultVertexTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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.communication.graph.CommunicationEntityConverter; +import org.eclipse.jnosql.databases.tinkerpop.communication.CommunicationEntityConverter; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import java.util.Iterator; @@ -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 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/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/DefaultVertexTraversalOrder.java index 2cfd8543b..9c1d6fa99 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/DefaultVertexTraversalOrder.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/mapping/graph/DefaultVertexUntilTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexUntilTraversal.java similarity index 99% 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/DefaultVertexUntilTraversal.java index da9b28377..bd151a1fd 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/DefaultVertexUntilTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/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/mapping/graph/EdgeConditionTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeConditionTraversal.java index 1971422af..4cb8fb26b 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/EdgeConditionTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/mapping/graph/EdgeEntity.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeEntity.java similarity index 97% 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/EdgeEntity.java index 1395ae87c..5574b993b 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/EdgeEntity.java @@ -12,11 +12,11 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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.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/mapping/graph/EdgeRepeatStepTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeRepeatStepTraversal.java similarity index 95% 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/EdgeRepeatStepTraversal.java index 343af8070..087d74609 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/EdgeRepeatStepTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/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/mapping/graph/EdgeRepeatTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeRepeatTraversal.java index 661177497..38ba9338d 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/EdgeRepeatTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/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/mapping/graph/EdgeTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeTraversal.java index 0f45ce897..45bc12f64 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/EdgeTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/mapping/graph/EdgeTraversalOrder.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeTraversalOrder.java similarity index 94% 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/EdgeTraversalOrder.java index abfa3000e..e2ff71627 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/EdgeTraversalOrder.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/mapping/graph/EdgeUntilTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeUntilTraversal.java similarity index 93% 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/EdgeUntilTraversal.java index d6902c8bf..4cdb90005 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/EdgeUntilTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; /** 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/GraphEntityConverter.java similarity index 86% 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/GraphEntityConverter.java index ea722bb51..64870f375 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/GraphEntityConverter.java @@ -12,10 +12,10 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.eclipse.jnosql.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/mapping/graph/GraphTemplate.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GraphTemplate.java similarity index 98% 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/GraphTemplate.java index 7416b1d53..eabe39081 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/GraphTemplate.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import org.eclipse.jnosql.mapping.PreparedStatement; import org.apache.tinkerpop.gremlin.structure.Direction; @@ -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); /** 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/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/GraphTemplateProducer.java index dc2603221..dc4840d08 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/GraphTemplateProducer.java @@ -12,14 +12,14 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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.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/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/mapping/graph/GremlinExecutor.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GremlinExecutor.java index bafbc4c39..ce1eb449e 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/GremlinExecutor.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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.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/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/mapping/graph/GremlinParamParser.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GremlinParamParser.java index f50897290..a7f5641a7 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/GremlinParamParser.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/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/mapping/graph/GremlinQueryException.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GremlinQueryException.java index f72835550..05ac272fa 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/GremlinQueryException.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/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/mapping/graph/Transactional.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/Transactional.java index 5fa099c78..b7f86b363 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/Transactional.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; 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/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/TransactionalInterceptor.java index 5eece4be2..1d98a5729 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/TransactionalInterceptor.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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.communication.graph.GraphTransactionUtil; +import org.eclipse.jnosql.databases.tinkerpop.communication.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/ValueMapTraversal.java similarity index 97% 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/ValueMapTraversal.java index eb556edb5..eff957311 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/ValueMapTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/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/mapping/graph/VertexConditionTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/VertexConditionTraversal.java index e4b66a52c..b8ae71997 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/VertexConditionTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/mapping/graph/VertexRepeatStepTraversal.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/VertexRepeatStepTraversal.java similarity index 95% 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/VertexRepeatStepTraversal.java index 78f3e4b98..49b0cf5a3 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/VertexRepeatStepTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/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/mapping/graph/VertexRepeatTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/VertexRepeatTraversal.java index f1ae9e23f..fae5edeb7 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/VertexRepeatTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/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/mapping/graph/VertexTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/VertexTraversal.java index e71f95146..c2156fc48 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/VertexTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/mapping/graph/VertexTraversalOrder.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/VertexTraversalOrder.java similarity index 94% 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/VertexTraversalOrder.java index bfc023bc9..cf3aa0e0e 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/VertexTraversalOrder.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/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/mapping/graph/VertexUntilTraversal.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/VertexUntilTraversal.java index 0850da007..97e07f971 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/VertexUntilTraversal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/mapping/graph/configuration/GraphSupplier.java b/jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/configuration/GraphSupplier.java similarity index 91% 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/configuration/GraphSupplier.java index 26389f875..4dd8ab30e 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/configuration/GraphSupplier.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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.communication.graph.GraphConfiguration; +import org.eclipse.jnosql.databases.tinkerpop.communication.GraphConfiguration; import org.eclipse.jnosql.mapping.reflection.Reflections; import java.util.function.Supplier; @@ -32,6 +32,7 @@ @ApplicationScoped class GraphSupplier implements Supplier { + @SuppressWarnings("unchecked") @Override @Produces @ApplicationScoped 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/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/query/RepositoryGraphBean.java index 263f582c1..2ecda73f0 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/query/RepositoryGraphBean.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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.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; @@ -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/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/spi/CustomRepositoryGraphBean.java index 59f89d70e..79df141ae 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/spi/CustomRepositoryGraphBean.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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.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; @@ -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/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/spi/GraphExtension.java index 88dc3e6cf..20146d491 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/spi/GraphExtension.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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.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/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/mapping/graph/spi/TemplateBean.java rename to jnosql-tinkerpop/src/main/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/TemplateBean.java index cfbcd1e44..73e420945 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/spi/TemplateBean.java @@ -12,14 +12,14 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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.mapping.graph.GraphTemplate; -import org.eclipse.jnosql.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 6f10bdf2d..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.mapping.graph.spi.GraphExtension \ No newline at end of file +org.eclipse.jnosql.databases.tinkerpop.mapping.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/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/DefaultGraphDatabaseManagerTest.java index c829cbc62..a5f5d954f 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/DefaultGraphDatabaseManagerTest.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.communication.graph; +package org.eclipse.jnosql.databases.tinkerpop.communication; 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/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/GraphSupplier.java index b87bf999e..dcf55743b 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/GraphSupplier.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/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/mapping/graph/AbstractGraphTemplateTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractGraphTemplateTest.java index 629d1c219..8281170da 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/AbstractGraphTemplateTest.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import jakarta.data.exceptions.EmptyResultException; import jakarta.data.exceptions.NonUniqueResultException; @@ -23,11 +23,9 @@ 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.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.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/mapping/graph/AbstractTraversalTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractTraversalTest.java similarity index 94% 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/AbstractTraversalTest.java index 6b379ce51..ff03d624a 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/AbstractTraversalTest.java @@ -14,14 +14,14 @@ * Otavio Santana * */ -package org.eclipse.jnosql.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.mapping.graph.entities.Book; -import org.eclipse.jnosql.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/mapping/graph/BookRepository.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/BookRepository.java similarity index 86% 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/BookRepository.java index 5fd67689b..89aa7415a 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/BookRepository.java @@ -12,12 +12,12 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; 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.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/BookTemplateTest.java similarity index 92% 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/BookTemplateTest.java index f44e44e89..be5662fef 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/BookTemplateTest.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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.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.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; @@ -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/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/mapping/graph/DefaultEdgeTraversalTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeTraversalTest.java index 44acf592d..be7fed6bd 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/DefaultEdgeTraversalTest.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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.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.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; @@ -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,8 +533,8 @@ void shouldDedup() { .inE("knows") .dedup() .result() - .collect(Collectors.toList()); + .toList(); 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/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/DefaultGraphTemplateProducerTest.java index 2cc000699..66862c080 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/DefaultGraphTemplateProducerTest.java @@ -12,14 +12,13 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; 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.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/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/DefaultGraphTraversalSourceTemplateTest.java index 2df77ec7b..4db988aa0 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/DefaultGraphTraversalSourceTemplateTest.java @@ -12,13 +12,13 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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.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; @@ -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/DefaultValueMapTraversalTest.java similarity index 91% 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/DefaultValueMapTraversalTest.java index b6eaa0d14..4e7402f21 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/DefaultValueMapTraversalTest.java @@ -12,13 +12,13 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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.mapping.graph.entities.Person; -import org.eclipse.jnosql.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; @@ -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 @@ -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("")); } -} \ 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/DefaultVertexTraversalTest.java similarity index 95% 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/DefaultVertexTraversalTest.java index efceae962..8dd132f33 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/DefaultVertexTraversalTest.java @@ -12,17 +12,17 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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.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.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; @@ -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 @@ -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"); } @@ -510,10 +510,10 @@ void shouldDedup() { people = graphTemplate.traversalVertex() .hasLabel(Person.class) .in("knows").dedup().result() - .collect(Collectors.toList()); + .toList(); assertEquals(3, people.size()); } -} \ 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/EdgeEntityTest.java similarity index 98% 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/EdgeEntityTest.java index ee3d14b87..0dd918f82 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/EdgeEntityTest.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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.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.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/mapping/graph/GraphProducer.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GraphProducer.java similarity index 97% 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/GraphProducer.java index d4840a224..e93101c3f 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/GraphProducer.java @@ -12,13 +12,12 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph; +package org.eclipse.jnosql.databases.tinkerpop.mapping; import jakarta.annotation.PostConstruct; 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/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/mapping/graph/GraphTemplateProducerTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/GraphTemplateProducerTest.java index 743775b61..df1d91335 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/GraphTemplateProducerTest.java @@ -12,13 +12,13 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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.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; @@ -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/GraphTemplateTest.java similarity index 93% 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/GraphTemplateTest.java index 59afb07d8..cd716afa8 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/GraphTemplateTest.java @@ -12,14 +12,14 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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.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/mapping/graph/configuration/GraphConfigurationMock.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/configuration/GraphConfigurationMock.java similarity index 92% 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/configuration/GraphConfigurationMock.java index 6af9d061c..d78c232f4 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/configuration/GraphConfigurationMock.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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.communication.graph.GraphConfiguration; +import org.eclipse.jnosql.databases.tinkerpop.communication.GraphConfiguration; import java.util.Iterator; @@ -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/mapping/graph/configuration/GraphConfigurationMock2.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/configuration/GraphConfigurationMock2.java similarity index 92% 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/configuration/GraphConfigurationMock2.java index 0a6241803..c08c302f7 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/configuration/GraphConfigurationMock2.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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.communication.graph.GraphConfiguration; +import org.eclipse.jnosql.databases.tinkerpop.communication.GraphConfiguration; import java.util.Iterator; @@ -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/mapping/graph/configuration/GraphSupplierTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/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/configuration/GraphSupplierTest.java index 798cc093b..d9c9528a1 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/configuration/GraphSupplierTest.java @@ -12,17 +12,15 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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.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.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; @@ -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/entities/Animal.java similarity index 92% 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/entities/Animal.java index 4d9d124a2..693b75d3e 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/entities/Animal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph.entities; +package org.eclipse.jnosql.databases.tinkerpop.mapping.entities; import jakarta.nosql.Column; import jakarta.nosql.Entity; @@ -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/mapping/graph/entities/Book.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Book.java similarity index 95% 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/entities/Book.java index 11fb6f850..7ad701fbb 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/entities/Book.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph.entities; +package org.eclipse.jnosql.databases.tinkerpop.mapping.entities; import jakarta.nosql.Column; import jakarta.nosql.Entity; @@ -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); } 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/entities/BookTemplate.java similarity index 84% 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/entities/BookTemplate.java index 45198effe..c01d0d028 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/entities/BookTemplate.java @@ -12,13 +12,12 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph.entities; +package org.eclipse.jnosql.databases.tinkerpop.mapping.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.GraphTemplate; +import org.eclipse.jnosql.databases.tinkerpop.mapping.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/entities/People.java similarity index 92% 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/entities/People.java index 56e35d37d..7a40eaad8 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/entities/People.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/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/mapping/graph/entities/Person.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Person.java index c14a87ec8..5ee2489c7 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/entities/Person.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/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/mapping/graph/entities/PersonBuilder.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/PersonBuilder.java index 207666f46..301c0163c 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/entities/PersonBuilder.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.graph.entities; +package org.eclipse.jnosql.databases.tinkerpop.mapping.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/entities/PersonRepository.java similarity index 92% 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/entities/PersonRepository.java index 9f31428d1..a31acb440 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/entities/PersonRepository.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/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/mapping/graph/entities/WrongEntity.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/WrongEntity.java index 6475eba8f..4ca2d506f 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/entities/WrongEntity.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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/mapping/graph/spi/GraphCustomExtensionTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/GraphCustomExtensionTest.java similarity index 78% 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/spi/GraphCustomExtensionTest.java index abdd3c1cb..ce8cc3fdf 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/spi/GraphCustomExtensionTest.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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.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.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; @@ -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()); } } 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/spi/GraphExtensionTest.java similarity index 87% 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/spi/GraphExtensionTest.java index c558a65c7..2906eec97 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/spi/GraphExtensionTest.java @@ -12,17 +12,17 @@ * * Otavio Santana */ -package org.eclipse.jnosql.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.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.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; @@ -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; 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.GraphConfiguration b/jnosql-tinkerpop/src/test/resources/META-INF/services/org.eclipse.jnosql.databases.tinkerpop.communication.GraphConfiguration new file mode 100644 index 000000000..eef0dd915 --- /dev/null +++ b/jnosql-tinkerpop/src/test/resources/META-INF/services/org.eclipse.jnosql.databases.tinkerpop.communication.GraphConfiguration @@ -0,0 +1 @@ +org.eclipse.jnosql.databases.tinkerpop.mapping.configuration.GraphConfigurationMock2