fix circular dependency

2 files changed, 4 insertions, 6 deletions

diff --git a/src/main/java/design/model/Golfer.java b/src/main/java/design/model/Golfer.java
index 77f411f..960568f 100644
--- a/src/main/java/design/model/Golfer.java
+++ b/src/main/java/design/model/Golfer.java
@@ -26,7 +26,7 @@ public class Golfer {
         this.courses = courses;
         this.rounds = rounds;
         this.clubs = clubs;
-        this.invites = invites;
+        this.invites = invites != null ? invites : new ArrayList<>();
         this.nextClubId = this.clubs.stream().mapToInt(Club::getId).max().orElse(0) + 1;
     }
 
diff --git a/src/main/java/design/persistence/Serializers.java b/src/main/java/design/persistence/Serializers.java
index ab4b18b..3940b44 100644
--- a/src/main/java/design/persistence/Serializers.java
+++ b/src/main/java/design/persistence/Serializers.java
@@ -36,10 +36,9 @@ public class Serializers {
     }
 
     public static class CourseIdDeserializer extends JsonDeserializer<Course> {
-        MasterDatabase masterDB = MasterDatabase.instance();
-
         @Override
         public Course deserialize(JsonParser p, DeserializationContext context) throws IOException {
+            MasterDatabase masterDB = MasterDatabase.instance();
             int id = p.getValueAsInt();
             return masterDB.getCourse(id);
         }
@@ -53,10 +52,9 @@ public class Serializers {
     }
 
     public static class LeagueIDDeserializer extends JsonDeserializer<League> {
-        LeagueDatabase leagueDB = LeagueDatabase.instance();
-
         @Override
         public League deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+            LeagueDatabase leagueDB = LeagueDatabase.instance();
             int id = p.getValueAsInt();
             return leagueDB.getLeague(id);
         }
@@ -70,10 +68,10 @@ public class Serializers {
     }
 
     public static class GolferUsernameDeserializer extends JsonDeserializer<Golfer> {
-        PersonalDatabase personalDB = PersonalDatabase.instance();
 
         @Override
         public Golfer deserialize(JsonParser p, DeserializationContext context) throws IOException {
+            PersonalDatabase personalDB = PersonalDatabase.instance();
             String username = p.getValueAsString();
             return personalDB.getGolfer(username);
         }