Skip to content

Commit 2e8ac3d

Browse files
committed
jnosql-tinkerpop: use ~id as default id field name
1 parent f79125c commit 2e8ac3d

File tree

6 files changed

+15
-8
lines changed

6 files changed

+15
-8
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@ public class DefaultTinkerpopGraphDatabaseManager implements TinkerpopGraphDatab
6060
this.graph = graph;
6161
}
6262

63+
@Override
64+
public Optional<String> defaultIdFieldName() {
65+
return Optional.of(T.id.getAccessor());
66+
}
67+
6368
@Override
6469
public Graph get() {
6570
return graph;

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.eclipse.jnosql.mapping.core.Converters;
2626
import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;
2727
import org.eclipse.jnosql.mapping.semistructured.EntityConverter;
28+
import org.eclipse.jnosql.mapping.semistructured.EntityConverterFactory;
2829
import org.eclipse.jnosql.mapping.semistructured.EventPersistManager;
2930

3031
import static org.eclipse.jnosql.mapping.DatabaseType.GRAPH;
@@ -43,15 +44,15 @@ class DefaultTinkerpopTemplate extends AbstractTinkerpopTemplate {
4344
private Graph graph;
4445

4546
@Inject
46-
DefaultTinkerpopTemplate(EntityConverter converter, Graph graph,
47+
DefaultTinkerpopTemplate(EntityConverterFactory converter, Graph graph,
4748
EventPersistManager eventManager,
4849
EntitiesMetadata entities, Converters converters) {
49-
this.converter = converter;
5050
this.graph = graph;
5151
this.eventManager = eventManager;
5252
this.entities = entities;
5353
this.converters = converters;
5454
this.manager = TinkerpopGraphDatabaseManager.of(graph);
55+
this.converter = converter.create(manager);
5556
}
5657

5758
/**

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.eclipse.jnosql.mapping.core.Converters;
2525
import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;
2626
import org.eclipse.jnosql.mapping.semistructured.EntityConverter;
27+
import org.eclipse.jnosql.mapping.semistructured.EntityConverterFactory;
2728
import org.eclipse.jnosql.mapping.semistructured.EventPersistManager;
2829

2930
import java.util.Objects;
@@ -37,7 +38,7 @@
3738
public class GraphTemplateProducer implements Function<Graph, TinkerpopTemplate> {
3839

3940
@Inject
40-
private EntityConverter converter;
41+
private EntityConverterFactory converter;
4142

4243
@Inject
4344
private EventPersistManager eventManager;
@@ -72,12 +73,12 @@ static class ProducerTinkerpopTemplate extends AbstractTinkerpopTemplate {
7273

7374
private final TinkerpopGraphDatabaseManager manager;
7475

75-
public ProducerTinkerpopTemplate(EntityConverter converter, Graph graph,
76+
public ProducerTinkerpopTemplate(EntityConverterFactory converter, Graph graph,
7677
EventPersistManager eventManager,
7778
EntitiesMetadata entities, Converters converters) {
78-
this.converter = converter;
7979
this.graph = graph;
8080
this.manager = TinkerpopGraphDatabaseManager.of(graph);
81+
this.converter = converter.create(manager);
8182
this.eventManager = eventManager;
8283
this.entities = entities;
8384
this.converters = converters;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
@Entity
2424
public class Creature {
2525

26-
@Id("~id")
26+
@Id
2727
private String id;
2828

2929
@Column

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
@MappedSuperclass
2828
public class Human {
2929

30-
@Id("~id")
30+
@Id
3131
private String id;
3232

3333
@Column

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
@Entity
2424
public class Magazine {
2525

26-
@Id("~id")
26+
@Id
2727
private String id;
2828

2929
@Column

0 commit comments

Comments
 (0)