Added custom serialization

pom.xml

@@ -19,7 +19,7 @@
         <dependency>
             <groupId>com.github.JaimeTruman</groupId>
             <artifactId>Java-DDD</artifactId>
-            <version>1.1.12</version>
+            <version>1.1.15</version>
         </dependency>
 
         <dependency>

src/main/java/es/jaimetruman/MySQLQueryBuilder.java

@@ -1,15 +1,31 @@
 package es.jaimetruman;
 
-import es.jaime.javaddd.domain.database.DatabaseTypeMapper;
+import es.jaime.javaddd.domain.database.DatabaseTypeSerializer;
+import es.jaimetruman._shared.DatabaseTypeSerializerMapper;
+import es.jaimetruman._shared.serializers.*;
+
+import java.time.LocalDateTime;
+import java.util.Collection;
+import java.util.UUID;
 
 public final class MySQLQueryBuilder {
-    private static DatabaseTypeMapper databaseTypeMapper = new DefaultDatabaseTypeMapper();
+    private final static DatabaseTypeSerializerMapper DATABASE_TYPE_SERIALIZER_MAPPER;
+
+    static {
+        DATABASE_TYPE_SERIALIZER_MAPPER = new DatabaseTypeSerializerMapper();
+        DATABASE_TYPE_SERIALIZER_MAPPER.addSerializer(Boolean.class, new BooleanSerialzier());
+        DATABASE_TYPE_SERIALIZER_MAPPER.addSerializer(Collection.class, new CollectionSerializer());
+        DATABASE_TYPE_SERIALIZER_MAPPER.addSerializer(Enum.class, new EnumSerializer());
+        DATABASE_TYPE_SERIALIZER_MAPPER.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer());
+        DATABASE_TYPE_SERIALIZER_MAPPER.addSerializer(String.class, new StringSerializer());
+        DATABASE_TYPE_SERIALIZER_MAPPER.addSerializer(UUID.class, new UUIDSerializer());
+    }
 
-    public static void setDatabaseTypeMapper(final DatabaseTypeMapper newDatabaseTypeMapper) {
-        databaseTypeMapper = newDatabaseTypeMapper;
+    public static <T> void addCustomSerializer(Class<? extends T> type, DatabaseTypeSerializer<T> serializer) {
+        DATABASE_TYPE_SERIALIZER_MAPPER.addSerializer(type, serializer);
     }
 
-    public static DatabaseTypeMapper getDatabaseTypeMapper() {
-        return databaseTypeMapper;
+    public static DatabaseTypeSerializerMapper getDatabaseTypeSerializerMapper() {
+        return DATABASE_TYPE_SERIALIZER_MAPPER;
     }
 }

src/main/java/es/jaimetruman/_shared/DatabaseTypeSerializerMapper.java

@@ -0,0 +1,30 @@
+package es.jaimetruman._shared;
+
+import es.jaime.javaddd.domain.database.DatabaseTypeSerializer;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public final class DatabaseTypeSerializerMapper {
+    private final Map<Class<?>, DatabaseTypeSerializer> mappings;
+
+    public DatabaseTypeSerializerMapper() {
+        this.mappings = new ConcurrentHashMap<>();
+    }
+
+    public <T> void addSerializer(Class<? extends T> type, DatabaseTypeSerializer<T> serializer) {
+        this.mappings.put(type, serializer);
+    }
+
+    public <T> String serialize(T t) {
+        if(t == null){
+            return "";
+        }
+        if(!mappings.containsKey(t.getClass())){
+            return t.toString();
+        }
+
+        return this.mappings.get(t.getClass())
+                .serialize(t);
+    }
+}

src/main/java/es/jaimetruman/_shared/serializers/BooleanSerialzier.java

@@ -0,0 +1,10 @@
+package es.jaimetruman._shared.serializers;
+
+import es.jaime.javaddd.domain.database.DatabaseTypeSerializer;
+
+public final class BooleanSerialzier implements DatabaseTypeSerializer<Boolean> {
+    @Override
+    public String serialize(Boolean bool) {
+        return bool == Boolean.TRUE ? "1" : "0";
+    }
+}

src/main/java/es/jaimetruman/_shared/serializers/CollectionSerializer.java

@@ -0,0 +1,17 @@
+package es.jaimetruman._shared.serializers;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import es.jaime.javaddd.domain.database.DatabaseTypeSerializer;
+import lombok.SneakyThrows;
+
+import java.util.Collection;
+
+public final class CollectionSerializer implements DatabaseTypeSerializer<Collection> {
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
+    @Override
+    @SneakyThrows
+    public String serialize(Collection objects) {
+        return String.format("'%s'", objectMapper.writeValueAsString(objects));
+    }
+}

src/main/java/es/jaimetruman/_shared/serializers/EnumSerializer.java

@@ -0,0 +1,10 @@
+package es.jaimetruman._shared.serializers;
+
+import es.jaime.javaddd.domain.database.DatabaseTypeSerializer;
+
+public final class EnumSerializer implements DatabaseTypeSerializer<Enum> {
+    @Override
+    public String serialize(Enum anEnum) {
+        return String.format("'%s'", anEnum.toString());
+    }
+}

src/main/java/es/jaimetruman/_shared/serializers/LocalDateTimeSerializer.java

@@ -0,0 +1,15 @@
+package es.jaimetruman._shared.serializers;
+
+import es.jaime.javaddd.domain.database.DatabaseTypeSerializer;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+public final class LocalDateTimeSerializer implements DatabaseTypeSerializer<LocalDateTime> {
+    private DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+    @Override
+    public String serialize(LocalDateTime localDateTime) {
+        return localDateTime.format(formatter);
+    }
+}

src/main/java/es/jaimetruman/_shared/serializers/StringSerializer.java

@@ -0,0 +1,10 @@
+package es.jaimetruman._shared.serializers;
+
+import es.jaime.javaddd.domain.database.DatabaseTypeSerializer;
+
+public final class StringSerializer implements DatabaseTypeSerializer<String> {
+    @Override
+    public String serialize(String s) {
+        return String.format("'%s'", s);
+    }
+}

src/main/java/es/jaimetruman/_shared/serializers/UUIDSerializer.java

@@ -0,0 +1,12 @@
+package es.jaimetruman._shared.serializers;
+
+import es.jaime.javaddd.domain.database.DatabaseTypeSerializer;
+
+import java.util.UUID;
+
+public final class UUIDSerializer implements DatabaseTypeSerializer<UUID> {
+    @Override
+    public String serialize(UUID uuid) {
+        return String.format("'%s'", uuid.toString());
+    }
+}

src/main/java/es/jaimetruman/delete/DeleteOptionsCompare.java

@@ -13,22 +13,22 @@ public DeleteOptionsCompare(String query, String... toAppend) {
     }
 
     public DeleteOptionsFull equal (Object value) {
-        return new DeleteOptionsFull(builder.toString(), "= ", MySQLQueryBuilder.getDatabaseTypeMapper().map(value), " ");
+        return new DeleteOptionsFull(builder.toString(), "= ", MySQLQueryBuilder.getDatabaseTypeSerializerMapper().serialize(value), " ");
     }
 
     public DeleteOptionsFull bigger(Object value) {
-        return new DeleteOptionsFull(builder.toString(), "> ", MySQLQueryBuilder.getDatabaseTypeMapper().map(value), " ");
+        return new DeleteOptionsFull(builder.toString(), "> ", MySQLQueryBuilder.getDatabaseTypeSerializerMapper().serialize(value), " ");
     }
 
     public DeleteOptionsFull smaller(Object value) {
-        return new DeleteOptionsFull(builder.toString(), "< ", MySQLQueryBuilder.getDatabaseTypeMapper().map(value), " ");
+        return new DeleteOptionsFull(builder.toString(), "< ", MySQLQueryBuilder.getDatabaseTypeSerializerMapper().serialize(value), " ");
     }
 
     public DeleteOptionsFull smallerOrEqual (Object value) {
-        return new DeleteOptionsFull(builder.toString(), "<= ", MySQLQueryBuilder.getDatabaseTypeMapper().map(value), " ");
+        return new DeleteOptionsFull(builder.toString(), "<= ", MySQLQueryBuilder.getDatabaseTypeSerializerMapper().serialize(value), " ");
     }
 
     public DeleteOptionsFull biggerOrEqual(Object value) {
-        return new DeleteOptionsFull(builder.toString(), ">= ", MySQLQueryBuilder.getDatabaseTypeMapper().map(value), " ");
+        return new DeleteOptionsFull(builder.toString(), ">= ", MySQLQueryBuilder.getDatabaseTypeSerializerMapper().serialize(value), " ");
     }
 }

src/main/java/es/jaimetruman/insert/InsertOptionFinal.java

@@ -18,7 +18,7 @@ public String values (Object... values) {
         StringBuilder newStringBuilder = new StringBuilder(this.builder);
 
         newStringBuilder.append(Stream.of(values)
-                        .map(value -> MySQLQueryBuilder.getDatabaseTypeMapper().map(value))
+                        .map(value -> MySQLQueryBuilder.getDatabaseTypeSerializerMapper().serialize(value))
                         .collect(Collectors.joining(", ")))
                 .append(")");
 

src/main/java/es/jaimetruman/select/SelectOptionCompare.java

@@ -13,22 +13,22 @@ public SelectOptionCompare(String query, String... toAppend) {
     }
 
     public SelectOptionFull equal (Object value) {
-        return new SelectOptionFull(builder.toString(), "= ", MySQLQueryBuilder.getDatabaseTypeMapper().map(value), " ");
+        return new SelectOptionFull(builder.toString(), "= ", MySQLQueryBuilder.getDatabaseTypeSerializerMapper().serialize(value), " ");
     }
 
     public SelectOptionFull bigger(Object value) {
-        return new SelectOptionFull(builder.toString(), "> ", MySQLQueryBuilder.getDatabaseTypeMapper().map(value), " ");
+        return new SelectOptionFull(builder.toString(), "> ", MySQLQueryBuilder.getDatabaseTypeSerializerMapper().serialize(value), " ");
     }
 
     public SelectOptionFull smaller(Object value) {
-        return new SelectOptionFull(builder.toString(), "< ", MySQLQueryBuilder.getDatabaseTypeMapper().map(value), " ");
+        return new SelectOptionFull(builder.toString(), "< ", MySQLQueryBuilder.getDatabaseTypeSerializerMapper().serialize(value), " ");
     }
 
     public SelectOptionFull smallerOrEqual (Object value) {
-        return new SelectOptionFull(builder.toString(), "<= ", MySQLQueryBuilder.getDatabaseTypeMapper().map(value), " ");
+        return new SelectOptionFull(builder.toString(), "<= ", MySQLQueryBuilder.getDatabaseTypeSerializerMapper().serialize(value), " ");
     }
 
     public SelectOptionFull biggerOrEqual(Object value) {
-        return new SelectOptionFull(builder.toString(), ">= ", MySQLQueryBuilder.getDatabaseTypeMapper().map(value), " ");
+        return new SelectOptionFull(builder.toString(), ">= ", MySQLQueryBuilder.getDatabaseTypeSerializerMapper().serialize(value), " ");
     }
 }

src/main/java/es/jaimetruman/update/UpdateOptionCompare.java

@@ -14,23 +14,23 @@ public UpdateOptionCompare(String string, String... toAppend) {
     }
 
     public UpdateOptionFull2 equal (Object value) {
-        return new UpdateOptionFull2(builder.toString(), "= ", MySQLQueryBuilder.getDatabaseTypeMapper().map(value), " ");
+        return new UpdateOptionFull2(builder.toString(), "= ", MySQLQueryBuilder.getDatabaseTypeSerializerMapper().serialize(value), " ");
     }
 
     public UpdateOptionFull2 bigger(Object value) {
-        return new UpdateOptionFull2(builder.toString(), "> ", MySQLQueryBuilder.getDatabaseTypeMapper().map(value));
+        return new UpdateOptionFull2(builder.toString(), "> ", MySQLQueryBuilder.getDatabaseTypeSerializerMapper().serialize(value));
     }
 
     public UpdateOptionFull2 smaller(Object value) {
-        return new UpdateOptionFull2(builder.toString(), "< ", MySQLQueryBuilder.getDatabaseTypeMapper().map(value));
+        return new UpdateOptionFull2(builder.toString(), "< ", MySQLQueryBuilder.getDatabaseTypeSerializerMapper().serialize(value));
     }
 
     public UpdateOptionFull2 smallerOrEqual (Object value) {
-        return new UpdateOptionFull2(builder.toString(), "<= ", MySQLQueryBuilder.getDatabaseTypeMapper().map(value));
+        return new UpdateOptionFull2(builder.toString(), "<= ", MySQLQueryBuilder.getDatabaseTypeSerializerMapper().serialize(value));
     }
 
     public UpdateOptionFull2 biggerOrEqual(Object value) {
-        return new UpdateOptionFull2(builder.toString(), ">= ", MySQLQueryBuilder.getDatabaseTypeMapper().map(value));
+        return new UpdateOptionFull2(builder.toString(), ">= ", MySQLQueryBuilder.getDatabaseTypeSerializerMapper().serialize(value));
     }
 
 }

src/main/java/es/jaimetruman/update/UpdateOptionFull1.java

@@ -13,7 +13,7 @@ public UpdateOptionFull1(String string, String... toAppend) {
     }
 
     public UpdateOptionFull1 andSet (String field, Object value) {
-        return new UpdateOptionFull1(builder.toString(), ", ", field, " = ", MySQLQueryBuilder.getDatabaseTypeMapper().map(value));
+        return new UpdateOptionFull1(builder.toString(), ", ", field, " = ", MySQLQueryBuilder.getDatabaseTypeSerializerMapper().serialize(value));
     }
 
     public UpdateOptionCompare where (String value) {

src/main/java/es/jaimetruman/update/UpdateOptionInitial.java

@@ -13,6 +13,6 @@ public UpdateOptionInitial (String table) {
     }
 
     public UpdateOptionFull1 set (String field, Object value) {
-        return new UpdateOptionFull1(builder.toString(), "SET ", field, " = ", MySQLQueryBuilder.getDatabaseTypeMapper().map(value));
+        return new UpdateOptionFull1(builder.toString(), "SET ", field, " = ", MySQLQueryBuilder.getDatabaseTypeSerializerMapper().serialize(value));
     }
 }

src/test/java/es/jaimetruman/_shared/serializers/CollectionSerializerTest.java

@@ -0,0 +1,29 @@
+package es.jaimetruman._shared.serializers;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.List;
+
+public final class CollectionSerializerTest {
+    @Test
+    public void collectionSerializer() {
+        CollectionSerializer collectionSerializer = new CollectionSerializer();
+
+        String serialized = collectionSerializer.serialize(Arrays.asList(
+                new ColletionSerializerObject("jaime", 3),
+                new ColletionSerializerObject("pedro", 12)
+        ));
+
+        Assert.assertEquals("'[{\"nombre\":\"jaime\",\"puntos\":3.0},{\"nombre\":\"pedro\",\"puntos\":12.0}]'", serialized);
+    }
+
+    @AllArgsConstructor
+    public static class ColletionSerializerObject {
+        @Getter private String nombre;
+        @Getter private double puntos;
+    }
+}

src/test/java/es/jaimetruman/_shared/serializers/EnumSerialzierTest.java

@@ -0,0 +1,17 @@
+package es.jaimetruman._shared.serializers;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public final class EnumSerialzierTest {
+    @Test
+    public void enumSerializer() {
+        EnumSerializer enumSerializer = new EnumSerializer();
+
+        Assert.assertEquals("'VALOR1'", enumSerializer.serialize(EjemploEnum.VALOR1));;
+    }
+
+    public enum EjemploEnum {
+        VALOR1, VALOR2
+    }
+}

src/test/java/es/jaimetruman/delete/DeleteTest.java

@@ -10,6 +10,6 @@ public void deleteTest() {
                 .where("nombre").equal("jaimetruman")
                 .build();
 
-        Assert.assertEquals(query, "DELETE FROM jugadores WHERE nombre = 'jaimetruman' ");
+        Assert.assertEquals("DELETE FROM jugadores WHERE nombre = 'jaimetruman' ", query);
     }
 }

src/test/java/es/jaimetruman/insert/InsertTest.java

@@ -12,5 +12,4 @@ public void testInsert () {
 
         Assert.assertEquals(query, "INSERT INTO jugadores (nombre, dinero) VALUES ('JaimeTruman', 10)");
     }
-
 }