Merge pull request #255 from eclipse/ISSUES-460

[BUG] Embeddable list of nested object cannot be saved

Author: otaviojava

CHANGELOG.adoc

@@ -8,6 +8,10 @@ and this project adheres to https://semver.org/spec/v2.0.0.html[Semantic Version
 
 == [Unreleased]
 
+=== Fixed
+
+- Allow Embeddable list of nested object with null value work in MongoDB and ArangoDB
+
 == [1.0.3] - 2023-12-02
 
 === Added

jnosql-arangodb/src/main/java/org/eclipse/jnosql/databases/arangodb/communication/ArangoDBUtil.java

@@ -37,7 +37,6 @@
 
 import static java.util.Collections.singletonMap;
 import static java.util.stream.Collectors.toList;
-import static java.util.stream.Collectors.toMap;
 import static java.util.stream.StreamSupport.stream;
 
 /**
@@ -48,11 +47,6 @@ public final class ArangoDBUtil {
     public static final String KEY = "_key";
     public static final String ID = "_id";
     public static final String REV = "_rev";
-
-    private static final Function<Object, String> KEY_DOCUMENT = d -> cast(d).name();
-    private static final Function<Object, Object> VALUE_DOCUMENT = d -> ValueUtil.convert(cast(d).value());
-
-
     private static final Logger LOGGER = Logger.getLogger(ArangoDBUtil.class.getName());
 
     private static final Function<Map.Entry<?, ?>, Document> ENTRY_DOCUMENT = entry ->
@@ -150,8 +144,13 @@ private static Object convert(Value value) {
     }
 
     private static Object getMap(Object val) {
-        return StreamSupport.stream(Iterable.class.cast(val).spliterator(), false)
-                .collect(toMap(KEY_DOCUMENT, VALUE_DOCUMENT));
+        Iterable<?> iterable = Iterable.class.cast(val);
+        Map<Object, Object> map = new HashMap<>();
+        for (Object item : iterable) {
+            var document = cast(item);
+            map.put(document.name(), document.get());
+        }
+        return map;
     }
 
     private static boolean isSudDocumentList(Object value) {

jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/MainStepType.java

@@ -0,0 +1,19 @@
+/*
+ *   Copyright (c) 2023 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 MainStepType {
+    MAIN, ENTRY
+}

jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/StepTransitionReason.java

@@ -0,0 +1,20 @@
+/*
+ *   Copyright (c) 2023 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 StepTransitionReason {
+    REPEAT
+}

jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/TemplateIntegrationTest.java

@@ -17,6 +17,7 @@
 
 import jakarta.inject.Inject;
 import jakarta.nosql.document.DocumentTemplate;
+import org.assertj.core.api.SoftAssertions;
 import org.eclipse.jnosql.databases.arangodb.communication.ArangoDBConfigurations;
 import org.eclipse.jnosql.databases.arangodb.communication.DocumentDatabase;
 import org.eclipse.jnosql.mapping.Convert;
@@ -32,12 +33,14 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
 
+import java.util.List;
 import java.util.Optional;
 
 import static java.util.UUID.randomUUID;
 import static org.assertj.core.api.Assertions.assertThat;
 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.integration.StepTransitionReason.REPEAT;
 
 @EnableAutoWeld
 @AddPackages(value = {Convert.class, DocumentEntityConverter.class})
@@ -60,7 +63,7 @@ class TemplateIntegrationTest {
 
 
     @Test
-    public void shouldInsert() {
+    void shouldInsert() {
         Book book = new Book(randomUUID().toString(), "Effective Java", 1);
         template.insert(book);
         Optional<Book> optional = template.find(Book.class, book.id());
@@ -69,7 +72,7 @@ public void shouldInsert() {
     }
 
     @Test
-    public void shouldUpdate() {
+    void shouldUpdate() {
         Book book = new Book(randomUUID().toString(), "Effective Java", 1);
         assertThat(template.insert(book))
                 .isNotNull()
@@ -87,7 +90,7 @@ public void shouldUpdate() {
     }
 
     @Test
-    public void shouldFindById() {
+    void shouldFindById() {
         Book book = new Book(randomUUID().toString(), "Effective Java", 1);
         assertThat(template.insert(book))
                 .isNotNull()
@@ -98,7 +101,7 @@ public void shouldFindById() {
     }
 
     @Test
-    public void shouldDelete() {
+    void shouldDelete() {
         Book book = new Book(randomUUID().toString(), "Effective Java", 1);
         assertThat(template.insert(book))
                 .isNotNull()
@@ -109,5 +112,40 @@ public void shouldDelete() {
                 .isNotNull().isEmpty();
     }
 
+    @Test
+    void shouldUpdateEmbeddable() {
+        var workflowStep = WorkflowStep.builder()
+                .id("id")
+                .key("key")
+                .workflowSchemaKey("workflowSchemaKey")
+                .stepName("stepName")
+                .mainStepType(MainStepType.MAIN)
+                .stepNo(1)
+                .componentConfigurationKey("componentConfigurationKey")
+                .relationTypeKey("relationTypeKey")
+                .availableTransitions(List.of(new Transition("TEST_WORKFLOW_STEP_KEY", REPEAT,
+                        null, List.of("ADMIN"))))
+                .build();
+        var result = this.template.insert(workflowStep);
+
+        SoftAssertions.assertSoftly(soft ->{
+            soft.assertThat(result).isNotNull();
+            soft.assertThat(result.id()).isEqualTo("workflow_step/key");
+            soft.assertThat(result.key()).isEqualTo("key");
+            soft.assertThat(result.workflowSchemaKey()).isEqualTo("workflowSchemaKey");
+            soft.assertThat(result.stepName()).isEqualTo("stepName");
+            soft.assertThat(result.mainStepType()).isEqualTo(MainStepType.MAIN);
+            soft.assertThat(result.stepNo()).isEqualTo(1);
+            soft.assertThat(result.componentConfigurationKey()).isEqualTo("componentConfigurationKey");
+            soft.assertThat(result.relationTypeKey()).isEqualTo("relationTypeKey");
+            soft.assertThat(result.availableTransitions()).hasSize(1);
+            soft.assertThat(result.availableTransitions().get(0).targetWorkflowStepKey()).isEqualTo("TEST_WORKFLOW_STEP_KEY");
+            soft.assertThat(result.availableTransitions().get(0).stepTransitionReason()).isEqualTo(REPEAT);
+            soft.assertThat(result.availableTransitions().get(0).mailTemplateKey()).isNull();
+            soft.assertThat(result.availableTransitions().get(0).restrictedRoleGroups()).hasSize(1);
+            soft.assertThat(result.availableTransitions().get(0).restrictedRoleGroups().get(0)).isEqualTo("ADMIN");
+        });
+    }
+
 
 }

jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/Transition.java

@@ -0,0 +1,62 @@
+/*
+ *   Copyright (c) 2023 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.Column;
+import org.eclipse.jnosql.mapping.Embeddable;
+
+import java.util.List;
+
+@Embeddable
+public class Transition {
+
+    @Column
+    private String targetWorkflowStepKey;
+    @Column
+    private StepTransitionReason stepTransitionReason;
+    @Column
+    private String mailTemplateKey;
+    @Column
+    private List<String> restrictedRoleGroups;
+
+    public Transition(String targetWorkflowStepKey,
+                      StepTransitionReason stepTransitionReason,
+                      String mailTemplateKey,
+                      List<String> restrictedRoleGroups) {
+        this.targetWorkflowStepKey = targetWorkflowStepKey;
+        this.stepTransitionReason = stepTransitionReason;
+        this.mailTemplateKey = mailTemplateKey;
+        this.restrictedRoleGroups = restrictedRoleGroups;
+    }
+
+    public Transition() {
+    }
+
+    public String targetWorkflowStepKey() {
+        return targetWorkflowStepKey;
+    }
+
+    public StepTransitionReason stepTransitionReason() {
+        return stepTransitionReason;
+    }
+
+    public String mailTemplateKey() {
+        return mailTemplateKey;
+    }
+
+    public List<String> restrictedRoleGroups() {
+        return restrictedRoleGroups;
+    }
+}

jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/WorkflowStep.java

@@ -0,0 +1,110 @@
+/*
+ *   Copyright (c) 2023 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.Column;
+import jakarta.nosql.Entity;
+import jakarta.nosql.Id;
+
+import java.util.List;
+
+@Entity("workflow_step")
+public class WorkflowStep {
+
+    @Id
+    private String id;
+
+    @Column("_key")
+    private String key;
+
+    @Column
+    private String workflowSchemaKey;
+
+    @Column
+    private String stepName;
+
+    @Column
+    private MainStepType mainStepType;
+
+    @Column
+    private Integer stepNo;
+
+    @Column
+    private String componentConfigurationKey;
+
+    @Column
+    private String relationTypeKey;
+
+    @Column
+    private List<Transition> availableTransitions;
+
+    WorkflowStep(String id, String key, String workflowSchemaKey,
+                 String stepName, MainStepType mainStepType,
+                 Integer stepNo, String componentConfigurationKey,
+                 String relationTypeKey, List<Transition> availableTransitions) {
+        this.id = id;
+        this.key = key;
+        this.workflowSchemaKey = workflowSchemaKey;
+        this.stepName = stepName;
+        this.mainStepType = mainStepType;
+        this.stepNo = stepNo;
+        this.componentConfigurationKey = componentConfigurationKey;
+        this.relationTypeKey = relationTypeKey;
+        this.availableTransitions = availableTransitions;
+    }
+
+    WorkflowStep() {
+    }
+
+    public static WorkflowStepBuilder builder() {
+        return new WorkflowStepBuilder();
+    }
+
+    public String id() {
+        return id;
+    }
+
+    public String key() {
+        return key;
+    }
+
+    public String workflowSchemaKey() {
+        return workflowSchemaKey;
+    }
+
+    public String stepName() {
+        return stepName;
+    }
+
+    public MainStepType mainStepType() {
+        return mainStepType;
+    }
+
+    public Integer stepNo() {
+        return stepNo;
+    }
+
+    public String componentConfigurationKey() {
+        return componentConfigurationKey;
+    }
+
+    public String relationTypeKey() {
+        return relationTypeKey;
+    }
+
+    public List<Transition> availableTransitions() {
+        return availableTransitions;
+    }
+}