test: update

Signed-off-by: Otavio Santana <[email protected]>

Author: otaviojava

jnosql-mongodb/src/main/java/org/eclipse/jnosql/databases/mongodb/communication/DocumentQueryConversor.java

@@ -34,15 +34,15 @@ private DocumentQueryConversor() {
 
     public static Bson convert(CriteriaCondition condition) {
         Element document = condition.element();
-        Object value = ValueUtil.convert(document.value());
+        Object value = ValueUtil.convert(document.value(), MongoDBValueWriteDecorator.MONGO_DB_VALUE_WRITER);
         return switch (condition.condition()) {
             case EQUALS -> Filters.eq(document.name(), value);
             case GREATER_THAN -> Filters.gt(document.name(), value);
             case GREATER_EQUALS_THAN -> Filters.gte(document.name(), value);
             case LESSER_THAN -> Filters.lt(document.name(), value);
             case LESSER_EQUALS_THAN -> Filters.lte(document.name(), value);
             case IN -> {
-                List<Object> inList = ValueUtil.convertToList(document.value());
+                List<Object> inList = ValueUtil.convertToList(document.value(), MongoDBValueWriteDecorator.MONGO_DB_VALUE_WRITER);
                 yield Filters.in(document.name(), inList.toArray());
             }
             case NOT -> {
@@ -69,7 +69,7 @@ public static Bson convert(CriteriaCondition condition) {
                         .map(DocumentQueryConversor::convert).toList());
             }
             case BETWEEN -> {
-                List<Object> betweenList = ValueUtil.convertToList(document.value());
+                List<Object> betweenList = ValueUtil.convertToList(document.value(), MongoDBValueWriteDecorator.MONGO_DB_VALUE_WRITER);
                 yield Filters.and(Filters.gte(document.name(), betweenList.get(0)),
                         Filters.lte(document.name(), betweenList.get(1)));
 

jnosql-mongodb/src/main/java/org/eclipse/jnosql/databases/mongodb/communication/MongoDBUtils.java

@@ -27,16 +27,13 @@
 import java.util.Map;
 import java.util.function.Function;
 import java.util.function.Predicate;
-import java.util.function.UnaryOperator;
 import java.util.stream.StreamSupport;
 
 import static java.util.stream.StreamSupport.stream;
 
 final class MongoDBUtils {
     static final String ID_FIELD = "_id";
 
-    private static final Function<Object, String> KEY_DOCUMENT = d -> cast(d).name();
-    private static final UnaryOperator<Object> VALUE_DOCUMENT = d -> MongoDBUtils.convert(cast(d).value());
 
     private MongoDBUtils() {
     }
@@ -48,7 +45,7 @@ static Document getDocument(CommunicationEntity entity) {
     }
 
     private static Object convert(Value value) {
-        Object val = ValueUtil.convert(value);
+        Object val = ValueUtil.convert(value, MongoDBValueWriteDecorator.MONGO_DB_VALUE_WRITER);
         if (val instanceof Element subDocument) {
             Object converted = convert(subDocument.value());
             return new Document(subDocument.name(), converted);

jnosql-mongodb/src/main/java/org/eclipse/jnosql/databases/mongodb/communication/MongoDBValueWriteDecorator.java

@@ -21,6 +21,9 @@
 
 final class MongoDBValueWriteDecorator<T, S> implements ValueWriter<T, S> {
 
+    @SuppressWarnings("rawtypes")
+    static final ValueWriter MONGO_DB_VALUE_WRITER = new MongoDBValueWriteDecorator();
+
     @SuppressWarnings("rawtypes")
     private static final ValueWriter DEFAULT = ValueWriterDecorator.getInstance();
 

jnosql-mongodb/src/main/resources/META-INF/services/org.eclipse.jnosql.communication.ValueWriter

@@ -14,8 +14,20 @@
  */
 package org.eclipse.jnosql.databases.mongodb.communication;
 
+import org.junit.jupiter.api.Test;
+
+import java.util.UUID;
+
 import static org.junit.jupiter.api.Assertions.*;
 
+@SuppressWarnings("rawtypes")
 class MongoDBValueWriteDecoratorTest {
 
+    private final MongoDBValueWriteDecorator<Object, String> valueWriter = new MongoDBValueWriteDecorator<>();
+
+    @Test
+    void shouldTestUUIDType() {
+        assertTrue(valueWriter.test(UUID.class));
+    }
+
 }