1 files changed, 11 insertions, 6 deletions
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);
     }
 }