summaryrefslogtreecommitdiff
path: root/src/main/java/design/persistence
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/design/persistence')
-rw-r--r--src/main/java/design/persistence/JSONPersonalDatabase.java8
-rw-r--r--src/main/java/design/persistence/PersonalDatabase.java10
2 files changed, 4 insertions, 14 deletions
diff --git a/src/main/java/design/persistence/JSONPersonalDatabase.java b/src/main/java/design/persistence/JSONPersonalDatabase.java
index 187c2d2..b034680 100644
--- a/src/main/java/design/persistence/JSONPersonalDatabase.java
+++ b/src/main/java/design/persistence/JSONPersonalDatabase.java
@@ -31,7 +31,9 @@ public class JSONPersonalDatabase implements PersonalDatabase {
this.cache = new HashMap<>();
this.mapper = new ObjectMapper();
- mapper.configure(com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+ // 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());
@@ -64,9 +66,7 @@ public class JSONPersonalDatabase implements PersonalDatabase {
// turns that collection into a real array of golfers
@Override
public Golfer[] getGolfers() {
- Collection<Golfer> golfers = cache.values();
- Golfer[] array = golfers.toArray(new Golfer[golfers.size()]);
- return array;
+ 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 886bd0b..428694b 100644
--- a/src/main/java/design/persistence/PersonalDatabase.java
+++ b/src/main/java/design/persistence/PersonalDatabase.java
@@ -1,7 +1,6 @@
package design.persistence;
import design.model.Golfer;
-
import java.io.IOException;
public interface PersonalDatabase {
@@ -16,13 +15,4 @@ public interface PersonalDatabase {
void removeGolfer(Golfer golfer) throws IOException;
void updateGolfer(Golfer golfer) throws IOException;
-
- default Golfer loadOrCreateGolfer(String username, String fullNameIfNew, String pwIfNew) throws IOException {
- Golfer g = getGolfer(username);
- if (g != null)
- return g;
- g = new Golfer(fullNameIfNew, username, pwIfNew);
- addGolfer(g);
- return g;
- }
}