From 7661b93160cdeab17163d7138e88cd0507ec3c6c Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Thu, 13 Feb 2025 07:23:58 +0000 Subject: [PATCH 01/11] test: create initial scenario category for test Signed-off-by: Otavio Santana --- .../arangodb/integration/MailCategory.java | 8 ++++++++ .../arangodb/integration/MailTemplate.java | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailCategory.java create mode 100644 jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailTemplate.java diff --git a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailCategory.java b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailCategory.java new file mode 100644 index 000000000..85bf21681 --- /dev/null +++ b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailCategory.java @@ -0,0 +1,8 @@ +package org.eclipse.jnosql.databases.arangodb.integration; + +public enum MailCategory { + TIMER, + TRANSITION_MAIN, + TRANSITION_ALTERNATIVE, + TRANSITION_FALLBACK +} \ No newline at end of file diff --git a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailTemplate.java b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailTemplate.java new file mode 100644 index 000000000..1d983de89 --- /dev/null +++ b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailTemplate.java @@ -0,0 +1,19 @@ +package org.eclipse.jnosql.databases.arangodb.integration; + +import jakarta.nosql.Entity; +import jakarta.nosql.Id; + +import java.util.UUID; + +@Entity +public class MailTemplate { + + @Id + private UUID id; + + private String to; + + private String from; + + private MailCategory category; +} From 04200c2af392c0349285d3737c0b4d6ffac570c8 Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Thu, 13 Feb 2025 07:24:23 +0000 Subject: [PATCH 02/11] style: define header to the new test classes Signed-off-by: Otavio Santana --- .../arangodb/integration/MailCategory.java | 14 ++++++++++++++ .../arangodb/integration/MailTemplate.java | 14 ++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailCategory.java b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailCategory.java index 85bf21681..3d86fa0f7 100644 --- a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailCategory.java +++ b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailCategory.java @@ -1,3 +1,17 @@ +/* + * Copyright (c) 2025 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.arangodb.integration; public enum MailCategory { diff --git a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailTemplate.java b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailTemplate.java index 1d983de89..c5fb404ad 100644 --- a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailTemplate.java +++ b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailTemplate.java @@ -1,3 +1,17 @@ +/* + * Copyright (c) 2025 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.arangodb.integration; import jakarta.nosql.Entity; From 99341361d06e112729772e7570425b97e244f923 Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Thu, 13 Feb 2025 07:25:59 +0000 Subject: [PATCH 03/11] test: define toString and hascode to mailtemplate at arangodb sample code Signed-off-by: Otavio Santana --- .../arangodb/integration/MailTemplate.java | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailTemplate.java b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailTemplate.java index c5fb404ad..0315d8231 100644 --- a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailTemplate.java +++ b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailTemplate.java @@ -14,9 +14,11 @@ */ package org.eclipse.jnosql.databases.arangodb.integration; +import jakarta.nosql.Column; import jakarta.nosql.Entity; import jakarta.nosql.Id; +import java.util.Objects; import java.util.UUID; @Entity @@ -25,9 +27,60 @@ public class MailTemplate { @Id private UUID id; + @Column private String to; + @Column private String from; + @Column private MailCategory category; + + @Column + private boolean isDefault; + + public UUID getId() { + return id; + } + + public String getTo() { + return to; + } + + public String getFrom() { + return from; + } + + public MailCategory getCategory() { + return category; + } + + public boolean isDefault() { + return isDefault; + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) { + return false; + } + MailTemplate that = (MailTemplate) o; + return Objects.equals(id, that.id); + } + + @Override + public int hashCode() { + return Objects.hashCode(id); + } + + @Override + public String toString() { + return "MailTemplate{" + + "id=" + id + + ", to='" + to + '\'' + + ", from='" + from + '\'' + + ", category=" + category + + ", isDefault=" + isDefault + + '}'; + } } From 8d376c8040fe165b2401c38382b19279a1034b1c Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Thu, 13 Feb 2025 07:27:33 +0000 Subject: [PATCH 04/11] feat: define builder to email template Signed-off-by: Otavio Santana --- .../arangodb/integration/MailTemplate.java | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailTemplate.java b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailTemplate.java index 0315d8231..1f1693cc3 100644 --- a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailTemplate.java +++ b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailTemplate.java @@ -83,4 +83,50 @@ public String toString() { ", isDefault=" + isDefault + '}'; } + + public static MailTemplateBuilder builder(){ + return new MailTemplateBuilder(); + } + + + public static class MailTemplateBuilder{ + + private String to; + + private String from; + + private MailCategory category; + + private boolean isDefault; + + public MailTemplateBuilder setTo(String to) { + this.to = to; + return this; + } + + public MailTemplateBuilder setFrom(String from) { + this.from = from; + return this; + } + + public MailTemplateBuilder setCategory(MailCategory category) { + this.category = category; + return this; + } + + public MailTemplateBuilder setDefault(boolean aDefault) { + isDefault = aDefault; + return this; + } + + public MailTemplate build(){ + MailTemplate mailTemplate = new MailTemplate(); + mailTemplate.id = UUID.randomUUID(); + mailTemplate.to = this.to; + mailTemplate.from = this.from; + mailTemplate.category = this.category; + mailTemplate.isDefault = this.isDefault; + return mailTemplate; + } + } } From 4b60ed540645782a18c8a92e743e5395559289c4 Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Thu, 13 Feb 2025 07:29:08 +0000 Subject: [PATCH 05/11] test: create mailtemplate repository Signed-off-by: Otavio Santana --- .../integration/MailTemplateRepository.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailTemplateRepository.java diff --git a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailTemplateRepository.java b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailTemplateRepository.java new file mode 100644 index 000000000..20781d943 --- /dev/null +++ b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailTemplateRepository.java @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2025 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.arangodb.integration; + +import jakarta.data.repository.Repository; +import org.eclipse.jnosql.mapping.NoSQLRepository; +import org.jetbrains.annotations.NotNull; + +import java.util.Optional; + +@Repository +public interface MailTemplateRepository extends NoSQLRepository { + + Optional findByCategoryAndIsDefaultTrue(@NotNull MailCategory mailCategory); +} \ No newline at end of file From b0dd64be5ce6ec9059617e3397bd61c058aff9a6 Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Thu, 13 Feb 2025 07:56:15 +0000 Subject: [PATCH 06/11] chore: update arangodb to version 7.17.0 Signed-off-by: Otavio Santana --- jnosql-arangodb/pom.xml | 2 +- .../arangodb/integration/ArangoDBEnumIntegrationTest.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/ArangoDBEnumIntegrationTest.java diff --git a/jnosql-arangodb/pom.xml b/jnosql-arangodb/pom.xml index d6e4b7e16..1aac16282 100644 --- a/jnosql-arangodb/pom.xml +++ b/jnosql-arangodb/pom.xml @@ -28,7 +28,7 @@ The Eclipse JNoSQL layer to ArangoDB - 7.16.0 + 7.17.0 diff --git a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/ArangoDBEnumIntegrationTest.java b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/ArangoDBEnumIntegrationTest.java new file mode 100644 index 000000000..28cf066fc --- /dev/null +++ b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/ArangoDBEnumIntegrationTest.java @@ -0,0 +1,4 @@ +package org.eclipse.jnosql.databases.arangodb.integration; + +public class ArangoDBEnumIntegrationTEst { +} From fce6b75d76cebccd4eaad55c58dac6c40c07e97c Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Thu, 13 Feb 2025 08:00:52 +0000 Subject: [PATCH 07/11] test: create test scenario to arangodb integration Signed-off-by: Otavio Santana --- .../ArangoDBEnumIntegrationTest.java | 108 +++++++++++++++++- .../arangodb/integration/Magazine.java | 2 +- .../arangodb/integration/MailTemplate.java | 16 +-- 3 files changed, 116 insertions(+), 10 deletions(-) diff --git a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/ArangoDBEnumIntegrationTest.java b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/ArangoDBEnumIntegrationTest.java index 28cf066fc..a10ea938a 100644 --- a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/ArangoDBEnumIntegrationTest.java +++ b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/ArangoDBEnumIntegrationTest.java @@ -1,4 +1,110 @@ +/* + * Copyright (c) 2025 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.arangodb.integration; -public class ArangoDBEnumIntegrationTEst { + +import jakarta.inject.Inject; +import org.assertj.core.api.SoftAssertions; +import org.eclipse.jnosql.databases.arangodb.communication.ArangoDBConfigurations; +import org.eclipse.jnosql.mapping.Database; +import org.eclipse.jnosql.mapping.core.Converters; +import org.eclipse.jnosql.mapping.core.config.MappingConfigurations; +import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; +import org.eclipse.jnosql.mapping.document.DocumentTemplate; +import org.eclipse.jnosql.mapping.document.spi.DocumentExtension; +import org.eclipse.jnosql.mapping.reflection.Reflections; +import org.eclipse.jnosql.mapping.semistructured.EntityConverter; +import org.jboss.weld.junit5.auto.AddExtensions; +import org.jboss.weld.junit5.auto.AddPackages; +import org.jboss.weld.junit5.auto.EnableAutoWeld; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; + +import java.util.List; +import java.util.function.Predicate; + +import static org.eclipse.jnosql.communication.driver.IntegrationTest.MATCHES; +import static org.eclipse.jnosql.communication.driver.IntegrationTest.NAMED; +import static org.eclipse.jnosql.databases.arangodb.communication.DocumentDatabase.INSTANCE; + +@EnableAutoWeld +@AddPackages(value = {Database.class, EntityConverter.class, DocumentTemplate.class}) +@AddPackages(Magazine.class) +@AddExtensions({EntityMetadataExtension.class, + DocumentExtension.class}) +@AddPackages(Reflections.class) +@AddPackages(Converters.class) +@EnabledIfSystemProperty(named = NAMED, matches = MATCHES) +public class ArangoDBEnumIntegrationTest { + + + static { + INSTANCE.get("library"); + System.setProperty(ArangoDBConfigurations.HOST.get() + ".1", INSTANCE.host()); + System.setProperty(MappingConfigurations.DOCUMENT_DATABASE.get(), "library"); + } + + @Inject + private DocumentTemplate template; + + + @Inject + private MailTemplateRepository repository; + + @Test + void shouldCreateAndQueryByEnumAndDefaultTrue() { + var emailTemplate = template.insert(MailTemplate.builder() + .category(MailCategory.TIMER) + .from("otavio@email.com") + .to("mateusz@email.com") + .isDefault(true) + .build()); + + List result = template.select(MailTemplate.class) .where("category") + .eq(MailCategory.TIMER).result(); + + SoftAssertions.assertSoftly(soft -> { + Predicate isTimer = m -> m.getCategory().equals(MailCategory.TIMER); + Predicate isTrue = m -> m.isDefault(); + soft.assertThat(result).hasSize(1).allMatch( + isTimer.and(isTrue)); + }); + } + + @Test + void shouldCreateAndQueryByEnumAndDefaultFalse() { + var emailTemplate = MailTemplate.builder() + .category(MailCategory.TRANSITION_ALTERNATIVE) + .from("otavio@email.com") + .to("mateusz@email.com") + .isDefault(false) + .build(); + + template.insert(emailTemplate); + + List result = template.select(MailTemplate.class) + .where("category") + .eq(MailCategory.TRANSITION_ALTERNATIVE) + .and("isDefault") + .eq(false).result(); + + SoftAssertions.assertSoftly(soft -> { + Predicate isAlternative = m -> m.getCategory().equals(MailCategory.TRANSITION_ALTERNATIVE); + Predicate isFalse = m -> !m.isDefault(); + soft.assertThat(result).hasSize(1).allMatch( + isAlternative.and(isFalse)); + }); + } } diff --git a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/Magazine.java b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/Magazine.java index ab78f387a..692724c0f 100644 --- a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/Magazine.java +++ b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/Magazine.java @@ -23,7 +23,7 @@ @Entity public class Magazine { - @Id("_key") + @Id private String id; @Column("title") diff --git a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailTemplate.java b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailTemplate.java index 1f1693cc3..511564b54 100644 --- a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailTemplate.java +++ b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailTemplate.java @@ -25,7 +25,7 @@ public class MailTemplate { @Id - private UUID id; + private String id; @Column private String to; @@ -39,7 +39,7 @@ public class MailTemplate { @Column private boolean isDefault; - public UUID getId() { + public String getId() { return id; } @@ -99,29 +99,29 @@ public static class MailTemplateBuilder{ private boolean isDefault; - public MailTemplateBuilder setTo(String to) { + public MailTemplateBuilder to(String to) { this.to = to; return this; } - public MailTemplateBuilder setFrom(String from) { + public MailTemplateBuilder from(String from) { this.from = from; return this; } - public MailTemplateBuilder setCategory(MailCategory category) { + public MailTemplateBuilder category(MailCategory category) { this.category = category; return this; } - public MailTemplateBuilder setDefault(boolean aDefault) { - isDefault = aDefault; + public MailTemplateBuilder isDefault(boolean isDefault) { + this.isDefault = isDefault; return this; } public MailTemplate build(){ MailTemplate mailTemplate = new MailTemplate(); - mailTemplate.id = UUID.randomUUID(); + mailTemplate.id = UUID.randomUUID().toString(); mailTemplate.to = this.to; mailTemplate.from = this.from; mailTemplate.category = this.category; From bad225d7496d4b7b000447b3199323586f72c6e0 Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Thu, 13 Feb 2025 08:02:57 +0000 Subject: [PATCH 08/11] test: generate a new test scenario to arangodb Signed-off-by: Otavio Santana --- .../ArangoDBEnumIntegrationTest.java | 29 ++++++++++++++++++- .../integration/MailTemplateRepository.java | 4 +-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/ArangoDBEnumIntegrationTest.java b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/ArangoDBEnumIntegrationTest.java index a10ea938a..95aacc751 100644 --- a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/ArangoDBEnumIntegrationTest.java +++ b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/ArangoDBEnumIntegrationTest.java @@ -33,6 +33,7 @@ import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import java.util.List; +import java.util.Optional; import java.util.function.Predicate; import static org.eclipse.jnosql.communication.driver.IntegrationTest.MATCHES; @@ -65,7 +66,7 @@ public class ArangoDBEnumIntegrationTest { @Test void shouldCreateAndQueryByEnumAndDefaultTrue() { - var emailTemplate = template.insert(MailTemplate.builder() + template.insert(MailTemplate.builder() .category(MailCategory.TIMER) .from("otavio@email.com") .to("mateusz@email.com") @@ -107,4 +108,30 @@ void shouldCreateAndQueryByEnumAndDefaultFalse() { isAlternative.and(isFalse)); }); } + + @Test + void shouldQueryUsingRepository() { + repository.save(MailTemplate.builder() + .category(MailCategory.TIMER) + .from("otavio@email.com") + .to("mateusz@email.com") + .isDefault(true) + .build()); + + repository.save(MailTemplate.builder() + .category(MailCategory.TRANSITION_ALTERNATIVE) + .from("otavio@email.com") + .to("mateusz@email.com") + .isDefault(true) + .build()); + + List categoryAndIsDefaultTrue = repository.findByCategoryAndIsDefaultTrue(MailCategory.TIMER); + + SoftAssertions.assertSoftly(soft -> { + Predicate isTimer = m -> m.getCategory().equals(MailCategory.TIMER); + Predicate isTrue = m -> m.isDefault(); + soft.assertThat(categoryAndIsDefaultTrue).hasSize(1).allMatch( + isTimer.and(isTrue)); + }); + } } diff --git a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailTemplateRepository.java b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailTemplateRepository.java index 20781d943..d68df6bc6 100644 --- a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailTemplateRepository.java +++ b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MailTemplateRepository.java @@ -18,10 +18,10 @@ import org.eclipse.jnosql.mapping.NoSQLRepository; import org.jetbrains.annotations.NotNull; -import java.util.Optional; +import java.util.List; @Repository public interface MailTemplateRepository extends NoSQLRepository { - Optional findByCategoryAndIsDefaultTrue(@NotNull MailCategory mailCategory); + List findByCategoryAndIsDefaultTrue(@NotNull MailCategory mailCategory); } \ No newline at end of file From 4709acd2eaed19e34f2f6454e5a1eb29b3e1b4c8 Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Thu, 13 Feb 2025 08:03:40 +0000 Subject: [PATCH 09/11] docs: enhance documentation at changelog with the enw arangodb version Signed-off-by: Otavio Santana --- CHANGELOG.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index b49b05b75..ad9926273 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -17,6 +17,7 @@ and this project adheres to https://semver.org/spec/v2.0.0.html[Semantic Version - Update OrientDB driver to 3.2.36 - Update Couchbase client 3.7.6 - Update DynamoDB driver 2.29.45 +- Update ArangoDb driver to 7.17.0 === Fixed From 644f2ddf80d4efec6dd86c36ee40d8851c61fcb0 Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Thu, 13 Feb 2025 08:19:29 +0000 Subject: [PATCH 10/11] test: update test scenario Signed-off-by: Otavio Santana --- .../arangodb/integration/ArangoDBEnumIntegrationTest.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/ArangoDBEnumIntegrationTest.java b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/ArangoDBEnumIntegrationTest.java index 95aacc751..e72c96f6b 100644 --- a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/ArangoDBEnumIntegrationTest.java +++ b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/ArangoDBEnumIntegrationTest.java @@ -33,7 +33,6 @@ import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import java.util.List; -import java.util.Optional; import java.util.function.Predicate; import static org.eclipse.jnosql.communication.driver.IntegrationTest.MATCHES; @@ -79,8 +78,7 @@ void shouldCreateAndQueryByEnumAndDefaultTrue() { SoftAssertions.assertSoftly(soft -> { Predicate isTimer = m -> m.getCategory().equals(MailCategory.TIMER); Predicate isTrue = m -> m.isDefault(); - soft.assertThat(result).hasSize(1).allMatch( - isTimer.and(isTrue)); + soft.assertThat(result).allMatch(isTimer.and(isTrue)); }); } From 234f4543faf80a4686442f21d070be996a7762cd Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Thu, 13 Feb 2025 08:24:29 +0000 Subject: [PATCH 11/11] feat: return magazine Signed-off-by: Otavio Santana --- .../eclipse/jnosql/databases/arangodb/integration/Magazine.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/Magazine.java b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/Magazine.java index 692724c0f..ab78f387a 100644 --- a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/Magazine.java +++ b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/Magazine.java @@ -23,7 +23,7 @@ @Entity public class Magazine { - @Id + @Id("_key") private String id; @Column("title")