3 files changed, 31 insertions, 18 deletions

diff --git a/src/main/java/design/persistence/importexport/DataSource.java b/src/main/java/design/persistence/importexport/DataSource.java
index 5290e33..e735c7e 100644
--- a/src/main/java/design/persistence/importexport/DataSource.java
+++ b/src/main/java/design/persistence/importexport/DataSource.java
@@ -1,12 +1,16 @@
 package design.persistence.importexport;
 
-import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.module.SimpleModule;
 
 import java.io.IOException;
 
 public interface DataSource {
 
-    void importData(JsonNode tree) throws IOException;
+    void importData(Object data) throws IOException;
 
-    JsonNode exportData() throws IOException;
+    Object exportData() throws IOException;
+
+    SimpleModule getJacksonModule();
+
+    Class<?> getTargetClass();
 }
\ No newline at end of file
diff --git a/src/main/java/design/persistence/importexport/JSONHandler.java b/src/main/java/design/persistence/importexport/JSONHandler.java
index 239eb6b..9c04281 100644
--- a/src/main/java/design/persistence/importexport/JSONHandler.java
+++ b/src/main/java/design/persistence/importexport/JSONHandler.java
@@ -1,6 +1,7 @@
 package design.persistence.importexport;
-import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
+import design.persistence.Serializers;
 
 import java.io.File;
 import java.io.IOException;
@@ -8,22 +9,26 @@ import java.io.IOException;
 public class JSONHandler implements DataHandler {
 
     private final DataSource dataSource;
-    private final JsonMapper jsonMapper = new JsonMapper();
+    private final ObjectMapper jsonMapper = new JsonMapper();
 
     public JSONHandler(DataSource dataSource) {
         this.dataSource = dataSource;
+
+        Serializers.configureMapper(jsonMapper);
+        jsonMapper.registerModule(dataSource.getJacksonModule());
     }
 
     @Override
     public void importData(File file) throws IOException {
-        JsonNode tree = jsonMapper.readTree(file);
-        dataSource.importData(tree);
+        Object data = jsonMapper.readValue(file, dataSource.getTargetClass());
+        dataSource.importData(data);
     }
 
     @Override
     public void exportData(File file) throws IOException{
-        JsonNode tree = dataSource.exportData();
-        jsonMapper.writerWithDefaultPrettyPrinter().writeValue(file, tree);
+        Object data = dataSource.exportData();
+        jsonMapper.writer(new Serializers.CustomPrettyPrinter())
+                .writeValue(file, data);
     }
 }
 
diff --git a/src/main/java/design/persistence/importexport/XMLHandler.java b/src/main/java/design/persistence/importexport/XMLHandler.java
index 1a16b90..0a07d6e 100644
--- a/src/main/java/design/persistence/importexport/XMLHandler.java
+++ b/src/main/java/design/persistence/importexport/XMLHandler.java
@@ -1,10 +1,11 @@
 package design.persistence.importexport;
 import java.io.File;
 import java.io.IOException;
+import java.time.LocalDateTime;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import design.persistence.Serializers;
 
 public class XMLHandler implements DataHandler {
 
@@ -13,21 +14,24 @@ public class XMLHandler implements DataHandler {
 
     public XMLHandler(DataSource dataSource) {
         this.dataSource = dataSource;
+
+        Serializers.configureMapper(xmlMapper);
+        SimpleModule module = dataSource.getJacksonModule();
+        module.addSerializer(LocalDateTime.class, new Serializers.DateTimeStringSerializer());
+        xmlMapper.registerModule(module);
     }
 
     @Override
     public void importData(File file) throws IOException {
-        JsonNode tree = xmlMapper.readTree(file);
-        JsonNode unwrapped = tree.get("items");
-        dataSource.importData(unwrapped);
+        Object data = xmlMapper.readValue(file, dataSource.getTargetClass());
+        dataSource.importData(data);
     }
 
     @Override
     public void exportData(File file) throws IOException {
-        JsonNode tree = dataSource.exportData();
-        ObjectNode wrapper = xmlMapper.createObjectNode();
-        wrapper.set("items", tree);
-        xmlMapper.writerWithDefaultPrettyPrinter().withRootName("export").writeValue(file, wrapper);
+        Object data = dataSource.exportData();
+        xmlMapper.writerWithDefaultPrettyPrinter()
+                .writeValue(file, data);
     }
 }