Merge pull request #170 from eclipse/fixes_coucdb

Unable to Read HashMap<String, Object> from CouchDB with Artemis

Author: otaviojava

couchdb-driver/pom.xml

@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient-cache</artifactId>
-            <version>4.5.12</version>
+            <version>4.5.13</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

couchdb-driver/src/test/java/org/eclipse/jnosql/communication/couchdb/document/DefaultCouchDBDocumentCollectionManagerTest.java

@@ -22,13 +22,18 @@
 import jakarta.nosql.document.DocumentEntity;
 import jakarta.nosql.document.DocumentQuery;
 import org.eclipse.jnosql.communication.document.Documents;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.ThreadLocalRandom;
 import java.util.stream.Collectors;
 
 import static jakarta.nosql.document.DocumentDeleteQuery.delete;
@@ -178,22 +183,20 @@ public void shouldSelectWithCouchDBDocumentQuery() {
 
     @Test
     public void shouldConvertFromListSubdocumentList() {
-        DocumentEntity entity = createSubdocumentList();
+        DocumentEntity entity = createDocumentList();
         entityManager.insert(entity);
 
     }
 
     @Test
-    public void shouldRetrieveListSubdocumentList() {
-        DocumentEntity entity = entityManager.insert(createSubdocumentList());
+    public void shouldRetrieveListDocumentList() {
+        DocumentEntity entity = entityManager.insert(createDocumentList());
         Document key = entity.find(CouchDBConstant.ID).get();
         DocumentQuery query = select().from("AppointmentBook").where(key.getName()).eq(key.get()).build();
 
         DocumentEntity documentEntity = entityManager.singleResult(query).get();
         assertNotNull(documentEntity);
-
         List<List<Document>> contacts = (List<List<Document>>) documentEntity.find("contacts").get().get();
-
         assertEquals(3, contacts.size());
         assertTrue(contacts.stream().allMatch(d -> d.size() == 3));
     }
@@ -232,7 +235,24 @@ public void shouldSaveSubDocument2() {
         assertThat(documents, containsInAnyOrder(Document.of("mobile", "1231231"), Document.of("mobile2", "1231231")));
     }
 
-    private DocumentEntity createSubdocumentList() {
+    @Test
+    public void shouldSaveMap() {
+        DocumentEntity entity = DocumentEntity.of(COLLECTION_NAME);
+        String id = UUID.randomUUID().toString();
+        entity.add("properties", Collections.singletonMap("hallo", "Welt"));
+        entity.add("scope", "xxx");
+        entity.add("_id", id);
+        entityManager.insert(entity);
+        final DocumentQuery query = select().from(COLLECTION_NAME)
+                .where("_id").eq(id).and("scope").eq("xxx").build();
+        final Optional<DocumentEntity> optional = entityManager.select(query).findFirst();
+        Assertions.assertTrue(optional.isPresent());
+        DocumentEntity documentEntity = optional.get();
+        Document properties = documentEntity.find("properties").get();
+        Assertions.assertNotNull(properties);
+    }
+
+    private DocumentEntity createDocumentList() {
         DocumentEntity entity = DocumentEntity.of("AppointmentBook");
         List<List<Document>> documents = new ArrayList<>();
 

mongodb-driver/src/test/java/org/eclipse/jnosql/communication/mongodb/document/MongoDBDocumentCollectionManagerTest.java

@@ -23,6 +23,7 @@
 import jakarta.nosql.document.DocumentQuery;
 import org.eclipse.jnosql.communication.document.Documents;
 import org.eclipse.jnosql.communication.mongodb.document.type.Money;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
@@ -448,15 +449,15 @@ public void shouldCreateDate() {
     }
 
     @Test
-    public void shouldConvertFromListSubdocumentList() {
-        DocumentEntity entity = createSubdocumentList();
+    public void shouldConvertFromListDocumentList() {
+        DocumentEntity entity = createDocumentList();
         entityManager.insert(entity);
 
     }
 
     @Test
-    public void shouldRetrieveListSubdocumentList() {
-        DocumentEntity entity = entityManager.insert(createSubdocumentList());
+    public void shouldRetrieveListDocumentList() {
+        DocumentEntity entity = entityManager.insert(createDocumentList());
         Document key = entity.find("_id").get();
         DocumentQuery query = select().from("AppointmentBook")
                 .where(key.getName())
@@ -493,7 +494,26 @@ public void shouldCustomTypeWork() {
 
     }
 
-    private DocumentEntity createSubdocumentList() {
+    @Test
+    public void shouldSaveMap() {
+        DocumentEntity entity = DocumentEntity.of(COLLECTION_NAME);
+        String id = UUID.randomUUID().toString();
+        entity.add("properties", Collections.singletonMap("hallo", "Welt"));
+        entity.add("scope", "xxx");
+        entity.add("_id", id);
+        entityManager.insert(entity);
+        final DocumentQuery query = select().from(COLLECTION_NAME)
+                .where("_id").eq(id).and("scope").eq("xxx").build();
+        final Optional<DocumentEntity> optional = entityManager.select(query).findFirst();
+        Assertions.assertTrue(optional.isPresent());
+        DocumentEntity documentEntity = optional.get();
+        Document properties = documentEntity.find("properties").get();
+        Map<String, Object> map = properties.get(new TypeReference<Map<String, Object>>() {
+        });
+        Assertions.assertNotNull(map);
+    }
+
+    private DocumentEntity createDocumentList() {
         DocumentEntity entity = DocumentEntity.of("AppointmentBook");
         entity.add(Document.of("_id", new Random().nextInt()));
         List<List<Document>> documents = new ArrayList<>();