diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 6e871a7c7..aceea482b 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -8,6 +8,16 @@ and this project adheres to https://semver.org/spec/v2.0.0.html[Semantic Version == [Unreleased] +=== Added + +- Include TCK tests + +=== Changed + +- Update OrientDB driver to 3.2.36 +- Update Couchbase client 3.7.6 +- Update DynamoDB driver 2.29.45 + == [1.1.4] - 2024-10-24 == Changes diff --git a/LICENSE b/LICENSE index 00a2d1641..ac36b6a75 100644 --- a/LICENSE +++ b/LICENSE @@ -13,7 +13,7 @@ b) in the case of each subsequent Contributor: i) changes to the Program, and ii) additions to the Program; where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. -"Contributor" means any person or entity that distributes the Program. +"Contributor" means any contact or entity that distributes the Program. "Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. diff --git a/README.adoc b/README.adoc index e638a955b..8ef0a684d 100644 --- a/README.adoc +++ b/README.adoc @@ -1960,6 +1960,42 @@ class IntegrationSampleTest { } ---- +== Performing the Jakarta NoSQL TCK + +To perform the Jakarta NoSQL TCK you should activate the `tck` profile. This profile will download the TCK and run it. + +[IMPORTANT] +==== +By default, the TCK will run in all modules that have the `tck.nosql.skip` property defined as `false`. +==== + +[source,bash] +---- +mvn test -Ptck +---- + +To run the Jakarta NoSQL TCK only in a specific module, you can use the `-pl` option, for example: + +[source,bash] +---- +mvn test -Ptck -pl jnosql-mongodb +---- + + +[IMPORTANT] +==== +By default, activating the `tck` profile does not disable the execution of the default tests. To skip the default tests you can use `-DskipTests`. It will skip the unit tests and run only the TCK tests. +[source,bash] +---- +mvn test -Ptck -DskipTests +---- +==== + +The JNoSQL Database API implementations that support Jakarta NoSQL TCK execution already: + +- link:#_mongodb[MongoDB] + + == Want to Contribute a New Driver? As an open-source project, you're free to create any driver, and you're welcome to join and participate in the process. diff --git a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/communication/ArangoDBDocumentManagerTest.java b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/communication/ArangoDBDocumentManagerTest.java index 900478bf0..b9d79891d 100644 --- a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/communication/ArangoDBDocumentManagerTest.java +++ b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/communication/ArangoDBDocumentManagerTest.java @@ -202,7 +202,7 @@ void shouldCount() { void shouldReadFromDifferentBaseDocumentUsingInstance() { entityManager.insert(getEntity()); ArangoDB arangoDB = DefaultArangoDBDocumentManager.class.cast(entityManager).getArangoDB(); - arangoDB.db(DATABASE).collection(COLLECTION_NAME).insertDocument(new Person()); + arangoDB.db(DATABASE).collection(COLLECTION_NAME).insertDocument(new Human()); SelectQuery select = select().from(COLLECTION_NAME).build(); List entities = entityManager.select(select).collect(Collectors.toList()); assertFalse(entities.isEmpty()); diff --git a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/communication/Person.java b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/communication/Human.java similarity index 97% rename from jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/communication/Person.java rename to jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/communication/Human.java index d12f64b1a..52e93ccdd 100644 --- a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/communication/Person.java +++ b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/communication/Human.java @@ -14,7 +14,7 @@ */ package org.eclipse.jnosql.databases.arangodb.communication; -public class Person { +public class Human { private String name = "Ada"; diff --git a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/ArangoDBTemplateIntegrationTest.java b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/ArangoDBTemplateIntegrationTest.java index a497451c3..29b9343e8 100644 --- a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/ArangoDBTemplateIntegrationTest.java +++ b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/ArangoDBTemplateIntegrationTest.java @@ -48,7 +48,7 @@ @EnableAutoWeld @AddPackages(value = {Database.class, EntityConverter.class, DocumentTemplate.class}) -@AddPackages(Book.class) +@AddPackages(Magazine.class) @AddPackages(ArangoDBTemplate.class) @AddExtensions({EntityMetadataExtension.class, DocumentExtension.class}) @@ -68,84 +68,84 @@ class ArangoDBTemplateIntegrationTest { @BeforeEach void setUp() { - this.template.delete(Book.class).execute(); + this.template.delete(Magazine.class).execute(); } @Test void shouldInsert() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - template.insert(book); - Optional optional = template.find(Book.class, book.id()); + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + template.insert(magazine); + Optional optional = template.find(Magazine.class, magazine.id()); assertThat(optional).isNotNull().isNotEmpty() - .get().isEqualTo(book); + .get().isEqualTo(magazine); } @Test void shouldUpdate() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - Book updated = new Book(book.id(), book.title() + " updated", 2); + Magazine updated = new Magazine(magazine.id(), magazine.title() + " updated", 2); assertThat(template.update(updated)) .isNotNull() - .isNotEqualTo(book); + .isNotEqualTo(magazine); - assertThat(template.find(Book.class, book.id())) + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().get().isEqualTo(updated); } @Test void shouldFindById() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - assertThat(template.find(Book.class, book.id())) - .isNotNull().get().isEqualTo(book); + assertThat(template.find(Magazine.class, magazine.id())) + .isNotNull().get().isEqualTo(magazine); } @Test void shouldDelete() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - template.delete(Book.class, book.id()); - assertThat(template.find(Book.class, book.id())) + template.delete(Magazine.class, magazine.id()); + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().isEmpty(); } @Test void shouldDeleteAll() { for (int index = 0; index < 20; index++) { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); } - template.delete(Book.class).execute(); - assertThat(template.select(Book.class).result()).isEmpty(); + template.delete(Magazine.class).execute(); + assertThat(template.select(Magazine.class).result()).isEmpty(); } @Test void shouldUpdateNullValues() { - var book = new Book(randomUUID().toString(), "Effective Java", 1); + var book = new Magazine(randomUUID().toString(), "Effective Java", 1); template.insert(book); - template.update(new Book(book.id(), null, 2)); - Optional optional = template.select(Book.class).where("id") + template.update(new Magazine(book.id(), null, 2)); + Optional optional = template.select(Magazine.class).where("id") .eq(book.id()).singleResult(); SoftAssertions.assertSoftly(softly -> { softly.assertThat(optional).isPresent(); - softly.assertThat(optional).get().extracting(Book::title).isNull(); - softly.assertThat(optional).get().extracting(Book::edition).isEqualTo(2); + softly.assertThat(optional).get().extracting(Magazine::title).isNull(); + softly.assertThat(optional).get().extracting(Magazine::edition).isEqualTo(2); }); } @@ -153,16 +153,16 @@ void shouldUpdateNullValues() { void shouldExecuteLimit() { for (int index = 1; index < 10; index++) { - var book = new Book(randomUUID().toString(), "Effective Java", index); + var book = new Magazine(randomUUID().toString(), "Effective Java", index); template.insert(book); } - List books = template.select(Book.class).orderBy("edition") + List magazines = template.select(Magazine.class).orderBy("edition") .asc().limit(4).result(); SoftAssertions.assertSoftly(soft -> { - soft.assertThat(books).hasSize(4); - var editions = books.stream().map(Book::edition).toList(); + soft.assertThat(magazines).hasSize(4); + var editions = magazines.stream().map(Magazine::edition).toList(); soft.assertThat(editions).hasSize(4).contains(1, 2, 3, 4); }); @@ -171,16 +171,16 @@ void shouldExecuteLimit() { @Test void shouldExecuteSkip() { for (int index = 1; index < 10; index++) { - var book = new Book(randomUUID().toString(), "Effective Java", index); + var book = new Magazine(randomUUID().toString(), "Effective Java", index); template.insert(book); } - List books = template.select(Book.class).orderBy("edition") + List magazines = template.select(Magazine.class).orderBy("edition") .asc().skip(4).result(); SoftAssertions.assertSoftly(soft -> { - soft.assertThat(books).hasSize(5); - var editions = books.stream().map(Book::edition).toList(); + soft.assertThat(magazines).hasSize(5); + var editions = magazines.stream().map(Magazine::edition).toList(); soft.assertThat(editions).hasSize(5).contains(5, 6, 7, 8, 9); }); } @@ -188,16 +188,16 @@ void shouldExecuteSkip() { @Test void shouldExecuteLimitStart() { for (int index = 1; index < 10; index++) { - var book = new Book(randomUUID().toString(), "Effective Java", index); + var book = new Magazine(randomUUID().toString(), "Effective Java", index); template.insert(book); } - List books = template.select(Book.class).orderBy("edition") + List magazines = template.select(Magazine.class).orderBy("edition") .asc().skip(4).limit(3).result(); SoftAssertions.assertSoftly(soft -> { - soft.assertThat(books).hasSize(3); - var editions = books.stream().map(Book::edition).toList(); + soft.assertThat(magazines).hasSize(3); + var editions = magazines.stream().map(Magazine::edition).toList(); soft.assertThat(editions).hasSize(3).contains(5, 6, 7); }); } @@ -205,18 +205,18 @@ void shouldExecuteLimitStart() { @Test void shouldSelectCursorSize() { for (int index = 1; index < 10; index++) { - var book = new Book(randomUUID().toString(), "Effective Java", index); + var book = new Magazine(randomUUID().toString(), "Effective Java", index); template.insert(book); } - var select = SelectQuery.select().from("Book").orderBy("edition").asc() + var select = SelectQuery.select().from("Magazine").orderBy("edition").asc() .skip(4).limit(3).build(); var pageRequest = PageRequest.ofSize(3); - CursoredPage entities = template.selectCursor(select, pageRequest); + CursoredPage entities = template.selectCursor(select, pageRequest); SoftAssertions.assertSoftly(soft -> { var content = entities.content(); soft.assertThat(content).hasSize(3); - var editions = content.stream().map(Book::edition).toList(); + var editions = content.stream().map(Magazine::edition).toList(); soft.assertThat(editions).hasSize(3).contains(1, 2, 3); }); } diff --git a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/Book.java b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/Magazine.java similarity index 84% rename from jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/Book.java rename to jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/Magazine.java index 2abda4c91..ab78f387a 100644 --- a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/Book.java +++ b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/Magazine.java @@ -21,7 +21,7 @@ import java.util.Objects; @Entity -public class Book { +public class Magazine { @Id("_key") private String id; @@ -32,13 +32,13 @@ public class Book { @Column("edition") private int edition; - public Book(String id, String title, int edition) { + public Magazine(String id, String title, int edition) { this.id = id; this.title = title; this.edition = edition; } - Book() { + Magazine() { } public String id() { @@ -57,10 +57,10 @@ public int edition() { public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - Book book = (Book) o; - return edition == book.edition - && Objects.equals(id, book.id) - && Objects.equals(title, book.title); + Magazine magazine = (Magazine) o; + return edition == magazine.edition + && Objects.equals(id, magazine.id) + && Objects.equals(title, magazine.title); } @Override diff --git a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/TemplateIntegrationTest.java b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/TemplateIntegrationTest.java index 9bc01510d..82b1f6404 100644 --- a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/TemplateIntegrationTest.java +++ b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/TemplateIntegrationTest.java @@ -45,7 +45,7 @@ @EnableAutoWeld @AddPackages(value = {Database.class, EntityConverter.class, DocumentTemplate.class}) -@AddPackages(Book.class) +@AddPackages(Magazine.class) @AddExtensions({EntityMetadataExtension.class, DocumentExtension.class}) @AddPackages(Reflections.class) @@ -65,51 +65,51 @@ class TemplateIntegrationTest { @Test void shouldInsert() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - template.insert(book); - Optional optional = template.find(Book.class, book.id()); + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + template.insert(magazine); + Optional optional = template.find(Magazine.class, magazine.id()); assertThat(optional).isNotNull().isNotEmpty() - .get().isEqualTo(book); + .get().isEqualTo(magazine); } @Test void shouldUpdate() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - Book updated = new Book(book.id(), book.title() + " updated", 2); + Magazine updated = new Magazine(magazine.id(), magazine.title() + " updated", 2); assertThat(template.update(updated)) .isNotNull() - .isNotEqualTo(book); + .isNotEqualTo(magazine); - assertThat(template.find(Book.class, book.id())) + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().get().isEqualTo(updated); } @Test void shouldFindById() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - assertThat(template.find(Book.class, book.id())) - .isNotNull().get().isEqualTo(book); + assertThat(template.find(Magazine.class, magazine.id())) + .isNotNull().get().isEqualTo(magazine); } @Test void shouldDelete() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - template.delete(Book.class, book.id()); - assertThat(template.find(Book.class, book.id())) + template.delete(Magazine.class, magazine.id()); + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().isEmpty(); } diff --git a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/mapping/ArangoDBDocumentRepositoryProxyTest.java b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/mapping/ArangoDBDocumentRepositoryProxyTest.java index 5a0e6ac87..d3b872e84 100644 --- a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/mapping/ArangoDBDocumentRepositoryProxyTest.java +++ b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/mapping/ArangoDBDocumentRepositoryProxyTest.java @@ -61,7 +61,7 @@ public class ArangoDBDocumentRepositoryProxyTest { @Inject private Converters converters; - private PersonRepository personRepository; + private HumanRepository humanRepository; @SuppressWarnings("rawtypes") @BeforeEach @@ -69,27 +69,27 @@ public void setUp() { this.template = Mockito.mock(ArangoDBTemplate.class); ArangoDBDocumentRepositoryProxy handler = new ArangoDBDocumentRepositoryProxy<>(template, - PersonRepository.class, converters, entitiesMetadata); + HumanRepository.class, converters, entitiesMetadata); - when(template.insert(any(Person.class))).thenReturn(new Person()); - when(template.insert(any(Person.class), any(Duration.class))).thenReturn(new Person()); - when(template.update(any(Person.class))).thenReturn(new Person()); - this.personRepository = (PersonRepository) Proxy.newProxyInstance(PersonRepository.class.getClassLoader(), - new Class[]{PersonRepository.class}, + when(template.insert(any(Human.class))).thenReturn(new Human()); + when(template.insert(any(Human.class), any(Duration.class))).thenReturn(new Human()); + when(template.update(any(Human.class))).thenReturn(new Human()); + this.humanRepository = (HumanRepository) Proxy.newProxyInstance(HumanRepository.class.getClassLoader(), + new Class[]{HumanRepository.class}, handler); } @Test public void shouldFindAll() { - personRepository.findAllQuery(); + humanRepository.findAllQuery(); verify(template).aql("FOR p IN Person RETURN p", emptyMap()); } @Test public void shouldFindByNameAQL() { ArgumentCaptor captor = ArgumentCaptor.forClass(Map.class); - personRepository.findByName("Ada"); + humanRepository.findByName("Ada"); verify(template).aql(eq("FOR p IN Person FILTER p.name = @name RETURN p"), captor.capture()); Map value = captor.getValue(); @@ -98,52 +98,52 @@ public void shouldFindByNameAQL() { @Test public void shouldSaveUsingInsert() { - Person person = Person.of("Ada", 10); - personRepository.save(person); - verify(template).insert(eq(person)); + Human human = Human.of("Ada", 10); + humanRepository.save(human); + verify(template).insert(eq(human)); } @Test public void shouldSaveUsingUpdate() { - Person person = Person.of("Ada-2", 10); - when(template.find(Person.class, "Ada-2")).thenReturn(Optional.of(person)); - personRepository.save(person); - verify(template).update(eq(person)); + Human human = Human.of("Ada-2", 10); + when(template.find(Human.class, "Ada-2")).thenReturn(Optional.of(human)); + humanRepository.save(human); + verify(template).update(eq(human)); } @Test public void shouldDelete(){ - personRepository.deleteById("id"); - verify(template).delete(Person.class, "id"); + humanRepository.deleteById("id"); + verify(template).delete(Human.class, "id"); } @Test public void shouldDeleteEntity(){ - Person person = Person.of("Ada", 10); - personRepository.delete(person); - verify(template).delete(Person.class, person.getName()); + Human human = Human.of("Ada", 10); + humanRepository.delete(human); + verify(template).delete(Human.class, human.getName()); } @Test public void shouldDeleteAll() { ArgumentCaptor> queryCaptor = ArgumentCaptor.forClass(Class.class); - personRepository.deleteAll(); + humanRepository.deleteAll(); verify(template).deleteAll(queryCaptor.capture()); Class query = queryCaptor.getValue(); - Assertions.assertThat(query).isEqualTo(Person.class); + Assertions.assertThat(query).isEqualTo(Human.class); } - interface PersonRepository extends ArangoDBRepository { + interface HumanRepository extends ArangoDBRepository { @AQL("FOR p IN Person RETURN p") - List findAllQuery(); + List findAllQuery(); @AQL("FOR p IN Person FILTER p.name = @name RETURN p") - List findByName(@Param("name") String name); + List findByName(@Param("name") String name); } } diff --git a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/mapping/ArangoDBExtensionTest.java b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/mapping/ArangoDBExtensionTest.java index e64975f52..be906cfa3 100644 --- a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/mapping/ArangoDBExtensionTest.java +++ b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/mapping/ArangoDBExtensionTest.java @@ -38,7 +38,7 @@ public class ArangoDBExtensionTest { @Inject - private PersonRepository repository; + private HumanRepository repository; @Test public void shouldSave() { diff --git a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/mapping/DefaultArangoDBTemplateTest.java b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/mapping/DefaultArangoDBTemplateTest.java index c7d01108b..7235a1869 100644 --- a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/mapping/DefaultArangoDBTemplateTest.java +++ b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/mapping/DefaultArangoDBTemplateTest.java @@ -21,7 +21,7 @@ import org.eclipse.jnosql.communication.semistructured.DeleteQuery; import org.eclipse.jnosql.communication.semistructured.Element; import org.eclipse.jnosql.databases.arangodb.communication.ArangoDBDocumentManager; -import org.eclipse.jnosql.databases.arangodb.communication.Person; +import org.eclipse.jnosql.databases.arangodb.communication.Human; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.document.DocumentTemplate; import org.eclipse.jnosql.mapping.document.spi.DocumentExtension; @@ -106,11 +106,11 @@ public void shouldFindAQLWithType() { @Test public void shouldDeleteAll(){ ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(DeleteQuery.class); - template.deleteAll(Person.class); + template.deleteAll(Human.class); Mockito.verify(manager).delete(argumentCaptor.capture()); DeleteQuery query = argumentCaptor.getValue(); SoftAssertions.assertSoftly(soft -> { - soft.assertThat(query.name()).isEqualTo("Person"); + soft.assertThat(query.name()).isEqualTo("Human"); soft.assertThat(query.columns()).isEmpty(); soft.assertThat(query.condition()).isEmpty(); }); diff --git a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/mapping/Person.java b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/mapping/Human.java similarity index 83% rename from jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/mapping/Person.java rename to jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/mapping/Human.java index 7635c67f9..50b233639 100644 --- a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/mapping/Person.java +++ b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/mapping/Human.java @@ -22,7 +22,7 @@ import java.util.Objects; @Entity -public class Person { +public class Human { @Id("_key") private String name; @@ -46,21 +46,21 @@ public void setAge(Integer age) { this.age = age; } - public Person(String name, Integer age) { + public Human(String name, Integer age) { this.name = name; this.age = age; } - public Person() { + public Human() { } @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - Person person = (Person) o; - return Objects.equals(name, person.name) && - Objects.equals(age, person.age); + Human human = (Human) o; + return Objects.equals(name, human.name) && + Objects.equals(age, human.age); } @Override @@ -76,7 +76,7 @@ public String toString() { '}'; } - public static Person of(String name, Integer age) { - return new Person(name, age); + public static Human of(String name, Integer age) { + return new Human(name, age); } } diff --git a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/mapping/PersonRepository.java b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/mapping/HumanRepository.java similarity index 89% rename from jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/mapping/PersonRepository.java rename to jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/mapping/HumanRepository.java index ac4164aab..f02ba264c 100644 --- a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/mapping/PersonRepository.java +++ b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/mapping/HumanRepository.java @@ -18,5 +18,5 @@ import jakarta.data.repository.Repository; @Repository -public interface PersonRepository extends ArangoDBRepository { +public interface HumanRepository extends ArangoDBRepository { } diff --git a/jnosql-arangodb/src/test/resources/document.properties b/jnosql-arangodb/src/test/resources/document.properties index d9625b9a3..b5f11fb4e 100644 --- a/jnosql-arangodb/src/test/resources/document.properties +++ b/jnosql-arangodb/src/test/resources/document.properties @@ -1,3 +1,3 @@ -query.1=insert person {"_id": 1, "name": "Diana"} -query.2=insert person {"_id": 2, "name": "Artemis"} +query.1=insert contact {"_id": 1, "name": "Diana"} +query.2=insert contact {"_id": 2, "name": "Artemis"} id.name=_id \ No newline at end of file diff --git a/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/integration/CassandraTemplateIntegrationTest.java b/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/integration/CassandraTemplateIntegrationTest.java index ec1ec67c7..c77be2e16 100644 --- a/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/integration/CassandraTemplateIntegrationTest.java +++ b/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/integration/CassandraTemplateIntegrationTest.java @@ -45,7 +45,7 @@ @EnableAutoWeld @AddPackages(value = {Database.class, EntityConverter.class, ColumnTemplate.class}) -@AddPackages(Book.class) +@AddPackages(Magazine.class) @AddPackages(CassandraTemplate.class) @AddExtensions({EntityMetadataExtension.class, ColumnExtension.class}) @@ -69,51 +69,51 @@ class CassandraTemplateIntegrationTest { @Test public void shouldInsert() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - template.insert(book); - Optional optional = template.find(Book.class, book.id()); + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + template.insert(magazine); + Optional optional = template.find(Magazine.class, magazine.id()); assertThat(optional).isNotNull().isNotEmpty() - .get().isEqualTo(book); + .get().isEqualTo(magazine); } @Test public void shouldUpdate() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - Book updated = new Book(book.id(), book.title() + " updated", 2); + Magazine updated = new Magazine(magazine.id(), magazine.title() + " updated", 2); assertThat(template.update(updated)) .isNotNull() - .isNotEqualTo(book); + .isNotEqualTo(magazine); - assertThat(template.find(Book.class, book.id())) + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().get().isEqualTo(updated); } @Test public void shouldFindById() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - assertThat(template.find(Book.class, book.id())) - .isNotNull().get().isEqualTo(book); + assertThat(template.find(Magazine.class, magazine.id())) + .isNotNull().get().isEqualTo(magazine); } @Test public void shouldDelete() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - template.delete(Book.class, book.id()); - assertThat(template.find(Book.class, book.id())) + template.delete(Magazine.class, magazine.id()); + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().isEmpty(); } diff --git a/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/integration/Book.java b/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/integration/Magazine.java similarity index 87% rename from jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/integration/Book.java rename to jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/integration/Magazine.java index 35965fa50..bf85a3a8e 100644 --- a/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/integration/Book.java +++ b/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/integration/Magazine.java @@ -19,7 +19,7 @@ import jakarta.nosql.Id; @Entity -public record Book(@Id("id") String id, @Column("title") String title, @Column("edition") int edition) { +public record Magazine(@Id("id") String id, @Column("title") String title, @Column("edition") int edition) { } diff --git a/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/integration/TemplateIntegrationTest.java b/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/integration/TemplateIntegrationTest.java index a358e9194..2f8297213 100644 --- a/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/integration/TemplateIntegrationTest.java +++ b/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/integration/TemplateIntegrationTest.java @@ -45,7 +45,7 @@ @EnableAutoWeld @AddPackages(value = {Database.class, EntityConverter.class, ColumnTemplate.class}) -@AddPackages(Book.class) +@AddPackages(Magazine.class) @AddExtensions({EntityMetadataExtension.class, ColumnExtension.class}) @AddPackages(Reflections.class) @@ -68,65 +68,65 @@ class TemplateIntegrationTest { @Test void shouldInsert() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - template.insert(book); - Optional optional = template.find(Book.class, book.id()); + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + template.insert(magazine); + Optional optional = template.find(Magazine.class, magazine.id()); assertThat(optional).isNotNull().isNotEmpty() - .get().isEqualTo(book); + .get().isEqualTo(magazine); } @Test void shouldUpdate() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - Book updated = new Book(book.id(), book.title() + " updated", 2); + Magazine updated = new Magazine(magazine.id(), magazine.title() + " updated", 2); assertThat(template.update(updated)) .isNotNull() - .isNotEqualTo(book); + .isNotEqualTo(magazine); - assertThat(template.find(Book.class, book.id())) + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().get().isEqualTo(updated); } @Test void shouldFindById() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - assertThat(template.find(Book.class, book.id())) - .isNotNull().get().isEqualTo(book); + assertThat(template.find(Magazine.class, magazine.id())) + .isNotNull().get().isEqualTo(magazine); } @Test void shouldDelete() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - template.delete(Book.class, book.id()); - assertThat(template.find(Book.class, book.id())) + template.delete(Magazine.class, magazine.id()); + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().isEmpty(); } @Test void shouldUpdateNullValues(){ - var book = new Book(randomUUID().toString(), "Effective Java", 1); + var book = new Magazine(randomUUID().toString(), "Effective Java", 1); template.insert(book); - template.update(new Book(book.id(), null, 2)); - Optional optional = template.select(Book.class).where("id") + template.update(new Magazine(book.id(), null, 2)); + Optional optional = template.select(Magazine.class).where("id") .eq(book.id()).singleResult(); SoftAssertions.assertSoftly(softly -> { softly.assertThat(optional).isPresent(); - softly.assertThat(optional).get().extracting(Book::title).isNull(); - softly.assertThat(optional).get().extracting(Book::edition).isEqualTo(2); + softly.assertThat(optional).get().extracting(Magazine::title).isNull(); + softly.assertThat(optional).get().extracting(Magazine::edition).isEqualTo(2); }); } diff --git a/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/CassandraColumnEntityConverterTest.java b/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/CassandraColumnEntityConverterTest.java index f0ab1a0ed..4fa80f696 100644 --- a/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/CassandraColumnEntityConverterTest.java +++ b/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/CassandraColumnEntityConverterTest.java @@ -23,7 +23,6 @@ import org.eclipse.jnosql.databases.cassandra.mapping.model.Actor; import org.eclipse.jnosql.databases.cassandra.mapping.model.AppointmentBook; import org.eclipse.jnosql.databases.cassandra.mapping.model.Artist; -import org.eclipse.jnosql.databases.cassandra.mapping.model.Contact; import org.eclipse.jnosql.databases.cassandra.mapping.model.Director; import org.eclipse.jnosql.databases.cassandra.mapping.model.History2; import org.eclipse.jnosql.databases.cassandra.mapping.model.Job; @@ -284,13 +283,13 @@ public void shouldSupportUDT() { address.setCity("California"); address.setStreet("Street"); - Person person = new Person(); - person.setAge(10); - person.setName("Ada"); - person.setHome(address); + Contact contact = new Contact(); + contact.setAge(10); + contact.setName("Ada"); + contact.setHome(address); - var entity = converter.toCommunication(person); - assertEquals("Person", entity.name()); + var entity = converter.toCommunication(contact); + assertEquals("Contact", entity.name()); Element column = entity.find("home").get(); UDT udt = UDT.class.cast(column); @@ -304,7 +303,7 @@ public void shouldSupportUDT() { @Test public void shouldSupportUDTToEntity() { - var entity = CommunicationEntity.of("Person"); + var entity = CommunicationEntity.of("Contact"); entity.add(Element.of("name", "Poliana")); entity.add(Element.of("age", 20)); List columns = asList(Element.of("city", "Salvador"), @@ -313,11 +312,11 @@ public void shouldSupportUDTToEntity() { .addUDT(columns).build(); entity.add(udt); - Person person = converter.toEntity(entity); - assertNotNull(person); - Address home = person.getHome(); - assertEquals("Poliana", person.getName()); - assertEquals(Integer.valueOf(20), person.getAge()); + Contact contact = converter.toEntity(entity); + assertNotNull(contact); + Address home = contact.getHome(); + assertEquals("Poliana", contact.getName()); + assertEquals(Integer.valueOf(20), contact.getAge()); assertEquals("Salvador", home.getCity()); assertEquals("Jose Anasoh", home.getStreet()); @@ -343,8 +342,8 @@ public void shouldSupportTimeStampConverter() { public void shouldConvertListUDT() { AppointmentBook appointmentBook = new AppointmentBook(); appointmentBook.setUser("otaviojava"); - appointmentBook.setContacts(asList(new Contact("Poliana", "poliana@santana.com"), - new Contact("Ada", "ada@lovelace.com"))); + appointmentBook.setContacts(asList(new org.eclipse.jnosql.databases.cassandra.mapping.model.Contact("Poliana", "poliana@santana.com"), + new org.eclipse.jnosql.databases.cassandra.mapping.model.Contact("Ada", "ada@lovelace.com"))); var entity = converter.toCommunication(appointmentBook); assertEquals("AppointmentBook", entity.name()); @@ -370,11 +369,11 @@ public void shouldConvertListUDTToEntity() { entity.add(Element.of("user", "otaviojava")); entity.add(UDT.builder("Contact").withName("contacts").addUDTs(columns).build()); AppointmentBook appointmentBook = converter.toEntity(entity); - List contacts = appointmentBook.getContacts(); + List contacts = appointmentBook.getContacts(); assertEquals("otaviojava", appointmentBook.getUser()); - assertThat(contacts).contains(new Contact("Poliana", "poliana"), - new Contact("Ada", "ada@lovelace.com")); + assertThat(contacts).contains(new org.eclipse.jnosql.databases.cassandra.mapping.model.Contact("Poliana", "poliana"), + new org.eclipse.jnosql.databases.cassandra.mapping.model.Contact("Ada", "ada@lovelace.com")); } diff --git a/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/CassandraExtensionTest.java b/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/CassandraExtensionTest.java index 28430f3b1..5cb9d174d 100644 --- a/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/CassandraExtensionTest.java +++ b/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/CassandraExtensionTest.java @@ -38,7 +38,7 @@ public class CassandraExtensionTest { @Inject - private PersonRepository repository; + private ContactRepository repository; @Test public void shouldSaveCassandra() { diff --git a/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/CassandraRepositoryProxyTest.java b/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/CassandraRepositoryProxyTest.java index 1b0303c63..7baefd800 100644 --- a/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/CassandraRepositoryProxyTest.java +++ b/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/CassandraRepositoryProxyTest.java @@ -60,19 +60,19 @@ public class CassandraRepositoryProxyTest { @Inject private EntitiesMetadata entitiesMetadata; - private PersonRepository personRepository; + private HumanRepository personRepository; @BeforeEach public void setUp() { this.template = Mockito.mock(CassandraTemplate.class); CassandraRepositoryProxy handler = new CassandraRepositoryProxy(template, - PersonRepository.class, converters, entitiesMetadata); + HumanRepository.class, converters, entitiesMetadata); - when(template.insert(any(Person.class))).thenReturn(new Person()); - when(template.insert(any(Person.class), any(Duration.class))).thenReturn(new Person()); - when(template.update(any(Person.class))).thenReturn(new Person()); - this.personRepository = (PersonRepository) Proxy.newProxyInstance(PersonRepository.class.getClassLoader(), - new Class[]{PersonRepository.class}, + when(template.insert(any(Contact.class))).thenReturn(new Contact()); + when(template.insert(any(Contact.class), any(Duration.class))).thenReturn(new Contact()); + when(template.update(any(Contact.class))).thenReturn(new Contact()); + this.personRepository = (HumanRepository) Proxy.newProxyInstance(HumanRepository.class.getClassLoader(), + new Class[]{HumanRepository.class}, handler); } @@ -113,45 +113,45 @@ public void shouldFindByName2CQL() { @Test public void shouldSaveUsingInsert() { - Person person = new Person("Ada", 10); - personRepository.save(person); - verify(template).insert(eq(person)); + Contact contact = new Contact("Ada", 10); + personRepository.save(contact); + verify(template).insert(eq(contact)); } @Test public void shouldSaveUsingUpdate() { - Person person = new Person("Ada-2", 10); - when(template.find(Person.class, "Ada-2")).thenReturn(Optional.of(person)); - personRepository.save(person); - verify(template).update(eq(person)); + Contact contact = new Contact("Ada-2", 10); + when(template.find(Contact.class, "Ada-2")).thenReturn(Optional.of(contact)); + personRepository.save(contact); + verify(template).update(eq(contact)); } @Test public void shouldDelete(){ personRepository.deleteById("id"); - verify(template).delete(Person.class, "id"); + verify(template).delete(Contact.class, "id"); } @Test public void shouldDeleteEntity(){ - Person person = new Person("Ada", 10); - personRepository.delete(person); - verify(template).delete(Person.class, person.getName()); + Contact contact = new Contact("Ada", 10); + personRepository.delete(contact); + verify(template).delete(Contact.class, contact.getName()); } - interface PersonRepository extends CassandraRepository { + interface HumanRepository extends CassandraRepository { void deleteByName(String namel); @CQL("select * from Person") - List findAllQuery(); + List findAllQuery(); @CQL("select * from Person where name = ?") - List findByName(String name); + List findByName(String name); @CQL("select * from Person where name = :name") - List findByName2(@Param("name") String name); + List findByName2(@Param("name") String name); } } \ No newline at end of file diff --git a/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/Person.java b/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/Contact.java similarity index 88% rename from jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/Person.java rename to jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/Contact.java index db007d279..6ce6342e5 100644 --- a/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/Person.java +++ b/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/Contact.java @@ -22,7 +22,7 @@ import java.util.Objects; @Entity -public class Person { +public class Contact { @Id("name") private String name; @@ -57,21 +57,21 @@ public void setHome(Address home) { this.home = home; } - public Person(String name, Integer age) { + public Contact(String name, Integer age) { this.name = name; this.age = age; } - public Person() { + public Contact() { } @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - Person person = (Person) o; - return Objects.equals(name, person.name) && - Objects.equals(age, person.age); + Contact contact = (Contact) o; + return Objects.equals(name, contact.name) && + Objects.equals(age, contact.age); } @Override diff --git a/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/PersonRepository.java b/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/ContactRepository.java similarity index 89% rename from jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/PersonRepository.java rename to jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/ContactRepository.java index 20d1d456a..87a76be70 100644 --- a/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/PersonRepository.java +++ b/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/ContactRepository.java @@ -18,5 +18,5 @@ import jakarta.data.repository.Repository; @Repository -public interface PersonRepository extends CassandraRepository { +public interface ContactRepository extends CassandraRepository { } diff --git a/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/DefaultCassandraTemplateTest.java b/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/DefaultCassandraTemplateTest.java index 2025819ce..668ff0b9f 100644 --- a/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/DefaultCassandraTemplateTest.java +++ b/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/DefaultCassandraTemplateTest.java @@ -90,7 +90,7 @@ void setUp() { @Test void shouldSaveConsistency() { - var entity = CommunicationEntity.of("Person", asList(Element.of("name", "Name"), Element.of("age", 20))); + var entity = CommunicationEntity.of("Contact", asList(Element.of("name", "Name"), Element.of("age", 20))); entity.addNull("home"); ArgumentCaptor captor = ArgumentCaptor.forClass(CommunicationEntity.class); @@ -100,10 +100,10 @@ void shouldSaveConsistency() { save(Mockito.any(CommunicationEntity.class), Mockito.eq(level))) .thenReturn(entity); - Person person = new Person(); - person.setName("Name"); - person.setAge(20); - assertEquals(person, template.save(person, level)); + Contact contact = new Contact(); + contact.setName("Name"); + contact.setAge(20); + assertEquals(contact, template.save(contact, level)); Mockito.verify(manager).save(captor.capture(), Mockito.eq(level)); assertEquals(entity, captor.getValue()); @@ -112,7 +112,7 @@ void shouldSaveConsistency() { @Test void shouldSaveConsistencyIterable() { - CommunicationEntity entity = CommunicationEntity.of("Person", asList(Element.of("name", "Name"), Element.of("age", 20))); + CommunicationEntity entity = CommunicationEntity.of("Contact", asList(Element.of("name", "Name"), Element.of("age", 20))); entity.addNull("home"); ArgumentCaptor captor = ArgumentCaptor.forClass(CommunicationEntity.class); @@ -122,10 +122,10 @@ void shouldSaveConsistencyIterable() { save(Mockito.any(CommunicationEntity.class), Mockito.eq(level))) .thenReturn(entity); - Person person = new Person(); - person.setName("Name"); - person.setAge(20); - assertThat(template.save(Collections.singletonList(person), level)).contains(person); + Contact contact = new Contact(); + contact.setName("Name"); + contact.setAge(20); + assertThat(template.save(Collections.singletonList(contact), level)).contains(contact); Mockito.verify(manager).save(captor.capture(), Mockito.eq(level)); assertEquals(entity, captor.getValue()); @@ -134,7 +134,7 @@ void shouldSaveConsistencyIterable() { @Test void shouldSaveConsistencyDuration() { Duration duration = Duration.ofHours(2); - CommunicationEntity entity = CommunicationEntity.of("Person", asList(Element.of("name", "Name"), Element.of("age", 20))); + CommunicationEntity entity = CommunicationEntity.of("Contact", asList(Element.of("name", "Name"), Element.of("age", 20))); entity.addNull("home"); ArgumentCaptor captor = ArgumentCaptor.forClass(CommunicationEntity.class); @@ -144,10 +144,10 @@ void shouldSaveConsistencyDuration() { Mockito.eq(level))) .thenReturn(entity); - Person person = new Person(); - person.setName("Name"); - person.setAge(20); - assertEquals(person, template.save(person, duration, level)); + Contact contact = new Contact(); + contact.setName("Name"); + contact.setAge(20); + assertEquals(contact, template.save(contact, duration, level)); Mockito.verify(manager).save(captor.capture(), Mockito.eq(duration), Mockito.eq(level)); assertEquals(entity, captor.getValue()); @@ -156,7 +156,7 @@ void shouldSaveConsistencyDuration() { @Test void shouldSaveConsistencyDurationIterable() { Duration duration = Duration.ofHours(2); - CommunicationEntity entity = CommunicationEntity.of("Person", asList(Element.of("name", "Name"), Element.of("age", 20))); + CommunicationEntity entity = CommunicationEntity.of("Contact", asList(Element.of("name", "Name"), Element.of("age", 20))); entity.addNull("home"); ArgumentCaptor captor = ArgumentCaptor.forClass(CommunicationEntity.class); @@ -166,10 +166,10 @@ void shouldSaveConsistencyDurationIterable() { Mockito.eq(level))) .thenReturn(entity); - Person person = new Person(); - person.setName("Name"); - person.setAge(20); - assertThat(template.save(Collections.singletonList(person), duration, level)).contains(person); + Contact contact = new Contact(); + contact.setName("Name"); + contact.setAge(20); + assertThat(template.save(Collections.singletonList(contact), duration, level)).contains(contact); Mockito.verify(manager).save(captor.capture(), Mockito.eq(duration), Mockito.eq(level)); assertEquals(entity, captor.getValue()); } @@ -186,45 +186,45 @@ void shouldDelete() { @Test void shouldFind() { - Person person = new Person(); - person.setName("Name"); - person.setAge(20); + Contact contact = new Contact(); + contact.setName("Name"); + contact.setAge(20); - CommunicationEntity entity = CommunicationEntity.of("Person", asList(Element.of("name", "Name"), Element.of("age", 20))); + CommunicationEntity entity = CommunicationEntity.of("Contact", asList(Element.of("name", "Name"), Element.of("age", 20))); SelectQuery query = select().from("columnFamily").build(); ConsistencyLevel level = ConsistencyLevel.THREE; when(manager.select(query, level)).thenReturn(Stream.of(entity)); - Stream people = template.find(query, level); - assertThat(people.collect(Collectors.toList())).contains(person); + Stream people = template.find(query, level); + assertThat(people.collect(Collectors.toList())).contains(contact); } @Test void shouldFindCQL() { - Person person = new Person(); - person.setName("Name"); - person.setAge(20); + Contact contact = new Contact(); + contact.setName("Name"); + contact.setAge(20); String cql = "select * from Person"; - CommunicationEntity entity = CommunicationEntity.of("Person", asList(Element.of("name", "Name"), Element.of("age", 20))); + CommunicationEntity entity = CommunicationEntity.of("Contact", asList(Element.of("name", "Name"), Element.of("age", 20))); when(manager.cql(cql)).thenReturn(Stream.of(entity)); - List people = template.cql(cql).collect(Collectors.toList()); - Assertions.assertThat(people).contains(person); + List people = template.cql(cql).collect(Collectors.toList()); + Assertions.assertThat(people).contains(contact); } @Test void shouldFindSimpleStatement() { - SimpleStatement statement = QueryBuilder.selectFrom("Person").all().build(); - Person person = new Person(); - person.setName("Name"); - person.setAge(20); - CommunicationEntity entity = CommunicationEntity.of("Person", asList(Element.of("name", "Name"), Element.of("age", 20))); + SimpleStatement statement = QueryBuilder.selectFrom("Contact").all().build(); + Contact contact = new Contact(); + contact.setName("Name"); + contact.setAge(20); + CommunicationEntity entity = CommunicationEntity.of("Contact", asList(Element.of("name", "Name"), Element.of("age", 20))); when(manager.execute(statement)).thenReturn(Stream.of(entity)); - List people = template.execute(statement).collect(Collectors.toList()); - Assertions.assertThat(people).contains(person); + List people = template.execute(statement).collect(Collectors.toList()); + Assertions.assertThat(people).contains(contact); } } diff --git a/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/model/Animal.java b/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/model/Creature.java similarity index 84% rename from jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/model/Animal.java rename to jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/model/Creature.java index 4f9c89e48..324f2cefb 100644 --- a/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/model/Animal.java +++ b/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/model/Creature.java @@ -16,11 +16,11 @@ import java.util.Objects; -public class Animal { +public class Creature { private String name; - public Animal(String name) { + public Creature(String name) { this.name = name; } @@ -36,8 +36,8 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - Animal animal = (Animal) o; - return Objects.equals(name, animal.name); + Creature creature = (Creature) o; + return Objects.equals(name, creature.name); } @Override @@ -47,8 +47,7 @@ public int hashCode() { @Override public String toString() { - String sb = "Animal{" + "name='" + name + '\'' + + return "Creature{" + "name='" + name + '\'' + '}'; - return sb; } } diff --git a/jnosql-cassandra/src/test/resources/cassandra.properties b/jnosql-cassandra/src/test/resources/cassandra.properties index fb6b8060e..be1818973 100644 --- a/jnosql-cassandra/src/test/resources/cassandra.properties +++ b/jnosql-cassandra/src/test/resources/cassandra.properties @@ -7,4 +7,4 @@ jnosql.cassandra.query.4=CREATE COLUMNFAMILY IF NOT EXISTS newKeySpace.users ( n jnosql.cassandra.query.5=CREATE COLUMNFAMILY IF NOT EXISTS newKeySpace.history ( name text PRIMARY KEY, dataStart date, dateEnd timestamp); jnosql.cassandra.query.6=CREATE COLUMNFAMILY IF NOT EXISTS newKeySpace.contacts ( user text PRIMARY KEY, names list>); jnosql.cassandra.query.7=CREATE COLUMNFAMILY IF NOT EXISTS newKeySpace.agenda ( user text PRIMARY KEY, names set>); -jnosql.cassandra.query.8=CREATE COLUMNFAMILY IF NOT EXISTS newKeySpace.person ( id bigint PRIMARY KEY, name text); \ No newline at end of file +jnosql.cassandra.query.8=CREATE COLUMNFAMILY IF NOT EXISTS newKeySpace.contact ( id bigint PRIMARY KEY, name text); \ No newline at end of file diff --git a/jnosql-cassandra/src/test/resources/column.properties b/jnosql-cassandra/src/test/resources/column.properties index 4312788fd..8742ff164 100644 --- a/jnosql-cassandra/src/test/resources/column.properties +++ b/jnosql-cassandra/src/test/resources/column.properties @@ -1,3 +1,3 @@ -query.1=insert person {"id": 1, "name": "Diana"} -query.2=insert person {"id": 2, "name": "Artemis"} +query.1=insert contact {"id": 1, "name": "Diana"} +query.2=insert contact {"id": 2, "name": "Artemis"} id.name=id \ No newline at end of file diff --git a/jnosql-cassandra/src/test/resources/column_ttl.properties b/jnosql-cassandra/src/test/resources/column_ttl.properties index 44c606cd1..6c0ca85e5 100644 --- a/jnosql-cassandra/src/test/resources/column_ttl.properties +++ b/jnosql-cassandra/src/test/resources/column_ttl.properties @@ -1,3 +1,3 @@ -query.1=insert person {"id": 1,"name":"Ada Lovelace"} 1 second -query.2=insert person {"id": 2,"name":"Poliana"} 1 second +query.1=insert contact {"id": 1,"name":"Ada Lovelace"} 1 second +query.2=insert contact {"id": 2,"name":"Poliana"} 1 second id.name=id \ No newline at end of file diff --git a/jnosql-cassandra/src/test/resources/mapping.properties b/jnosql-cassandra/src/test/resources/mapping.properties index c57ddc76d..13ef046bf 100644 --- a/jnosql-cassandra/src/test/resources/mapping.properties +++ b/jnosql-cassandra/src/test/resources/mapping.properties @@ -1,2 +1,2 @@ jnosql.cassandra.query.1=CREATE KEYSPACE IF NOT EXISTS library WITH replication = {'class': 'SimpleStrategy', 'replication_factor' : 3}; -jnosql.cassandra.query.2=CREATE COLUMNFAMILY IF NOT EXISTS library.book ( id text PRIMARY KEY, title text, edition int); \ No newline at end of file +jnosql.cassandra.query.2=CREATE COLUMNFAMILY IF NOT EXISTS library.magazine ( id text PRIMARY KEY, title text, edition int); \ No newline at end of file diff --git a/jnosql-couchbase/pom.xml b/jnosql-couchbase/pom.xml index 02fcbea01..6439fbaf4 100644 --- a/jnosql-couchbase/pom.xml +++ b/jnosql-couchbase/pom.xml @@ -47,7 +47,7 @@ com.couchbase.client java-client - 3.7.5 + 3.7.6 org.testcontainers diff --git a/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/integration/CouchbaseDocumentRepositoryIntegrationTest.java b/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/integration/CouchbaseDocumentRepositoryIntegrationTest.java index cbb2cc983..c162ab69f 100644 --- a/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/integration/CouchbaseDocumentRepositoryIntegrationTest.java +++ b/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/integration/CouchbaseDocumentRepositoryIntegrationTest.java @@ -46,7 +46,7 @@ @EnableAutoWeld @AddPackages(value = {Database.class, EntityConverter.class, DocumentTemplate.class}) -@AddPackages(Book.class) +@AddPackages(Magazine.class) @AddPackages(CouchbaseTemplate.class) @AddPackages(Reflections.class) @AddPackages(Converters.class) @@ -71,71 +71,71 @@ public void cleanUp() { @Test public void shouldInsert() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - library.save(book); + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + library.save(magazine); await().atLeast(TimeoutConfig.DEFAULT_KV_DURABLE_TIMEOUT); - Optional optional = library.findById(book.id()); + Optional optional = library.findById(magazine.id()); assertThat(optional).isNotNull().isNotEmpty() - .get().isEqualTo(book); + .get().isEqualTo(magazine); } @Test public void shouldUpdate() throws InterruptedException { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(library.save(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(library.save(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); await().atLeast(TimeoutConfig.DEFAULT_KV_DURABLE_TIMEOUT); - Book updated = new Book(book.id(), book.title() + " updated", 2); + Magazine updated = new Magazine(magazine.id(), magazine.title() + " updated", 2); assertThat(library.save(updated)) .isNotNull() - .isNotEqualTo(book); + .isNotEqualTo(magazine); await().atLeast(TimeoutConfig.DEFAULT_KV_DURABLE_TIMEOUT); - assertThat(library.findById(book.id())) + assertThat(library.findById(magazine.id())) .isNotNull().get().isEqualTo(updated); } @Test public void shouldFindById() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(library.save(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(library.save(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); await().atLeast(TimeoutConfig.DEFAULT_KV_DURABLE_TIMEOUT); - assertThat(library.findById(book.id())) - .isNotNull().get().isEqualTo(book); + assertThat(library.findById(magazine.id())) + .isNotNull().get().isEqualTo(magazine); } @Test public void shouldFindByTitleLike() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(library.save(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(library.save(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); await().atLeast(TimeoutConfig.DEFAULT_KV_DURABLE_TIMEOUT); - var data = library.findByTitleLike(book.title()).toList(); + var data = library.findByTitleLike(magazine.title()).toList(); assertSoftly(softly -> { softly.assertThat(data).as("query result is a non-null instance").isNotNull(); softly.assertThat(data.size()).as("query result size is correct").isEqualTo(1); - softly.assertThat(data.get(0)).as("returned data is correct").isEqualTo(book); + softly.assertThat(data.get(0)).as("returned data is correct").isEqualTo(magazine); }); } @Test public void shouldFindByEditionLessThan() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(library.save(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(library.save(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); await().atLeast(TimeoutConfig.DEFAULT_KV_DURABLE_TIMEOUT); @@ -144,7 +144,7 @@ public void shouldFindByEditionLessThan() { assertSoftly(softly -> { softly.assertThat(booksFoundByEditionLessThan).as("query result from findByEditionLessThan() is a non-null instance").isNotNull(); softly.assertThat(booksFoundByEditionLessThan.size()).as("query result size from findByEditionLessThan() is correct").isEqualTo(1); - softly.assertThat(booksFoundByEditionLessThan.get(0)).as("returned books from findByEditionLessThan() are correct").isEqualTo(book); + softly.assertThat(booksFoundByEditionLessThan.get(0)).as("returned books from findByEditionLessThan() are correct").isEqualTo(magazine); }); var booksFoundByEditionLessThanZero = library.findByEditionLessThan(0).toList(); @@ -159,7 +159,7 @@ public void shouldFindByEditionLessThan() { assertSoftly(softly -> { softly.assertThat(booksFoundByEditionGreaterThan).as("query result from findByEditionGreaterThan() is a non-null instance").isNotNull(); softly.assertThat(booksFoundByEditionGreaterThan.size()).as("query result size from findByEditionGreaterThan() is correct").isEqualTo(1); - softly.assertThat(booksFoundByEditionGreaterThan.get(0)).as("returned books from findByEditionGreaterThan() are correct").isEqualTo(book); + softly.assertThat(booksFoundByEditionGreaterThan.get(0)).as("returned books from findByEditionGreaterThan() are correct").isEqualTo(magazine); }); @@ -173,10 +173,10 @@ public void shouldFindByEditionLessThan() { @Test public void shouldFindByEditionGreaterThan() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(library.save(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(library.save(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); await().atLeast(TimeoutConfig.DEFAULT_KV_DURABLE_TIMEOUT); @@ -185,7 +185,7 @@ public void shouldFindByEditionGreaterThan() { assertSoftly(softly -> { softly.assertThat(booksFoundByEditionGreaterThanZero).as("query result from findByEditionGreaterThan() is a non-null instance").isNotNull(); softly.assertThat(booksFoundByEditionGreaterThanZero.size()).as("query result size from findByEditionGreaterThan() is correct").isEqualTo(1); - softly.assertThat(booksFoundByEditionGreaterThanZero.get(0)).as("returned books from findByEditionGreaterThan() are correct").isEqualTo(book); + softly.assertThat(booksFoundByEditionGreaterThanZero.get(0)).as("returned books from findByEditionGreaterThan() are correct").isEqualTo(magazine); }); @@ -199,18 +199,18 @@ public void shouldFindByEditionGreaterThan() { @Test public void shouldDeleteById() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(library.save(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(library.save(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); await().atLeast(TimeoutConfig.DEFAULT_KV_DURABLE_TIMEOUT); - library.deleteById(book.id()); + library.deleteById(magazine.id()); await().atLeast(TimeoutConfig.DEFAULT_KV_DURABLE_TIMEOUT); - assertThat(library.findById(book.id())) + assertThat(library.findById(magazine.id())) .isNotNull().isEmpty(); } diff --git a/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/integration/CouchbaseTemplateIntegrationTest.java b/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/integration/CouchbaseTemplateIntegrationTest.java index 339d3e52d..dd5c3a418 100644 --- a/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/integration/CouchbaseTemplateIntegrationTest.java +++ b/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/integration/CouchbaseTemplateIntegrationTest.java @@ -47,7 +47,7 @@ @EnableAutoWeld @AddPackages(value = {Database.class, EntityConverter.class, DocumentTemplate.class}) -@AddPackages(Book.class) +@AddPackages(Magazine.class) @AddPackages(CouchbaseTemplate.class) @AddExtensions({EntityMetadataExtension.class, DocumentExtension.class}) @@ -66,90 +66,90 @@ class CouchbaseTemplateIntegrationTest { @BeforeEach @AfterEach public void cleanUp(){ - template.deleteAll(Book.class); + template.deleteAll(Magazine.class); } @Test public void shouldInsert() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - template.insert(book); - Optional optional = template.find(Book.class, book.id()); + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + template.insert(magazine); + Optional optional = template.find(Magazine.class, magazine.id()); assertThat(optional).isNotNull().isNotEmpty() - .get().isEqualTo(book); + .get().isEqualTo(magazine); } @Test public void shouldUpdate() throws InterruptedException { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - Book updated = new Book(book.id(), book.title() + " updated", 2); + Magazine updated = new Magazine(magazine.id(), magazine.title() + " updated", 2); assertThat(template.update(updated)) .isNotNull() - .isNotEqualTo(book); + .isNotEqualTo(magazine); await().atLeast(TimeoutConfig.DEFAULT_KV_DURABLE_TIMEOUT); - assertThat(template.find(Book.class, book.id())) + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().get().isEqualTo(updated); } @Test public void shouldFindById() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - assertThat(template.find(Book.class, book.id())) - .isNotNull().get().isEqualTo(book); + assertThat(template.find(Magazine.class, magazine.id())) + .isNotNull().get().isEqualTo(magazine); } @Test public void shouldFindByN1qlWithParams() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); var data = template.n1qlQuery("select * from " + CouchbaseUtil.BUCKET_NAME + "._default.Book where title = $title", - JsonObject.from(Map.of("title", book.title()))).toList(); + JsonObject.from(Map.of("title", magazine.title()))).toList(); assertSoftly(softly -> { softly.assertThat(data).as("query result is a non-null instance").isNotNull(); softly.assertThat(data.size()).as("query result size is correct").isEqualTo(1); - softly.assertThat(data.get(0)).as("returned data is correct").isEqualTo(book); + softly.assertThat(data.get(0)).as("returned data is correct").isEqualTo(magazine); }); } @Test public void shouldFindByN1qlWithoutParams() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); var data = template.n1qlQuery("select * from " + CouchbaseUtil.BUCKET_NAME + "._default.Book").toList(); assertSoftly(softly -> { softly.assertThat(data).as("query result is a non-null instance").isNotNull(); softly.assertThat(data.size()).as("query result size is correct").isEqualTo(1); - softly.assertThat(data.get(0)).as("returned data is correct").isEqualTo(book); + softly.assertThat(data.get(0)).as("returned data is correct").isEqualTo(magazine); }); } @Test public void shouldDelete() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - template.delete(Book.class, book.id()); - assertThat(template.find(Book.class, book.id())) + template.delete(Magazine.class, magazine.id()); + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().isEmpty(); } diff --git a/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/integration/DocumentTemplateIntegrationTest.java b/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/integration/DocumentTemplateIntegrationTest.java index bd74b6ccb..0a75c31a8 100644 --- a/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/integration/DocumentTemplateIntegrationTest.java +++ b/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/integration/DocumentTemplateIntegrationTest.java @@ -42,7 +42,7 @@ @EnableAutoWeld @AddPackages(value = {Database.class, EntityConverter.class, DocumentTemplate.class}) -@AddPackages(Book.class) +@AddPackages(Magazine.class) @AddPackages(Reflections.class) @AddExtensions({EntityMetadataExtension.class, DocumentExtension.class}) @@ -60,71 +60,71 @@ class DocumentTemplateIntegrationTest { @BeforeEach @AfterEach public void cleanUp() { - template.delete(Book.class).execute(); + template.delete(Magazine.class).execute(); } @Test public void shouldInsert() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - template.insert(book); - Optional optional = template.find(Book.class, book.id()); + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + template.insert(magazine); + Optional optional = template.find(Magazine.class, magazine.id()); assertThat(optional).isNotNull().isNotEmpty() - .get().isEqualTo(book); + .get().isEqualTo(magazine); } @Test public void shouldUpdate() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - Book updated = new Book(book.id(), book.title() + " updated", 2); + Magazine updated = new Magazine(magazine.id(), magazine.title() + " updated", 2); assertThat(template.update(updated)) .isNotNull() - .isNotEqualTo(book); + .isNotEqualTo(magazine); - assertThat(template.find(Book.class, book.id())) + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().get().isEqualTo(updated); } @Test public void shouldFindById() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - assertThat(template.find(Book.class, book.id())) - .isNotNull().get().isEqualTo(book); + assertThat(template.find(Magazine.class, magazine.id())) + .isNotNull().get().isEqualTo(magazine); } @Test public void shouldDelete() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - template.delete(Book.class, book.id()); - assertThat(template.find(Book.class, book.id())) + template.delete(Magazine.class, magazine.id()); + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().isEmpty(); } @Test void shouldUpdateNullValues(){ - var book = new Book(randomUUID().toString(), "Effective Java", 1); + var book = new Magazine(randomUUID().toString(), "Effective Java", 1); template.insert(book); - template.update(new Book(book.id(), null, 2)); - Optional optional = template.select(Book.class).where("id") + template.update(new Magazine(book.id(), null, 2)); + Optional optional = template.select(Magazine.class).where("id") .eq(book.id()).singleResult(); SoftAssertions.assertSoftly(softly -> { softly.assertThat(optional).isPresent(); - softly.assertThat(optional).get().extracting(Book::title).isNull(); - softly.assertThat(optional).get().extracting(Book::edition).isEqualTo(2); + softly.assertThat(optional).get().extracting(Magazine::title).isNull(); + softly.assertThat(optional).get().extracting(Magazine::edition).isEqualTo(2); }); } diff --git a/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/integration/Library.java b/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/integration/Library.java index dffbd7fbb..bdc4fbc5e 100644 --- a/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/integration/Library.java +++ b/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/integration/Library.java @@ -22,12 +22,12 @@ import java.util.stream.Stream; @Repository -public interface Library extends CouchbaseRepository { +public interface Library extends CouchbaseRepository { - Stream findByEditionLessThan(Integer edition); + Stream findByEditionLessThan(Integer edition); - Stream findByEditionGreaterThan(Integer edition); + Stream findByEditionGreaterThan(Integer edition); - Stream findByTitleLike(String title); + Stream findByTitleLike(String title); } diff --git a/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/integration/Book.java b/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/integration/Magazine.java similarity index 87% rename from jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/integration/Book.java rename to jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/integration/Magazine.java index 416034b43..e1d05bfc0 100644 --- a/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/integration/Book.java +++ b/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/integration/Magazine.java @@ -19,5 +19,5 @@ import jakarta.nosql.Id; @Entity -public record Book(@Id String id, @Column("title") String title, @Column("edition") int edition) { +public record Magazine(@Id String id, @Column("title") String title, @Column("edition") int edition) { } diff --git a/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/integration/TemplateIntegrationTest.java b/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/integration/TemplateIntegrationTest.java index b0e79928e..ead09f3e3 100644 --- a/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/integration/TemplateIntegrationTest.java +++ b/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/integration/TemplateIntegrationTest.java @@ -43,7 +43,7 @@ @EnableAutoWeld @AddPackages(value = {Database.class, Converters.class, EntityConverter.class, DocumentTemplate.class}) -@AddPackages(Book.class) +@AddPackages(Magazine.class) @AddExtensions({EntityMetadataExtension.class, DocumentExtension.class}) @AddPackages(Reflections.class) @@ -60,57 +60,57 @@ class TemplateIntegrationTest { @BeforeEach @AfterEach public void cleanUp() { - template.delete(Book.class).execute(); + template.delete(Magazine.class).execute(); } @Test public void shouldInsert() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - template.insert(book); - Optional optional = template.find(Book.class, book.id()); + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + template.insert(magazine); + Optional optional = template.find(Magazine.class, magazine.id()); assertThat(optional).isNotNull().isNotEmpty() - .get().isEqualTo(book); + .get().isEqualTo(magazine); } @Test public void shouldUpdate() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - Book updated = new Book(book.id(), book.title() + " updated", 2); + Magazine updated = new Magazine(magazine.id(), magazine.title() + " updated", 2); assertThat(template.update(updated)) .isNotNull() - .isNotEqualTo(book); + .isNotEqualTo(magazine); - assertThat(template.find(Book.class, book.id())) + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().get().isEqualTo(updated); } @Test public void shouldFindById() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - assertThat(template.find(Book.class, book.id())) - .isNotNull().get().isEqualTo(book); + assertThat(template.find(Magazine.class, magazine.id())) + .isNotNull().get().isEqualTo(magazine); } @Test public void shouldDelete() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - template.delete(Book.class, book.id()); - assertThat(template.find(Book.class, book.id())) + template.delete(Magazine.class, magazine.id()); + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().isEmpty(); } diff --git a/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/mapping/CouchbaseDocumentRepositoryProxyTest.java b/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/mapping/CouchbaseDocumentRepositoryProxyTest.java index 74eee6b4e..0c74161d5 100644 --- a/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/mapping/CouchbaseDocumentRepositoryProxyTest.java +++ b/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/mapping/CouchbaseDocumentRepositoryProxyTest.java @@ -61,7 +61,7 @@ public class CouchbaseDocumentRepositoryProxyTest { @Inject private EntitiesMetadata entitiesMetadata; - private PersonRepository personRepository; + private HumanRepository humanRepository; @BeforeEach @@ -69,27 +69,27 @@ public void setUp() { this.template = Mockito.mock(CouchbaseTemplate.class); CouchbaseDocumentRepositoryProxy handler = new CouchbaseDocumentRepositoryProxy(template, - PersonRepository.class, converters, entitiesMetadata); + HumanRepository.class, converters, entitiesMetadata); - when(template.insert(any(Person.class))).thenReturn(new Person()); - when(template.insert(any(Person.class), any(Duration.class))).thenReturn(new Person()); - when(template.update(any(Person.class))).thenReturn(new Person()); - personRepository = (PersonRepository) Proxy.newProxyInstance(PersonRepository.class.getClassLoader(), - new Class[]{PersonRepository.class}, + when(template.insert(any(Human.class))).thenReturn(new Human()); + when(template.insert(any(Human.class), any(Duration.class))).thenReturn(new Human()); + when(template.update(any(Human.class))).thenReturn(new Human()); + humanRepository = (HumanRepository) Proxy.newProxyInstance(HumanRepository.class.getClassLoader(), + new Class[]{HumanRepository.class}, handler); } @Test public void shouldFindAll() { - personRepository.findAllQuery(); + humanRepository.findAllQuery(); verify(template).n1qlQuery("select * from Person"); } @Test public void shouldFindByNameN1ql() { ArgumentCaptor captor = ArgumentCaptor.forClass(JsonObject.class); - personRepository.findByName("Ada"); + humanRepository.findByName("Ada"); verify(template).n1qlQuery(Mockito.eq("select * from Person where name = $name"), captor.capture()); JsonObject value = captor.getValue(); @@ -99,40 +99,40 @@ public void shouldFindByNameN1ql() { @Test public void shouldSaveUsingInsert() { - Person person = Person.of("Ada", 10); - personRepository.save(person); - verify(template).insert(eq(person)); + Human human = Human.of("Ada", 10); + humanRepository.save(human); + verify(template).insert(eq(human)); } @Test public void shouldSaveUsingUpdate() { - Person person = Person.of("Ada-2", 10); - when(template.find(Person.class, "Ada-2")).thenReturn(Optional.of(person)); - personRepository.save(person); - verify(template).update(eq(person)); + Human human = Human.of("Ada-2", 10); + when(template.find(Human.class, "Ada-2")).thenReturn(Optional.of(human)); + humanRepository.save(human); + verify(template).update(eq(human)); } @Test public void shouldDelete(){ - personRepository.deleteById("id"); - verify(template).delete(Person.class, "id"); + humanRepository.deleteById("id"); + verify(template).delete(Human.class, "id"); } @Test public void shouldDeleteEntity(){ - Person person = Person.of("Ada", 10); - personRepository.delete(person); - verify(template).delete(Person.class, person.getName()); + Human human = Human.of("Ada", 10); + humanRepository.delete(human); + verify(template).delete(Human.class, human.getName()); } - interface PersonRepository extends CouchbaseRepository { + interface HumanRepository extends CouchbaseRepository { @N1QL("select * from Person") - List findAllQuery(); + List findAllQuery(); @N1QL("select * from Person where name = $name") - List findByName(@Param("name") String name); + List findByName(@Param("name") String name); } } \ No newline at end of file diff --git a/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/mapping/CouchbaseExtensionTest.java b/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/mapping/CouchbaseExtensionTest.java index b47d6e482..aba7d5226 100644 --- a/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/mapping/CouchbaseExtensionTest.java +++ b/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/mapping/CouchbaseExtensionTest.java @@ -37,7 +37,7 @@ @AddPackages(Reflections.class) public class CouchbaseExtensionTest { @Inject - private PersonRepository repository; + private HumanRepository repository; @Test public void shouldSaveOrientDB() { diff --git a/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/mapping/Person.java b/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/mapping/Human.java similarity index 83% rename from jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/mapping/Person.java rename to jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/mapping/Human.java index b21dca58a..fa4e01978 100644 --- a/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/mapping/Person.java +++ b/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/mapping/Human.java @@ -22,7 +22,7 @@ import java.util.Objects; @Entity -public class Person { +public class Human { @Id private String name; @@ -46,21 +46,21 @@ public void setAge(Integer age) { this.age = age; } - public Person(String name, Integer age) { + public Human(String name, Integer age) { this.name = name; this.age = age; } - public Person() { + public Human() { } @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - Person person = (Person) o; - return Objects.equals(name, person.name) && - Objects.equals(age, person.age); + Human human = (Human) o; + return Objects.equals(name, human.name) && + Objects.equals(age, human.age); } @Override @@ -76,7 +76,7 @@ public String toString() { '}'; } - public static Person of(String name, Integer age) { - return new Person(name, age); + public static Human of(String name, Integer age) { + return new Human(name, age); } } diff --git a/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/mapping/PersonRepository.java b/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/mapping/HumanRepository.java similarity index 89% rename from jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/mapping/PersonRepository.java rename to jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/mapping/HumanRepository.java index 768f138e7..a507570c0 100644 --- a/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/mapping/PersonRepository.java +++ b/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/mapping/HumanRepository.java @@ -18,5 +18,5 @@ import jakarta.data.repository.Repository; @Repository -public interface PersonRepository extends CouchbaseRepository { +public interface HumanRepository extends CouchbaseRepository { } diff --git a/jnosql-couchbase/src/test/resources/couchbase.properties b/jnosql-couchbase/src/test/resources/couchbase.properties index c59d22506..7501c5dd5 100644 --- a/jnosql-couchbase/src/test/resources/couchbase.properties +++ b/jnosql-couchbase/src/test/resources/couchbase.properties @@ -15,5 +15,5 @@ jnosql.couchbase.host=couchbase://localhost jnosql.couchbase.user=root jnosql.couchbase.password=123456 -jnosql.couchbase.collections=Book,person,AppointmentBook,jnosql -jnosql.couchbase.index=Book,person,AppointmentBook,jnosql \ No newline at end of file +jnosql.couchbase.collections=Book,contact,AppointmentBook,jnosql,Magazine +jnosql.couchbase.index=Book,contact,AppointmentBook,jnosql,Magazine \ No newline at end of file diff --git a/jnosql-couchbase/src/test/resources/document.properties b/jnosql-couchbase/src/test/resources/document.properties index d9625b9a3..b5f11fb4e 100644 --- a/jnosql-couchbase/src/test/resources/document.properties +++ b/jnosql-couchbase/src/test/resources/document.properties @@ -1,3 +1,3 @@ -query.1=insert person {"_id": 1, "name": "Diana"} -query.2=insert person {"_id": 2, "name": "Artemis"} +query.1=insert contact {"_id": 1, "name": "Diana"} +query.2=insert contact {"_id": 2, "name": "Artemis"} id.name=_id \ No newline at end of file diff --git a/jnosql-couchbase/src/test/resources/document_ttl.properties b/jnosql-couchbase/src/test/resources/document_ttl.properties index 24934e0ca..0cf311b6f 100644 --- a/jnosql-couchbase/src/test/resources/document_ttl.properties +++ b/jnosql-couchbase/src/test/resources/document_ttl.properties @@ -1,3 +1,3 @@ -query.1=insert person {"_id": 1, "name": "Diana"} 1 second -query.2=insert person {"_id": 2, "name": "Artemis"} 1 second +query.1=insert contact {"_id": 1, "name": "Diana"} 1 second +query.2=insert contact {"_id": 2, "name": "Artemis"} 1 second id.name=_id \ No newline at end of file diff --git a/jnosql-couchdb/src/test/resources/document.properties b/jnosql-couchdb/src/test/resources/document.properties index 575d46363..55c368310 100644 --- a/jnosql-couchdb/src/test/resources/document.properties +++ b/jnosql-couchdb/src/test/resources/document.properties @@ -1,3 +1,3 @@ -query.1=insert person {"_id": "1", "name": "Diana"} -query.2=insert person {"_id": "2", "name": "Artemis"} +query.1=insert contact {"_id": "1", "name": "Diana"} +query.2=insert contact {"_id": "2", "name": "Artemis"} id.name=_id \ No newline at end of file diff --git a/jnosql-dynamodb/pom.xml b/jnosql-dynamodb/pom.xml index c9dc75f52..f0aac3eeb 100644 --- a/jnosql-dynamodb/pom.xml +++ b/jnosql-dynamodb/pom.xml @@ -22,7 +22,7 @@ The Eclipse JNoSQL layer implementation AWS DynamoDB - 2.27.2 + 2.29.45 diff --git a/jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/integration/DynamoDBTemplateIntegrationTest.java b/jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/integration/DynamoDBTemplateIntegrationTest.java index 6d9b4684a..4ffda2434 100644 --- a/jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/integration/DynamoDBTemplateIntegrationTest.java +++ b/jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/integration/DynamoDBTemplateIntegrationTest.java @@ -42,7 +42,7 @@ @EnableAutoWeld @AddPackages(value = {Converters.class, EntityConverter.class}) -@AddPackages(Book.class) +@AddPackages(Magazine.class) @AddPackages(DynamoDBTemplate.class) @AddExtensions({EntityMetadataExtension.class, DocumentExtension.class, DynamoDBExtension.class}) @AddPackages(Reflections.class) @@ -60,78 +60,78 @@ class DynamoDBTemplateIntegrationTest { @Test void shouldInsert() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - template.insert(book); - Optional optional = template.find(Book.class, book.id()); + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + template.insert(magazine); + Optional optional = template.find(Magazine.class, magazine.id()); assertThat(optional).isNotNull().isNotEmpty() - .get().isEqualTo(book); + .get().isEqualTo(magazine); } @Test void shouldUpdate() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - Book updated = new Book(book.id(), book.title() + " updated", 2); + Magazine updated = new Magazine(magazine.id(), magazine.title() + " updated", 2); assertThat(template.update(updated)) .isNotNull() - .isNotEqualTo(book); + .isNotEqualTo(magazine); - assertThat(template.find(Book.class, book.id())) + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().get().isEqualTo(updated); } @Test void shouldFindById() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - assertThat(template.find(Book.class, book.id())) - .isNotNull().get().isEqualTo(book); + assertThat(template.find(Magazine.class, magazine.id())) + .isNotNull().get().isEqualTo(magazine); } @Test void shouldDelete() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - template.delete(Book.class, book.id()); - assertThat(template.find(Book.class, book.id())) + template.delete(Magazine.class, magazine.id()); + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().isEmpty(); } @Test void shouldDeleteAll() { for (int index = 0; index < 20; index++) { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); } - template.delete(Book.class).execute(); - assertThat(template.select(Book.class).result()).isEmpty(); + template.delete(Magazine.class).execute(); + assertThat(template.select(Magazine.class).result()).isEmpty(); } @Test void shouldUpdateNullValues() { - var book = new Book(randomUUID().toString(), "Effective Java", 1); + var book = new Magazine(randomUUID().toString(), "Effective Java", 1); template.insert(book); - template.update(new Book(book.id(), null, 2)); - Optional optional = template.select(Book.class).where("id") + template.update(new Magazine(book.id(), null, 2)); + Optional optional = template.select(Magazine.class).where("id") .eq(book.id()).singleResult(); assertSoftly(softly -> { softly.assertThat(optional).isPresent(); - softly.assertThat(optional).get().extracting(Book::title).isNull(); - softly.assertThat(optional).get().extracting(Book::edition).isEqualTo(2); + softly.assertThat(optional).get().extracting(Magazine::title).isNull(); + softly.assertThat(optional).get().extracting(Magazine::edition).isEqualTo(2); }); } diff --git a/jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/integration/Book.java b/jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/integration/Magazine.java similarity index 84% rename from jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/integration/Book.java rename to jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/integration/Magazine.java index b6160ec61..14d9fa01a 100644 --- a/jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/integration/Book.java +++ b/jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/integration/Magazine.java @@ -22,7 +22,7 @@ import java.util.Objects; @Entity -public class Book { +public class Magazine { @Id("id") private String id; @@ -33,13 +33,13 @@ public class Book { @Column("edition") private int edition; - public Book(String id, String title, int edition) { + public Magazine(String id, String title, int edition) { this.id = id; this.title = title; this.edition = edition; } - Book() { + Magazine() { } public String id() { @@ -58,10 +58,10 @@ public int edition() { public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - Book book = (Book) o; - return edition == book.edition - && Objects.equals(id, book.id) - && Objects.equals(title, book.title); + Magazine magazine = (Magazine) o; + return edition == magazine.edition + && Objects.equals(id, magazine.id) + && Objects.equals(title, magazine.title); } @Override diff --git a/jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/mapping/DefaultDynamoDBTemplateTest.java b/jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/mapping/DefaultDynamoDBTemplateTest.java index a34399d4a..ca4e678e7 100644 --- a/jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/mapping/DefaultDynamoDBTemplateTest.java +++ b/jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/mapping/DefaultDynamoDBTemplateTest.java @@ -88,11 +88,11 @@ void shouldFindSQLWithTypeAndParameters() { @Test void shouldDeleteAll(){ ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(DeleteQuery.class); - template.deleteAll(Person.class); + template.deleteAll(Human.class); Mockito.verify(manager).delete(argumentCaptor.capture()); var query = argumentCaptor.getValue(); SoftAssertions.assertSoftly(soft -> { - soft.assertThat(query.name()).isEqualTo("Person"); + soft.assertThat(query.name()).isEqualTo("Human"); soft.assertThat(query.columns()).isEmpty(); soft.assertThat(query.condition()).isEmpty(); }); diff --git a/jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/mapping/DynamoDBExtensionTest.java b/jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/mapping/DynamoDBExtensionTest.java index 524f3c696..e86e9e03b 100644 --- a/jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/mapping/DynamoDBExtensionTest.java +++ b/jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/mapping/DynamoDBExtensionTest.java @@ -38,7 +38,7 @@ public class DynamoDBExtensionTest { @Inject - private PersonNoSQLRepository repository; + private HumanNoSQLRepository repository; @Test public void shouldSave() { diff --git a/jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/mapping/DynamoDBRepositoryProxyTest.java b/jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/mapping/DynamoDBRepositoryProxyTest.java index 4596ebd8e..d515620dc 100644 --- a/jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/mapping/DynamoDBRepositoryProxyTest.java +++ b/jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/mapping/DynamoDBRepositoryProxyTest.java @@ -57,7 +57,7 @@ class DynamoDBRepositoryProxyTest { @Inject private Converters converters; - private PersonNoSQLRepository personRepository; + private HumanNoSQLRepository personRepository; @SuppressWarnings("rawtypes") @BeforeEach @@ -65,14 +65,14 @@ void setUp() { this.template = Mockito.mock(DynamoDBTemplate.class); DynamoDBRepositoryProxy handler = new DynamoDBRepositoryProxy<>(template, - PersonNoSQLRepository.class, converters, entitiesMetadata); + HumanNoSQLRepository.class, converters, entitiesMetadata); - when(template.insert(any(Person.class))).thenReturn(new Person()); - when(template.insert(any(Person.class), any(Duration.class))).thenReturn(new Person()); - when(template.update(any(Person.class))).thenReturn(new Person()); + when(template.insert(any(Human.class))).thenReturn(new Human()); + when(template.insert(any(Human.class), any(Duration.class))).thenReturn(new Human()); + when(template.update(any(Human.class))).thenReturn(new Human()); - this.personRepository = (PersonNoSQLRepository) Proxy.newProxyInstance(PersonNoSQLRepository.class.getClassLoader(), - new Class[]{PersonNoSQLRepository.class}, + this.personRepository = (HumanNoSQLRepository) Proxy.newProxyInstance(HumanNoSQLRepository.class.getClassLoader(), + new Class[]{HumanNoSQLRepository.class}, handler); } @@ -94,32 +94,32 @@ public void shouldFindByNameSQL() { @Test public void shouldSaveUsingInsert() { - Person person = Person.of("Ada", 10); - personRepository.save(person); - verify(template).insert(eq(person)); + Human human = Human.of("Ada", 10); + personRepository.save(human); + verify(template).insert(eq(human)); } @Test public void shouldSaveUsingUpdate() { - Person person = Person.of("Ada-2", 10); - when(template.find(Person.class, "Ada-2")).thenReturn(Optional.of(person)); - personRepository.save(person); - verify(template).update(eq(person)); + Human human = Human.of("Ada-2", 10); + when(template.find(Human.class, "Ada-2")).thenReturn(Optional.of(human)); + personRepository.save(human); + verify(template).update(eq(human)); } @Test public void shouldDelete(){ personRepository.deleteById("id"); - verify(template).delete(Person.class, "id"); + verify(template).delete(Human.class, "id"); } @Test public void shouldDeleteEntity(){ - Person person = Person.of("Ada", 10); - personRepository.delete(person); - verify(template).delete(Person.class, person.getName()); + Human human = Human.of("Ada", 10); + personRepository.delete(human); + verify(template).delete(Human.class, human.getName()); } @Test @@ -130,16 +130,16 @@ public void shouldDeleteAll() { verify(template).deleteAll(queryCaptor.capture()); Class query = queryCaptor.getValue(); - Assertions.assertThat(query).isEqualTo(Person.class); + Assertions.assertThat(query).isEqualTo(Human.class); } - interface PersonNoSQLRepository extends DynamoDBRepository { + interface HumanNoSQLRepository extends DynamoDBRepository { @PartiQL("select * from Person") - List findAllQuery(); + List findAllQuery(); @PartiQL("select * from Person where name= ?") - List findByName(@Param("") String name); + List findByName(@Param("") String name); } } diff --git a/jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/mapping/Person.java b/jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/mapping/Human.java similarity index 83% rename from jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/mapping/Person.java rename to jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/mapping/Human.java index 40e3705a5..49827c8f6 100644 --- a/jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/mapping/Person.java +++ b/jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/mapping/Human.java @@ -22,7 +22,7 @@ import java.util.Objects; @Entity -public class Person { +public class Human { @Id private String name; @@ -46,21 +46,21 @@ public void setAge(Integer age) { this.age = age; } - public Person(String name, Integer age) { + public Human(String name, Integer age) { this.name = name; this.age = age; } - public Person() { + public Human() { } @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - Person person = (Person) o; - return Objects.equals(name, person.name) && - Objects.equals(age, person.age); + Human human = (Human) o; + return Objects.equals(name, human.name) && + Objects.equals(age, human.age); } @Override @@ -76,7 +76,7 @@ public String toString() { '}'; } - public static Person of(String name, Integer age) { - return new Person(name, age); + public static Human of(String name, Integer age) { + return new Human(name, age); } } \ No newline at end of file diff --git a/jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/mapping/PersonNoSQLRepository.java b/jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/mapping/HumanNoSQLRepository.java similarity index 89% rename from jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/mapping/PersonNoSQLRepository.java rename to jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/mapping/HumanNoSQLRepository.java index d05fd8084..506408558 100644 --- a/jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/mapping/PersonNoSQLRepository.java +++ b/jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/mapping/HumanNoSQLRepository.java @@ -18,5 +18,5 @@ import jakarta.data.repository.Repository; @Repository -public interface PersonNoSQLRepository extends DynamoDBRepository { +public interface HumanNoSQLRepository extends DynamoDBRepository { } diff --git a/jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/integration/ElasticsearchTemplateIntegrationTest.java b/jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/integration/ElasticsearchTemplateIntegrationTest.java index 81aaf65fd..a2aca0482 100644 --- a/jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/integration/ElasticsearchTemplateIntegrationTest.java +++ b/jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/integration/ElasticsearchTemplateIntegrationTest.java @@ -49,7 +49,7 @@ @EnableAutoWeld @AddPackages(value = {Database.class, Converters.class, EntityConverter.class, DocumentTemplate.class}) -@AddPackages(Book.class) +@AddPackages(Magazine.class) @AddPackages(ElasticsearchTemplate.class) @AddExtensions({EntityMetadataExtension.class, DocumentExtension.class}) @@ -82,35 +82,35 @@ public void clearDatabase(){ @Test public void shouldInsert() { Author joshuaBloch = new Author("Joshua Bloch"); - Book book = new Book(randomUUID().toString(), "Effective Java", 1, joshuaBloch); - template.insert(book); + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1, joshuaBloch); + template.insert(magazine); - AtomicReference reference = new AtomicReference<>(); + AtomicReference reference = new AtomicReference<>(); await().until(() -> { - Optional optional = template.find(Book.class, book.id()); + Optional optional = template.find(Magazine.class, magazine.id()); optional.ifPresent(reference::set); return optional.isPresent(); }); - assertThat(reference.get()).isNotNull().isEqualTo(book); + assertThat(reference.get()).isNotNull().isEqualTo(magazine); } @Test public void shouldUpdate() { Author joshuaBloch = new Author("Joshua Bloch"); - Book book = new Book(randomUUID().toString(), "Effective Java", 1, joshuaBloch); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1, joshuaBloch); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - Book updated = book.updateEdition(book.edition() + 1); + Magazine updated = magazine.updateEdition(magazine.edition() + 1); assertThat(template.update(updated)) .isNotNull() - .isNotEqualTo(book); + .isNotEqualTo(magazine); - AtomicReference reference = new AtomicReference<>(); + AtomicReference reference = new AtomicReference<>(); await().until(() -> { - Optional optional = template.find(Book.class, book.id()); + Optional optional = template.find(Magazine.class, magazine.id()); optional.ifPresent(reference::set); return optional.isPresent(); }); @@ -121,32 +121,32 @@ public void shouldUpdate() { @Test public void shouldFindById() { Author joshuaBloch = new Author("Joshua Bloch"); - Book book = new Book(randomUUID().toString(), "Effective Java", 1, joshuaBloch); + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1, joshuaBloch); - assertThat(template.insert(book)) + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - AtomicReference reference = new AtomicReference<>(); + AtomicReference reference = new AtomicReference<>(); await().until(() -> { - Optional optional = template.find(Book.class, book.id()); + Optional optional = template.find(Magazine.class, magazine.id()); optional.ifPresent(reference::set); return optional.isPresent(); }); - assertThat(reference.get()).isNotNull().isEqualTo(book); + assertThat(reference.get()).isNotNull().isEqualTo(magazine); } @Test public void shouldDelete() { Author joshuaBloch = new Author("Joshua Bloch"); - Book book = new Book(randomUUID().toString(), "Effective Java", 1, joshuaBloch); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1, joshuaBloch); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - template.delete(Book.class, book.id()); - assertThat(template.find(Book.class, book.id())) + template.delete(Magazine.class, magazine.id()); + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().isEmpty(); } diff --git a/jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/integration/Library.java b/jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/integration/Library.java index ccbbe22f5..54c3874de 100644 --- a/jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/integration/Library.java +++ b/jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/integration/Library.java @@ -24,11 +24,11 @@ import java.util.stream.Stream; @Repository -public interface Library extends CrudRepository { +public interface Library extends CrudRepository { @Query("select * from Book where author.name = @name") - Stream findByAuthorName(@Param("name") String name); + Stream findByAuthorName(@Param("name") String name); - Stream findByTitleLike( String title); + Stream findByTitleLike(String title); } diff --git a/jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/integration/Book.java b/jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/integration/Magazine.java similarity index 90% rename from jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/integration/Book.java rename to jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/integration/Magazine.java index 2a806aeb2..c636dbf27 100644 --- a/jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/integration/Book.java +++ b/jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/integration/Magazine.java @@ -22,7 +22,7 @@ import java.util.UUID; @Entity -public final class Book { +public final class Magazine { @Id private final String id; @Column("title") @@ -32,7 +32,7 @@ public final class Book { @Column("author") private final Author author; - public Book( + public Magazine( @Id String id, @Column("title") String title, @Column("edition") int edition, @@ -43,15 +43,15 @@ public Book( this.author = author; } - public Book newEdition() { - return new Book(UUID.randomUUID().toString(), + public Magazine newEdition() { + return new Magazine(UUID.randomUUID().toString(), this.title, this.edition + 1, this.author); } - public Book updateEdition(int edition) { - return new Book(this.id, + public Magazine updateEdition(int edition) { + return new Magazine(this.id, this.title, edition, this.author); @@ -77,7 +77,7 @@ public Author author() { public boolean equals(Object obj) { if (obj == this) return true; if (obj == null || obj.getClass() != this.getClass()) return false; - var that = (Book) obj; + var that = (Magazine) obj; return Objects.equals(this.id, that.id) && Objects.equals(this.title, that.title) && this.edition == that.edition && diff --git a/jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/integration/RepositoryIntegrationTest.java b/jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/integration/RepositoryIntegrationTest.java index b5ecb27d0..06372d7fa 100644 --- a/jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/integration/RepositoryIntegrationTest.java +++ b/jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/integration/RepositoryIntegrationTest.java @@ -51,7 +51,7 @@ @EnableAutoWeld @AddPackages(value = {Database.class, Converters.class, EntityConverter.class, DocumentTemplate.class}) -@AddPackages(Book.class) +@AddPackages(Magazine.class) @AddPackages(ElasticsearchTemplate.class) @AddExtensions({EntityMetadataExtension.class, DocumentExtension.class}) @@ -83,35 +83,35 @@ public void clearDatabase() { @Test public void shouldInsert() { Author joshuaBloch = new Author("Joshua Bloch"); - Book book = new Book(randomUUID().toString(), "Effective Java", 1, joshuaBloch); - library.save(book); + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1, joshuaBloch); + library.save(magazine); - AtomicReference reference = new AtomicReference<>(); + AtomicReference reference = new AtomicReference<>(); await().until(() -> { - Optional optional = library.findById(book.id()); + Optional optional = library.findById(magazine.id()); optional.ifPresent(reference::set); return optional.isPresent(); }); - assertThat(reference.get()).isNotNull().isEqualTo(book); + assertThat(reference.get()).isNotNull().isEqualTo(magazine); } @Test public void shouldUpdate() { Author joshuaBloch = new Author("Joshua Bloch"); - Book book = new Book(randomUUID().toString(), "Effective Java", 1, joshuaBloch); - assertThat(library.save(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1, joshuaBloch); + assertThat(library.save(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - Book updated = book.updateEdition(2); + Magazine updated = magazine.updateEdition(2); assertThat(library.save(updated)) .isNotNull() - .isNotEqualTo(book); + .isNotEqualTo(magazine); - AtomicReference reference = new AtomicReference<>(); + AtomicReference reference = new AtomicReference<>(); await().until(() -> { - Optional optional = library.findById(book.id()); + Optional optional = library.findById(magazine.id()); optional.ifPresent(reference::set); return optional.isPresent(); }); @@ -122,34 +122,34 @@ public void shouldUpdate() { @Test public void shouldFindById() { Author joshuaBloch = new Author("Joshua Bloch"); - Book book = new Book(randomUUID().toString(), "Effective Java", 1, joshuaBloch); + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1, joshuaBloch); - assertThat(library.save(book)) + assertThat(library.save(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - AtomicReference reference = new AtomicReference<>(); + AtomicReference reference = new AtomicReference<>(); await().until(() -> { - Optional optional = library.findById(book.id()); + Optional optional = library.findById(magazine.id()); optional.ifPresent(reference::set); return optional.isPresent(); }); - assertThat(reference.get()).isNotNull().isEqualTo(book); + assertThat(reference.get()).isNotNull().isEqualTo(magazine); } @Test public void shouldDelete() { Author joshuaBloch = new Author("Joshua Bloch"); - Book book = new Book(randomUUID().toString(), "Effective Java", 1, joshuaBloch); - assertThat(library.save(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1, joshuaBloch); + assertThat(library.save(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - library.deleteById(book.id()); + library.deleteById(magazine.id()); - assertThat(library.findById(book.id())) + assertThat(library.findById(magazine.id())) .isNotNull().isEmpty(); } @@ -157,47 +157,47 @@ public void shouldDelete() { @Test public void shouldFindByAuthorName() throws InterruptedException { Author joshuaBloch = new Author("Joshua Bloch"); - Book book = new Book(randomUUID().toString(), "Effective Java", 1, joshuaBloch); + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1, joshuaBloch); - List expectedBooks = List.of(book, book.newEdition(), book.newEdition()); - library.saveAll(expectedBooks); + List expectedMagazines = List.of(magazine, magazine.newEdition(), magazine.newEdition()); + library.saveAll(expectedMagazines); await().until(() -> - !library.findByAuthorName(book.author().name()).toList().isEmpty()); + !library.findByAuthorName(magazine.author().name()).toList().isEmpty()); - var books = library.findByAuthorName(book.author().name()).toList(); + var books = library.findByAuthorName(magazine.author().name()).toList(); assertThat(books) .hasSize(3); assertThat(books) - .containsAll(expectedBooks); + .containsAll(expectedMagazines); } @Test public void shouldFindByTitleLike() throws InterruptedException { Author joshuaBloch = new Author("Joshua Bloch"); - Book effectiveJava1stEdition = new Book(randomUUID().toString(), "Effective Java", 1, joshuaBloch); - Book effectiveJava2ndEdition = effectiveJava1stEdition.newEdition(); - Book effectiveJava3rdEdition = effectiveJava2ndEdition.newEdition(); + Magazine effectiveJava1stEdition = new Magazine(randomUUID().toString(), "Effective Java", 1, joshuaBloch); + Magazine effectiveJava2ndEdition = effectiveJava1stEdition.newEdition(); + Magazine effectiveJava3rdEdition = effectiveJava2ndEdition.newEdition(); Author elderMoraes = new Author("Elder Moraes"); - Book jakartaEECookBook = new Book(randomUUID().toString(), "Jakarta EE CookBook", 1, elderMoraes); + Magazine jakartaEECookMagazine = new Magazine(randomUUID().toString(), "Jakarta EE CookBook", 1, elderMoraes); - List allBooks = List.of(jakartaEECookBook, effectiveJava1stEdition, effectiveJava2ndEdition, effectiveJava3rdEdition); + List allMagazines = List.of(jakartaEECookMagazine, effectiveJava1stEdition, effectiveJava2ndEdition, effectiveJava3rdEdition); - List effectiveBooks = List.of(effectiveJava1stEdition, effectiveJava2ndEdition, effectiveJava3rdEdition); + List effectiveMagazines = List.of(effectiveJava1stEdition, effectiveJava2ndEdition, effectiveJava3rdEdition); - library.saveAll(allBooks); + library.saveAll(allMagazines); - AtomicReference> booksWithEffective = new AtomicReference<>(); + AtomicReference> booksWithEffective = new AtomicReference<>(); await().until(() -> { var books = library.findByTitleLike("Effective").toList(); booksWithEffective.set(books); return !books.isEmpty(); }); - AtomicReference> booksWithJa = new AtomicReference<>(); + AtomicReference> booksWithJa = new AtomicReference<>(); await().until(() -> { var books = library.findByTitleLike("Ja*").toList(); booksWithJa.set(books); @@ -206,12 +206,12 @@ public void shouldFindByTitleLike() throws InterruptedException { assertSoftly(softly -> assertThat(booksWithEffective.get()) .as("returned book list with 'Effective' is not equals to the expected items ") - .containsAll(effectiveBooks)); + .containsAll(effectiveMagazines)); assertSoftly(softly -> assertThat(booksWithJa.get()) .as("returned book list with 'Ja*' is not equals to the expected items ") - .containsAll(allBooks)); + .containsAll(allMagazines)); } diff --git a/jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/integration/TemplateIntegrationTest.java b/jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/integration/TemplateIntegrationTest.java index 93e5dbd03..2666b9a1e 100644 --- a/jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/integration/TemplateIntegrationTest.java +++ b/jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/integration/TemplateIntegrationTest.java @@ -48,7 +48,7 @@ @EnableAutoWeld @AddPackages(value = {Database.class, Converters.class, EntityConverter.class, DocumentTemplate.class}) -@AddPackages(Book.class) +@AddPackages(Magazine.class) @AddPackages(Reflections.class) @AddExtensions({EntityMetadataExtension.class, DocumentExtension.class}) @@ -79,35 +79,35 @@ public void clearDatabase(){ @Test public void shouldInsert() { Author joshuaBloch = new Author("Joshua Bloch"); - Book book = new Book(randomUUID().toString(), "Effective Java", 1, joshuaBloch); - template.insert(book); + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1, joshuaBloch); + template.insert(magazine); - AtomicReference reference = new AtomicReference<>(); + AtomicReference reference = new AtomicReference<>(); await().until(() -> { - Optional optional = template.find(Book.class, book.id()); + Optional optional = template.find(Magazine.class, magazine.id()); optional.ifPresent(reference::set); return optional.isPresent(); }); - assertThat(reference.get()).isNotNull().isEqualTo(book); + assertThat(reference.get()).isNotNull().isEqualTo(magazine); } @Test public void shouldUpdate() { Author joshuaBloch = new Author("Joshua Bloch"); - Book book = new Book(randomUUID().toString(), "Effective Java", 1, joshuaBloch); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1, joshuaBloch); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - Book updated = book.updateEdition(book.edition() + 1); + Magazine updated = magazine.updateEdition(magazine.edition() + 1); assertThat(template.update(updated)) .isNotNull() - .isNotEqualTo(book); + .isNotEqualTo(magazine); - AtomicReference reference = new AtomicReference<>(); + AtomicReference reference = new AtomicReference<>(); await().until(() -> { - Optional optional = template.find(Book.class, book.id()); + Optional optional = template.find(Magazine.class, magazine.id()); optional.ifPresent(reference::set); return optional.isPresent(); }); @@ -118,31 +118,31 @@ public void shouldUpdate() { @Test public void shouldFindById() { Author joshuaBloch = new Author("Joshua Bloch"); - Book book = new Book(randomUUID().toString(), "Effective Java", 1, joshuaBloch); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1, joshuaBloch); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - AtomicReference reference = new AtomicReference<>(); + AtomicReference reference = new AtomicReference<>(); await().until(() -> { - Optional optional = template.find(Book.class, book.id()); + Optional optional = template.find(Magazine.class, magazine.id()); optional.ifPresent(reference::set); return optional.isPresent(); }); - assertThat(reference.get()).isNotNull().isEqualTo(book); + assertThat(reference.get()).isNotNull().isEqualTo(magazine); } @Test public void shouldDelete() { Author joshuaBloch = new Author("Joshua Bloch"); - Book book = new Book(randomUUID().toString(), "Effective Java", 1, joshuaBloch); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1, joshuaBloch); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - template.delete(Book.class, book.id()); - assertThat(template.find(Book.class, book.id())) + template.delete(Magazine.class, magazine.id()); + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().isEmpty(); } diff --git a/jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/mapping/DefaultElasticsearchTemplateTest.java b/jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/mapping/DefaultElasticsearchTemplateTest.java index bcf98496c..0fe542c71 100644 --- a/jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/mapping/DefaultElasticsearchTemplateTest.java +++ b/jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/mapping/DefaultElasticsearchTemplateTest.java @@ -51,7 +51,7 @@ @EnableAutoWeld @AddPackages(value = {Converters.class, EntityConverter.class, DocumentTemplate.class, ElasticsearchTemplate.class}) -@AddPackages(Person.class) +@AddPackages(Human.class) @AddPackages(Reflections.class) @AddExtensions({EntityMetadataExtension.class, DocumentExtension.class}) @@ -81,7 +81,7 @@ public void setup() { when(instance.get()).thenReturn(manager); template = new DefaultElasticsearchTemplate(instance, converter, persistManager, entities, converters); - CommunicationEntity entity = CommunicationEntity.of("Person"); + CommunicationEntity entity = CommunicationEntity.of("Human"); entity.add(Element.of("name", "Ada")); entity.add(Element.of("age", 10)); when(manager.search(Mockito.any(SearchRequest.class))) @@ -94,9 +94,9 @@ public void shouldFindQuery() { Function> fn = q -> q.query(t -> t.match(MatchQuery.of(m -> m.field("field").query(2)))); SearchRequest request = fn.apply(new SearchRequest.Builder()).build(); - List people = template.search(request).collect(Collectors.toList()); + List people = template.search(request).collect(Collectors.toList()); - assertThat(people).contains(new Person("Ada", 10)); + assertThat(people).contains(new Human("Ada", 10)); Mockito.verify(manager).search(Mockito.eq(request)); } diff --git a/jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/mapping/Person.java b/jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/mapping/Human.java similarity index 83% rename from jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/mapping/Person.java rename to jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/mapping/Human.java index 15bafd697..d79e23dcb 100644 --- a/jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/mapping/Person.java +++ b/jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/mapping/Human.java @@ -21,7 +21,7 @@ import java.util.Objects; @Entity -public class Person { +public class Human { @Column private String name; @@ -45,21 +45,21 @@ public void setAge(Integer age) { this.age = age; } - public Person(String name, Integer age) { + public Human(String name, Integer age) { this.name = name; this.age = age; } - public Person() { + public Human() { } @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - Person person = (Person) o; - return Objects.equals(name, person.name) && - Objects.equals(age, person.age); + Human human = (Human) o; + return Objects.equals(name, human.name) && + Objects.equals(age, human.age); } @Override @@ -69,9 +69,8 @@ public int hashCode() { @Override public String toString() { - String sb = "Person{" + "name='" + name + '\'' + + return "Person{" + "name='" + name + '\'' + ", age=" + age + '}'; - return sb; } } diff --git a/jnosql-elasticsearch/src/test/resources/document.properties b/jnosql-elasticsearch/src/test/resources/document.properties index d9625b9a3..b5f11fb4e 100644 --- a/jnosql-elasticsearch/src/test/resources/document.properties +++ b/jnosql-elasticsearch/src/test/resources/document.properties @@ -1,3 +1,3 @@ -query.1=insert person {"_id": 1, "name": "Diana"} -query.2=insert person {"_id": 2, "name": "Artemis"} +query.1=insert contact {"_id": 1, "name": "Diana"} +query.2=insert contact {"_id": 2, "name": "Artemis"} id.name=_id \ No newline at end of file diff --git a/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/communication/model/Person.java b/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/communication/model/Human.java similarity index 74% rename from jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/communication/model/Person.java rename to jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/communication/model/Human.java index f2b4ddf68..4fec52539 100644 --- a/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/communication/model/Person.java +++ b/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/communication/model/Human.java @@ -18,17 +18,15 @@ import java.io.Serializable; -public record Person(String name, Integer age) implements Serializable { +public record Human(String name, Integer age) implements Serializable { private static final long serialVersionUID = 5089852596376703955L; @Override public String toString() { - final StringBuilder sb = new StringBuilder("Person{"); - sb.append("name='").append(name).append('\''); - sb.append(", age=").append(age); - sb.append('}'); - return sb.toString(); + return "Person{" + "name='" + name + '\'' + + ", age=" + age + + '}'; } } \ No newline at end of file diff --git a/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/communication/model/LineBank.java b/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/communication/model/LineBank.java index 79ad2261c..b4ff7cbb7 100644 --- a/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/communication/model/LineBank.java +++ b/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/communication/model/LineBank.java @@ -22,14 +22,14 @@ public class LineBank implements Serializable { - private final Person person; + private final Human human; - public Person getPerson() { - return person; + public Human getPerson() { + return human; } public LineBank(String name, Integer age) { - this.person = new Person(name, age); + this.human = new Human(name, age); } @@ -38,18 +38,18 @@ public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; LineBank lineBank = (LineBank) o; - return Objects.equals(person, lineBank.person); + return Objects.equals(human, lineBank.human); } @Override public int hashCode() { - return Objects.hash(person); + return Objects.hash(human); } @Override public String toString() { final StringBuilder sb = new StringBuilder("LineBank{"); - sb.append("person=").append(person); + sb.append("person=").append(human); sb.append('}'); return sb.toString(); } diff --git a/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/integration/HazelcastTemplateIntegrationTest.java b/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/integration/HazelcastTemplateIntegrationTest.java index 7a95545d3..ae32d6580 100644 --- a/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/integration/HazelcastTemplateIntegrationTest.java +++ b/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/integration/HazelcastTemplateIntegrationTest.java @@ -35,7 +35,7 @@ @EnableAutoWeld @AddPackages(value = {Converters.class, KeyValueEntityConverter.class}) -@AddPackages(Book.class) +@AddPackages(Magazine.class) @AddPackages(HazelcastTemplate.class) @AddPackages(Reflections.class) @AddExtensions({EntityMetadataExtension.class, @@ -51,38 +51,38 @@ class HazelcastTemplateIntegrationTest { @Test public void shouldPutValue() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - template.put(book); - Optional effective = template.get(book.id(), Book.class); + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + template.put(magazine); + Optional effective = template.get(magazine.id(), Magazine.class); assertThat(effective) .isNotNull() .isPresent() - .get().isEqualTo(book); + .get().isEqualTo(magazine); } @Test public void shouldGet() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - template.put(book); - Optional effective = template.get(book.id(), Book.class); + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + template.put(magazine); + Optional effective = template.get(magazine.id(), Magazine.class); assertThat(effective) .isNotNull() .isPresent() - .get().isEqualTo(book); + .get().isEqualTo(magazine); } @Test public void shouldDelete() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - template.put(book); - Optional effective = template.get(book.id(), Book.class); + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + template.put(magazine); + Optional effective = template.get(magazine.id(), Magazine.class); assertThat(effective) .isNotNull() .isPresent() - .get().isEqualTo(book); - template.delete(Book.class, book.id()); + .get().isEqualTo(magazine); + template.delete(Magazine.class, magazine.id()); - assertThat(template.get(book.id(), Book.class)) + assertThat(template.get(magazine.id(), Magazine.class)) .isEmpty(); } } diff --git a/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/integration/KeyValueTemplateIntegrationTest.java b/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/integration/KeyValueTemplateIntegrationTest.java index 010dbf85a..7bd3e60a2 100644 --- a/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/integration/KeyValueTemplateIntegrationTest.java +++ b/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/integration/KeyValueTemplateIntegrationTest.java @@ -36,7 +36,7 @@ @EnableAutoWeld @AddPackages(value = {Converters.class, KeyValueEntityConverter.class}) -@AddPackages(Book.class) +@AddPackages(Magazine.class) @AddPackages(Reflections.class) @AddPackages(HazelcastTemplate.class) @AddExtensions({EntityMetadataExtension.class, @@ -52,38 +52,38 @@ class KeyValueTemplateIntegrationTest { @Test public void shouldPutValue() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - template.put(book); - Optional effective = template.get(book.id(), Book.class); + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + template.put(magazine); + Optional effective = template.get(magazine.id(), Magazine.class); assertThat(effective) .isNotNull() .isPresent() - .get().isEqualTo(book); + .get().isEqualTo(magazine); } @Test public void shouldGet() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - template.put(book); - Optional effective = template.get(book.id(), Book.class); + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + template.put(magazine); + Optional effective = template.get(magazine.id(), Magazine.class); assertThat(effective) .isNotNull() .isPresent() - .get().isEqualTo(book); + .get().isEqualTo(magazine); } @Test public void shouldDelete() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - template.put(book); - Optional effective = template.get(book.id(), Book.class); + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + template.put(magazine); + Optional effective = template.get(magazine.id(), Magazine.class); assertThat(effective) .isNotNull() .isPresent() - .get().isEqualTo(book); - template.delete(Book.class, book.id()); + .get().isEqualTo(magazine); + template.delete(Magazine.class, magazine.id()); - assertThat(template.get(book.id(), Book.class)) + assertThat(template.get(magazine.id(), Magazine.class)) .isEmpty(); } } diff --git a/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/integration/Book.java b/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/integration/Magazine.java similarity index 86% rename from jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/integration/Book.java rename to jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/integration/Magazine.java index 66f1373c3..a48443c2b 100644 --- a/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/integration/Book.java +++ b/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/integration/Magazine.java @@ -21,7 +21,7 @@ import java.io.Serializable; @Entity -public record Book(@Id String id, @Column("title") String title, @Column("edition") int edition) implements Serializable { +public record Magazine(@Id String id, @Column("title") String title, @Column("edition") int edition) implements Serializable { } diff --git a/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/mapping/DefaultHazelcastTemplateTest.java b/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/mapping/DefaultHazelcastTemplateTest.java index 137f13332..68a234534 100644 --- a/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/mapping/DefaultHazelcastTemplateTest.java +++ b/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/mapping/DefaultHazelcastTemplateTest.java @@ -45,23 +45,23 @@ public class DefaultHazelcastTemplateTest { @Test public void shouldRunQuery() { - Collection people = template.sql("active"); + Collection people = template.sql("active"); assertNotNull(people); - assertTrue(people.stream().allMatch(Person.class::isInstance)); + assertTrue(people.stream().allMatch(Human.class::isInstance)); } @Test public void shouldRunQuery2() { - Collection people = template.sql("age = :age", singletonMap("age", 10)); + Collection people = template.sql("age = :age", singletonMap("age", 10)); assertNotNull(people); - assertTrue(people.stream().allMatch(Person.class::isInstance)); + assertTrue(people.stream().allMatch(Human.class::isInstance)); } @Test public void shouldRunQuery3() { - Collection people = template.sql(equal("name", "Poliana")); + Collection people = template.sql(equal("name", "Poliana")); assertNotNull(people); - assertTrue(people.stream().allMatch(Person.class::isInstance)); + assertTrue(people.stream().allMatch(Human.class::isInstance)); } } \ No newline at end of file diff --git a/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/mapping/HazelcastExtensionTest.java b/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/mapping/HazelcastExtensionTest.java index 453ce2183..2c7fd0a95 100644 --- a/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/mapping/HazelcastExtensionTest.java +++ b/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/mapping/HazelcastExtensionTest.java @@ -35,7 +35,7 @@ public class HazelcastExtensionTest { @Inject - private PersonRepository repository; + private HumanRepository repository; @Test public void shouldSave() { diff --git a/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/mapping/HazelcastRepositoryProxyTest.java b/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/mapping/HazelcastRepositoryProxyTest.java index df07738e8..64b3fd649 100644 --- a/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/mapping/HazelcastRepositoryProxyTest.java +++ b/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/mapping/HazelcastRepositoryProxyTest.java @@ -65,77 +65,77 @@ public class HazelcastRepositoryProxyTest { @Inject private EntitiesMetadata entitiesMetadata; - private PersonRepository personRepository; + private HumanRepository humanRepository; @SuppressWarnings("rawtypes") @BeforeEach public void setUp() { - Collection people = asList(new Person("Poliana", 25), new Person("Otavio", 28)); + Collection people = asList(new Human("Poliana", 25), new Human("Otavio", 28)); when(template.sql(anyString())).thenReturn(people); - HazelcastRepositoryProxy handler = new HazelcastRepositoryProxy<>(template, PersonRepository.class, entitiesMetadata); + HazelcastRepositoryProxy handler = new HazelcastRepositoryProxy<>(template, HumanRepository.class, entitiesMetadata); when(template.sql(anyString(), any(Map.class))).thenReturn(people); - personRepository = (PersonRepository) Proxy.newProxyInstance(PersonRepository.class.getClassLoader(), - new Class[]{PersonRepository.class}, + humanRepository = (HumanRepository) Proxy.newProxyInstance(HumanRepository.class.getClassLoader(), + new Class[]{HumanRepository.class}, handler); } @Test public void shouldFindAll() { - List people = personRepository.findActive(); + List people = humanRepository.findActive(); verify(template).sql("active"); assertNotNull(people); - assertTrue(people.stream().allMatch(Person.class::isInstance)); + assertTrue(people.stream().allMatch(Human.class::isInstance)); } @Test public void shouldFindByAgeAndInteger() { - Set people = personRepository.findByAgeAndInteger("Ada", 10); + Set people = humanRepository.findByAgeAndInteger("Ada", 10); Map params = new HashMap<>(); params.put("age", 10); params.put("name", "Ada"); verify(template).sql("name = :name AND age = :age", params); assertNotNull(people); - assertTrue(people.stream().allMatch(Person.class::isInstance)); + assertTrue(people.stream().allMatch(Human.class::isInstance)); } @Test public void shouldSaveUsingInsert() { - Person person = Person.of("Ada", 10); - personRepository.save(person); + Human human = Human.of("Ada", 10); + humanRepository.save(human); } @Test public void shouldSaveUsingUpdate() { - Person person = Person.of("Ada-2", 10); - when(template.find(Person.class, "Ada-2")).thenReturn(Optional.of(person)); - personRepository.save(person); + Human human = Human.of("Ada-2", 10); + when(template.find(Human.class, "Ada-2")).thenReturn(Optional.of(human)); + humanRepository.save(human); } @Test public void shouldDelete(){ - personRepository.deleteById("id"); + humanRepository.deleteById("id"); } @Test public void shouldDeleteEntity(){ - Person person = Person.of("Ada", 10); - personRepository.delete(person); + Human human = Human.of("Ada", 10); + humanRepository.delete(human); } - interface PersonRepository extends HazelcastRepository { + interface HumanRepository extends HazelcastRepository { @Query("active") - List findActive(); + List findActive(); @Query("name = :name AND age = :age") - Set findByAgeAndInteger(@Param("name") String name, @Param("age") Integer age); + Set findByAgeAndInteger(@Param("name") String name, @Param("age") Integer age); } } \ No newline at end of file diff --git a/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/mapping/Person.java b/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/mapping/Human.java similarity index 83% rename from jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/mapping/Person.java rename to jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/mapping/Human.java index f042f2791..15830e6e5 100644 --- a/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/mapping/Person.java +++ b/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/mapping/Human.java @@ -22,7 +22,7 @@ import java.util.Objects; @Entity -public class Person { +public class Human { @Id private String name; @@ -46,21 +46,21 @@ public void setAge(Integer age) { this.age = age; } - public Person(String name, Integer age) { + public Human(String name, Integer age) { this.name = name; this.age = age; } - public Person() { + public Human() { } @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - Person person = (Person) o; - return Objects.equals(name, person.name) && - Objects.equals(age, person.age); + Human human = (Human) o; + return Objects.equals(name, human.name) && + Objects.equals(age, human.age); } @Override @@ -76,7 +76,7 @@ public String toString() { '}'; } - public static Person of(String name, Integer age) { - return new Person(name, age); + public static Human of(String name, Integer age) { + return new Human(name, age); } } diff --git a/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/mapping/PersonRepository.java b/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/mapping/HumanRepository.java similarity index 89% rename from jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/mapping/PersonRepository.java rename to jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/mapping/HumanRepository.java index 9f291185f..f56e1c50e 100644 --- a/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/mapping/PersonRepository.java +++ b/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/mapping/HumanRepository.java @@ -18,5 +18,5 @@ import jakarta.data.repository.Repository; @Repository -public interface PersonRepository extends HazelcastRepository { +public interface HumanRepository extends HazelcastRepository { } diff --git a/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/mapping/MockProducer.java b/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/mapping/MockProducer.java index d528c7476..194edb2c9 100644 --- a/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/mapping/MockProducer.java +++ b/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/mapping/MockProducer.java @@ -44,8 +44,8 @@ public class MockProducer implements Supplier { @Override public HazelcastBucketManager get() { HazelcastBucketManager manager = mock(HazelcastBucketManager.class); - List people = asList(Value.of(new Person("Poliana", 25)), - Value.of(new Person("Otavio", 28))); + List people = asList(Value.of(new Human("Poliana", 25)), + Value.of(new Human("Otavio", 28))); when(manager.sql(anyString())).thenReturn(people); when(manager.sql(anyString(), any(Map.class))).thenReturn(people); diff --git a/jnosql-hbase/src/test/resources/column.properties b/jnosql-hbase/src/test/resources/column.properties index d9625b9a3..b5f11fb4e 100644 --- a/jnosql-hbase/src/test/resources/column.properties +++ b/jnosql-hbase/src/test/resources/column.properties @@ -1,3 +1,3 @@ -query.1=insert person {"_id": 1, "name": "Diana"} -query.2=insert person {"_id": 2, "name": "Artemis"} +query.1=insert contact {"_id": 1, "name": "Diana"} +query.2=insert contact {"_id": 2, "name": "Artemis"} id.name=_id \ No newline at end of file diff --git a/jnosql-infinispan/src/test/java/org/eclipse/jnosql/databases/infinispan/communication/model/Person.java b/jnosql-infinispan/src/test/java/org/eclipse/jnosql/databases/infinispan/communication/model/Human.java similarity index 93% rename from jnosql-infinispan/src/test/java/org/eclipse/jnosql/databases/infinispan/communication/model/Person.java rename to jnosql-infinispan/src/test/java/org/eclipse/jnosql/databases/infinispan/communication/model/Human.java index 8a01ef327..743b49d51 100644 --- a/jnosql-infinispan/src/test/java/org/eclipse/jnosql/databases/infinispan/communication/model/Person.java +++ b/jnosql-infinispan/src/test/java/org/eclipse/jnosql/databases/infinispan/communication/model/Human.java @@ -18,7 +18,7 @@ import java.io.Serializable; -public record Person(String name, Integer age) implements Serializable { +public record Human(String name, Integer age) implements Serializable { private static final long serialVersionUID = 5089852596376703955L; diff --git a/jnosql-infinispan/src/test/java/org/eclipse/jnosql/databases/infinispan/communication/model/LineBank.java b/jnosql-infinispan/src/test/java/org/eclipse/jnosql/databases/infinispan/communication/model/LineBank.java index b1f0cfb45..e02cbf7cc 100644 --- a/jnosql-infinispan/src/test/java/org/eclipse/jnosql/databases/infinispan/communication/model/LineBank.java +++ b/jnosql-infinispan/src/test/java/org/eclipse/jnosql/databases/infinispan/communication/model/LineBank.java @@ -22,14 +22,14 @@ public class LineBank implements Serializable { - private final Person person; + private final Human human; - public Person getPerson() { - return person; + public Human getPerson() { + return human; } public LineBank(String name, Integer age) { - this.person = new Person(name, age); + this.human = new Human(name, age); } @@ -38,18 +38,18 @@ public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; LineBank lineBank = (LineBank) o; - return Objects.equals(person, lineBank.person); + return Objects.equals(human, lineBank.human); } @Override public int hashCode() { - return Objects.hash(person); + return Objects.hash(human); } @Override public String toString() { final StringBuilder sb = new StringBuilder("LineBank{"); - sb.append("person=").append(person); + sb.append("person=").append(human); sb.append('}'); return sb.toString(); } diff --git a/jnosql-mongodb/pom.xml b/jnosql-mongodb/pom.xml index 45dc44fc3..9b1158166 100644 --- a/jnosql-mongodb/pom.xml +++ b/jnosql-mongodb/pom.xml @@ -12,6 +12,7 @@ ~ Contributors: ~ ~ Otavio Santana + ~ Maximillian Arruda --> 5.2.1 + false diff --git a/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/MongoDBBook.java b/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/Article.java similarity index 90% rename from jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/MongoDBBook.java rename to jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/Article.java index b61f22fc0..5dedf9d74 100644 --- a/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/MongoDBBook.java +++ b/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/Article.java @@ -22,5 +22,5 @@ import java.util.UUID; @Entity -public record MongoDBBook(@Id UUID id, @Column String title, @Column String author) { +public record Article(@Id UUID id, @Column String title, @Column String author) { } diff --git a/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/BookOrderItem.java b/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/BookOrderItem.java index d9d5718b1..e24678a65 100644 --- a/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/BookOrderItem.java +++ b/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/BookOrderItem.java @@ -18,5 +18,5 @@ import jakarta.nosql.Entity; @Entity -public record BookOrderItem(@Column Book book, @Column Integer quantity) { +public record BookOrderItem(@Column Magazine magazine, @Column Integer quantity) { } diff --git a/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/CustomRepositoryIntegrationTest.java b/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/CustomRepositoryIntegrationTest.java index b33452ef8..0e1ade227 100644 --- a/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/CustomRepositoryIntegrationTest.java +++ b/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/CustomRepositoryIntegrationTest.java @@ -54,7 +54,7 @@ @EnableAutoWeld @AddPackages(value = {Database.class, EntityConverter.class, DocumentTemplate.class, MongoDBTemplate.class}) -@AddPackages(Book.class) +@AddPackages(Magazine.class) @AddPackages(Reflections.class) @AddPackages(Converters.class) @AddExtensions({EntityMetadataExtension.class, @@ -72,14 +72,14 @@ class CustomRepositoryIntegrationTest { @Inject @Database(DatabaseType.DOCUMENT) - BookCustomRepository bookCustomRepository; + MagazineCustomRepository magazineCustomRepository; @BeforeEach void cleanUp() { try (MongoClient mongoClient = INSTANCE.mongoClient()) { MongoCollection collection = mongoClient.getDatabase(DATABASE_NAME) - .getCollection(Book.class.getSimpleName()); + .getCollection(Magazine.class.getSimpleName()); collection.deleteMany(new BsonDocument()); await().atMost(Duration.ofSeconds(2)) .until(() -> collection.find().limit(1).first() == null); @@ -88,22 +88,22 @@ void cleanUp() { @Test void shouldSave() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(bookCustomRepository.save(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(magazineCustomRepository.save(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - assertThat(bookCustomRepository.getById(book.id())) + assertThat(magazineCustomRepository.getById(magazine.id())) .as("should return the persisted book") - .hasValue(book); + .hasValue(magazine); - Book updated = new Book(book.id(), book.title() + " updated", 2); + Magazine updated = new Magazine(magazine.id(), magazine.title() + " updated", 2); - assertThat(bookCustomRepository.save(updated)) + assertThat(magazineCustomRepository.save(updated)) .isNotNull() - .isNotEqualTo(book); + .isNotEqualTo(magazine); - assertThat(bookCustomRepository.getById(book.id())) + assertThat(magazineCustomRepository.getById(magazine.id())) .as("should return the updated book") .hasValue(updated); } @@ -111,48 +111,48 @@ void shouldSave() { @Test void shouldSaveAllAndFindByIdIn() { - List books = List.of( - new Book(randomUUID().toString(), "Java Persistence Layer", 1) - , new Book(randomUUID().toString(), "Effective Java", 3) - , new Book(randomUUID().toString(), "Jakarta EE Cookbook", 1) - , new Book(randomUUID().toString(), "Mastering The Java Virtual Machine", 1) + List magazines = List.of( + new Magazine(randomUUID().toString(), "Java Persistence Layer", 1) + , new Magazine(randomUUID().toString(), "Effective Java", 3) + , new Magazine(randomUUID().toString(), "Jakarta EE Cookbook", 1) + , new Magazine(randomUUID().toString(), "Mastering The Java Virtual Machine", 1) ); - assertThat(bookCustomRepository.saveAll(books)) + assertThat(magazineCustomRepository.saveAll(magazines)) .isNotNull() - .containsAll(books); + .containsAll(magazines); - assertThat(bookCustomRepository.findByIdIn(books.stream().map(Book::id).toList())) + assertThat(magazineCustomRepository.findByIdIn(magazines.stream().map(Magazine::id).toList())) .as("should return the persisted books") - .containsAll(books); + .containsAll(magazines); } @Test void shouldSaveAllAndFindBy() { - Book javaPersistenceLayer = new Book(randomUUID().toString(), "Java Persistence Layer", 1); - Book effectiveJava = new Book(randomUUID().toString(), "Effective Java", 3); - Book jakartaEeCookbook = new Book(randomUUID().toString(), "Jakarta EE Cookbook", 1); - Book masteringTheJavaVirtualMachine = new Book(randomUUID().toString(), "Mastering The Java Virtual Machine", 1); + Magazine javaPersistenceLayer = new Magazine(randomUUID().toString(), "Java Persistence Layer", 1); + Magazine effectiveJava = new Magazine(randomUUID().toString(), "Effective Java", 3); + Magazine jakartaEeCookbook = new Magazine(randomUUID().toString(), "Jakarta EE Cookbook", 1); + Magazine masteringTheJavaVirtualMachine = new Magazine(randomUUID().toString(), "Mastering The Java Virtual Machine", 1); - List books = List.of( + List magazines = List.of( javaPersistenceLayer , effectiveJava , jakartaEeCookbook , masteringTheJavaVirtualMachine ); - assertThat(bookCustomRepository.saveAll(books)) + assertThat(magazineCustomRepository.saveAll(magazines)) .isNotNull() - .containsAll(books); + .containsAll(magazines); PageRequest pageRequest = PageRequest.ofSize(2); - Order orderByTitleAsc = Order.by(Sort.asc("title")); + Order orderByTitleAsc = Order.by(Sort.asc("title")); - Page page1 = bookCustomRepository.listAll(pageRequest, orderByTitleAsc); - Page page2 = bookCustomRepository.listAll(page1.nextPageRequest(), orderByTitleAsc); - Page page3 = bookCustomRepository.listAll(page2.nextPageRequest(), orderByTitleAsc); + Page page1 = magazineCustomRepository.listAll(pageRequest, orderByTitleAsc); + Page page2 = magazineCustomRepository.listAll(page1.nextPageRequest(), orderByTitleAsc); + Page page3 = magazineCustomRepository.listAll(page2.nextPageRequest(), orderByTitleAsc); assertSoftly(softly -> { @@ -177,18 +177,18 @@ void shouldSaveAllAndFindBy() { @Test void shouldDelete() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(bookCustomRepository.save(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(magazineCustomRepository.save(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - assertThat(bookCustomRepository.getById(book.id())) + assertThat(magazineCustomRepository.getById(magazine.id())) .isNotNull() - .hasValue(book); + .hasValue(magazine); - bookCustomRepository.delete(book); + magazineCustomRepository.delete(magazine); - assertThat(bookCustomRepository.getById(book.id())) + assertThat(magazineCustomRepository.getById(magazine.id())) .isNotNull() .isEmpty(); } @@ -196,31 +196,31 @@ void shouldDelete() { @Test void shouldDeleteAll() { - List books = List.of( - new Book(randomUUID().toString(), "Java Persistence Layer", 1) - , new Book(randomUUID().toString(), "Effective Java", 3) - , new Book(randomUUID().toString(), "Jakarta EE Cookbook", 1) - , new Book(randomUUID().toString(), "Mastering The Java Virtual Machine", 1) + List magazines = List.of( + new Magazine(randomUUID().toString(), "Java Persistence Layer", 1) + , new Magazine(randomUUID().toString(), "Effective Java", 3) + , new Magazine(randomUUID().toString(), "Jakarta EE Cookbook", 1) + , new Magazine(randomUUID().toString(), "Mastering The Java Virtual Machine", 1) ); - assertThat(bookCustomRepository.saveAll(books)) + assertThat(magazineCustomRepository.saveAll(magazines)) .isNotNull() - .containsAll(books); + .containsAll(magazines); await().atMost(Duration.ofSeconds(2)) - .until(() -> bookCustomRepository.listAll().toList().size() >= books.size()); + .until(() -> magazineCustomRepository.listAll().toList().size() >= magazines.size()); - assertThat(bookCustomRepository.listAll()) + assertThat(magazineCustomRepository.listAll()) .isNotNull() - .containsAll(books); + .containsAll(magazines); - bookCustomRepository.deleteAll(); + magazineCustomRepository.deleteAll(); await().atMost(Duration.ofSeconds(2)) - .until(() -> bookCustomRepository.listAll().toList().isEmpty()); + .until(() -> magazineCustomRepository.listAll().toList().isEmpty()); - assertThat(bookCustomRepository.listAll()) + assertThat(magazineCustomRepository.listAll()) .isNotNull() .isEmpty(); @@ -229,32 +229,32 @@ void shouldDeleteAll() { @Test void shouldRemoveAll() { - List books = List.of( - new Book(randomUUID().toString(), "Java Persistence Layer", 1) - , new Book(randomUUID().toString(), "Effective Java", 3) - , new Book(randomUUID().toString(), "Jakarta EE Cookbook", 1) - , new Book(randomUUID().toString(), "Mastering The Java Virtual Machine", 1) + List magazines = List.of( + new Magazine(randomUUID().toString(), "Java Persistence Layer", 1) + , new Magazine(randomUUID().toString(), "Effective Java", 3) + , new Magazine(randomUUID().toString(), "Jakarta EE Cookbook", 1) + , new Magazine(randomUUID().toString(), "Mastering The Java Virtual Machine", 1) ); - assertThat(bookCustomRepository.saveAll(books)) + assertThat(magazineCustomRepository.saveAll(magazines)) .isNotNull() - .containsAll(books); + .containsAll(magazines); await().atMost(Duration.ofSeconds(2)) - .until(() -> bookCustomRepository.listAll().toList().size() >= books.size()); + .until(() -> magazineCustomRepository.listAll().toList().size() >= magazines.size()); - assertThat(bookCustomRepository.listAll()) + assertThat(magazineCustomRepository.listAll()) .isNotNull() - .containsAll(books); + .containsAll(magazines); - bookCustomRepository.removeAll(books); + magazineCustomRepository.removeAll(magazines); await().atMost(Duration.ofSeconds(2)) - .until(() -> bookCustomRepository.listAll() - .filter(books::contains) + .until(() -> magazineCustomRepository.listAll() + .filter(magazines::contains) .toList().isEmpty()); - assertThat(bookCustomRepository.findByIdIn(books.stream().map(Book::id).toList())) + assertThat(magazineCustomRepository.findByIdIn(magazines.stream().map(Magazine::id).toList())) .isNotNull() .isEmpty(); } diff --git a/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/Book.java b/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/Magazine.java similarity index 87% rename from jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/Book.java rename to jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/Magazine.java index 01914ccc1..91554b59e 100644 --- a/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/Book.java +++ b/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/Magazine.java @@ -19,7 +19,7 @@ import jakarta.nosql.Id; @Entity -public record Book(@Id String id, @Column("title") String title, @Column("edition") int edition) { +public record Magazine(@Id String id, @Column("title") String title, @Column("edition") int edition) { } diff --git a/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/BookCustomRepository.java b/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/MagazineCustomRepository.java similarity index 67% rename from jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/BookCustomRepository.java rename to jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/MagazineCustomRepository.java index 9c48648ae..93a1ce0a7 100644 --- a/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/BookCustomRepository.java +++ b/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/MagazineCustomRepository.java @@ -23,33 +23,33 @@ import java.util.stream.Stream; @Repository -public interface BookCustomRepository { +public interface MagazineCustomRepository { @Save - Book save(Book book); + Magazine save(Magazine magazine); @Save - Iterable saveAll(Iterable books); + Iterable saveAll(Iterable books); @Delete - void delete(Book book); + void delete(Magazine magazine); @Delete - void removeAll(Iterable books); + void removeAll(Iterable books); @Find - Optional getById(@By("id") String id); + Optional getById(@By("id") String id); @Find - Stream findByIdIn(Iterable ids); + Stream findByIdIn(Iterable ids); @Find - Stream listAll(); + Stream listAll(); @Find - Page listAll(PageRequest pageRequest, Order sortBy); + Page listAll(PageRequest pageRequest, Order sortBy); - @Query("delete from Book") + @Query("delete from Magazine") void deleteAll(); } diff --git a/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/BookRepository.java b/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/MagazineRepository.java similarity index 90% rename from jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/BookRepository.java rename to jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/MagazineRepository.java index e0e41a08f..cae654779 100644 --- a/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/BookRepository.java +++ b/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/MagazineRepository.java @@ -19,5 +19,5 @@ import org.eclipse.jnosql.mapping.NoSQLRepository; @Repository -public interface BookRepository extends NoSQLRepository { +public interface MagazineRepository extends NoSQLRepository { } diff --git a/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/MongoDBTemplateIntegrationTest.java b/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/MongoDBTemplateIntegrationTest.java index 1f12c983b..101b09de1 100644 --- a/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/MongoDBTemplateIntegrationTest.java +++ b/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/MongoDBTemplateIntegrationTest.java @@ -43,7 +43,7 @@ @EnableAutoWeld @AddPackages(value = {Database.class, EntityConverter.class, DocumentTemplate.class, MongoDBTemplate.class}) -@AddPackages(Book.class) +@AddPackages(Magazine.class) @AddPackages(MongoDBTemplate.class) @AddPackages(Reflections.class) @AddPackages(Converters.class) @@ -63,78 +63,78 @@ class MongoDBTemplateIntegrationTest { @Test void shouldInsert() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - template.insert(book); - Optional optional = template.find(Book.class, book.id()); + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + template.insert(magazine); + Optional optional = template.find(Magazine.class, magazine.id()); assertThat(optional).isNotNull().isNotEmpty() - .get().isEqualTo(book); + .get().isEqualTo(magazine); } @Test void shouldUpdate() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - Book updated = new Book(book.id(), book.title() + " updated", 2); + Magazine updated = new Magazine(magazine.id(), magazine.title() + " updated", 2); assertThat(template.update(updated)) .isNotNull() - .isNotEqualTo(book); + .isNotEqualTo(magazine); - assertThat(template.find(Book.class, book.id())) + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().get().isEqualTo(updated); } @Test void shouldFindById() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - assertThat(template.find(Book.class, book.id())) - .isNotNull().get().isEqualTo(book); + assertThat(template.find(Magazine.class, magazine.id())) + .isNotNull().get().isEqualTo(magazine); } @Test void shouldDelete() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - template.delete(Book.class, book.id()); - assertThat(template.find(Book.class, book.id())) + template.delete(Magazine.class, magazine.id()); + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().isEmpty(); } @Test void shouldDeleteAll(){ for (int index = 0; index < 20; index++) { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); } - template.delete(Book.class).execute(); - assertThat(template.select(Book.class).result()).isEmpty(); + template.delete(Magazine.class).execute(); + assertThat(template.select(Magazine.class).result()).isEmpty(); } @Test void shouldUpdateNullValues(){ - var book = new Book(randomUUID().toString(), "Effective Java", 1); + var book = new Magazine(randomUUID().toString(), "Effective Java", 1); template.insert(book); - template.update(new Book(book.id(), null, 2)); - Optional optional = template.select(Book.class).where("id") + template.update(new Magazine(book.id(), null, 2)); + Optional optional = template.select(Magazine.class).where("id") .eq(book.id()).singleResult(); SoftAssertions.assertSoftly(softly -> { softly.assertThat(optional).isPresent(); - softly.assertThat(optional).get().extracting(Book::title).isNull(); - softly.assertThat(optional).get().extracting(Book::edition).isEqualTo(2); + softly.assertThat(optional).get().extracting(Magazine::title).isNull(); + softly.assertThat(optional).get().extracting(Magazine::edition).isEqualTo(2); }); } @@ -143,7 +143,7 @@ void shouldCreateMongoDBBook() { var id = randomUUID(); var title = "Persistence with MongoDB"; var author = "Otavio Santana"; - var book = template.insert(new MongoDBBook(id, title, author)); + var book = template.insert(new Article(id, title, author)); SoftAssertions.assertSoftly(softly -> { softly.assertThat(book).isNotNull(); @@ -158,9 +158,9 @@ void shouldFindByUUID() { var id = randomUUID(); var title = "Persistence with MongoDB"; var author = "Otavio Santana"; - var book = template.insert(new MongoDBBook(id, title, author)); + var book = template.insert(new Article(id, title, author)); - var optional = template.find(MongoDBBook.class, id); + var optional = template.find(Article.class, id); assertThat(optional).isPresent(); assertThat(optional.get().id()).isEqualTo(id); assertThat(optional.get().title()).isEqualTo(title); diff --git a/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/RepositoryIntegrationTest.java b/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/RepositoryIntegrationTest.java index d6eb1c51c..1f950fe85 100644 --- a/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/RepositoryIntegrationTest.java +++ b/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/RepositoryIntegrationTest.java @@ -45,7 +45,7 @@ @EnableAutoWeld @AddPackages(value = {Database.class, EntityConverter.class, DocumentTemplate.class, MongoDBTemplate.class}) -@AddPackages(Book.class) +@AddPackages(Magazine.class) @AddPackages(Reflections.class) @AddPackages(Converters.class) @AddExtensions({EntityMetadataExtension.class, @@ -61,7 +61,7 @@ class RepositoryIntegrationTest { @Inject @Database(DatabaseType.DOCUMENT) - BookRepository repository; + MagazineRepository repository; @Inject @@ -74,18 +74,18 @@ class RepositoryIntegrationTest { @Test void shouldSave() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(repository.save(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(repository.save(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - Book updated = new Book(book.id(), book.title() + " updated", 2); + Magazine updated = new Magazine(magazine.id(), magazine.title() + " updated", 2); assertThat(repository.save(updated)) .isNotNull() - .isNotEqualTo(book); + .isNotEqualTo(magazine); - assertThat(repository.findById(book.id())) + assertThat(repository.findById(magazine.id())) .isNotNull().get().isEqualTo(updated); assertSoftly(softly -> { @@ -93,9 +93,9 @@ void shouldSave() { BookOrder order = new BookOrder( randomUUID().toString(), List.of( - new BookOrderItem(new Book(randomUUID().toString(), "Effective Java", 3), 1) - , new BookOrderItem(new Book(randomUUID().toString(), "Java Persistence Layer", 1), 10) - , new BookOrderItem(new Book(randomUUID().toString(), "Jakarta EE Cookbook", 1), 5) + new BookOrderItem(new Magazine(randomUUID().toString(), "Effective Java", 3), 1) + , new BookOrderItem(new Magazine(randomUUID().toString(), "Java Persistence Layer", 1), 10) + , new BookOrderItem(new Magazine(randomUUID().toString(), "Jakarta EE Cookbook", 1), 5) ) ); @@ -122,35 +122,35 @@ void shouldSave() { @Test void shouldDelete() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(repository.save(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(repository.save(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - repository.delete(book); - assertThat(repository.findById(book.id())) + repository.delete(magazine); + assertThat(repository.findById(magazine.id())) .isNotNull().isEmpty(); } @Test void shouldDeleteById() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(repository.save(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(repository.save(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - repository.deleteById(book.id()); - assertThat(repository.findById(book.id())) + repository.deleteById(magazine.id()); + assertThat(repository.findById(magazine.id())) .isNotNull().isEmpty(); } @Test void shouldDeleteAll() { for (int index = 0; index < 20; index++) { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(repository.save(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(repository.save(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); } repository.deleteAll(); diff --git a/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/TemplateIntegrationTest.java b/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/TemplateIntegrationTest.java index bcee97d85..d4299f1f7 100644 --- a/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/TemplateIntegrationTest.java +++ b/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/TemplateIntegrationTest.java @@ -45,7 +45,7 @@ @EnableAutoWeld @AddPackages(value = {Database.class, EntityConverter.class, DocumentTemplate.class, MongoDBTemplate.class}) -@AddPackages(Book.class) +@AddPackages(Magazine.class) @AddPackages(Reflections.class) @AddPackages(Converters.class) @AddExtensions({EntityMetadataExtension.class, @@ -64,65 +64,65 @@ class TemplateIntegrationTest { @Test void shouldFindById() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - assertThat(template.find(Book.class, book.id())) - .isNotNull().get().isEqualTo(book); + assertThat(template.find(Magazine.class, magazine.id())) + .isNotNull().get().isEqualTo(magazine); } @Test void shouldInsert() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - template.insert(book); - Optional optional = template.find(Book.class, book.id()); + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + template.insert(magazine); + Optional optional = template.find(Magazine.class, magazine.id()); assertThat(optional).isNotNull().isNotEmpty() - .get().isEqualTo(book); + .get().isEqualTo(magazine); } @Test void shouldUpdate() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - Book updated = new Book(book.id(), book.title() + " updated", 2); + Magazine updated = new Magazine(magazine.id(), magazine.title() + " updated", 2); assertThat(template.update(updated)) .isNotNull() - .isNotEqualTo(book); + .isNotEqualTo(magazine); - assertThat(template.find(Book.class, book.id())) + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().get().isEqualTo(updated); } @Test void shouldDeleteById() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - template.delete(Book.class, book.id()); - assertThat(template.find(Book.class, book.id())) + template.delete(Magazine.class, magazine.id()); + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().isEmpty(); } @Test void shouldDeleteAll(){ for (int index = 0; index < 20; index++) { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); } - template.delete(Book.class).execute(); - assertThat(template.select(Book.class).result()).isEmpty(); + template.delete(Magazine.class).execute(); + assertThat(template.select(Magazine.class).result()).isEmpty(); } @Test diff --git a/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/mapping/Person.java b/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/mapping/Birthday.java similarity index 85% rename from jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/mapping/Person.java rename to jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/mapping/Birthday.java index 8eb9f612f..03ecacac5 100644 --- a/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/mapping/Person.java +++ b/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/mapping/Birthday.java @@ -22,7 +22,7 @@ import java.util.Objects; @Entity -public class Person { +public class Birthday { @Id private String name; @@ -39,21 +39,21 @@ public Integer getAge() { return age; } - public Person(String name, Integer age) { + public Birthday(String name, Integer age) { this.name = name; this.age = age; } - public Person() { + public Birthday() { } @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - Person person = (Person) o; - return Objects.equals(name, person.name) && - Objects.equals(age, person.age); + Birthday birthday = (Birthday) o; + return Objects.equals(name, birthday.name) && + Objects.equals(age, birthday.age); } @Override @@ -68,4 +68,4 @@ public String toString() { '}'; return sb; } -} \ No newline at end of file +} diff --git a/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/mapping/DefaultMongoDBTemplateTest.java b/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/mapping/DefaultMongoDBTemplateTest.java index afdef98e7..320eed341 100644 --- a/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/mapping/DefaultMongoDBTemplateTest.java +++ b/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/mapping/DefaultMongoDBTemplateTest.java @@ -91,7 +91,7 @@ void shouldReturnErrorOnDeleteMethod() { assertThrows(NullPointerException.class,() -> template.delete("Collection", null)); assertThrows(NullPointerException.class,() -> template.delete((String) null, filter)); - assertThrows(NullPointerException.class,() -> template.delete(Person.class, null)); + assertThrows(NullPointerException.class,() -> template.delete(Birthday.class, null)); assertThrows(NullPointerException.class,() -> template.delete((Class) null, filter)); } @@ -105,15 +105,15 @@ void shouldDeleteWithCollectionName() { @Test void shouldDeleteWithEntity() { Bson filter = eq("name", "Poliana"); - template.delete(Person.class, filter); - Mockito.verify(manager).delete("Person", filter); + template.delete(Birthday.class, filter); + Mockito.verify(manager).delete("Birthday", filter); } @Test void shouldDeleteAll() { - EntityMetadata metadata = entities.get(Person.class); + EntityMetadata metadata = entities.get(Birthday.class); DeleteQuery query = DeleteQuery.delete().from(metadata.name()).build(); - template.deleteAll(Person.class); + template.deleteAll(Birthday.class); Mockito.verify(manager).delete(query); } @@ -126,21 +126,21 @@ void shouldReturnErrorOnSelectMethod() { assertThrows(NullPointerException.class, () -> template.select((String) null, filter)); assertThrows(NullPointerException.class, () -> template.select((Class) null, null)); - assertThrows(NullPointerException.class, () -> template.select(Person.class, null)); + assertThrows(NullPointerException.class, () -> template.select(Birthday.class, null)); assertThrows(NullPointerException.class, () -> template.select((Class) null, filter)); } @Test void shouldSelectWithCollectionName() { - var entity = CommunicationEntity.of("Person", Arrays + var entity = CommunicationEntity.of("Birthday", Arrays .asList(Element.of("_id", "Poliana"), Element.of("age", 30))); Bson filter = eq("name", "Poliana"); - Mockito.when(manager.select("Person", filter)) + Mockito.when(manager.select("Birthday", filter)) .thenReturn(Stream.of(entity)); - Stream stream = template.select("Person", filter); + Stream stream = template.select("Birthday", filter); Assertions.assertNotNull(stream); - Person poliana = stream.findFirst() + Birthday poliana = stream.findFirst() .orElseThrow(() -> new IllegalStateException("There is an issue on the test")); Assertions.assertNotNull(poliana); @@ -150,15 +150,15 @@ void shouldSelectWithCollectionName() { @Test void shouldSelectWithEntity() { - var entity = CommunicationEntity.of("Person", Arrays + var entity = CommunicationEntity.of("Birthday", Arrays .asList(Element.of("_id", "Poliana"), Element.of("age", 30))); Bson filter = eq("name", "Poliana"); - Mockito.when(manager.select("Person", filter)) + Mockito.when(manager.select("Birthday", filter)) .thenReturn(Stream.of(entity)); - Stream stream = template.select(Person.class, filter); + Stream stream = template.select(Birthday.class, filter); Assertions.assertNotNull(stream); - Person poliana = stream.findFirst() + Birthday poliana = stream.findFirst() .orElseThrow(() -> new IllegalStateException("There is an issue on the test")); Assertions.assertNotNull(poliana); @@ -188,8 +188,8 @@ void shouldReturnErrorOnAggregateMethod() { assertThrows(NullPointerException.class, () -> template.aggregate((String) null, pipeline)); assertThrows(NullPointerException.class, () -> template.aggregate((String) null, pipelineArray)); assertThrows(NullPointerException.class, () -> template.aggregate((String) null, bson)); - assertThrows(NullPointerException.class, () -> template.aggregate(Person.class, (List) null)); - assertThrows(NullPointerException.class, () -> template.aggregate(Person.class, (Bson[]) null)); + assertThrows(NullPointerException.class, () -> template.aggregate(Birthday.class, (List) null)); + assertThrows(NullPointerException.class, () -> template.aggregate(Birthday.class, (Bson[]) null)); } @@ -211,8 +211,8 @@ void shouldAggregateWithEntity() { Aggregates.group("$stars", Accumulators.sum("count", 1)) }; - template.aggregate(Person.class, predicates); - Mockito.verify(manager).aggregate("Person", predicates); + template.aggregate(Birthday.class, predicates); + Mockito.verify(manager).aggregate("Birthday", predicates); } @Test @@ -228,9 +228,9 @@ void shouldCountByFilterWithCollectionName() { void shouldCountByFilterWithEntity() { var filter = eq("name", "Poliana"); - template.count(Person.class, filter); + template.count(Birthday.class, filter); - Mockito.verify(manager).count("Person", filter); + Mockito.verify(manager).count("Birthday", filter); } @Test @@ -239,8 +239,8 @@ void shouldReturnErrorOnCountByFilterMethod() { assertThrows(NullPointerException.class, () -> template.count((String) null, null)); assertThrows(NullPointerException.class, () -> template.count((String) null, filter)); assertThrows(NullPointerException.class, () -> template.count("Person", null)); - assertThrows(NullPointerException.class, () -> template.count((Class) null, null)); - assertThrows(NullPointerException.class, () -> template.count((Class) null, filter)); - assertThrows(NullPointerException.class, () -> template.count(Person.class, null)); + assertThrows(NullPointerException.class, () -> template.count((Class) null, null)); + assertThrows(NullPointerException.class, () -> template.count((Class) null, filter)); + assertThrows(NullPointerException.class, () -> template.count(Birthday.class, null)); } } diff --git a/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/tck/MongoDBTemplateSupplier.java b/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/tck/MongoDBTemplateSupplier.java new file mode 100644 index 000000000..ada3c8cea --- /dev/null +++ b/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/tck/MongoDBTemplateSupplier.java @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2024 Contributors to the Eclipse Foundation + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * and Apache License v2.0 which accompanies this distribution. + * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html + * and the Apache License v2.0 is available at http://www.opensource.org/licenses/apache2.0.php. + * + * You may elect to redistribute this code under either of these licenses. + * + * Contributors: + * + * Otavio Santana + * Alessandro Moscatelli + * Maximillian Arruda + */ +package org.eclipse.jnosql.databases.mongodb.tck; + +import jakarta.enterprise.inject.se.SeContainerInitializer; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.nosql.Template; +import jakarta.nosql.tck.TemplateSupplier; +import org.eclipse.jnosql.databases.mongodb.communication.MongoDBDocumentConfigurations; +import org.eclipse.jnosql.mapping.core.config.MappingConfigurations; + +import static org.eclipse.jnosql.databases.mongodb.communication.DocumentDatabase.INSTANCE; + +public class MongoDBTemplateSupplier implements TemplateSupplier { + + static { + System.setProperty(MongoDBDocumentConfigurations.HOST.get() + ".1", INSTANCE.host()); + System.setProperty(MappingConfigurations.DOCUMENT_DATABASE.get(), "jakarta-nosql-tck"); + SeContainerInitializer.newInstance().initialize(); + } + + @Override + public Template get() { + return CDI.current().select(Template.class).get(); + } +} diff --git a/jnosql-mongodb/src/test/resources/META-INF/services/jakarta.nosql.tck.TemplateSupplier b/jnosql-mongodb/src/test/resources/META-INF/services/jakarta.nosql.tck.TemplateSupplier new file mode 100644 index 000000000..e9974f729 --- /dev/null +++ b/jnosql-mongodb/src/test/resources/META-INF/services/jakarta.nosql.tck.TemplateSupplier @@ -0,0 +1 @@ +org.eclipse.jnosql.databases.mongodb.tck.MongoDBTemplateSupplier \ No newline at end of file diff --git a/jnosql-mongodb/src/test/resources/document.properties b/jnosql-mongodb/src/test/resources/document.properties index d9625b9a3..6aa81a103 100644 --- a/jnosql-mongodb/src/test/resources/document.properties +++ b/jnosql-mongodb/src/test/resources/document.properties @@ -1,3 +1,3 @@ -query.1=insert person {"_id": 1, "name": "Diana"} -query.2=insert person {"_id": 2, "name": "Artemis"} -id.name=_id \ No newline at end of file +query.1=insert birthday {"_id": 1, "name": "Diana"} +query.2=insert birthday {"_id": 2, "name": "Artemis"} +id.name=_id diff --git a/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/integration/Book.java b/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/integration/Magazine.java similarity index 84% rename from jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/integration/Book.java rename to jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/integration/Magazine.java index 44978df00..f2ee35418 100644 --- a/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/integration/Book.java +++ b/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/integration/Magazine.java @@ -21,7 +21,7 @@ import java.util.Objects; @Entity -public class Book { +public class Magazine { @Id private String id; @@ -32,13 +32,13 @@ public class Book { @Column("edition") private int edition; - public Book(String id, String title, int edition) { + public Magazine(String id, String title, int edition) { this.id = id; this.title = title; this.edition = edition; } - Book() { + Magazine() { } public String id() { @@ -57,10 +57,10 @@ public int edition() { public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - Book book = (Book) o; - return edition == book.edition - && Objects.equals(id, book.id) - && Objects.equals(title, book.title); + Magazine magazine = (Magazine) o; + return edition == magazine.edition + && Objects.equals(id, magazine.id) + && Objects.equals(title, magazine.title); } @Override diff --git a/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/integration/OracleNoSQLTemplateIntegrationTest.java b/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/integration/OracleNoSQLTemplateIntegrationTest.java index eec502dc7..40a523f32 100644 --- a/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/integration/OracleNoSQLTemplateIntegrationTest.java +++ b/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/integration/OracleNoSQLTemplateIntegrationTest.java @@ -42,7 +42,7 @@ @EnableAutoWeld @AddPackages(value = {Database.class, EntityConverter.class, DocumentTemplate.class}) -@AddPackages(Book.class) +@AddPackages(Magazine.class) @AddPackages(OracleNoSQLTemplate.class) @AddExtensions({EntityMetadataExtension.class, DocumentExtension.class}) @@ -61,79 +61,79 @@ class OracleNoSQLTemplateIntegrationTest { @Test void shouldInsert() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - template.insert(book); - Optional optional = template.find(Book.class, book.id()); + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + template.insert(magazine); + Optional optional = template.find(Magazine.class, magazine.id()); assertThat(optional).isNotNull().isNotEmpty() - .get().isEqualTo(book); + .get().isEqualTo(magazine); } @Test void shouldUpdate() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - Book updated = new Book(book.id(), book.title() + " updated", 2); + Magazine updated = new Magazine(magazine.id(), magazine.title() + " updated", 2); assertThat(template.update(updated)) .isNotNull() - .isNotEqualTo(book); + .isNotEqualTo(magazine); - assertThat(template.find(Book.class, book.id())) + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().get().isEqualTo(updated); } @Test void shouldFindById() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - assertThat(template.find(Book.class, book.id())) - .isNotNull().get().isEqualTo(book); + assertThat(template.find(Magazine.class, magazine.id())) + .isNotNull().get().isEqualTo(magazine); } @Test void shouldDelete() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - template.delete(Book.class, book.id()); - assertThat(template.find(Book.class, book.id())) + template.delete(Magazine.class, magazine.id()); + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().isEmpty(); } @Test void shouldDeleteAll(){ for (int index = 0; index < 20; index++) { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); } - template.delete(Book.class).execute(); - assertThat(template.select(Book.class).result()).isEmpty(); + template.delete(Magazine.class).execute(); + assertThat(template.select(Magazine.class).result()).isEmpty(); } @Test void shouldUpdateNullValues(){ - var book = new Book(randomUUID().toString(), "Effective Java", 1); + var book = new Magazine(randomUUID().toString(), "Effective Java", 1); template.insert(book); - template.update(new Book(book.id(), null, 2)); - Optional optional = template.select(Book.class).where("id") + template.update(new Magazine(book.id(), null, 2)); + Optional optional = template.select(Magazine.class).where("id") .eq(book.id()).singleResult(); SoftAssertions.assertSoftly(softly -> { softly.assertThat(optional).isPresent(); - softly.assertThat(optional).get().extracting(Book::title).isNull(); - softly.assertThat(optional).get().extracting(Book::edition).isEqualTo(2); + softly.assertThat(optional).get().extracting(Magazine::title).isNull(); + softly.assertThat(optional).get().extracting(Magazine::edition).isEqualTo(2); }); } diff --git a/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/integration/Beer.java b/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/integration/Wine.java similarity index 88% rename from jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/integration/Beer.java rename to jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/integration/Wine.java index b2237ea5e..d3ca0c024 100644 --- a/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/integration/Beer.java +++ b/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/integration/Wine.java @@ -23,7 +23,7 @@ import java.util.Objects; @Entity -public class Beer { +public class Wine { @Id private String id; @@ -54,10 +54,10 @@ public Map data() { return data; } - Beer() { + Wine() { } - Beer(String id, List comments, List crew, Map data) { + Wine(String id, List comments, List crew, Map data) { this.id = id; this.comments = comments; this.crew = crew; @@ -82,8 +82,8 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - Beer beer = (Beer) o; - return Objects.equals(id, beer.id); + Wine wine = (Wine) o; + return Objects.equals(id, wine.id); } @Override @@ -91,7 +91,7 @@ public int hashCode() { return Objects.hashCode(id); } - public static BeerBuilder builder() { - return new BeerBuilder(); + public static WineBuilder builder() { + return new WineBuilder(); } } diff --git a/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/integration/BeerBuilder.java b/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/integration/WineBuilder.java similarity index 77% rename from jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/integration/BeerBuilder.java rename to jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/integration/WineBuilder.java index db05c2ece..1624e394f 100644 --- a/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/integration/BeerBuilder.java +++ b/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/integration/WineBuilder.java @@ -17,33 +17,33 @@ import java.util.List; import java.util.Map; -public class BeerBuilder { +public class WineBuilder { private String id; private List comments; private List crew; private Map data; - public BeerBuilder id(String id) { + public WineBuilder id(String id) { this.id = id; return this; } - public BeerBuilder comments(List comments) { + public WineBuilder comments(List comments) { this.comments = comments; return this; } - public BeerBuilder crew(List crew) { + public WineBuilder crew(List crew) { this.crew = crew; return this; } - public BeerBuilder data(Map data) { + public WineBuilder data(Map data) { this.data = data; return this; } - public Beer build() { - return new Beer(id, comments, crew, data); + public Wine build() { + return new Wine(id, comments, crew, data); } } \ No newline at end of file diff --git a/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/integration/BeerTemplateIntegrationTest.java b/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/integration/WineTemplateIntegrationTest.java similarity index 83% rename from jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/integration/BeerTemplateIntegrationTest.java rename to jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/integration/WineTemplateIntegrationTest.java index a93ac7817..ff74b9c6e 100644 --- a/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/integration/BeerTemplateIntegrationTest.java +++ b/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/integration/WineTemplateIntegrationTest.java @@ -43,14 +43,14 @@ @EnableAutoWeld @AddPackages(value = {Database.class, EntityConverter.class, DocumentTemplate.class}) -@AddPackages(Beer.class) +@AddPackages(Wine.class) @AddPackages(OracleNoSQLTemplate.class) @AddExtensions({EntityMetadataExtension.class, DocumentExtension.class}) @AddPackages(Reflections.class) @AddPackages(Converters.class) @EnabledIfSystemProperty(named = NAMED, matches = MATCHES) -class BeerTemplateIntegrationTest { +class WineTemplateIntegrationTest { @Inject private OracleNoSQLTemplate template; @@ -63,24 +63,24 @@ class BeerTemplateIntegrationTest { @Test void shouldInsert() { - Beer beer = Beer.builder() + Wine wine = Wine.builder() .id(UUID.randomUUID().toString()) .data(Map.of("name", "beer")) .comments(List.of("comment1", "comment2")) .crew(List.of(new Crew("Otavio"))) .build(); - this.template.insert(beer); + this.template.insert(wine); - Optional result = this.template.select(Beer.class).where("id").eq(beer.id()).singleResult(); + Optional result = this.template.select(Wine.class).where("id").eq(wine.id()).singleResult(); SoftAssertions.assertSoftly(soft ->{ soft.assertThat(result).isPresent(); - Beer updateBeer = result.orElseThrow(); - soft.assertThat(updateBeer.id()).isEqualTo(beer.id()); - soft.assertThat(updateBeer.data()).isEqualTo(beer.data()); - soft.assertThat(updateBeer.comments()).isEqualTo(beer.comments()); - soft.assertThat(updateBeer.crew()).isEqualTo(beer.crew()); + Wine updateWine = result.orElseThrow(); + soft.assertThat(updateWine.id()).isEqualTo(wine.id()); + soft.assertThat(updateWine.data()).isEqualTo(wine.data()); + soft.assertThat(updateWine.comments()).isEqualTo(wine.comments()); + soft.assertThat(updateWine.crew()).isEqualTo(wine.crew()); }); } diff --git a/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/mapping/DefaultOracleNoSQLTemplateTest.java b/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/mapping/DefaultOracleNoSQLTemplateTest.java index ec8742ebf..8fbdc052b 100644 --- a/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/mapping/DefaultOracleNoSQLTemplateTest.java +++ b/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/mapping/DefaultOracleNoSQLTemplateTest.java @@ -97,11 +97,11 @@ public void shouldFindSQLWithTypeAndParameters() { @Test public void shouldDeleteAll(){ ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(DeleteQuery.class); - template.deleteAll(Person.class); + template.deleteAll(Human.class); Mockito.verify(manager).delete(argumentCaptor.capture()); var query = argumentCaptor.getValue(); SoftAssertions.assertSoftly(soft -> { - soft.assertThat(query.name()).isEqualTo("Person"); + soft.assertThat(query.name()).isEqualTo("Human"); soft.assertThat(query.columns()).isEmpty(); soft.assertThat(query.condition()).isEmpty(); }); diff --git a/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/mapping/Person.java b/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/mapping/Human.java similarity index 83% rename from jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/mapping/Person.java rename to jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/mapping/Human.java index c6c0db013..4dd4ebf94 100644 --- a/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/mapping/Person.java +++ b/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/mapping/Human.java @@ -22,7 +22,7 @@ import java.util.Objects; @Entity -public class Person { +public class Human { @Id private String name; @@ -46,21 +46,21 @@ public void setAge(Integer age) { this.age = age; } - public Person(String name, Integer age) { + public Human(String name, Integer age) { this.name = name; this.age = age; } - public Person() { + public Human() { } @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - Person person = (Person) o; - return Objects.equals(name, person.name) && - Objects.equals(age, person.age); + Human human = (Human) o; + return Objects.equals(name, human.name) && + Objects.equals(age, human.age); } @Override @@ -76,7 +76,7 @@ public String toString() { '}'; } - public static Person of(String name, Integer age) { - return new Person(name, age); + public static Human of(String name, Integer age) { + return new Human(name, age); } } diff --git a/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/mapping/PersonNoSQLRepository.java b/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/mapping/HumanNoSQLRepository.java similarity index 89% rename from jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/mapping/PersonNoSQLRepository.java rename to jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/mapping/HumanNoSQLRepository.java index f8866f34a..e52f48a9f 100644 --- a/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/mapping/PersonNoSQLRepository.java +++ b/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/mapping/HumanNoSQLRepository.java @@ -18,5 +18,5 @@ import jakarta.data.repository.Repository; @Repository -public interface PersonNoSQLRepository extends OracleNoSQLRepository { +public interface HumanNoSQLRepository extends OracleNoSQLRepository { } diff --git a/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/mapping/OracleDBExtensionTest.java b/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/mapping/OracleDBExtensionTest.java index 10eeb9714..5e40ea582 100644 --- a/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/mapping/OracleDBExtensionTest.java +++ b/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/mapping/OracleDBExtensionTest.java @@ -38,7 +38,7 @@ public class OracleDBExtensionTest { @Inject - private PersonNoSQLRepository repository; + private HumanNoSQLRepository repository; @Test public void shouldSave() { diff --git a/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/mapping/OracleDocumentRepositoryProxyTest.java b/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/mapping/OracleDocumentRepositoryProxyTest.java index 04ee97ff9..ec19e03ed 100644 --- a/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/mapping/OracleDocumentRepositoryProxyTest.java +++ b/jnosql-oracle-nosql/src/test/java/org/eclipse/jnosql/databases/oracle/mapping/OracleDocumentRepositoryProxyTest.java @@ -59,7 +59,7 @@ public class OracleDocumentRepositoryProxyTest { @Inject private Converters converters; - private PersonNoSQLRepository personRepository; + private HumanNoSQLRepository personRepository; @SuppressWarnings("rawtypes") @BeforeEach @@ -67,13 +67,13 @@ public void setUp() { this.template = Mockito.mock(OracleNoSQLTemplate.class); OracleDocumentRepositoryProxy handler = new OracleDocumentRepositoryProxy<>(template, - PersonNoSQLRepository.class, converters, entitiesMetadata); + HumanNoSQLRepository.class, converters, entitiesMetadata); - when(template.insert(any(Person.class))).thenReturn(new Person()); - when(template.insert(any(Person.class), any(Duration.class))).thenReturn(new Person()); - when(template.update(any(Person.class))).thenReturn(new Person()); - this.personRepository = (PersonNoSQLRepository) Proxy.newProxyInstance(PersonNoSQLRepository.class.getClassLoader(), - new Class[]{PersonNoSQLRepository.class}, + when(template.insert(any(Human.class))).thenReturn(new Human()); + when(template.insert(any(Human.class), any(Duration.class))).thenReturn(new Human()); + when(template.update(any(Human.class))).thenReturn(new Human()); + this.personRepository = (HumanNoSQLRepository) Proxy.newProxyInstance(HumanNoSQLRepository.class.getClassLoader(), + new Class[]{HumanNoSQLRepository.class}, handler); } @@ -96,32 +96,32 @@ public void shouldFindByNameSQL() { @Test public void shouldSaveUsingInsert() { - Person person = Person.of("Ada", 10); - personRepository.save(person); - verify(template).insert(eq(person)); + Human human = Human.of("Ada", 10); + personRepository.save(human); + verify(template).insert(eq(human)); } @Test public void shouldSaveUsingUpdate() { - Person person = Person.of("Ada-2", 10); - when(template.find(Person.class, "Ada-2")).thenReturn(Optional.of(person)); - personRepository.save(person); - verify(template).update(eq(person)); + Human human = Human.of("Ada-2", 10); + when(template.find(Human.class, "Ada-2")).thenReturn(Optional.of(human)); + personRepository.save(human); + verify(template).update(eq(human)); } @Test public void shouldDelete(){ personRepository.deleteById("id"); - verify(template).delete(Person.class, "id"); + verify(template).delete(Human.class, "id"); } @Test public void shouldDeleteEntity(){ - Person person = Person.of("Ada", 10); - personRepository.delete(person); - verify(template).delete(Person.class, person.getName()); + Human human = Human.of("Ada", 10); + personRepository.delete(human); + verify(template).delete(Human.class, human.getName()); } @Test @@ -132,16 +132,16 @@ public void shouldDeleteAll() { verify(template).deleteAll(queryCaptor.capture()); Class query = queryCaptor.getValue(); - Assertions.assertThat(query).isEqualTo(Person.class); + Assertions.assertThat(query).isEqualTo(Human.class); } - interface PersonNoSQLRepository extends OracleNoSQLRepository { + interface HumanNoSQLRepository extends OracleNoSQLRepository { @SQL("select * from Person") - List findAllQuery(); + List findAllQuery(); @SQL("select * from Person where content.name= ?") - List findByName(@Param("") String name); + List findByName(@Param("") String name); } } diff --git a/jnosql-orientdb/pom.xml b/jnosql-orientdb/pom.xml index cd5c1981c..22ea587fd 100644 --- a/jnosql-orientdb/pom.xml +++ b/jnosql-orientdb/pom.xml @@ -30,7 +30,7 @@ com.orientechnologies orientdb-graphdb - 3.2.35 + 3.2.36 ${project.groupId} diff --git a/jnosql-orientdb/src/test/java/org/eclipse/jnosql/databases/orientdb/integration/Book.java b/jnosql-orientdb/src/test/java/org/eclipse/jnosql/databases/orientdb/integration/Magazine.java similarity index 85% rename from jnosql-orientdb/src/test/java/org/eclipse/jnosql/databases/orientdb/integration/Book.java rename to jnosql-orientdb/src/test/java/org/eclipse/jnosql/databases/orientdb/integration/Magazine.java index 61333b8a8..e650e911e 100644 --- a/jnosql-orientdb/src/test/java/org/eclipse/jnosql/databases/orientdb/integration/Book.java +++ b/jnosql-orientdb/src/test/java/org/eclipse/jnosql/databases/orientdb/integration/Magazine.java @@ -21,7 +21,7 @@ import java.util.Objects; @Entity -public class Book { +public class Magazine { @Id private String id; @Column("title") @@ -29,13 +29,13 @@ public class Book { @Column("edition") private int edition; - public Book(String id, String title, int edition) { + public Magazine(String id, String title, int edition) { this.id = id; this.title = title; this.edition = edition; } - Book() { + Magazine() { } public String id() { @@ -58,10 +58,10 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - Book book = (Book) o; - return edition == book.edition - && Objects.equals(id, book.id) - && Objects.equals(title, book.title); + Magazine magazine = (Magazine) o; + return edition == magazine.edition + && Objects.equals(id, magazine.id) + && Objects.equals(title, magazine.title); } @Override diff --git a/jnosql-orientdb/src/test/java/org/eclipse/jnosql/databases/orientdb/integration/OrientDBTemplateIntegrationTest.java b/jnosql-orientdb/src/test/java/org/eclipse/jnosql/databases/orientdb/integration/OrientDBTemplateIntegrationTest.java index 08ff402a3..8e4b9dde0 100644 --- a/jnosql-orientdb/src/test/java/org/eclipse/jnosql/databases/orientdb/integration/OrientDBTemplateIntegrationTest.java +++ b/jnosql-orientdb/src/test/java/org/eclipse/jnosql/databases/orientdb/integration/OrientDBTemplateIntegrationTest.java @@ -42,7 +42,7 @@ @EnableAutoWeld @AddPackages(value = {Database.class, EntityConverter.class, DocumentTemplate.class}) -@AddPackages(Book.class) +@AddPackages(Magazine.class) @AddPackages(OrientDBTemplate.class) @AddPackages(Reflections.class) @AddExtensions({EntityMetadataExtension.class, @@ -63,50 +63,50 @@ class OrientDBTemplateIntegrationTest { } @Test public void shouldInsert() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - template.insert(book); - Optional optional = template.find(Book.class, book.id()); + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + template.insert(magazine); + Optional optional = template.find(Magazine.class, magazine.id()); assertThat(optional).isNotNull().isNotEmpty() - .get().isEqualTo(book); + .get().isEqualTo(magazine); } @Test public void shouldUpdate() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - Book updated = new Book(book.id(), book.title() + " updated", 2); + Magazine updated = new Magazine(magazine.id(), magazine.title() + " updated", 2); assertThat(template.update(updated)) .isNotNull() - .isNotEqualTo(book); + .isNotEqualTo(magazine); - assertThat(template.find(Book.class, book.id())) + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().get().isEqualTo(updated); } @Test public void shouldFindById() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - assertThat(template.find(Book.class, book.id())) - .isNotNull().get().isEqualTo(book); + assertThat(template.find(Magazine.class, magazine.id())) + .isNotNull().get().isEqualTo(magazine); } @Test public void shouldDelete() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); - template.delete(Book.class, book.id()); - assertThat(template.find(Book.class, book.id())) + .isEqualTo(magazine); + template.delete(Magazine.class, magazine.id()); + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().isEmpty(); } diff --git a/jnosql-orientdb/src/test/java/org/eclipse/jnosql/databases/orientdb/integration/TemplateIntegrationTest.java b/jnosql-orientdb/src/test/java/org/eclipse/jnosql/databases/orientdb/integration/TemplateIntegrationTest.java index f6b68d90a..25fffd0d6 100644 --- a/jnosql-orientdb/src/test/java/org/eclipse/jnosql/databases/orientdb/integration/TemplateIntegrationTest.java +++ b/jnosql-orientdb/src/test/java/org/eclipse/jnosql/databases/orientdb/integration/TemplateIntegrationTest.java @@ -41,7 +41,7 @@ @EnableAutoWeld @AddPackages(value = {Database.class, EntityConverter.class, DocumentTemplate.class}) -@AddPackages(Book.class) +@AddPackages(Magazine.class) @AddExtensions({EntityMetadataExtension.class, DocumentExtension.class}) @AddPackages(Reflections.class) @@ -62,51 +62,51 @@ class TemplateIntegrationTest { @Test public void shouldInsert() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - template.insert(book); - Optional optional = template.find(Book.class, book.id()); + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + template.insert(magazine); + Optional optional = template.find(Magazine.class, magazine.id()); assertThat(optional).isNotNull().isNotEmpty() - .get().isEqualTo(book); + .get().isEqualTo(magazine); } @Test public void shouldUpdate() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - Book updated = new Book(book.id(), book.title() + " updated", 2); + Magazine updated = new Magazine(magazine.id(), magazine.title() + " updated", 2); assertThat(template.update(updated)) .isNotNull() - .isNotEqualTo(book); + .isNotEqualTo(magazine); - assertThat(template.find(Book.class, book.id())) + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().get().isEqualTo(updated); } @Test public void shouldFindById() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - assertThat(template.find(Book.class, book.id())) - .isNotNull().get().isEqualTo(book); + assertThat(template.find(Magazine.class, magazine.id())) + .isNotNull().get().isEqualTo(magazine); } @Test public void shouldDelete() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - template.delete(Book.class, book.id()); - assertThat(template.find(Book.class, book.id())) + template.delete(Magazine.class, magazine.id()); + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().isEmpty(); } diff --git a/jnosql-orientdb/src/test/java/org/eclipse/jnosql/databases/orientdb/mapping/DefaultOrientDBTemplateTest.java b/jnosql-orientdb/src/test/java/org/eclipse/jnosql/databases/orientdb/mapping/DefaultOrientDBTemplateTest.java index f80c604f5..309c7f62b 100644 --- a/jnosql-orientdb/src/test/java/org/eclipse/jnosql/databases/orientdb/mapping/DefaultOrientDBTemplateTest.java +++ b/jnosql-orientdb/src/test/java/org/eclipse/jnosql/databases/orientdb/mapping/DefaultOrientDBTemplateTest.java @@ -16,6 +16,7 @@ import jakarta.enterprise.inject.Instance; import jakarta.inject.Inject; +import jakarta.nosql.tck.entities.Person; import org.eclipse.jnosql.communication.semistructured.CommunicationEntity; import org.eclipse.jnosql.communication.semistructured.Element; import org.eclipse.jnosql.communication.semistructured.SelectQuery; @@ -81,7 +82,7 @@ public void setup() { CommunicationEntity entity = CommunicationEntity.of("Person"); entity.add(Element.of("name", "Ada")); - entity.add(Element.of("age", 10)); + entity.add(Element.of("native_age", 10)); when(manager.sql(Mockito.anyString(), Mockito.any(String.class))) .thenReturn(Stream.of(entity)); } @@ -90,7 +91,10 @@ public void setup() { public void shouldFindQuery() { Stream people = template.sql("sql * from Person where name = ?", "Ada"); - assertThat(people.collect(Collectors.toList())).contains(new Person("Ada", 10)); + var person = new Person(); + person.setName("Ada"); + person.setAge(10); + assertThat(people.collect(Collectors.toList())).contains(person); verify(manager).sql(Mockito.eq("sql * from Person where name = ?"), Mockito.eq("Ada")); } diff --git a/jnosql-orientdb/src/test/java/org/eclipse/jnosql/databases/orientdb/mapping/OrientDBDocumentRepositoryProxyTest.java b/jnosql-orientdb/src/test/java/org/eclipse/jnosql/databases/orientdb/mapping/OrientDBDocumentRepositoryProxyTest.java index 45b1b83f1..c41e0cb5f 100644 --- a/jnosql-orientdb/src/test/java/org/eclipse/jnosql/databases/orientdb/mapping/OrientDBDocumentRepositoryProxyTest.java +++ b/jnosql-orientdb/src/test/java/org/eclipse/jnosql/databases/orientdb/mapping/OrientDBDocumentRepositoryProxyTest.java @@ -15,6 +15,7 @@ package org.eclipse.jnosql.databases.orientdb.mapping; import jakarta.inject.Inject; +import jakarta.nosql.tck.entities.Person; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.document.DocumentTemplate; import org.eclipse.jnosql.mapping.document.spi.DocumentExtension; @@ -60,38 +61,38 @@ public class OrientDBDocumentRepositoryProxyTest { @Inject private Converters converters; - private PersonRepository personRepository; + private HumanRepository humanRepository; @BeforeEach public void setUp() { this.template = Mockito.mock(OrientDBTemplate.class); OrientDBDocumentRepositoryProxy handler = new OrientDBDocumentRepositoryProxy(template, - PersonRepository.class, converters, entitiesMetadata); + HumanRepository.class, converters, entitiesMetadata); when(template.insert(any(Person.class))).thenReturn(new Person()); when(template.insert(any(Person.class), any(Duration.class))).thenReturn(new Person()); when(template.update(any(Person.class))).thenReturn(new Person()); - this.personRepository = (PersonRepository) Proxy.newProxyInstance(PersonRepository.class.getClassLoader(), - new Class[]{PersonRepository.class}, + this.humanRepository = (HumanRepository) Proxy.newProxyInstance(HumanRepository.class.getClassLoader(), + new Class[]{HumanRepository.class}, handler); } @Test public void shouldFindAll() { - personRepository.findAllQuery(); + humanRepository.findAllQuery(); verify(template).sql("select * from Person"); } @Test public void shouldFindByNameSQL() { - personRepository.findByName("Ada"); + humanRepository.findByName("Ada"); verify(template).sql(Mockito.eq("select * from Person where name = ?"), Mockito.any(Object.class)); } @Test public void shouldFindByNameSQL2() { - personRepository.findByAge(10); + humanRepository.findByAge(10); ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(Map.class); verify(template).sql(Mockito.eq("select * from Person where age = :age"), argumentCaptor.capture()); Map value = argumentCaptor.getValue(); @@ -100,35 +101,44 @@ public void shouldFindByNameSQL2() { @Test public void shouldSaveUsingInsert() { - Person person = Person.of("Ada", 10); - personRepository.save(person); + var person = new Person(); + person.setName("Ada"); + person.setAge(10); + humanRepository.save(person); verify(template).insert(eq(person)); } @Test public void shouldSaveUsingUpdate() { - Person person = Person.of("Ada-2", 10); - when(template.find(Person.class, "Ada-2")).thenReturn(Optional.of(person)); - personRepository.save(person); + var person = new Person(); + person.setName("Ada-2"); + person.setAge(10); + person.setId(10L); + when(template.find(Person.class, 10L)).thenReturn(Optional.of(person)); + humanRepository.save(person); verify(template).update(eq(person)); } @Test public void shouldDelete(){ - personRepository.deleteById("id"); + humanRepository.deleteById("id"); verify(template).delete(Person.class, "id"); } @Test public void shouldDeleteEntity(){ - Person person = Person.of("Ada", 10); - personRepository.delete(person); - verify(template).delete(Person.class, person.getName()); + + var person = new Person(); + person.setName("Ada"); + person.setAge(10); + person.setId(10L); + humanRepository.delete(person); + verify(template).delete(Person.class, person.getId()); } - interface PersonRepository extends OrientDBCrudRepository { + interface HumanRepository extends OrientDBCrudRepository { @SQL("select * from Person") List findAllQuery(); diff --git a/jnosql-orientdb/src/test/java/org/eclipse/jnosql/databases/orientdb/mapping/Person.java b/jnosql-orientdb/src/test/java/org/eclipse/jnosql/databases/orientdb/mapping/Person.java deleted file mode 100644 index ae817a068..000000000 --- a/jnosql-orientdb/src/test/java/org/eclipse/jnosql/databases/orientdb/mapping/Person.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (c) 2022 Contributors to the Eclipse Foundation - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and Apache License v2.0 which accompanies this distribution. - * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html - * and the Apache License v2.0 is available at http://www.opensource.org/licenses/apache2.0.php. - * - * You may elect to redistribute this code under either of these licenses. - * - * Contributors: - * - * Otavio Santana - */ -package org.eclipse.jnosql.databases.orientdb.mapping; - - -import jakarta.nosql.Column; -import jakarta.nosql.Entity; -import jakarta.nosql.Id; - -import java.util.Objects; - -@Entity -public class Person { - - @Id("name") - private String name; - - @Column - private Integer age; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Integer getAge() { - return age; - } - - public void setAge(Integer age) { - this.age = age; - } - - public Person(String name, Integer age) { - this.name = name; - this.age = age; - } - - public Person() { - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - Person person = (Person) o; - return Objects.equals(name, person.name) && - Objects.equals(age, person.age); - } - - @Override - public int hashCode() { - return Objects.hash(name, age); - } - - @Override - public String toString() { - return "Person{" + - "name='" + name + '\'' + - ", age=" + age + - '}'; - } - - public static Person of(String name, Integer age) { - return new Person(name, age); - } -} diff --git a/jnosql-orientdb/src/test/java/org/eclipse/jnosql/databases/orientdb/mapping/PersonRepository.java b/jnosql-orientdb/src/test/java/org/eclipse/jnosql/databases/orientdb/mapping/PersonRepository.java index 5091f8fa7..545258af5 100644 --- a/jnosql-orientdb/src/test/java/org/eclipse/jnosql/databases/orientdb/mapping/PersonRepository.java +++ b/jnosql-orientdb/src/test/java/org/eclipse/jnosql/databases/orientdb/mapping/PersonRepository.java @@ -16,6 +16,7 @@ import jakarta.data.repository.Repository; +import jakarta.nosql.tck.entities.Person; @Repository public interface PersonRepository extends OrientDBCrudRepository { diff --git a/jnosql-orientdb/src/test/resources/document.properties b/jnosql-orientdb/src/test/resources/document.properties index d9625b9a3..b5f11fb4e 100644 --- a/jnosql-orientdb/src/test/resources/document.properties +++ b/jnosql-orientdb/src/test/resources/document.properties @@ -1,3 +1,3 @@ -query.1=insert person {"_id": 1, "name": "Diana"} -query.2=insert person {"_id": 2, "name": "Artemis"} +query.1=insert contact {"_id": 1, "name": "Diana"} +query.2=insert contact {"_id": 2, "name": "Artemis"} id.name=_id \ No newline at end of file diff --git a/jnosql-ravendb/src/test/resources/document.properties b/jnosql-ravendb/src/test/resources/document.properties index d9625b9a3..b5f11fb4e 100644 --- a/jnosql-ravendb/src/test/resources/document.properties +++ b/jnosql-ravendb/src/test/resources/document.properties @@ -1,3 +1,3 @@ -query.1=insert person {"_id": 1, "name": "Diana"} -query.2=insert person {"_id": 2, "name": "Artemis"} +query.1=insert contact {"_id": 1, "name": "Diana"} +query.2=insert contact {"_id": 2, "name": "Artemis"} id.name=_id \ No newline at end of file diff --git a/jnosql-redis/src/test/java/org/eclipse/jnosql/databases/redis/communication/Person.java b/jnosql-redis/src/test/java/org/eclipse/jnosql/databases/redis/communication/Human.java similarity index 87% rename from jnosql-redis/src/test/java/org/eclipse/jnosql/databases/redis/communication/Person.java rename to jnosql-redis/src/test/java/org/eclipse/jnosql/databases/redis/communication/Human.java index 2c40d2954..d08e5465f 100644 --- a/jnosql-redis/src/test/java/org/eclipse/jnosql/databases/redis/communication/Person.java +++ b/jnosql-redis/src/test/java/org/eclipse/jnosql/databases/redis/communication/Human.java @@ -21,13 +21,13 @@ import java.io.Serializable; -public record Person(String name, Integer age) implements Serializable { +public record Human(String name, Integer age) implements Serializable { private static final long serialVersionUID = 5089852596376703955L; @JsonbCreator - public Person(@JsonbProperty("name") String name, @JsonbProperty("age") Integer age) { + public Human(@JsonbProperty("name") String name, @JsonbProperty("age") Integer age) { this.name = name; this.age = age; } diff --git a/jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/integration/Book.java b/jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/integration/Magazine.java similarity index 87% rename from jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/integration/Book.java rename to jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/integration/Magazine.java index 175b9255f..c495485ae 100644 --- a/jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/integration/Book.java +++ b/jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/integration/Magazine.java @@ -19,7 +19,7 @@ import jakarta.nosql.Id; @Entity -public record Book(@Id String id, @Column("title") String title, @Column("edition") int edition) { +public record Magazine(@Id String id, @Column("title") String title, @Column("edition") int edition) { } diff --git a/jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/integration/SolrTemplateIntegrationTest.java b/jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/integration/SolrTemplateIntegrationTest.java index ca80f6adf..f855d9c82 100644 --- a/jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/integration/SolrTemplateIntegrationTest.java +++ b/jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/integration/SolrTemplateIntegrationTest.java @@ -43,7 +43,7 @@ @EnableAutoWeld @AddPackages(value = {Database.class, EntityConverter.class, DocumentTemplate.class}) -@AddPackages(Book.class) +@AddPackages(Magazine.class) @AddPackages(SolrTemplate.class) @AddPackages(Reflections.class) @AddPackages(Converters.class) @@ -63,65 +63,65 @@ class SolrTemplateIntegrationTest { @Test public void shouldInsert() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - template.insert(book); - Optional optional = template.find(Book.class, book.id()); + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + template.insert(magazine); + Optional optional = template.find(Magazine.class, magazine.id()); assertThat(optional).isNotNull().isNotEmpty() - .get().isEqualTo(book); + .get().isEqualTo(magazine); } @Test public void shouldUpdate() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - Book updated = new Book(book.id(), book.title() + " updated", 2); + Magazine updated = new Magazine(magazine.id(), magazine.title() + " updated", 2); assertThat(template.update(updated)) .isNotNull() - .isNotEqualTo(book); + .isNotEqualTo(magazine); - assertThat(template.find(Book.class, book.id())) + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().get().isEqualTo(updated); } @Test public void shouldFindById() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - assertThat(template.find(Book.class, book.id())) - .isNotNull().get().isEqualTo(book); + assertThat(template.find(Magazine.class, magazine.id())) + .isNotNull().get().isEqualTo(magazine); } @Test public void shouldDelete() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - template.delete(Book.class, book.id()); - assertThat(template.find(Book.class, book.id())) + template.delete(Magazine.class, magazine.id()); + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().isEmpty(); } @Test void shouldUpdateNullValues(){ - var book = new Book(randomUUID().toString(), "Effective Java", 1); + var book = new Magazine(randomUUID().toString(), "Effective Java", 1); template.insert(book); - template.update(new Book(book.id(), null, 2)); - Optional optional = template.select(Book.class).where("id") + template.update(new Magazine(book.id(), null, 2)); + Optional optional = template.select(Magazine.class).where("id") .eq(book.id()).singleResult(); SoftAssertions.assertSoftly(softly -> { softly.assertThat(optional).isPresent(); - softly.assertThat(optional).get().extracting(Book::title).isNull(); - softly.assertThat(optional).get().extracting(Book::edition).isEqualTo(2); + softly.assertThat(optional).get().extracting(Magazine::title).isNull(); + softly.assertThat(optional).get().extracting(Magazine::edition).isEqualTo(2); }); } diff --git a/jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/integration/TemplateIntegrationTest.java b/jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/integration/TemplateIntegrationTest.java index 72226f420..9b15a8386 100644 --- a/jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/integration/TemplateIntegrationTest.java +++ b/jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/integration/TemplateIntegrationTest.java @@ -41,7 +41,7 @@ @EnableAutoWeld @AddPackages(value = {Database.class, EntityConverter.class, DocumentTemplate.class}) -@AddPackages(Book.class) +@AddPackages(Magazine.class) @AddPackages(Reflections.class) @AddPackages(Converters.class) @AddExtensions({EntityMetadataExtension.class, @@ -61,51 +61,51 @@ class TemplateIntegrationTest { @Test public void shouldInsert() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - template.insert(book); - Optional optional = template.find(Book.class, book.id()); + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + template.insert(magazine); + Optional optional = template.find(Magazine.class, magazine.id()); assertThat(optional).isNotNull().isNotEmpty() - .get().isEqualTo(book); + .get().isEqualTo(magazine); } @Test public void shouldUpdate() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - Book updated = new Book(book.id(), book.title() + " updated", 2); + Magazine updated = new Magazine(magazine.id(), magazine.title() + " updated", 2); assertThat(template.update(updated)) .isNotNull() - .isNotEqualTo(book); + .isNotEqualTo(magazine); - assertThat(template.find(Book.class, book.id())) + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().get().isEqualTo(updated); } @Test public void shouldFindById() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - assertThat(template.find(Book.class, book.id())) - .isNotNull().get().isEqualTo(book); + assertThat(template.find(Magazine.class, magazine.id())) + .isNotNull().get().isEqualTo(magazine); } @Test public void shouldDelete() { - Book book = new Book(randomUUID().toString(), "Effective Java", 1); - assertThat(template.insert(book)) + Magazine magazine = new Magazine(randomUUID().toString(), "Effective Java", 1); + assertThat(template.insert(magazine)) .isNotNull() - .isEqualTo(book); + .isEqualTo(magazine); - template.delete(Book.class, book.id()); - assertThat(template.find(Book.class, book.id())) + template.delete(Magazine.class, magazine.id()); + assertThat(template.find(Magazine.class, magazine.id())) .isNotNull().isEmpty(); } diff --git a/jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/mapping/Person.java b/jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/mapping/Human.java similarity index 83% rename from jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/mapping/Person.java rename to jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/mapping/Human.java index 17997435b..cea59a667 100644 --- a/jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/mapping/Person.java +++ b/jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/mapping/Human.java @@ -22,7 +22,7 @@ import java.util.Objects; @Entity -public class Person { +public class Human { @Id private String name; @@ -46,21 +46,21 @@ public void setAge(Integer age) { this.age = age; } - public Person(String name, Integer age) { + public Human(String name, Integer age) { this.name = name; this.age = age; } - public Person() { + public Human() { } @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - Person person = (Person) o; - return Objects.equals(name, person.name) && - Objects.equals(age, person.age); + Human human = (Human) o; + return Objects.equals(name, human.name) && + Objects.equals(age, human.age); } @Override @@ -75,7 +75,7 @@ public String toString() { ", age=" + age + '}'; } - public static Person of(String name, Integer age) { - return new Person(name, age); + public static Human of(String name, Integer age) { + return new Human(name, age); } } diff --git a/jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/mapping/PersonRepository.java b/jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/mapping/HumannRepository.java similarity index 90% rename from jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/mapping/PersonRepository.java rename to jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/mapping/HumannRepository.java index cdbb67a9b..d7ab9a3ce 100644 --- a/jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/mapping/PersonRepository.java +++ b/jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/mapping/HumannRepository.java @@ -18,5 +18,5 @@ import jakarta.data.repository.Repository; @Repository -public interface PersonRepository extends SolrRepository { +public interface HumannRepository extends SolrRepository { } diff --git a/jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/mapping/SolrExtensionTest.java b/jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/mapping/SolrExtensionTest.java index 0bf2da2ae..9b754ad27 100644 --- a/jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/mapping/SolrExtensionTest.java +++ b/jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/mapping/SolrExtensionTest.java @@ -37,7 +37,7 @@ public class SolrExtensionTest { @Inject - private PersonRepository repository; + private HumannRepository repository; @Test public void shouldSaveOrientDB() { diff --git a/jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/mapping/SolrRepositoryProxyTest.java b/jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/mapping/SolrRepositoryProxyTest.java index 41f28a3c7..3b1cfcf71 100644 --- a/jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/mapping/SolrRepositoryProxyTest.java +++ b/jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/mapping/SolrRepositoryProxyTest.java @@ -60,33 +60,33 @@ public class SolrRepositoryProxyTest { @Inject private EntitiesMetadata entitiesMetadata; - private PersonRepository personRepository; + private HumanRepository humanRepository; @BeforeEach public void setUp() { this.template = Mockito.mock(SolrTemplate.class); SolrRepositoryProxy handler = new SolrRepositoryProxy(template, - PersonRepository.class, converters, entitiesMetadata); + HumanRepository.class, converters, entitiesMetadata); - when(template.insert(any(Person.class))).thenReturn(new Person()); - when(template.insert(any(Person.class), any(Duration.class))).thenReturn(new Person()); - when(template.update(any(Person.class))).thenReturn(new Person()); - personRepository = (PersonRepository) Proxy.newProxyInstance(PersonRepository.class.getClassLoader(), - new Class[]{PersonRepository.class}, + when(template.insert(any(Human.class))).thenReturn(new Human()); + when(template.insert(any(Human.class), any(Duration.class))).thenReturn(new Human()); + when(template.update(any(Human.class))).thenReturn(new Human()); + humanRepository = (HumanRepository) Proxy.newProxyInstance(HumanRepository.class.getClassLoader(), + new Class[]{HumanRepository.class}, handler); } @Test public void shouldFindAll() { - personRepository.findAllQuery(); + humanRepository.findAllQuery(); verify(template).solr("_entity:person"); } @Test public void shouldFindByNameN1ql() { ArgumentCaptor captor = ArgumentCaptor.forClass(Map.class); - personRepository.findByName("Ada"); + humanRepository.findByName("Ada"); verify(template).solr(Mockito.eq("name:@name AND _entity:person"), captor.capture()); Map value = captor.getValue(); @@ -96,40 +96,40 @@ public void shouldFindByNameN1ql() { @Test public void shouldSaveUsingInsert() { - Person person = Person.of("Ada", 10); - personRepository.save(person); - verify(template).insert(eq(person)); + Human human = Human.of("Ada", 10); + humanRepository.save(human); + verify(template).insert(eq(human)); } @Test public void shouldSaveUsingUpdate() { - Person person = Person.of("Ada-2", 10); - when(template.find(Person.class, "Ada-2")).thenReturn(Optional.of(person)); - personRepository.save(person); - verify(template).update(eq(person)); + Human human = Human.of("Ada-2", 10); + when(template.find(Human.class, "Ada-2")).thenReturn(Optional.of(human)); + humanRepository.save(human); + verify(template).update(eq(human)); } @Test public void shouldDelete(){ - personRepository.deleteById("id"); - verify(template).delete(Person.class, "id"); + humanRepository.deleteById("id"); + verify(template).delete(Human.class, "id"); } @Test public void shouldDeleteEntity(){ - Person person = Person.of("Ada", 10); - personRepository.delete(person); - verify(template).delete(Person.class, person.getName()); + Human human = Human.of("Ada", 10); + humanRepository.delete(human); + verify(template).delete(Human.class, human.getName()); } - interface PersonRepository extends SolrRepository { + interface HumanRepository extends SolrRepository { @Solr("_entity:person") - List findAllQuery(); + List findAllQuery(); @Solr("name:@name AND _entity:person") - List findByName(@Param("name") String name); + List findByName(@Param("name") String name); } } \ No newline at end of file diff --git a/jnosql-solr/src/test/resources/document.properties b/jnosql-solr/src/test/resources/document.properties index d9625b9a3..b5f11fb4e 100644 --- a/jnosql-solr/src/test/resources/document.properties +++ b/jnosql-solr/src/test/resources/document.properties @@ -1,3 +1,3 @@ -query.1=insert person {"_id": 1, "name": "Diana"} -query.2=insert person {"_id": 2, "name": "Artemis"} +query.1=insert contact {"_id": 1, "name": "Diana"} +query.2=insert contact {"_id": 2, "name": "Artemis"} id.name=_id \ No newline at end of file diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractGraphTemplateTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractGraphTemplateTest.java index 8281170da..1186b070f 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractGraphTemplateTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractGraphTemplateTest.java @@ -16,6 +16,7 @@ import jakarta.data.exceptions.EmptyResultException; import jakarta.data.exceptions.NonUniqueResultException; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Magazine; import org.eclipse.jnosql.mapping.PreparedStatement; import org.apache.tinkerpop.gremlin.structure.Direction; import org.apache.tinkerpop.gremlin.structure.Edge; @@ -23,9 +24,8 @@ import org.apache.tinkerpop.gremlin.structure.Transaction; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.assertj.core.api.SoftAssertions; -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.entities.Creature; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Human; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -68,109 +68,109 @@ void shouldReturnErrorWhenEntityIsNull() { @Test void shouldInsertAnEntity() { - Person person = Person.builder().withAge() + Human human = Human.builder().withAge() .withName("Otavio").build(); - Person updated = getGraphTemplate().insert(person); + Human updated = getGraphTemplate().insert(human); getGraphTemplate().delete(updated.getId()); } @Test void shouldReturnErrorWhenInsertWithTTL() { - Person person = Person.builder().withAge() + Human human = Human.builder().withAge() .withName("Otavio").build(); Assertions.assertThrows(UnsupportedOperationException.class, - () -> getGraphTemplate().insert(person, Duration.ZERO)); + () -> getGraphTemplate().insert(human, Duration.ZERO)); } @Test void shouldReturnErrorWhenInsertIterableWithTTL() { - Person person = Person.builder().withAge() + Human human = Human.builder().withAge() .withName("Otavio").build(); Assertions.assertThrows(UnsupportedOperationException.class, - () -> getGraphTemplate().insert(Collections.singleton(person), Duration.ZERO)); + () -> getGraphTemplate().insert(Collections.singleton(human), Duration.ZERO)); } @Test void shouldInsertEntities() { - Person otavio = Person.builder().withAge() + Human otavio = Human.builder().withAge() .withName("Otavio").build(); - Person poliana = Person.builder().withAge() + Human poliana = Human.builder().withAge() .withName("Poliana").build(); - final Iterable people = getGraphTemplate() + final Iterable people = getGraphTemplate() .insert(Arrays.asList(otavio, poliana)); final boolean allHasId = StreamSupport.stream(people.spliterator(), false) - .map(Person::getId) + .map(Human::getId) .allMatch(Objects::nonNull); assertTrue(allHasId); } @Test void shouldMergeOnInsert() { - Person person = Person.builder().withAge() + Human human = Human.builder().withAge() .withName("Otavio").build(); - Person updated = getGraphTemplate().insert(person); - assertSame(person, updated); + Human updated = getGraphTemplate().insert(human); + assertSame(human, updated); } @Test void shouldGetErrorWhenIdIsNullWhenUpdate() { assertThrows(EmptyResultException.class, () -> { - Person person = Person.builder().withAge() + Human human = Human.builder().withAge() .withName("Otavio").build(); - getGraphTemplate().update(person); + getGraphTemplate().update(human); }); } @Test void shouldGetErrorWhenEntityIsNotSavedYet() { assertThrows(EmptyResultException.class, () -> { - Person person = Person.builder().withAge() + Human human = Human.builder().withAge() .withId(10L) .withName("Otavio").build(); - getGraphTemplate().update(person); + getGraphTemplate().update(human); }); } @Test void shouldUpdate() { - Person person = Person.builder().withAge() + Human human = Human.builder().withAge() .withName("Otavio").build(); - Person updated = getGraphTemplate().insert(person); - Person newPerson = Person.builder() + Human updated = getGraphTemplate().insert(human); + Human newHuman = Human.builder() .withAge() .withId(updated.getId()) .withName("Otavio Updated").build(); - Person update = getGraphTemplate().update(newPerson); + Human update = getGraphTemplate().update(newHuman); - assertEquals(newPerson, update); + assertEquals(newHuman, update); getGraphTemplate().delete(update.getId()); } @Test void shouldUpdateEntities() { - Person otavio = Person.builder().withAge() + Human otavio = Human.builder().withAge() .withName("Otavio").build(); - Person poliana = Person.builder().withAge() + Human poliana = Human.builder().withAge() .withName("Poliana").build(); - final Iterable insertPeople = getGraphTemplate().insert(Arrays.asList(otavio, poliana)); + final Iterable insertPeople = getGraphTemplate().insert(Arrays.asList(otavio, poliana)); - final List newPeople = StreamSupport.stream(insertPeople.spliterator(), false) - .map(p -> Person.builder().withAge().withId(p.getId()).withName(p.getName() + " updated").build()) + final List newPeople = StreamSupport.stream(insertPeople.spliterator(), false) + .map(p -> Human.builder().withAge().withId(p.getId()).withName(p.getName() + " updated").build()) .collect(toList()); - final Iterable update = getGraphTemplate().update(newPeople); + final Iterable update = getGraphTemplate().update(newPeople); final boolean allUpdated = StreamSupport.stream(update.spliterator(), false) - .map(Person::getName).allMatch(name -> name.contains(" updated")); + .map(Human::getName).allMatch(name -> name.contains(" updated")); assertTrue(allUpdated); } @@ -178,17 +178,17 @@ void shouldUpdateEntities() { @Test void shouldMergeOnUpdate() { - Person person = Person.builder().withAge() + Human human = Human.builder().withAge() .withName("Otavio").build(); - Person updated = getGraphTemplate().insert(person); - Person newPerson = Person.builder() + Human updated = getGraphTemplate().insert(human); + Human newHuman = Human.builder() .withAge() .withId(updated.getId()) .withName("Otavio Updated").build(); - Person update = getGraphTemplate().update(newPerson); + Human update = getGraphTemplate().update(newHuman); - assertSame(update, newPerson); + assertSame(update, newHuman); } @Test @@ -198,10 +198,10 @@ void shouldReturnErrorInFindWhenIdIsNull() { @Test void shouldFindAnEntity() { - Person person = Person.builder().withAge() + Human human = Human.builder().withAge() .withName("Otavio").build(); - Person updated = getGraphTemplate().insert(person); - Optional personFound = getGraphTemplate().find(updated.getId()); + Human updated = getGraphTemplate().insert(human); + Optional personFound = getGraphTemplate().find(updated.getId()); assertTrue(personFound.isPresent()); assertEquals(updated, personFound.get()); @@ -211,54 +211,54 @@ void shouldFindAnEntity() { @Test void shouldNotFindAnEntity() { - Optional personFound = getGraphTemplate().find(0L); + Optional personFound = getGraphTemplate().find(0L); assertFalse(personFound.isPresent()); } @Test void shouldDeleteById() { - Person person = getGraphTemplate().insert(Person.builder().withAge() + Human human = getGraphTemplate().insert(Human.builder().withAge() .withName("Otavio").build()); - assertTrue(getGraphTemplate().find(person.getId()).isPresent()); - getGraphTemplate().delete(person.getId()); - assertFalse(getGraphTemplate().find(person.getId()).isPresent()); + assertTrue(getGraphTemplate().find(human.getId()).isPresent()); + getGraphTemplate().delete(human.getId()); + assertFalse(getGraphTemplate().find(human.getId()).isPresent()); } @Test void shouldDeleteAnEntityFromTemplate() { - Person person = getGraphTemplate().insert(Person.builder().withAge() + Human human = getGraphTemplate().insert(Human.builder().withAge() .withName("Otavio").build()); - assertTrue(getGraphTemplate().find(person.getId()).isPresent()); - getGraphTemplate().delete(Person.class, person.getId()); - assertFalse(getGraphTemplate().find(person.getId()).isPresent()); + assertTrue(getGraphTemplate().find(human.getId()).isPresent()); + getGraphTemplate().delete(Human.class, human.getId()); + assertFalse(getGraphTemplate().find(human.getId()).isPresent()); } @Test void shouldNotDeleteAnEntityFromTemplate() { - Person person = getGraphTemplate().insert(Person.builder().withAge() + Human human = getGraphTemplate().insert(Human.builder().withAge() .withName("Otavio").build()); - assertTrue(getGraphTemplate().find(person.getId()).isPresent()); - getGraphTemplate().delete(Book.class, person.getId()); - assertTrue(getGraphTemplate().find(person.getId()).isPresent()); - getGraphTemplate().delete(Person.class, person.getId()); - assertFalse(getGraphTemplate().find(person.getId()).isPresent()); + assertTrue(getGraphTemplate().find(human.getId()).isPresent()); + getGraphTemplate().delete(Magazine.class, human.getId()); + assertTrue(getGraphTemplate().find(human.getId()).isPresent()); + getGraphTemplate().delete(Human.class, human.getId()); + assertFalse(getGraphTemplate().find(human.getId()).isPresent()); } @Test void shouldDeleteEntitiesById() { - Person otavio = getGraphTemplate().insert(Person.builder().withAge() + Human otavio = getGraphTemplate().insert(Human.builder().withAge() .withName("Otavio").build()); - Person poliana = getGraphTemplate().insert(Person.builder().withAge() + Human poliana = getGraphTemplate().insert(Human.builder().withAge() .withName("Poliana").build()); assertTrue(getGraphTemplate().find(otavio.getId()).isPresent()); @@ -285,11 +285,11 @@ void shouldReturnEmptyWhenVertexDoesNotExist() { @Test void shouldReturnEdgesById() { - Person otavio = getGraphTemplate().insert(Person.builder().withAge() + Human otavio = getGraphTemplate().insert(Human.builder().withAge() .withName("Otavio").build()); - Animal dog = getGraphTemplate().insert(new Animal("dog")); - Book cleanCode = getGraphTemplate().insert(Book.builder().withName("Clean code").build()); + Creature dog = getGraphTemplate().insert(new Creature("dog")); + Magazine cleanCode = getGraphTemplate().insert(Magazine.builder().withName("Clean code").build()); EdgeEntity likes = getGraphTemplate().edge(otavio, "likes", dog); EdgeEntity reads = getGraphTemplate().edge(otavio, "reads", cleanCode); @@ -310,9 +310,9 @@ void shouldReturnEdgesById() { @Test void shouldDeleteEdge() { - Person otavio = getGraphTemplate().insert(Person.builder().withAge() + Human otavio = getGraphTemplate().insert(Human.builder().withAge() .withName("Otavio").build()); - Animal dog = getGraphTemplate().insert(new Animal("Ada")); + Creature dog = getGraphTemplate().insert(new Creature("Ada")); EdgeEntity likes = getGraphTemplate().edge(otavio, "likes", dog); @@ -325,10 +325,10 @@ void shouldDeleteEdge() { @Test void shouldDeleteEdges() { - Person otavio = getGraphTemplate().insert(Person.builder().withAge() + Human otavio = getGraphTemplate().insert(Human.builder().withAge() .withName("Otavio").build()); - Animal dog = getGraphTemplate().insert(new Animal("Ada")); - Book cleanCode = getGraphTemplate().insert(Book.builder().withName("Clean code").build()); + Creature dog = getGraphTemplate().insert(new Creature("Ada")); + Magazine cleanCode = getGraphTemplate().insert(Magazine.builder().withName("Clean code").build()); EdgeEntity likes = getGraphTemplate().edge(otavio, "likes", dog); EdgeEntity reads = getGraphTemplate().edge(otavio, "reads", cleanCode); @@ -348,7 +348,7 @@ void shouldReturnErrorWhenGetEdgesHasNullId() { @Test void shouldReturnErrorWhenGetEdgesHasNullId2() { - Person otavio = Person.builder().withAge().withName("Otavio").build(); + Human otavio = Human.builder().withAge().withName("Otavio").build(); Collection edges = getGraphTemplate().edges(otavio, Direction.BOTH); assertThat(edges).isEmpty(); } @@ -356,7 +356,7 @@ void shouldReturnErrorWhenGetEdgesHasNullId2() { @Test void shouldReturnErrorWhenGetEdgesHasNullDirection() { assertThrows(NullPointerException.class, () -> { - Person otavio = getGraphTemplate().insert(Person.builder().withAge() + Human otavio = getGraphTemplate().insert(Human.builder().withAge() .withName("Otavio").build()); getGraphTemplate().edges(otavio, null); }); @@ -364,7 +364,7 @@ void shouldReturnErrorWhenGetEdgesHasNullDirection() { @Test void shouldReturnEmptyWhenEntityDoesNotExist() { - Person otavio = Person.builder().withAge().withName("Otavio").withId(10L).build(); + Human otavio = Human.builder().withAge().withName("Otavio").withId(10L).build(); Collection edges = getGraphTemplate().edges(otavio, Direction.BOTH); assertTrue(edges.isEmpty()); } @@ -372,11 +372,11 @@ void shouldReturnEmptyWhenEntityDoesNotExist() { @Test void shouldReturnEdges() { - Person otavio = getGraphTemplate().insert(Person.builder().withAge() + Human otavio = getGraphTemplate().insert(Human.builder().withAge() .withName("Otavio").build()); - Animal dog = getGraphTemplate().insert(new Animal("dog")); - Book cleanCode = getGraphTemplate().insert(Book.builder().withName("Clean code").build()); + Creature dog = getGraphTemplate().insert(new Creature("dog")); + Magazine cleanCode = getGraphTemplate().insert(Magazine.builder().withName("Clean code").build()); EdgeEntity likes = getGraphTemplate().edge(otavio, "likes", dog); EdgeEntity reads = getGraphTemplate().edge(otavio, "reads", cleanCode); @@ -404,53 +404,53 @@ void shouldGetTransaction() { @Test void shouldExecuteQuery() { - Person person = Person.builder().withAge() + Human human = Human.builder().withAge() .withName("Otavio").build(); - getGraphTemplate().insert(person); - List people = getGraphTemplate() - .gremlin("g.V().hasLabel('Person')") + getGraphTemplate().insert(human); + List people = getGraphTemplate() + .gremlin("g.V().hasLabel('Human')") .toList(); - assertThat(people.stream().map(Person::getName).collect(toList())).contains("Otavio"); + assertThat(people.stream().map(Human::getName).collect(toList())).contains("Otavio"); } @Test void shouldReturnEmpty() { - Optional person = getGraphTemplate().gremlinSingleResult("g.V().hasLabel('Person')"); + Optional person = getGraphTemplate().gremlinSingleResult("g.V().hasLabel('Person')"); assertFalse(person.isPresent()); } @Test void shouldReturnOneElement() { - Person otavio = Person.builder().withAge() + Human otavio = Human.builder().withAge() .withName("Otavio").build(); getGraphTemplate().insert(otavio); - Optional person = getGraphTemplate().gremlinSingleResult("g.V().hasLabel('Person')"); + Optional person = getGraphTemplate().gremlinSingleResult("g.V().hasLabel('Human')"); assertTrue(person.isPresent()); } @Test void shouldReturnErrorWhenHasNoneThanOneElement() { - getGraphTemplate().insert(Person.builder().withAge().withName("Otavio").build()); - getGraphTemplate().insert(Person.builder().withAge().withName("Poliana").build()); - assertThrows(NonUniqueResultException.class, () -> getGraphTemplate().gremlinSingleResult("g.V().hasLabel('Person')")); + getGraphTemplate().insert(Human.builder().withAge().withName("Otavio").build()); + getGraphTemplate().insert(Human.builder().withAge().withName("Poliana").build()); + assertThrows(NonUniqueResultException.class, () -> getGraphTemplate().gremlinSingleResult("g.V().hasLabel('Human')")); } @Test void shouldExecutePrepareStatement() { - getGraphTemplate().insert(Person.builder().withAge().withName("Otavio").build()); + getGraphTemplate().insert(Human.builder().withAge().withName("Otavio").build()); PreparedStatement prepare = getGraphTemplate().gremlinPrepare("g.V().hasLabel(@param)"); - prepare.bind("param", "Person"); - List people = prepare.result().toList(); - assertThat(people.stream().map(Person::getName).collect(toList())).contains("Otavio"); + prepare.bind("param", "Human"); + List people = prepare.result().toList(); + assertThat(people.stream().map(Human::getName).collect(toList())).contains("Otavio"); } @Test void shouldExecutePrepareStatementSingleton() { - getGraphTemplate().insert(Person.builder().withAge().withName("Otavio").build()); + getGraphTemplate().insert(Human.builder().withAge().withName("Otavio").build()); PreparedStatement prepare = getGraphTemplate().gremlinPrepare("g.V().hasLabel(@param)"); - prepare.bind("param", "Person"); - Optional otavio = prepare.singleResult(); + prepare.bind("param", "Human"); + Optional otavio = prepare.singleResult(); assertTrue(otavio.isPresent()); } @@ -458,68 +458,68 @@ void shouldExecutePrepareStatementSingleton() { void shouldExecutePrepareStatementSingletonEmpty() { PreparedStatement prepare = getGraphTemplate().gremlinPrepare("g.V().hasLabel(@param)"); prepare.bind("param", "Person"); - Optional otavio = prepare.singleResult(); + Optional otavio = prepare.singleResult(); assertFalse(otavio.isPresent()); } @Test void shouldExecutePrepareStatementWithErrorWhenThereIsMoreThanOneResult() { - getGraphTemplate().insert(Person.builder().withAge().withName("Otavio").build()); - getGraphTemplate().insert(Person.builder().withAge().withName("Poliana").build()); + getGraphTemplate().insert(Human.builder().withAge().withName("Otavio").build()); + getGraphTemplate().insert(Human.builder().withAge().withName("Poliana").build()); PreparedStatement prepare = getGraphTemplate().gremlinPrepare("g.V().hasLabel(@param)"); - prepare.bind("param", "Person"); + prepare.bind("param", "Human"); assertThrows(NonUniqueResultException.class, prepare::singleResult); } @Test void shouldCount() { - getGraphTemplate().insert(Person.builder().withAge().withName("Otavio").build()); - getGraphTemplate().insert(Person.builder().withAge().withName("Poliana").build()); - assertEquals(2L, getGraphTemplate().count("Person")); + getGraphTemplate().insert(Human.builder().withAge().withName("Otavio").build()); + getGraphTemplate().insert(Human.builder().withAge().withName("Poliana").build()); + assertEquals(2L, getGraphTemplate().count("Human")); } @Test void shouldCountFromEntity() { - getGraphTemplate().insert(Person.builder().withAge().withName("Otavio").build()); - getGraphTemplate().insert(Person.builder().withAge().withName("Poliana").build()); - assertEquals(2L, getGraphTemplate().count(Person.class)); + getGraphTemplate().insert(Human.builder().withAge().withName("Otavio").build()); + getGraphTemplate().insert(Human.builder().withAge().withName("Poliana").build()); + assertEquals(2L, getGraphTemplate().count(Human.class)); } @Test void shouldFindById() { - final Person otavio = getGraphTemplate().insert(Person.builder().withAge() + final Human otavio = getGraphTemplate().insert(Human.builder().withAge() .withName("Otavio").build()); - final Optional person = getGraphTemplate().find(Person.class, otavio.getId()); + final Optional person = getGraphTemplate().find(Human.class, otavio.getId()); assertNotNull(person); assertTrue(person.isPresent()); - assertEquals(otavio.getName(), person.map(Person::getName).get()); + assertEquals(otavio.getName(), person.map(Human::getName).get()); } @Test void shouldFindAll() { - final Person otavio = getGraphTemplate().insert(Person.builder().withAge() + final Human otavio = getGraphTemplate().insert(Human.builder().withAge() .withName("Otavio").build()); - List people = getGraphTemplate().findAll(Person.class).toList(); + List people = getGraphTemplate().findAll(Human.class).toList(); assertThat(people).hasSize(1) - .map(Person::getName) + .map(Human::getName) .contains("Otavio"); } @Test void shouldDeleteAll() { - final Person otavio = getGraphTemplate().insert(Person.builder().withAge() + final Human otavio = getGraphTemplate().insert(Human.builder().withAge() .withName("Otavio").build()); - List people = getGraphTemplate().findAll(Person.class).toList(); + List people = getGraphTemplate().findAll(Human.class).toList(); assertThat(people).hasSize(1) - .map(Person::getName) + .map(Human::getName) .contains("Otavio"); - getGraphTemplate().deleteAll(Person.class); - people = getGraphTemplate().findAll(Person.class).toList(); + getGraphTemplate().deleteAll(Human.class); + people = getGraphTemplate().findAll(Human.class).toList(); assertThat(people).isEmpty(); } @@ -527,20 +527,20 @@ void shouldDeleteAll() { @Test void shouldReturnEmptyWhenFindByIdNotFound() { - final Optional person = getGraphTemplate().find(Person.class, -2L); + final Optional person = getGraphTemplate().find(Human.class, -2L); assertNotNull(person); assertFalse(person.isPresent()); } @Test void shouldUpdateNullValues(){ - final Person otavio = getGraphTemplate().insert(Person.builder().withAge() + final Human otavio = getGraphTemplate().insert(Human.builder().withAge() .withName("Otavio").build()); assertEquals("Otavio", otavio.getName()); otavio.setName(null); - final Person person = getGraphTemplate().update(otavio); - assertNull(person.getName()); + final Human human = getGraphTemplate().update(otavio); + assertNull(human.getName()); } } diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractTraversalTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractTraversalTest.java index ff03d624a..f8a87dbc8 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractTraversalTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/AbstractTraversalTest.java @@ -20,8 +20,8 @@ import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Book; -import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Person; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Magazine; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Human; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -36,13 +36,13 @@ public abstract class AbstractTraversalTest { protected Graph graph; - protected Person otavio; - protected Person poliana; - protected Person paulo; + protected Human otavio; + protected Human poliana; + protected Human paulo; - protected Book shack; - protected Book license; - protected Book effectiveJava; + protected Magazine shack; + protected Magazine license; + protected Magazine effectiveJava; protected EdgeEntity reads; protected EdgeEntity reads2; @@ -54,16 +54,16 @@ public void setUp() { graph.traversal().V().toList().forEach(Vertex::remove); graph.traversal().E().toList().forEach(Edge::remove); - otavio = graphTemplate.insert(Person.builder().withAge(27) + otavio = graphTemplate.insert(Human.builder().withAge(27) .withName("Otavio").build()); - poliana = graphTemplate.insert(Person.builder().withAge(26) + poliana = graphTemplate.insert(Human.builder().withAge(26) .withName("Poliana").build()); - paulo = graphTemplate.insert(Person.builder().withAge(50) + paulo = graphTemplate.insert(Human.builder().withAge(50) .withName("Paulo").build()); - shack = graphTemplate.insert(Book.builder().withAge(2007).withName("The Shack").build()); - license = graphTemplate.insert(Book.builder().withAge(2013).withName("Software License").build()); - effectiveJava = graphTemplate.insert(Book.builder().withAge(2001).withName("Effective Java").build()); + shack = graphTemplate.insert(Magazine.builder().withAge(2007).withName("The Shack").build()); + license = graphTemplate.insert(Magazine.builder().withAge(2013).withName("Software License").build()); + effectiveJava = graphTemplate.insert(Magazine.builder().withAge(2001).withName("Effective Java").build()); reads = graphTemplate.edge(otavio, READS, effectiveJava); diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeTraversalTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeTraversalTest.java index be7fed6bd..cb0762d38 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeTraversalTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultEdgeTraversalTest.java @@ -18,11 +18,11 @@ import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.structure.T; import org.assertj.core.api.SoftAssertions; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Magazine; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; -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.entities.Creature; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Human; import org.eclipse.jnosql.databases.tinkerpop.mapping.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; @@ -154,16 +154,16 @@ void shouldReturnErrorWhenBothEIsNull() { @Test void shouldReturnOut() { - List people = graphTemplate.traversalVertex().outE(READS).outV().result().collect(toList()); + List people = graphTemplate.traversalVertex().outE(READS).outV().result().collect(toList()); assertEquals(3, people.size()); assertThat(people).contains(poliana, otavio, paulo); } @Test void shouldReturnIn() { - List books = graphTemplate.traversalVertex().outE(READS).inV().result().collect(toList()); - assertEquals(3, books.size()); - assertThat(books).contains(shack, effectiveJava, license); + List magazines = graphTemplate.traversalVertex().outE(READS).inV().result().collect(toList()); + assertEquals(3, magazines.size()); + assertThat(magazines).contains(shack, effectiveJava, license); } @@ -330,10 +330,10 @@ void shouldReturnNext() { @Test void shouldReturnHas() { - Animal lion = graphTemplate.insert(new Animal("lion")); - Animal snake = graphTemplate.insert(new Animal("snake")); - Animal mouse = graphTemplate.insert(new Animal("mouse")); - Animal plant = graphTemplate.insert(new Animal("plant")); + Creature lion = graphTemplate.insert(new Creature("lion")); + Creature snake = graphTemplate.insert(new Creature("snake")); + Creature mouse = graphTemplate.insert(new Creature("mouse")); + Creature plant = graphTemplate.insert(new Creature("plant")); graphTemplate.edge(lion, "eats", snake).add("when", "night"); graphTemplate.edge(snake, "eats", mouse); @@ -348,10 +348,10 @@ void shouldReturnHas() { @Test void shouldRepeatTimesTraversal() { - Animal lion = graphTemplate.insert(new Animal("lion")); - Animal snake = graphTemplate.insert(new Animal("snake")); - Animal mouse = graphTemplate.insert(new Animal("mouse")); - Animal plant = graphTemplate.insert(new Animal("plant")); + Creature lion = graphTemplate.insert(new Creature("lion")); + Creature snake = graphTemplate.insert(new Creature("snake")); + Creature mouse = graphTemplate.insert(new Creature("mouse")); + Creature plant = graphTemplate.insert(new Creature("plant")); graphTemplate.edge(lion, "eats", snake).add("when", "night"); graphTemplate.edge(snake, "eats", mouse); @@ -364,10 +364,10 @@ void shouldRepeatTimesTraversal() { @Test void shouldRepeatUntilTraversal() { - Animal lion = graphTemplate.insert(new Animal("lion")); - Animal snake = graphTemplate.insert(new Animal("snake")); - Animal mouse = graphTemplate.insert(new Animal("mouse")); - Animal plant = graphTemplate.insert(new Animal("plant")); + Creature lion = graphTemplate.insert(new Creature("lion")); + Creature snake = graphTemplate.insert(new Creature("snake")); + Creature mouse = graphTemplate.insert(new Creature("mouse")); + Creature plant = graphTemplate.insert(new Creature("plant")); graphTemplate.edge(lion, "eats", snake).add("when", "night"); graphTemplate.edge(snake, "eats", mouse); @@ -385,10 +385,10 @@ void shouldRepeatUntilTraversal() { @Test void shouldRepeatUntilHasValueTraversal() { - Animal lion = graphTemplate.insert(new Animal("lion")); - Animal snake = graphTemplate.insert(new Animal("snake")); - Animal mouse = graphTemplate.insert(new Animal("mouse")); - Animal plant = graphTemplate.insert(new Animal("plant")); + Creature lion = graphTemplate.insert(new Creature("lion")); + Creature snake = graphTemplate.insert(new Creature("snake")); + Creature mouse = graphTemplate.insert(new Creature("mouse")); + Creature plant = graphTemplate.insert(new Creature("plant")); graphTemplate.edge(lion, "eats", snake).add("when", "night"); graphTemplate.edge(snake, "eats", mouse); @@ -406,10 +406,10 @@ void shouldRepeatUntilHasValueTraversal() { @Test void shouldRepeatUntilHasPredicateTraversal() { - Animal lion = graphTemplate.insert(new Animal("lion")); - Animal snake = graphTemplate.insert(new Animal("snake")); - Animal mouse = graphTemplate.insert(new Animal("mouse")); - Animal plant = graphTemplate.insert(new Animal("plant")); + Creature lion = graphTemplate.insert(new Creature("lion")); + Creature snake = graphTemplate.insert(new Creature("snake")); + Creature mouse = graphTemplate.insert(new Creature("mouse")); + Creature plant = graphTemplate.insert(new Creature("plant")); graphTemplate.edge(lion, "eats", snake).add("when", "night"); graphTemplate.edge(snake, "eats", mouse); @@ -420,8 +420,8 @@ void shouldRepeatUntilHasPredicateTraversal() { SoftAssertions.assertSoftly(softly -> { - Animal incoming = result.incoming(); - Animal outgoing = result.outgoing(); + Creature incoming = result.incoming(); + Creature outgoing = result.outgoing(); softly.assertThat(incoming).isEqualTo(snake); softly.assertThat(outgoing).isEqualTo(lion); }); @@ -522,14 +522,14 @@ void shouldDedup() { graphTemplate.edge(paulo, "knows", poliana); List edges = graphTemplate.traversalVertex() - .hasLabel(Person.class) + .hasLabel(Human.class) .inE("knows").result() .collect(Collectors.toList()); assertEquals(6, edges.size()); edges = graphTemplate.traversalVertex() - .hasLabel(Person.class) + .hasLabel(Human.class) .inE("knows") .dedup() .result() diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultGraphTraversalSourceTemplateTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultGraphTraversalSourceTemplateTest.java index 4db988aa0..4a110ec2a 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultGraphTraversalSourceTemplateTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultGraphTraversalSourceTemplateTest.java @@ -27,7 +27,7 @@ @EnableAutoWeld @AddPackages(value = {Converters.class, EntityConverter.class, Transactional.class}) -@AddPackages({BookRepository.class, Reflections.class, GraphProducer.class}) +@AddPackages({MagazineRepository.class, Reflections.class, GraphProducer.class}) @AddExtensions({EntityMetadataExtension.class, GraphExtension.class}) class DefaultGraphTraversalSourceTemplateTest extends AbstractGraphTemplateTest { diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultValueMapTraversalTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultValueMapTraversalTest.java index 4e7402f21..560828a29 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultValueMapTraversalTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultValueMapTraversalTest.java @@ -17,7 +17,7 @@ import jakarta.data.exceptions.NonUniqueResultException; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; -import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Person; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Human; import org.eclipse.jnosql.databases.tinkerpop.mapping.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; @@ -49,7 +49,7 @@ class DefaultValueMapTraversalTest extends AbstractTraversalTest { @Test void shouldCount() { long count = graphTemplate.traversalVertex() - .hasLabel(Person.class).valueMap("name").count(); + .hasLabel(Human.class).valueMap("name").count(); assertEquals(3L, count); } @@ -57,7 +57,7 @@ void shouldCount() { @Test void shouldReturnMapValues() { List names = graphTemplate.traversalVertex() - .hasLabel(Person.class).valueMap("name") + .hasLabel(Human.class).valueMap("name") .stream() .map(m -> m.getOrDefault("name", "").toString()).collect(Collectors.toList()); @@ -68,7 +68,7 @@ void shouldReturnMapValues() { @Test void shouldReturnStream() { Stream> stream = graphTemplate.traversalVertex() - .hasLabel(Person.class).valueMap("name") + .hasLabel(Human.class).valueMap("name") .stream(); assertNotNull(stream); assertEquals(3L, stream.count()); @@ -78,7 +78,7 @@ void shouldReturnStream() { @Test void shouldReturnResultAsList() { List> maps = graphTemplate.traversalVertex() - .hasLabel(Person.class).valueMap("name") + .hasLabel(Human.class).valueMap("name") .resultList(); assertEquals(3, maps.size()); } @@ -86,7 +86,7 @@ void shouldReturnResultAsList() { @Test void shouldReturnErrorWhenThereAreMoreThanOneInGetSingleResult() { assertThrows(NonUniqueResultException.class, () -> graphTemplate.traversalVertex() - .hasLabel(Person.class).valueMap("name") + .hasLabel(Human.class).valueMap("name") .singleResult()); } @@ -100,7 +100,7 @@ void shouldReturnOptionalEmptyWhenThereIsNotResultInSingleResult() { @Test void shouldReturnSingleResult() { String name = "Poliana"; - Optional> poliana = graphTemplate.traversalVertex().hasLabel("Person"). + Optional> poliana = graphTemplate.traversalVertex().hasLabel("Human"). has("name", name).valueMap("name").singleResult(); assertEquals(name, poliana.map(m -> m.get("name")).orElse("")); } diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexTraversalTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexTraversalTest.java index 8dd132f33..4fb22a9e4 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexTraversalTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/DefaultVertexTraversalTest.java @@ -17,11 +17,11 @@ import jakarta.data.exceptions.NonUniqueResultException; import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.structure.T; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Magazine; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; -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.entities.Creature; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Human; import org.eclipse.jnosql.databases.tinkerpop.mapping.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; @@ -65,7 +65,7 @@ void shouldReturnErrorWhenVertexIdIsNull() { @Test void shouldGetVertexFromId() { - List people = graphTemplate.traversalVertex(otavio.getId(), poliana.getId()).result() + List people = graphTemplate.traversalVertex(otavio.getId(), poliana.getId()).result() .collect(toList()); assertThat(people).contains(otavio, poliana); @@ -73,9 +73,9 @@ void shouldGetVertexFromId() { @Test void shouldDefineLimit() { - List people = graphTemplate.traversalVertex(otavio.getId(), poliana.getId(), + List people = graphTemplate.traversalVertex(otavio.getId(), poliana.getId(), paulo.getId()).limit(1) - .result() + .result() .collect(toList()); assertEquals(1, people.size()); @@ -84,8 +84,8 @@ void shouldDefineLimit() { @Test void shouldDefineLimit2() { - List people = graphTemplate.traversalVertex(otavio.getId(), poliana.getId(), paulo.getId()). - next(2) + List people = graphTemplate.traversalVertex(otavio.getId(), poliana.getId(), paulo.getId()). + next(2) .collect(toList()); assertEquals(2, people.size()); @@ -107,7 +107,7 @@ void shouldEmptyNext() { @Test void shouldHave() { - Optional person = graphTemplate.traversalVertex().has("name", "Poliana").next(); + Optional person = graphTemplate.traversalVertex().has("name", "Poliana").next(); assertTrue(person.isPresent()); assertEquals(person.get(), poliana); } @@ -128,7 +128,7 @@ void shouldReturnErrorWhenHasNullValue() { @Test void shouldHaveId() { - Optional person = graphTemplate.traversalVertex().has(T.id, poliana.getId()).next(); + Optional person = graphTemplate.traversalVertex().has(T.id, poliana.getId()).next(); assertTrue(person.isPresent()); assertEquals(person.get(), poliana); } @@ -175,16 +175,16 @@ void shouldReturnErrorWhenHasKeyIsNull() { @Test void shouldHaveLabel() { - List books = graphTemplate.traversalVertex().hasLabel("Book").result().collect(toList()); - assertEquals(3, books.size()); - assertThat(books).contains(shack, license, effectiveJava); + List magazines = graphTemplate.traversalVertex().hasLabel("Magazine").result().collect(toList()); + assertEquals(3, magazines.size()); + assertThat(magazines).contains(shack, license, effectiveJava); } @Test void shouldHaveLabel2() { List entities = graphTemplate.traversalVertex() - .hasLabel(P.eq("Book").or(P.eq("Person"))) + .hasLabel(P.eq("Magazine").or(P.eq("Human"))) .result().collect(toList()); assertThat(entities).hasSize(6).contains(shack, license, effectiveJava, otavio, poliana, paulo); } @@ -192,44 +192,44 @@ void shouldHaveLabel2() { @Test void shouldReturnErrorWhenHasLabelHasNull() { assertThrows(NullPointerException.class, () -> graphTemplate.traversalVertex().hasLabel((String) null) - .result().toList()); + .result().toList()); } @Test void shouldIn() { - List books = graphTemplate.traversalVertex().out(READS).result().collect(toList()); - assertEquals(3, books.size()); - assertThat(books).contains(shack, license, effectiveJava); + List magazines = graphTemplate.traversalVertex().out(READS).result().collect(toList()); + assertEquals(3, magazines.size()); + assertThat(magazines).contains(shack, license, effectiveJava); } @Test void shouldReturnErrorWhenInIsNull() { - assertThrows(NullPointerException.class, () -> graphTemplate.traversalVertex().out((String) null).result().toList()); + assertThrows(NullPointerException.class, () -> graphTemplate.traversalVertex().out((String) null).result().toList()); } @Test void shouldOut() { - List people = graphTemplate.traversalVertex().in(READS).result().collect(toList()); + List people = graphTemplate.traversalVertex().in(READS).result().collect(toList()); assertEquals(3, people.size()); assertThat(people).contains(otavio, poliana, paulo); } @Test void shouldReturnErrorWhenOutIsNull() { - assertThrows(NullPointerException.class, () -> graphTemplate.traversalVertex().in((String) null).result().toList()); + assertThrows(NullPointerException.class, () -> graphTemplate.traversalVertex().in((String) null).result().toList()); } @Test void shouldBoth() { List entities = graphTemplate.traversalVertex().both(READS) - .result().toList(); + .result().toList(); assertEquals(6, entities.size()); } @Test void shouldReturnErrorWhenBothIsNull() { assertThrows(NullPointerException.class, () -> graphTemplate.traversalVertex().both((String) null) - .result().toList()); + .result().toList()); } @Test @@ -272,7 +272,7 @@ void shouldDefinesRange() { @Test void shouldMapValuesAsStream() { - List> maps = graphTemplate.traversalVertex().hasLabel("Person") + List> maps = graphTemplate.traversalVertex().hasLabel("Human") .valueMap("name").stream().toList(); assertFalse(maps.isEmpty()); @@ -287,7 +287,7 @@ void shouldMapValuesAsStream() { @Test void shouldMapValuesAsStreamLimit() { - List> maps = graphTemplate.traversalVertex().hasLabel("Person") + List> maps = graphTemplate.traversalVertex().hasLabel("Human") .valueMap("name").next(2).toList(); assertFalse(maps.isEmpty()); @@ -304,7 +304,7 @@ void shouldReturnMapValueAsEmptyStream() { @Test void shouldReturnNext() { - Map map = graphTemplate.traversalVertex().hasLabel("Person") + Map map = graphTemplate.traversalVertex().hasLabel("Human") .valueMap("name").next(); assertNotNull(map); @@ -314,15 +314,15 @@ void shouldReturnNext() { @Test void shouldRepeatTimesTraversal() { - Animal lion = graphTemplate.insert(new Animal("lion")); - Animal snake = graphTemplate.insert(new Animal("snake")); - Animal mouse = graphTemplate.insert(new Animal("mouse")); - Animal plant = graphTemplate.insert(new Animal("plant")); + Creature lion = graphTemplate.insert(new Creature("lion")); + Creature snake = graphTemplate.insert(new Creature("snake")); + Creature mouse = graphTemplate.insert(new Creature("mouse")); + Creature plant = graphTemplate.insert(new Creature("plant")); graphTemplate.edge(lion, "eats", snake).add("when", "night"); graphTemplate.edge(snake, "eats", mouse); graphTemplate.edge(mouse, "eats", plant); - Optional animal = graphTemplate.traversalVertex().repeat().out("eats").times(3).next(); + Optional animal = graphTemplate.traversalVertex().repeat().out("eats").times(3).next(); assertTrue(animal.isPresent()); assertEquals(plant, animal.get()); @@ -330,15 +330,15 @@ void shouldRepeatTimesTraversal() { @Test void shouldRepeatTimesTraversal2() { - Animal lion = graphTemplate.insert(new Animal("lion")); - Animal snake = graphTemplate.insert(new Animal("snake")); - Animal mouse = graphTemplate.insert(new Animal("mouse")); - Animal plant = graphTemplate.insert(new Animal("plant")); + Creature lion = graphTemplate.insert(new Creature("lion")); + Creature snake = graphTemplate.insert(new Creature("snake")); + Creature mouse = graphTemplate.insert(new Creature("mouse")); + Creature plant = graphTemplate.insert(new Creature("plant")); graphTemplate.edge(lion, "eats", snake).add("when", "night"); graphTemplate.edge(snake, "eats", mouse); graphTemplate.edge(mouse, "eats", plant); - Optional animal = graphTemplate.traversalVertex().repeat().in("eats").times(3).next(); + Optional animal = graphTemplate.traversalVertex().repeat().in("eats").times(3).next(); assertTrue(animal.isPresent()); assertEquals(lion, animal.get()); @@ -346,16 +346,16 @@ void shouldRepeatTimesTraversal2() { @Test void shouldRepeatUntilTraversal() { - Animal lion = graphTemplate.insert(new Animal("lion")); - Animal snake = graphTemplate.insert(new Animal("snake")); - Animal mouse = graphTemplate.insert(new Animal("mouse")); - Animal plant = graphTemplate.insert(new Animal("plant")); + Creature lion = graphTemplate.insert(new Creature("lion")); + Creature snake = graphTemplate.insert(new Creature("snake")); + Creature mouse = graphTemplate.insert(new Creature("mouse")); + Creature plant = graphTemplate.insert(new Creature("plant")); graphTemplate.edge(lion, "eats", snake); graphTemplate.edge(snake, "eats", mouse); graphTemplate.edge(mouse, "eats", plant); - Optional animal = graphTemplate.traversalVertex() + Optional animal = graphTemplate.traversalVertex() .repeat().out("eats") .until().has("name", "plant").next(); @@ -367,16 +367,16 @@ void shouldRepeatUntilTraversal() { @Test void shouldRepeatUntilTraversal2() { - Animal lion = graphTemplate.insert(new Animal("lion")); - Animal snake = graphTemplate.insert(new Animal("snake")); - Animal mouse = graphTemplate.insert(new Animal("mouse")); - Animal plant = graphTemplate.insert(new Animal("plant")); + Creature lion = graphTemplate.insert(new Creature("lion")); + Creature snake = graphTemplate.insert(new Creature("snake")); + Creature mouse = graphTemplate.insert(new Creature("mouse")); + Creature plant = graphTemplate.insert(new Creature("plant")); graphTemplate.edge(lion, "eats", snake); graphTemplate.edge(snake, "eats", mouse); graphTemplate.edge(mouse, "eats", plant); - Optional animal = graphTemplate.traversalVertex() + Optional animal = graphTemplate.traversalVertex() .repeat().in("eats") .until().has("name", "lion").next(); @@ -403,11 +403,11 @@ void shouldOrderAsc() { String property = "name"; List properties = graphTemplate.traversalVertex() - .hasLabel("Book") + .hasLabel("Magazine") .has(property) .orderBy(property) - .asc().result() - .map(Book::getName) + .asc().result() + .map(Magazine::getName) .collect(toList()); assertThat(properties).contains("Effective Java", "Software License", "The Shack"); @@ -418,11 +418,11 @@ void shouldOrderDesc() { String property = "name"; List properties = graphTemplate.traversalVertex() - .hasLabel("Book") + .hasLabel("Magazine") .has(property) .orderBy(property) - .desc().result() - .map(Book::getName) + .desc().result() + .map(Magazine::getName) .collect(toList()); assertThat(properties).contains("The Shack", "Software License", "Effective Java"); @@ -445,22 +445,22 @@ void shouldReturnErrorWhenHasLabelEntityClassNull() { @Test void shouldReturnHasLabel() { - assertTrue(graphTemplate.traversalVertex().hasLabel("Person").result().allMatch(Person.class::isInstance)); - assertTrue(graphTemplate.traversalVertex().hasLabel(() -> "Book").result().allMatch(Book.class::isInstance)); - assertTrue(graphTemplate.traversalVertex().hasLabel(Animal.class).result().allMatch(Animal.class::isInstance)); + assertTrue(graphTemplate.traversalVertex().hasLabel("Person").result().allMatch(Human.class::isInstance)); + assertTrue(graphTemplate.traversalVertex().hasLabel(() -> "Book").result().allMatch(Magazine.class::isInstance)); + assertTrue(graphTemplate.traversalVertex().hasLabel(Creature.class).result().allMatch(Creature.class::isInstance)); } @Test void shouldReturnResultAsList() { - List people = graphTemplate.traversalVertex().hasLabel("Person") - .result() + List people = graphTemplate.traversalVertex().hasLabel("Human") + .result() .toList(); assertEquals(3, people.size()); } @Test void shouldReturnErrorWhenThereAreMoreThanOneInGetSingleResult() { - assertThrows(NonUniqueResultException.class, () -> graphTemplate.traversalVertex().hasLabel("Person").singleResult()); + assertThrows(NonUniqueResultException.class, () -> graphTemplate.traversalVertex().hasLabel("Human").singleResult()); } @Test @@ -472,9 +472,9 @@ void shouldReturnOptionalEmptyWhenThereIsNotResultInSingleResult() { @Test void shouldReturnSingleResult() { String name = "Poliana"; - Optional poliana = graphTemplate.traversalVertex().hasLabel("Person"). + Optional poliana = graphTemplate.traversalVertex().hasLabel("Human"). has("name", name).singleResult(); - assertEquals(name, poliana.map(Person::getName).orElse("")); + assertEquals(name, poliana.map(Human::getName).orElse("")); } @Test @@ -485,8 +485,8 @@ void shouldReturnErrorWhenPredicateIsNull() { @Test void shouldPredicate() { long count = graphTemplate.traversalVertex() - .hasLabel(Person.class) - .filter(Person::isAdult).count(); + .hasLabel(Human.class) + .filter(Human::isAdult).count(); assertEquals(3L, count); } @@ -500,16 +500,16 @@ void shouldDedup() { graphTemplate.edge(poliana, "knows", paulo); graphTemplate.edge(paulo, "knows", poliana); - List people = graphTemplate.traversalVertex() - .hasLabel(Person.class) - .in("knows").result() + List people = graphTemplate.traversalVertex() + .hasLabel(Human.class) + .in("knows").result() .collect(Collectors.toList()); assertEquals(6, people.size()); people = graphTemplate.traversalVertex() - .hasLabel(Person.class) - .in("knows").dedup().result() + .hasLabel(Human.class) + .in("knows").dedup().result() .toList(); assertEquals(3, people.size()); diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeEntityTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeEntityTest.java index 0dd918f82..ffdfb0d4f 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeEntityTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/EdgeEntityTest.java @@ -18,10 +18,10 @@ import jakarta.inject.Inject; import org.eclipse.jnosql.communication.Value; import org.eclipse.jnosql.communication.semistructured.Element; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Magazine; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; -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.entities.Human; import org.eclipse.jnosql.databases.tinkerpop.mapping.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; @@ -56,36 +56,36 @@ class EdgeEntityTest { @Test void shouldReturnErrorWhenInboundIsNull() { Assertions.assertThrows(NullPointerException.class, () -> { - Person person = Person.builder().withName("Poliana").withAge().build(); - Book book = null; - graphTemplate.edge(person, "reads", book); + Human human = Human.builder().withName("Poliana").withAge().build(); + Magazine magazine = null; + graphTemplate.edge(human, "reads", magazine); }); } @Test void shouldReturnErrorWhenOutboundIsNull() { Assertions.assertThrows(IllegalStateException.class, () -> { - Person person = Person.builder().withName("Poliana").withAge().build(); - Book book = Book.builder().withAge(2007).withName("The Shack").build(); - graphTemplate.edge(person, "reads", book); + Human human = Human.builder().withName("Poliana").withAge().build(); + Magazine magazine = Magazine.builder().withAge(2007).withName("The Shack").build(); + graphTemplate.edge(human, "reads", magazine); }); } @Test void shouldReturnErrorWhenLabelIsNull() { Assertions.assertThrows(NullPointerException.class, () -> { - Person person = Person.builder().withName("Poliana").withAge().build(); - Book book = Book.builder().withAge(2007).withName("The Shack").build(); - graphTemplate.edge(person, (String) null, book); + Human human = Human.builder().withName("Poliana").withAge().build(); + Magazine magazine = Magazine.builder().withAge(2007).withName("The Shack").build(); + graphTemplate.edge(human, (String) null, magazine); }); } @Test void shouldReturnNullWhenInboundIdIsNull() { Assertions.assertThrows(EmptyResultException.class, () -> { - Person person = Person.builder().withId(-5).withName("Poliana").withAge().build(); - Book book = graphTemplate.insert(Book.builder().withAge(2007).withName("The Shack").build()); - graphTemplate.edge(person, "reads", book); + Human human = Human.builder().withId(-5).withName("Poliana").withAge().build(); + Magazine magazine = graphTemplate.insert(Magazine.builder().withAge(2007).withName("The Shack").build()); + graphTemplate.edge(human, "reads", magazine); }); } @@ -93,52 +93,52 @@ void shouldReturnNullWhenInboundIdIsNull() { @Test void shouldReturnNullWhenOutboundIdIsNull() { Assertions.assertThrows(IllegalStateException.class, () -> { - Person person = graphTemplate.insert(Person.builder().withName("Poliana").withAge().build()); - Book book = Book.builder().withAge(2007).withName("The Shack").build(); - graphTemplate.edge(person, "reads", book); + Human human = graphTemplate.insert(Human.builder().withName("Poliana").withAge().build()); + Magazine magazine = Magazine.builder().withAge(2007).withName("The Shack").build(); + graphTemplate.edge(human, "reads", magazine); }); } @Test void shouldReturnEntityNotFoundWhenOutBoundDidNotFound() { Assertions.assertThrows( EmptyResultException.class, () -> { - Person person = Person.builder().withId(-10L).withName("Poliana").withAge().build(); - Book book = graphTemplate.insert(Book.builder().withAge(2007).withName("The Shack").build()); - graphTemplate.edge(person, "reads", book); + Human human = Human.builder().withId(-10L).withName("Poliana").withAge().build(); + Magazine magazine = graphTemplate.insert(Magazine.builder().withAge(2007).withName("The Shack").build()); + graphTemplate.edge(human, "reads", magazine); }); } @Test void shouldReturnEntityNotFoundWhenInBoundDidNotFound() { Assertions.assertThrows( EmptyResultException.class, () -> { - Person person = graphTemplate.insert(Person.builder().withName("Poliana").withAge().build()); - Book book = Book.builder().withId(10L).withAge(2007).withName("The Shack").build(); - graphTemplate.edge(person, "reads", book); + Human human = graphTemplate.insert(Human.builder().withName("Poliana").withAge().build()); + Magazine magazine = Magazine.builder().withId(10L).withAge(2007).withName("The Shack").build(); + graphTemplate.edge(human, "reads", magazine); }); } @Test void shouldCreateAnEdge() { - Person person = graphTemplate.insert(Person.builder().withName("Poliana").withAge().build()); - Book book = graphTemplate.insert(Book.builder().withAge(2007).withName("The Shack").build()); - EdgeEntity edge = graphTemplate.edge(person, "reads", book); + Human human = graphTemplate.insert(Human.builder().withName("Poliana").withAge().build()); + Magazine magazine = graphTemplate.insert(Magazine.builder().withAge(2007).withName("The Shack").build()); + EdgeEntity edge = graphTemplate.edge(human, "reads", magazine); assertEquals("reads", edge.label()); - assertEquals(person, edge.outgoing()); - assertEquals(book, edge.incoming()); + assertEquals(human, edge.outgoing()); + assertEquals(magazine, edge.incoming()); assertTrue(edge.isEmpty()); assertNotNull(edge.id()); } @Test void shouldGetId() { - Person person = graphTemplate.insert(Person.builder().withName("Poliana").withAge().build()); - Book book = graphTemplate.insert(Book.builder().withAge(2007).withName("The Shack").build()); - EdgeEntity edge = graphTemplate.edge(person, "reads", book); + Human human = graphTemplate.insert(Human.builder().withName("Poliana").withAge().build()); + Magazine magazine = graphTemplate.insert(Magazine.builder().withAge(2007).withName("The Shack").build()); + EdgeEntity edge = graphTemplate.edge(human, "reads", magazine); assertEquals("reads", edge.label()); - assertEquals(person, edge.outgoing()); - assertEquals(book, edge.incoming()); + assertEquals(human, edge.outgoing()); + assertEquals(magazine, edge.incoming()); assertTrue(edge.isEmpty()); assertNotNull(edge.id()); final Long id = edge.id(Long.class); @@ -150,24 +150,24 @@ void shouldGetId() { @Test void shouldCreateAnEdgeWithSupplier() { - Person person = graphTemplate.insert(Person.builder().withName("Poliana").withAge().build()); - Book book = graphTemplate.insert(Book.builder().withAge(2007).withName("The Shack").build()); - EdgeEntity edge = graphTemplate.edge(person, () -> "reads", book); + Human human = graphTemplate.insert(Human.builder().withName("Poliana").withAge().build()); + Magazine magazine = graphTemplate.insert(Magazine.builder().withAge(2007).withName("The Shack").build()); + EdgeEntity edge = graphTemplate.edge(human, () -> "reads", magazine); assertEquals("reads", edge.label()); - assertEquals(person, edge.outgoing()); - assertEquals(book, edge.incoming()); + assertEquals(human, edge.outgoing()); + assertEquals(magazine, edge.incoming()); assertTrue(edge.isEmpty()); assertNotNull(edge.id()); } @Test void shouldUseAnEdge() { - Person person = graphTemplate.insert(Person.builder().withName("Poliana").withAge().build()); - Book book = graphTemplate.insert(Book.builder().withAge(2007).withName("The Shack").build()); - EdgeEntity edge = graphTemplate.edge(person, "reads", book); + Human human = graphTemplate.insert(Human.builder().withName("Poliana").withAge().build()); + Magazine magazine = graphTemplate.insert(Magazine.builder().withAge(2007).withName("The Shack").build()); + EdgeEntity edge = graphTemplate.edge(human, "reads", magazine); - EdgeEntity sameEdge = graphTemplate.edge(person, "reads", book); + EdgeEntity sameEdge = graphTemplate.edge(human, "reads", magazine); assertEquals(edge.id(), sameEdge.id()); assertEquals(edge, sameEdge); @@ -175,15 +175,15 @@ void shouldUseAnEdge() { @Test void shouldUseAnEdge2() { - Person poliana = graphTemplate.insert(Person.builder().withName("Poliana").withAge().build()); - Person nilzete = graphTemplate.insert(Person.builder().withName("Nilzete").withAge().build()); + Human poliana = graphTemplate.insert(Human.builder().withName("Poliana").withAge().build()); + Human nilzete = graphTemplate.insert(Human.builder().withName("Nilzete").withAge().build()); - Book book = graphTemplate.insert(Book.builder().withAge(2007).withName("The Shack").build()); - EdgeEntity edge = graphTemplate.edge(poliana, "reads", book); - EdgeEntity edge1 = graphTemplate.edge(nilzete, "reads", book); + Magazine magazine = graphTemplate.insert(Magazine.builder().withAge(2007).withName("The Shack").build()); + EdgeEntity edge = graphTemplate.edge(poliana, "reads", magazine); + EdgeEntity edge1 = graphTemplate.edge(nilzete, "reads", magazine); - EdgeEntity sameEdge = graphTemplate.edge(poliana, "reads", book); - EdgeEntity sameEdge1 = graphTemplate.edge(nilzete, "reads", book); + EdgeEntity sameEdge = graphTemplate.edge(poliana, "reads", magazine); + EdgeEntity sameEdge1 = graphTemplate.edge(nilzete, "reads", magazine); assertEquals(edge.id(), sameEdge.id()); assertEquals(edge, sameEdge); @@ -195,15 +195,15 @@ void shouldUseAnEdge2() { @Test void shouldUseADifferentEdge() { - Person poliana = graphTemplate.insert(Person.builder().withName("Poliana").withAge().build()); - Person nilzete = graphTemplate.insert(Person.builder().withName("Nilzete").withAge().build()); + Human poliana = graphTemplate.insert(Human.builder().withName("Poliana").withAge().build()); + Human nilzete = graphTemplate.insert(Human.builder().withName("Nilzete").withAge().build()); - Book book = graphTemplate.insert(Book.builder().withAge(2007).withName("The Shack").build()); - EdgeEntity edge = graphTemplate.edge(poliana, "reads", book); - EdgeEntity edge1 = graphTemplate.edge(nilzete, "reads", book); + Magazine magazine = graphTemplate.insert(Magazine.builder().withAge(2007).withName("The Shack").build()); + EdgeEntity edge = graphTemplate.edge(poliana, "reads", magazine); + EdgeEntity edge1 = graphTemplate.edge(nilzete, "reads", magazine); - EdgeEntity sameEdge = graphTemplate.edge(poliana, "reads", book); - EdgeEntity sameEdge1 = graphTemplate.edge(nilzete, "reads", book); + EdgeEntity sameEdge = graphTemplate.edge(poliana, "reads", magazine); + EdgeEntity sameEdge1 = graphTemplate.edge(nilzete, "reads", magazine); assertNotEquals(edge.id(), edge1.id()); assertNotEquals(edge.id(), sameEdge1.id()); @@ -214,9 +214,9 @@ void shouldUseADifferentEdge() { @Test void shouldReturnErrorWhenAddKeyIsNull() { assertThrows(NullPointerException.class, () -> { - Person person = graphTemplate.insert(Person.builder().withName("Poliana").withAge().build()); - Book book = graphTemplate.insert(Book.builder().withAge(2007).withName("The Shack").build()); - EdgeEntity edge = graphTemplate.edge(person, "reads", book); + Human human = graphTemplate.insert(Human.builder().withName("Poliana").withAge().build()); + Magazine magazine = graphTemplate.insert(Magazine.builder().withAge(2007).withName("The Shack").build()); + EdgeEntity edge = graphTemplate.edge(human, "reads", magazine); edge.add(null, "Brazil"); }); } @@ -225,18 +225,18 @@ void shouldReturnErrorWhenAddKeyIsNull() { void shouldReturnErrorWhenAddValueIsNull() { assertThrows(NullPointerException.class, () -> { - Person person = graphTemplate.insert(Person.builder().withName("Poliana").withAge().build()); - Book book = graphTemplate.insert(Book.builder().withAge(2007).withName("The Shack").build()); - EdgeEntity edge = graphTemplate.edge(person, "reads", book); + Human human = graphTemplate.insert(Human.builder().withName("Poliana").withAge().build()); + Magazine magazine = graphTemplate.insert(Magazine.builder().withAge(2007).withName("The Shack").build()); + EdgeEntity edge = graphTemplate.edge(human, "reads", magazine); edge.add("where", null); }); } @Test void shouldAddProperty() { - Person person = graphTemplate.insert(Person.builder().withName("Poliana").withAge().build()); - Book book = graphTemplate.insert(Book.builder().withAge(2007).withName("The Shack").build()); - EdgeEntity edge = graphTemplate.edge(person, "reads", book); + Human human = graphTemplate.insert(Human.builder().withName("Poliana").withAge().build()); + Magazine magazine = graphTemplate.insert(Magazine.builder().withAge(2007).withName("The Shack").build()); + EdgeEntity edge = graphTemplate.edge(human, "reads", magazine); edge.add("where", "Brazil"); assertFalse(edge.isEmpty()); @@ -246,9 +246,9 @@ void shouldAddProperty() { @Test void shouldAddPropertyWithValue() { - Person person = graphTemplate.insert(Person.builder().withName("Poliana").withAge().build()); - Book book = graphTemplate.insert(Book.builder().withAge(2007).withName("The Shack").build()); - EdgeEntity edge = graphTemplate.edge(person, "reads", book); + Human human = graphTemplate.insert(Human.builder().withName("Poliana").withAge().build()); + Magazine magazine = graphTemplate.insert(Magazine.builder().withAge(2007).withName("The Shack").build()); + EdgeEntity edge = graphTemplate.edge(human, "reads", magazine); edge.add("where", Value.of("Brazil")); assertFalse(edge.isEmpty()); @@ -260,9 +260,9 @@ void shouldAddPropertyWithValue() { @Test void shouldReturnErrorWhenRemoveNullKeyProperty() { assertThrows(NullPointerException.class, () -> { - Person person = graphTemplate.insert(Person.builder().withName("Poliana").withAge().build()); - Book book = graphTemplate.insert(Book.builder().withAge(2007).withName("The Shack").build()); - EdgeEntity edge = graphTemplate.edge(person, "reads", book); + Human human = graphTemplate.insert(Human.builder().withName("Poliana").withAge().build()); + Magazine magazine = graphTemplate.insert(Magazine.builder().withAge(2007).withName("The Shack").build()); + EdgeEntity edge = graphTemplate.edge(human, "reads", magazine); edge.add("where", "Brazil"); @@ -273,9 +273,9 @@ void shouldReturnErrorWhenRemoveNullKeyProperty() { @Test void shouldRemoveProperty() { - Person person = graphTemplate.insert(Person.builder().withName("Poliana").withAge().build()); - Book book = graphTemplate.insert(Book.builder().withAge(2007).withName("The Shack").build()); - EdgeEntity edge = graphTemplate.edge(person, "reads", book); + Human human = graphTemplate.insert(Human.builder().withName("Poliana").withAge().build()); + Magazine magazine = graphTemplate.insert(Magazine.builder().withAge(2007).withName("The Shack").build()); + EdgeEntity edge = graphTemplate.edge(human, "reads", magazine); edge.add("where", "Brazil"); assertEquals(1, edge.size()); assertFalse(edge.isEmpty()); @@ -286,9 +286,9 @@ void shouldRemoveProperty() { @Test void shouldFindProperty() { - Person person = graphTemplate.insert(Person.builder().withName("Poliana").withAge().build()); - Book book = graphTemplate.insert(Book.builder().withAge(2007).withName("The Shack").build()); - EdgeEntity edge = graphTemplate.edge(person, "reads", book); + Human human = graphTemplate.insert(Human.builder().withName("Poliana").withAge().build()); + Magazine magazine = graphTemplate.insert(Magazine.builder().withAge(2007).withName("The Shack").build()); + EdgeEntity edge = graphTemplate.edge(human, "reads", magazine); edge.add("where", "Brazil"); Optional where = edge.get("where"); @@ -300,12 +300,12 @@ void shouldFindProperty() { @Test void shouldDeleteAnEdge() { - Person person = graphTemplate.insert(Person.builder().withName("Poliana").withAge().build()); - Book book = graphTemplate.insert(Book.builder().withAge(2007).withName("The Shack").build()); - EdgeEntity edge = graphTemplate.edge(person, "reads", book); + Human human = graphTemplate.insert(Human.builder().withName("Poliana").withAge().build()); + Magazine magazine = graphTemplate.insert(Magazine.builder().withAge(2007).withName("The Shack").build()); + EdgeEntity edge = graphTemplate.edge(human, "reads", magazine); edge.delete(); - EdgeEntity newEdge = graphTemplate.edge(person, "reads", book); + EdgeEntity newEdge = graphTemplate.edge(human, "reads", magazine); assertNotEquals(edge.id(), newEdge.id()); graphTemplate.deleteEdge(newEdge.id()); @@ -318,14 +318,14 @@ void shouldReturnErrorWhenDeleteAnEdgeWithNull() { @Test void shouldDeleteAnEdge2() { - Person person = graphTemplate.insert(Person.builder().withName("Poliana").withAge().build()); - Book book = graphTemplate.insert(Book.builder().withAge(2007).withName("The Shack").build()); + Human human = graphTemplate.insert(Human.builder().withName("Poliana").withAge().build()); + Magazine magazine = graphTemplate.insert(Magazine.builder().withAge(2007).withName("The Shack").build()); - EdgeEntity edge = graphTemplate.edge(person, "reads", book); + EdgeEntity edge = graphTemplate.edge(human, "reads", magazine); graphTemplate.deleteEdge(edge.id()); - EdgeEntity newEdge = graphTemplate.edge(person, "reads", book); + EdgeEntity newEdge = graphTemplate.edge(human, "reads", magazine); assertNotEquals(edge.id(), newEdge.id()); } @@ -338,9 +338,9 @@ void shouldReturnErrorWhenFindEdgeWithNull() { @Test void shouldFindAnEdge() { - Person person = graphTemplate.insert(Person.builder().withName("Poliana").withAge().build()); - Book book = graphTemplate.insert(Book.builder().withAge(2007).withName("The Shack").build()); - EdgeEntity edge = graphTemplate.edge(person, "reads", book); + Human human = graphTemplate.insert(Human.builder().withName("Poliana").withAge().build()); + Magazine magazine = graphTemplate.insert(Magazine.builder().withAge(2007).withName("The Shack").build()); + EdgeEntity edge = graphTemplate.edge(human, "reads", magazine); Optional newEdge = graphTemplate.edge(edge.id()); diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/BookRepository.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/MagazineRepository.java similarity index 83% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/BookRepository.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/MagazineRepository.java index 89aa7415a..33e597647 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/BookRepository.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/MagazineRepository.java @@ -17,8 +17,8 @@ import jakarta.data.repository.BasicRepository; import jakarta.data.repository.Repository; -import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Book; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Magazine; @Repository -public interface BookRepository extends BasicRepository { +public interface MagazineRepository extends BasicRepository { } diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/BookTemplateTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/MagazineTemplateTest.java similarity index 84% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/BookTemplateTest.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/MagazineTemplateTest.java index be5662fef..fc271e8a7 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/BookTemplateTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/MagazineTemplateTest.java @@ -18,10 +18,10 @@ import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Transaction; import org.apache.tinkerpop.gremlin.structure.Transaction.Status; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.Magazine; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; -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.entities.MagazineTemplate; import org.eclipse.jnosql.databases.tinkerpop.mapping.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; @@ -43,10 +43,10 @@ @AddPackages(GraphProducer.class) @AddPackages(Reflections.class) @AddExtensions({EntityMetadataExtension.class, GraphExtension.class}) -class BookTemplateTest { +class MagazineTemplateTest { @Inject - private BookTemplate template; + private MagazineTemplate template; @Inject private Graph graph; @@ -55,10 +55,10 @@ class BookTemplateTest { void shouldSaveWithTransaction() { AtomicReference status = new AtomicReference<>(); - Book book = Book.builder().withName("The Book").build(); + Magazine magazine = Magazine.builder().withName("The Book").build(); Transaction transaction = graph.tx(); transaction.addTransactionListener(status::set); - template.insert(book); + template.insert(magazine); assertFalse(transaction.isOpen()); assertEquals(COMMIT, status.get()); } @@ -67,11 +67,11 @@ void shouldSaveWithTransaction() { void shouldSaveWithRollback() { AtomicReference status = new AtomicReference<>(); - Book book = Book.builder().withName("The Book").build(); + Magazine magazine = Magazine.builder().withName("The Book").build(); Transaction transaction = graph.tx(); transaction.addTransactionListener(status::set); try { - template.insertException(book); + template.insertException(magazine); assert false; }catch (Exception ignored){ @@ -85,11 +85,11 @@ void shouldSaveWithRollback() { void shouldUseAutomaticNormalTransaction() { AtomicReference status = new AtomicReference<>(); - Book book = Book.builder().withName("The Book").build(); + Magazine magazine = Magazine.builder().withName("The Book").build(); Transaction transaction = graph.tx(); transaction.addTransactionListener(status::set); assertNull(status.get()); - template.normalInsertion(book); + template.normalInsertion(magazine); assertEquals(COMMIT, status.get()); assertFalse(transaction.isOpen()); } diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Animal.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Creature.java similarity index 82% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Animal.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Creature.java index 693b75d3e..40fef8e77 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Animal.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Creature.java @@ -21,7 +21,7 @@ import java.util.Objects; @Entity -public class Animal { +public class Creature { @Id @@ -30,10 +30,10 @@ public class Animal { @Column private String name; - Animal() { + Creature() { } - public Animal(String name) { + public Creature(String name) { this.name = name; } @@ -50,11 +50,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof Animal animal)) { + if (!(o instanceof Creature creature)) { return false; } - return Objects.equals(id, animal.id) && - Objects.equals(name, animal.name); + return Objects.equals(id, creature.id) && + Objects.equals(name, creature.name); } @Override @@ -64,7 +64,7 @@ public int hashCode() { @Override public String toString() { - return "Animal{" + "name='" + name + '\'' + + return "Creature{" + "name='" + name + '\'' + '}'; } } diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Person.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Human.java similarity index 84% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Person.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Human.java index 5ee2489c7..dabc87030 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Person.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Human.java @@ -25,7 +25,7 @@ @Entity @MappedSuperclass -public class Person { +public class Human { @Id private long id; @@ -66,10 +66,10 @@ public boolean isAdult() { return age > 21; } - Person() { + Human() { } - Person(long id, String name, int age, List phones, String ignore) { + Human(long id, String name, int age, List phones, String ignore) { this.id = id; this.name = name; this.age = age; @@ -95,11 +95,11 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - Person person = (Person) o; - return id == person.id && - age == person.age && - Objects.equals(name, person.name) && - Objects.equals(phones, person.phones); + Human human = (Human) o; + return id == human.id && + age == human.age && + Objects.equals(name, human.name) && + Objects.equals(phones, human.phones); } @Override @@ -107,8 +107,8 @@ public int hashCode() { return Objects.hash(id, name, age, phones, ignore); } - public static PersonBuilder builder() { - return new PersonBuilder(); + public static HumanBuilder builder() { + return new HumanBuilder(); } public void setName(String name){ diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/PersonBuilder.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/HumanBuilder.java similarity index 74% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/PersonBuilder.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/HumanBuilder.java index 301c0163c..4d7ee50e8 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/PersonBuilder.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/HumanBuilder.java @@ -16,45 +16,45 @@ import java.util.List; -public class PersonBuilder { +public class HumanBuilder { private long id; private String name; private int age; private List phones; private String ignore; - public PersonBuilder withId(long id) { + public HumanBuilder withId(long id) { this.id = id; return this; } - public PersonBuilder withName(String name) { + public HumanBuilder withName(String name) { this.name = name; return this; } - public PersonBuilder withAge() { + public HumanBuilder withAge() { this.age = 10; return this; } - public PersonBuilder withAge(int age) { + public HumanBuilder withAge(int age) { this.age = age; return this; } - public PersonBuilder withPhones(List phones) { + public HumanBuilder withPhones(List phones) { this.phones = phones; return this; } - public PersonBuilder withIgnore() { + public HumanBuilder withIgnore() { this.ignore = "Just Ignore"; return this; } - public Person build() { - return new Person(id, name, age, phones, ignore); + public Human build() { + return new Human(id, name, age, phones, ignore); } } diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/PersonRepository.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/HumanRepository.java similarity index 91% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/PersonRepository.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/HumanRepository.java index a31acb440..945d1f198 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/PersonRepository.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/HumanRepository.java @@ -19,5 +19,5 @@ import jakarta.data.repository.Repository; @Repository -public interface PersonRepository extends BasicRepository { +public interface HumanRepository extends BasicRepository { } diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Book.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Magazine.java similarity index 76% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Book.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Magazine.java index 7ad701fbb..07d03ed95 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Book.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/Magazine.java @@ -21,7 +21,7 @@ import java.util.Objects; @Entity -public class Book { +public class Magazine { @Id private Long id; @@ -33,10 +33,10 @@ public class Book { private Integer age; - Book() { + Magazine() { } - Book(Long id, String name, Integer age) { + Magazine(Long id, String name, Integer age) { this.id = id; this.name = name; this.age = age; @@ -59,10 +59,10 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof Book book)) { + if (!(o instanceof Magazine magazine)) { return false; } - return Objects.equals(id, book.id); + return Objects.equals(id, magazine.id); } @Override @@ -79,35 +79,35 @@ public String toString() { '}'; } - public static BookBuilder builder() { - return new BookBuilder(); + public static MagazineBuilder builder() { + return new MagazineBuilder(); } - public static class BookBuilder { + public static class MagazineBuilder { private String name; private Integer age; private Long id; - private BookBuilder() { + private MagazineBuilder() { } - public BookBuilder withName(String name) { + public MagazineBuilder withName(String name) { this.name = name; return this; } - public BookBuilder withAge(Integer age) { + public MagazineBuilder withAge(Integer age) { this.age = age; return this; } - public BookBuilder withId(Long id) { + public MagazineBuilder withId(Long id) { this.id = id; return this; } - public Book build() { - return new Book(id, name, age); + public Magazine build() { + return new Magazine(id, name, age); } } } diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/BookTemplate.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/MagazineTemplate.java similarity index 87% rename from jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/BookTemplate.java rename to jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/MagazineTemplate.java index c01d0d028..b8f4a510c 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/BookTemplate.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/MagazineTemplate.java @@ -20,23 +20,23 @@ import org.eclipse.jnosql.databases.tinkerpop.mapping.Transactional; @ApplicationScoped -public class BookTemplate { +public class MagazineTemplate { @Inject private GraphTemplate graphTemplate; @Transactional - public void insert(Book actor) { + public void insert(Magazine actor) { graphTemplate.insert(actor); } @Transactional - public void insertException(Book actor) { + public void insertException(Magazine actor) { graphTemplate.insert(actor); throw new NullPointerException("should get a rollback"); } - public void normalInsertion(Book actor) { + public void normalInsertion(Magazine actor) { graphTemplate.insert(actor); } diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/People.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/People.java index 7a40eaad8..1e47557cf 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/People.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/entities/People.java @@ -22,5 +22,5 @@ public interface People { @Insert - Person insert(Person person); + Human insert(Human human); } diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/GraphCustomExtensionTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/GraphCustomExtensionTest.java index ce8cc3fdf..8d226fe13 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/GraphCustomExtensionTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/GraphCustomExtensionTest.java @@ -23,7 +23,7 @@ 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.databases.tinkerpop.mapping.entities.Human; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import org.jboss.weld.junit5.auto.AddExtensions; @@ -55,23 +55,23 @@ class GraphCustomExtensionTest { @Test void shouldInitiate() { assertNotNull(people); - Person person = people.insert(Person.builder().build()); - SoftAssertions.assertSoftly(soft -> soft.assertThat(person).isNotNull()); + Human human = people.insert(Human.builder().build()); + SoftAssertions.assertSoftly(soft -> soft.assertThat(human).isNotNull()); } @Test void shouldUseMock(){ assertNotNull(pepoleMock); - Person person = pepoleMock.insert(Person.builder().build()); - SoftAssertions.assertSoftly(soft -> soft.assertThat(person).isNotNull()); + Human human = pepoleMock.insert(Human.builder().build()); + SoftAssertions.assertSoftly(soft -> soft.assertThat(human).isNotNull()); } @Test void shouldUseDefault(){ assertNotNull(repository); - Person person = repository.insert(Person.builder().build()); - SoftAssertions.assertSoftly(soft -> soft.assertThat(person).isNotNull()); + Human human = repository.insert(Human.builder().build()); + SoftAssertions.assertSoftly(soft -> soft.assertThat(human).isNotNull()); } } diff --git a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/GraphExtensionTest.java b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/GraphExtensionTest.java index 2906eec97..0bd5117c3 100644 --- a/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/GraphExtensionTest.java +++ b/jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/mapping/spi/GraphExtensionTest.java @@ -21,8 +21,8 @@ import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; 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.databases.tinkerpop.mapping.entities.Human; +import org.eclipse.jnosql.databases.tinkerpop.mapping.entities.HumanRepository; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import org.jboss.weld.junit5.auto.AddExtensions; @@ -44,11 +44,11 @@ class GraphExtensionTest { @Inject @Database(value = DatabaseType.GRAPH) - private PersonRepository repository; + private HumanRepository repository; @Inject @Database(value = DatabaseType.GRAPH, provider = "graphRepositoryMock") - private PersonRepository repositoryMock; + private HumanRepository repositoryMock; @Inject @Database(value = DatabaseType.GRAPH, provider = "graphRepositoryMock") @@ -61,8 +61,8 @@ class GraphExtensionTest { @Test void shouldInitiate() { assertNotNull(repository); - Person person = repository.save(Person.builder().build()); - assertNull(person.getName()); + Human human = repository.save(Human.builder().build()); + assertNull(human.getName()); } @Test diff --git a/pom.xml b/pom.xml index 9c3340ab3..e79f0077d 100644 --- a/pom.xml +++ b/pom.xml @@ -12,6 +12,7 @@ ~ Contributors: ~ ~ Otavio Santana + ~ Maximillian Arruda --> 4.0.0 - + org.eclipse.jnosql.mapping jnosql-mapping-parent 1.1.5-SNAPSHOT @@ -40,6 +41,8 @@ 1.20.4 false + 1.0.0-SNAPSHOT + true https://raw.githubusercontent.com/eclipse/jnosql-databases/refs/heads/main/pmd/pmd-rules.xml @@ -107,10 +110,20 @@ jnosql-mapping-key-value ${project.version} + + jakarta.nosql + jakarta.nosql-tck + ${jakarta.nosql.version} + + + jakarta.nosql + jakarta.nosql-tck + test + org.testcontainers testcontainers @@ -141,4 +154,37 @@ + + + + tck + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven.surefire.plugin.version} + + + nosql-tck-runner + test + + test + + + ${tck.nosql.skip} + + org/eclipse/jnosql/**.**Test.class + + + jakarta.nosql:jakarta.nosql-tck + + + + + + + + +