Merge branch 'league-play-refactoring' of https://github.com/RIT-SWEN-262/designproject-design-6 into league-play-refactoringleague-play-refactoring

Merging?

9 files changed, 225 insertions, 51 deletions

diff --git a/src/main/java/design/persistence/JSONLeagueDatabase.java b/src/main/java/design/persistence/JSONLeagueDatabase.java
index 6f3f2d2..6446b34 100644
--- a/src/main/java/design/persistence/JSONLeagueDatabase.java
+++ b/src/main/java/design/persistence/JSONLeagueDatabase.java
@@ -1,14 +1,7 @@
 package design.persistence;
 
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.core.StreamReadFeature;
 import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import com.fasterxml.jackson.module.paramnames.ParameterNamesModule;
 import design.model.Course;
 import design.model.Golfer;
 import design.model.League;
@@ -30,6 +23,12 @@ public class JSONLeagueDatabase implements LeagueDatabase {
         return INSTANCE;
     }
 
+    // static instance strictly for testing, to not add data to leaguedb.json
+    static JSONLeagueDatabase testInstance(String filename) {
+        INSTANCE = new JSONLeagueDatabase(filename);
+        return INSTANCE;
+    }
+
     private final Map<Integer, League> cache;
     private final ObjectMapper mapper;
     private final File file;
@@ -38,20 +37,10 @@ public class JSONLeagueDatabase implements LeagueDatabase {
     public JSONLeagueDatabase(String filename) {
         this.file = new File(filename);
         this.cache = new HashMap<>();
-        this.mapper = JsonMapper.builder().enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION).build();
-
-        SimpleModule module = new SimpleModule();
-        module.addDeserializer(Course.class, new Serializers.CourseIdDeserializer());
-        module.addSerializer(Course.class, new Serializers.CourseIdSerializer());
-        module.addDeserializer(Golfer.class, new Serializers.GolferUsernameDeserializer());
-        module.addSerializer(Golfer.class, new Serializers.GolferUsernameSerializer());
-        module.addSerializer(Map.class, new Serializers.MapListSerializer());
-        module.addDeserializer(Map.class, new Serializers.MapListDeserializer());
-        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-        mapper.registerModule(module);
-        mapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY);
-        mapper.registerModule(new ParameterNamesModule(JsonCreator.Mode.PROPERTIES));
-        mapper.registerModule(new JavaTimeModule());
+        this.mapper = new ObjectMapper();
+
+        Serializers.configureMapper(mapper);
+        mapper.registerModule(this.getJacksonModule());
 
         try {
             load();
@@ -101,4 +90,35 @@ public class JSONLeagueDatabase implements LeagueDatabase {
         cache.put(league.getId(), league);
         save();
     }
+
+    @Override
+    public void importData(Object rawData) throws IOException {
+        if (!(rawData instanceof League[] data)) {
+            throw new ClassCastException();
+        }
+        cache.clear();
+        for (League league : data) {
+            cache.put(league.getId(), league);
+        }
+        save();
+    }
+
+    @Override
+    public League[] exportData() {
+        return getLeagues();
+    }
+
+    @Override
+    public SimpleModule getJacksonModule() {
+        return new SimpleModule()
+                .addSerializer(Course.class, new Serializers.CourseIdSerializer())
+                .addDeserializer(Course.class, new Serializers.CourseIdDeserializer())
+                .addSerializer(Golfer.class, new Serializers.GolferUsernameSerializer())
+                .addDeserializer(Golfer.class, new Serializers.GolferUsernameDeserializer());
+    }
+
+    @Override
+    public Class<?> getTargetClass() {
+        return League[].class;
+    }
 }
diff --git a/src/main/java/design/persistence/JSONPersonalDatabase.java b/src/main/java/design/persistence/JSONPersonalDatabase.java
index a2908f3..2f021d7 100644
--- a/src/main/java/design/persistence/JSONPersonalDatabase.java
+++ b/src/main/java/design/persistence/JSONPersonalDatabase.java
@@ -1,14 +1,7 @@
 package design.persistence;
 
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.core.StreamReadFeature;
 import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import com.fasterxml.jackson.module.paramnames.ParameterNamesModule;
 import design.model.Course;
 import design.model.Golfer;
 import design.model.League;
@@ -29,6 +22,12 @@ public class JSONPersonalDatabase implements PersonalDatabase {
         return INSTANCE;
     }
 
+    // static instance strictly for testing, to not add data to personaldb.json
+    static JSONPersonalDatabase testInstance(String filename) {
+        INSTANCE = new JSONPersonalDatabase(filename);
+        return INSTANCE;
+    }
+
     private final Map<String, Golfer> cache;
     private final ObjectMapper mapper;
     private final File file;
@@ -36,23 +35,10 @@ public class JSONPersonalDatabase implements PersonalDatabase {
     private JSONPersonalDatabase(String filename) {
         this.file = new File(filename);
         this.cache = new HashMap<>();
-        this.mapper = JsonMapper.builder().enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION).build();
-
-        // TODO: Once the saved JSON matches the model, consider removing.
-        // TEMP: tolerate unknown props while the model stabilizes
-        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-
-        SimpleModule module = new SimpleModule();
-        module.addDeserializer(Course.class, new Serializers.CourseIdDeserializer());
-        module.addSerializer(Course.class, new Serializers.CourseIdSerializer());
-        module.addSerializer(League.class, new Serializers.LeagueIDSerializer());
-        module.addDeserializer(League.class, new Serializers.LeagueIDDeserializer());
-        module.addSerializer(Map.class, new Serializers.MapListSerializer());
-        module.addDeserializer(Map.class, new Serializers.MapListDeserializer());
-        mapper.registerModule(module);
-        mapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY);
-        mapper.registerModule(new ParameterNamesModule(JsonCreator.Mode.PROPERTIES));
-        mapper.registerModule(new JavaTimeModule());
+        this.mapper = new ObjectMapper();
+
+        Serializers.configureMapper(mapper);
+        mapper.registerModule(this.getJacksonModule());
 
         try {
             load();
@@ -102,4 +88,35 @@ public class JSONPersonalDatabase implements PersonalDatabase {
         cache.put(golfer.getUsername(), golfer);
         save();
     }
+
+    @Override
+    public void importData(Object rawData) throws IOException {
+        if (!(rawData instanceof Golfer[] data)) {
+            throw new ClassCastException();
+        }
+        cache.clear();
+        for (Golfer golfer : data) {
+            cache.put(golfer.getUsername(), golfer);
+        }
+        save();
+    }
+
+    @Override
+    public Golfer[] exportData() {
+        return getGolfers();
+    }
+
+    @Override
+    public SimpleModule getJacksonModule() {
+        return new SimpleModule()
+                .addSerializer(Course.class, new Serializers.CourseIdSerializer())
+                .addDeserializer(Course.class, new Serializers.CourseIdDeserializer())
+                .addSerializer(League.class, new Serializers.LeagueIDSerializer())
+                .addDeserializer(League.class, new Serializers.LeagueIDDeserializer());
+    }
+
+    @Override
+    public Class<?> getTargetClass() {
+        return Golfer[].class;
+    }
 }
diff --git a/src/main/java/design/persistence/LeagueDatabase.java b/src/main/java/design/persistence/LeagueDatabase.java
index 953624d..ed6ddae 100644
--- a/src/main/java/design/persistence/LeagueDatabase.java
+++ b/src/main/java/design/persistence/LeagueDatabase.java
@@ -1,10 +1,11 @@
 package design.persistence;
 
 import design.model.League;
+import design.persistence.importexport.DataSource;
 
 import java.io.IOException;
 
-public interface LeagueDatabase {
+public interface LeagueDatabase extends DataSource {
     static LeagueDatabase instance() {
         return JSONLeagueDatabase.instance();
     }
@@ -18,4 +19,10 @@ public interface LeagueDatabase {
     void removeLeague(League league) throws IOException;
 
     void updateLeague(League league) throws IOException;
+
+    @Override
+    void importData(Object data) throws IOException;
+
+    @Override
+    Object exportData() throws IOException;
 }
diff --git a/src/main/java/design/persistence/PersonalDatabase.java b/src/main/java/design/persistence/PersonalDatabase.java
index adb865d..70dd37d 100644
--- a/src/main/java/design/persistence/PersonalDatabase.java
+++ b/src/main/java/design/persistence/PersonalDatabase.java
@@ -1,9 +1,11 @@
 package design.persistence;
 
 import design.model.Golfer;
+import design.persistence.importexport.DataSource;
+
 import java.io.IOException;
 
-public interface PersonalDatabase {
+public interface PersonalDatabase extends DataSource {
 
     static PersonalDatabase instance() {
         return JSONPersonalDatabase.instance();
@@ -18,4 +20,10 @@ public interface PersonalDatabase {
     void removeGolfer(Golfer golfer) throws IOException;
 
     void updateGolfer(Golfer golfer) throws IOException;
+
+    @Override
+    void importData(Object data) throws IOException;
+
+    @Override
+    Object exportData() throws IOException;
 }
diff --git a/src/main/java/design/persistence/Serializers.java b/src/main/java/design/persistence/Serializers.java
index d00dcbf..225ec7c 100644
--- a/src/main/java/design/persistence/Serializers.java
+++ b/src/main/java/design/persistence/Serializers.java
@@ -1,21 +1,36 @@
 package design.persistence;
 
+import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.util.DefaultIndenter;
 import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.fasterxml.jackson.module.paramnames.ParameterNamesModule;
 import design.model.Course;
 import design.model.Golfer;
 import design.model.League;
 
 import java.io.IOException;
 import java.util.Map;
+import java.time.LocalDateTime;
+import java.util.List;
 
 public class Serializers {
+    public static void configureMapper(ObjectMapper mapper) {
+        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        mapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY);
+        mapper.registerModule(new ParameterNamesModule(JsonCreator.Mode.PROPERTIES));
+        mapper.configOverride(List.class).setSetterInfo(JsonSetter.Value.forValueNulls(Nulls.AS_EMPTY));
+        mapper.registerModule(new JavaTimeModule());
+        mapper.registerModule(new SimpleModule()
+                .addSerializer(Map.class, new Serializers.MapListSerializer())
+                .addDeserializer(Map.class, new Serializers.MapListDeserializer())
+        );
+    }
+
     public static class CustomPrettyPrinter extends DefaultPrettyPrinter {
         public CustomPrettyPrinter() {
             super._arrayIndenter = new DefaultIndenter();
@@ -78,6 +93,13 @@ public class Serializers {
         }
     }
 
+    public static class DateTimeStringSerializer extends JsonSerializer<LocalDateTime> {
+        @Override
+        public void serialize(LocalDateTime value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+            gen.writeString(value.toString());
+        }
+    }
+
     @SuppressWarnings("rawtypes")
     public static class MapListSerializer extends JsonSerializer<Map> {
 
diff --git a/src/main/java/design/persistence/importexport/DataHandler.java b/src/main/java/design/persistence/importexport/DataHandler.java
new file mode 100644
index 0000000..59df9be
--- /dev/null
+++ b/src/main/java/design/persistence/importexport/DataHandler.java
@@ -0,0 +1,11 @@
+package design.persistence.importexport;
+
+import java.io.File;
+import java.io.IOException;
+
+public interface DataHandler {
+
+    void importData(File file) throws IOException;
+
+    void exportData(File file) throws IOException;
+}
diff --git a/src/main/java/design/persistence/importexport/DataSource.java b/src/main/java/design/persistence/importexport/DataSource.java
new file mode 100644
index 0000000..e735c7e
--- /dev/null
+++ b/src/main/java/design/persistence/importexport/DataSource.java
@@ -0,0 +1,16 @@
+package design.persistence.importexport;
+
+import com.fasterxml.jackson.databind.module.SimpleModule;
+
+import java.io.IOException;
+
+public interface DataSource {
+
+    void importData(Object data) 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
new file mode 100644
index 0000000..9c04281
--- /dev/null
+++ b/src/main/java/design/persistence/importexport/JSONHandler.java
@@ -0,0 +1,35 @@
+package design.persistence.importexport;
+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;
+
+public class JSONHandler implements DataHandler {
+
+    private final DataSource dataSource;
+    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 {
+        Object data = jsonMapper.readValue(file, dataSource.getTargetClass());
+        dataSource.importData(data);
+    }
+
+    @Override
+    public void exportData(File file) throws IOException{
+        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
new file mode 100644
index 0000000..0a07d6e
--- /dev/null
+++ b/src/main/java/design/persistence/importexport/XMLHandler.java
@@ -0,0 +1,38 @@
+package design.persistence.importexport;
+import java.io.File;
+import java.io.IOException;
+import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import design.persistence.Serializers;
+
+public class XMLHandler implements DataHandler {
+
+    private final DataSource dataSource;
+    private final XmlMapper xmlMapper = new XmlMapper();
+
+    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 {
+        Object data = xmlMapper.readValue(file, dataSource.getTargetClass());
+        dataSource.importData(data);
+    }
+
+    @Override
+    public void exportData(File file) throws IOException {
+        Object data = dataSource.exportData();
+        xmlMapper.writerWithDefaultPrettyPrinter()
+                .writeValue(file, data);
+    }
+}
+
+