Merge branch 'main' into course-search

merging main onto course search branch

2 files changed, 11 insertions, 2 deletions

diff --git a/src/main/java/design/persistence/JSONPersonalDatabase.java b/src/main/java/design/persistence/JSONPersonalDatabase.java
index 0efa362..b034680 100644
--- a/src/main/java/design/persistence/JSONPersonalDatabase.java
+++ b/src/main/java/design/persistence/JSONPersonalDatabase.java
@@ -16,6 +16,7 @@ import design.model.Golfer;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -30,6 +31,10 @@ public class JSONPersonalDatabase implements PersonalDatabase {
         this.cache = new HashMap<>();
         this.mapper = new ObjectMapper();
 
+        // 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());
@@ -58,9 +63,10 @@ public class JSONPersonalDatabase implements PersonalDatabase {
         mapper.writer(new CustomPrettyPrinter()).writeValue(file, data);
     }
 
+    // turns that collection into a real array of golfers
     @Override
     public Golfer[] getGolfers() {
-        return new Golfer[0];
+        return cache.values().toArray(Golfer[]::new);
     }
 
     @Override
diff --git a/src/main/java/design/persistence/PersonalDatabase.java b/src/main/java/design/persistence/PersonalDatabase.java
index a045d59..428694b 100644
--- a/src/main/java/design/persistence/PersonalDatabase.java
+++ b/src/main/java/design/persistence/PersonalDatabase.java
@@ -1,15 +1,18 @@
 package design.persistence;
 
 import design.model.Golfer;
-
 import java.io.IOException;
 
 public interface PersonalDatabase {
     PersonalDatabase INSTANCE = new JSONPersonalDatabase("data/personaldb.json");
 
     Golfer[] getGolfers();
+
     Golfer getGolfer(String name);
+
     void addGolfer(Golfer golfer) throws IOException;
+
     void removeGolfer(Golfer golfer) throws IOException;
+
     void updateGolfer(Golfer golfer) throws IOException;
 }