Merge remote-tracking branch 'origin/league-model'

# Conflicts:
#	src/main/java/design/controller/userinput/menus/MainMenu.java
#	src/main/java/design/model/Golfer.java
#	src/test/java/design/model/ClubTest.java
#	src/test/java/design/model/GolferTest.java

1 files changed, 9 insertions, 40 deletions

diff --git a/src/main/java/design/persistence/JSONPersonalDatabase.java b/src/main/java/design/persistence/JSONPersonalDatabase.java
index 70aa1ab..30c280a 100644
--- a/src/main/java/design/persistence/JSONPersonalDatabase.java
+++ b/src/main/java/design/persistence/JSONPersonalDatabase.java
@@ -3,21 +3,18 @@ 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.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.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.Club;
 import design.model.Course;
 import design.model.Golfer;
+import design.model.League;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -39,15 +36,17 @@ public class JSONPersonalDatabase implements PersonalDatabase {
     private JSONPersonalDatabase(String filename) {
         this.file = new File(filename);
         this.cache = new HashMap<>();
-        this.mapper = new ObjectMapper();
+        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 CourseIdDeserializer());
-        module.addSerializer(Course.class, new CourseIdSerializer());
+        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());
         mapper.registerModule(module);
         mapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY);
         mapper.registerModule(new ParameterNamesModule(JsonCreator.Mode.PROPERTIES));
@@ -70,7 +69,7 @@ public class JSONPersonalDatabase implements PersonalDatabase {
 
     private void save() throws IOException {
         Golfer[] data = cache.values().toArray(Golfer[]::new);
-        mapper.writer(new CustomPrettyPrinter()).writeValue(file, data);
+        mapper.writer(new Serializers.CustomPrettyPrinter()).writeValue(file, data);
     }
 
     // turns that collection into a real array of golfers
@@ -101,34 +100,4 @@ public class JSONPersonalDatabase implements PersonalDatabase {
         cache.put(golfer.getUsername(), golfer);
         save();
     }
-
-    private static class CourseIdSerializer extends JsonSerializer<Course> {
-        @Override
-        public void serialize(Course course, JsonGenerator gen, SerializerProvider serializers) throws IOException {
-            gen.writeNumber(course.getId());
-        }
-    }
-
-    private static class CourseIdDeserializer extends JsonDeserializer<Course> {
-        MasterDatabase masterDB = MasterDatabase.instance();
-
-        @Override
-        public Course deserialize(JsonParser p, DeserializationContext context) throws IOException {
-            int id = p.getValueAsInt();
-            return masterDB.getCourse(id);
-        }
-    }
-
-    private static class CustomPrettyPrinter extends DefaultPrettyPrinter {
-        public CustomPrettyPrinter() {
-            super._arrayIndenter = new DefaultIndenter();
-            super._objectFieldValueSeparatorWithSpaces = _separators.getObjectFieldValueSeparator() + " ";
-            super._arrayEmptySeparator = "";
-        }
-
-        @Override
-        public CustomPrettyPrinter createInstance() {
-            return new CustomPrettyPrinter();
-        }
-    }
 }