Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update graph database #300

Merged
merged 19 commits into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions jnosql-tinkerpop/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.jnosql.mapping</groupId>
<artifactId>jnosql-mapping-parent</artifactId>
<groupId>org.eclipse.jnosql.databases</groupId>
<artifactId>jnosql-databases-parent</artifactId>
<version>1.1.4-SNAPSHOT</version>
</parent>

<artifactId>jnosql-mapping-graph</artifactId>
<artifactId>jnosql-tinkerpop</artifactId>

<properties>
<tinkerpop.version>3.7.3</tinkerpop.version>
Expand All @@ -36,7 +36,7 @@

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<groupId>org.eclipse.jnosql.mapping</groupId>
<artifactId>jnosql-mapping-semistructured</artifactId>
<version>${project.version}</version>
<exclusions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -33,6 +33,7 @@ public interface GraphConfiguration extends Function<Settings, Graph> {
* @param <T> the configuration type
* @return {@link GraphConfiguration} instance
*/
@SuppressWarnings("unchecked")
static <T extends GraphConfiguration> T getConfiguration() {
return (T) ServiceLoader.load(GraphConfiguration.class)
.stream()
Expand All @@ -48,6 +49,7 @@ static <T extends GraphConfiguration> T getConfiguration() {
* @param type the particular provider
* @return {@link GraphConfiguration} instance
*/
@SuppressWarnings("unchecked")
static <T extends GraphConfiguration> T getConfiguration(Class<T> type) {
return (T) ServiceLoader.load(GraphConfiguration.class)
.stream()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* in the JNoSQL project. It contains interfaces, classes, and utilities that enable developers to
* communicate with and manage graph databases.
* <p>
* 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,
Expand All @@ -28,4 +28,4 @@
* for working with different graph database technologies supported by JNoSQL.
* </p>
*/
package org.eclipse.jnosql.communication.graph;
package org.eclipse.jnosql.databases.tinkerpop.communication;
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -52,9 +52,11 @@

abstract class AbstractGraphTemplate extends AbstractSemiStructuredTemplate implements GraphTemplate {

@SuppressWarnings("unchecked")
private static final Function<GraphTraversal<?, ?>, GraphTraversal<Vertex, Vertex>> INITIAL_VERTEX =
g -> (GraphTraversal<Vertex, Vertex>) g;

@SuppressWarnings("unchecked")
private static final Function<GraphTraversal<?, ?>, GraphTraversal<Vertex, Edge>> INITIAL_EDGE =
g -> (GraphTraversal<Vertex, Edge>) g;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -168,7 +168,7 @@ public Stream<EdgeEntity> 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -221,7 +221,7 @@ public <T> Stream<T> 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading
Loading