add serializer for leagues in golfer, reorganize serializers

3 files changed, 92 insertions, 63 deletions

diff --git a/src/main/java/design/persistence/JSONLeagueDatabase.java b/src/main/java/design/persistence/JSONLeagueDatabase.java
index 78e1903..8b201e6 100644
--- a/src/main/java/design/persistence/JSONLeagueDatabase.java
+++ b/src/main/java/design/persistence/JSONLeagueDatabase.java
@@ -3,8 +3,6 @@ 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.databind.*;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
@@ -19,8 +17,6 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
-import static design.persistence.JSONPersonalDatabase.*;
-
 public class JSONLeagueDatabase implements LeagueDatabase {
 
     private static JSONLeagueDatabase INSTANCE;
@@ -43,10 +39,10 @@ public class JSONLeagueDatabase implements LeagueDatabase {
         this.mapper = new ObjectMapper();
 
         SimpleModule module = new SimpleModule();
-        module.addDeserializer(Course.class, new CourseIdDeserializer());
-        module.addSerializer(Course.class, new CourseIdSerializer());
-        module.addDeserializer(Golfer.class, new GolferUsernameDeserializer());
-        module.addSerializer(Golfer.class, new GolferUsernameSerializer());
+        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);
@@ -70,7 +66,7 @@ public class JSONLeagueDatabase implements LeagueDatabase {
 
     private void save() throws IOException {
         League[] data = cache.values().toArray(League[]::new);
-        mapper.writer(new CustomPrettyPrinter()).writeValue(file, data);
+        mapper.writer(new Serializers.CustomPrettyPrinter()).writeValue(file, data);
     }
 
     @Override
@@ -101,21 +97,4 @@ public class JSONLeagueDatabase implements LeagueDatabase {
         cache.put(league.getId(), league);
         save();
     }
-
-    protected static class GolferUsernameSerializer extends JsonSerializer<Golfer> {
-        @Override
-        public void serialize(Golfer course, JsonGenerator gen, SerializerProvider serializers) throws IOException {
-            gen.writeString(course.getUsername());
-        }
-    }
-
-    protected static class GolferUsernameDeserializer extends JsonDeserializer<Golfer> {
-        PersonalDatabase personalDB = PersonalDatabase.instance();
-
-        @Override
-        public Golfer deserialize(JsonParser p, DeserializationContext context) throws IOException {
-            String username = p.getValueAsString();
-            return personalDB.getGolfer(username);
-        }
-    }
 }
diff --git a/src/main/java/design/persistence/JSONPersonalDatabase.java b/src/main/java/design/persistence/JSONPersonalDatabase.java
index 00b6398..0e95437 100644
--- a/src/main/java/design/persistence/JSONPersonalDatabase.java
+++ b/src/main/java/design/persistence/JSONPersonalDatabase.java
@@ -3,16 +3,13 @@ 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.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.File;
 import java.io.IOException;
@@ -44,8 +41,10 @@ public class JSONPersonalDatabase implements PersonalDatabase {
         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));
@@ -68,7 +67,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
@@ -99,34 +98,4 @@ public class JSONPersonalDatabase implements PersonalDatabase {
         cache.put(golfer.getUsername(), golfer);
         save();
     }
-
-    protected static class CourseIdSerializer extends JsonSerializer<Course> {
-        @Override
-        public void serialize(Course course, JsonGenerator gen, SerializerProvider serializers) throws IOException {
-            gen.writeNumber(course.getId());
-        }
-    }
-
-    protected 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);
-        }
-    }
-
-    protected 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/Serializers.java b/src/main/java/design/persistence/Serializers.java
new file mode 100644
index 0000000..ab4b18b
--- /dev/null
+++ b/src/main/java/design/persistence/Serializers.java
@@ -0,0 +1,81 @@
+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> {
+        MasterDatabase masterDB = MasterDatabase.instance();
+
+        @Override
+        public Course deserialize(JsonParser p, DeserializationContext context) throws IOException {
+            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> {
+        LeagueDatabase leagueDB = LeagueDatabase.instance();
+
+        @Override
+        public League deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+            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> {
+        PersonalDatabase personalDB = PersonalDatabase.instance();
+
+        @Override
+        public Golfer deserialize(JsonParser p, DeserializationContext context) throws IOException {
+            String username = p.getValueAsString();
+            return personalDB.getGolfer(username);
+        }
+    }
+}