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

5 files changed, 213 insertions, 40 deletions

diff --git a/src/main/java/design/persistence/JSONLeagueDatabase.java b/src/main/java/design/persistence/JSONLeagueDatabase.java
new file mode 100644
index 0000000..8a55065
--- /dev/null
+++ b/src/main/java/design/persistence/JSONLeagueDatabase.java
@@ -0,0 +1,102 @@
+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;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+public class JSONLeagueDatabase implements LeagueDatabase {
+
+    private static JSONLeagueDatabase INSTANCE;
+
+    public static JSONLeagueDatabase instance() {
+        if (INSTANCE == null) {
+            INSTANCE = new JSONLeagueDatabase("data/leaguedb.json");
+        }
+        return INSTANCE;
+    }
+
+    private final Map<Integer, League> cache;
+    private final ObjectMapper mapper;
+    private final File file;
+    private int nextLeagueID;
+
+    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());
+        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());
+
+        try {
+            load();
+        } catch (IOException ex) {
+            throw new RuntimeException(ex);
+        }
+
+        this.nextLeagueID = cache.values().stream().mapToInt(League::getId).max().orElse(0) + 1;
+    }
+
+    private void load() throws IOException {
+        League[] data = mapper.readValue(file, League[].class);
+        cache.clear();
+        Arrays.stream(data).forEach(i -> cache.put(i.getId(), i));
+    }
+
+    private void save() throws IOException {
+        League[] data = cache.values().toArray(League[]::new);
+        mapper.writer(new Serializers.CustomPrettyPrinter()).writeValue(file, data);
+    }
+
+    @Override
+    public League getLeague(int id) {
+        return cache.get(id);
+    }
+
+    @Override
+    public League[] getLeagues() {
+        return cache.values().toArray(League[]::new);
+    }
+
+    @Override
+    public void addLeague(League league) throws IOException {
+        league.setId(nextLeagueID++);
+        cache.putIfAbsent(league.getId(), league);
+        save();
+    }
+
+    @Override
+    public void removeLeague(League league) throws IOException {
+        cache.remove(league.getId());
+        save();
+    }
+
+    @Override
+    public void updateLeague(League league) throws IOException {
+        cache.put(league.getId(), league);
+        save();
+    }
+}
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();
-        }
-    }
 }
diff --git a/src/main/java/design/persistence/LeagueDatabase.java b/src/main/java/design/persistence/LeagueDatabase.java
new file mode 100644
index 0000000..953624d
--- /dev/null
+++ b/src/main/java/design/persistence/LeagueDatabase.java
@@ -0,0 +1,21 @@
+package design.persistence;
+
+import design.model.League;
+
+import java.io.IOException;
+
+public interface LeagueDatabase {
+    static LeagueDatabase instance() {
+        return JSONLeagueDatabase.instance();
+    }
+
+    League getLeague(int id);
+
+    League[] getLeagues();
+
+    void addLeague(League league) throws IOException;
+
+    void removeLeague(League league) throws IOException;
+
+    void updateLeague(League league) throws IOException;
+}
diff --git a/src/main/java/design/persistence/MasterDatabase.java b/src/main/java/design/persistence/MasterDatabase.java
index 59e3ebd..86e326b 100644
--- a/src/main/java/design/persistence/MasterDatabase.java
+++ b/src/main/java/design/persistence/MasterDatabase.java
@@ -10,6 +10,8 @@ public interface MasterDatabase {
     }
 
     Course[] getCourses();
+
     CourseList getCourseList(); // unique from courses as this is a composite of ICourses.
+
     Course getCourse(int id);
 }
diff --git a/src/main/java/design/persistence/Serializers.java b/src/main/java/design/persistence/Serializers.java
new file mode 100644
index 0000000..3940b44
--- /dev/null
+++ b/src/main/java/design/persistence/Serializers.java
@@ -0,0 +1,79 @@
+package design.persistence;
+
+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 design.model.Course;
+import design.model.Golfer;
+import design.model.League;
+
+import java.io.IOException;
+
+public class Serializers {
+    public static class CustomPrettyPrinter extends DefaultPrettyPrinter {
+        public CustomPrettyPrinter() {
+            super._arrayIndenter = new DefaultIndenter();
+            super._objectFieldValueSeparatorWithSpaces = _separators.getObjectFieldValueSeparator() + " ";
+            super._arrayEmptySeparator = "";
+        }
+
+        @Override
+        public CustomPrettyPrinter createInstance() {
+            return new CustomPrettyPrinter();
+        }
+    }
+
+    public static class CourseIdSerializer extends JsonSerializer<Course> {
+        @Override
+        public void serialize(Course course, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+            gen.writeNumber(course.getId());
+        }
+    }
+
+    public static class CourseIdDeserializer extends JsonDeserializer<Course> {
+        @Override
+        public Course deserialize(JsonParser p, DeserializationContext context) throws IOException {
+            MasterDatabase masterDB = MasterDatabase.instance();
+            int id = p.getValueAsInt();
+            return masterDB.getCourse(id);
+        }
+    }
+
+    public static class LeagueIDSerializer extends JsonSerializer<League> {
+        @Override
+        public void serialize(League value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+            gen.writeNumber(value.getId());
+        }
+    }
+
+    public static class LeagueIDDeserializer extends JsonDeserializer<League> {
+        @Override
+        public League deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+            LeagueDatabase leagueDB = LeagueDatabase.instance();
+            int id = p.getValueAsInt();
+            return leagueDB.getLeague(id);
+        }
+    }
+
+    public static class GolferUsernameSerializer extends JsonSerializer<Golfer> {
+        @Override
+        public void serialize(Golfer course, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+            gen.writeString(course.getUsername());
+        }
+    }
+
+    public static class GolferUsernameDeserializer extends JsonDeserializer<Golfer> {
+
+        @Override
+        public Golfer deserialize(JsonParser p, DeserializationContext context) throws IOException {
+            PersonalDatabase personalDB = PersonalDatabase.instance();
+            String username = p.getValueAsString();
+            return personalDB.getGolfer(username);
+        }
+    }
+}