From e56ad78ddba089b5bb93af96e33ee7c42b7d0b51 Mon Sep 17 00:00:00 2001 From: sowgro Date: Sun, 9 Nov 2025 00:06:03 -0500 Subject: create most of the model and league DAOs --- .../design/persistence/JSONLeagueDatabase.java | 63 ++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 src/main/java/design/persistence/JSONLeagueDatabase.java (limited to 'src/main/java/design/persistence/JSONLeagueDatabase.java') diff --git a/src/main/java/design/persistence/JSONLeagueDatabase.java b/src/main/java/design/persistence/JSONLeagueDatabase.java new file mode 100644 index 0000000..01f4fc3 --- /dev/null +++ b/src/main/java/design/persistence/JSONLeagueDatabase.java @@ -0,0 +1,63 @@ +package design.persistence; + +import design.model.League; + +import java.io.File; +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 cache; + private final File file; + + public JSONLeagueDatabase(String filename) { + this.file = new File(filename); + this.cache = new HashMap<>(); + } + + private void load() { + //TODO impl + } + + private void save() { + //TODO impl + } + + @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) { + cache.putIfAbsent(league.getId(), league); + save(); + } + + @Override + public void removeLeague(League league) { + cache.remove(league.getId()); + save(); + } + + @Override + public void updateLeague(League league) { + cache.put(league.getId(), league); + save(); + } +} -- cgit v1.2.3 From 7a87c716e85a12c72c24173b88b2e07729d85241 Mon Sep 17 00:00:00 2001 From: sowgro Date: Sun, 9 Nov 2025 01:01:03 -0500 Subject: complete serialization --- .../design/persistence/JSONLeagueDatabase.java | 72 +++++++++++++++++++--- 1 file changed, 65 insertions(+), 7 deletions(-) (limited to 'src/main/java/design/persistence/JSONLeagueDatabase.java') diff --git a/src/main/java/design/persistence/JSONLeagueDatabase.java b/src/main/java/design/persistence/JSONLeagueDatabase.java index 01f4fc3..78e1903 100644 --- a/src/main/java/design/persistence/JSONLeagueDatabase.java +++ b/src/main/java/design/persistence/JSONLeagueDatabase.java @@ -1,11 +1,26 @@ 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; +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; +import static design.persistence.JSONPersonalDatabase.*; + public class JSONLeagueDatabase implements LeagueDatabase { private static JSONLeagueDatabase INSTANCE; @@ -18,19 +33,44 @@ public class JSONLeagueDatabase implements LeagueDatabase { } private final Map 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 = 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()); + 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() { - //TODO impl + 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() { - //TODO impl + private void save() throws IOException { + League[] data = cache.values().toArray(League[]::new); + mapper.writer(new CustomPrettyPrinter()).writeValue(file, data); } @Override @@ -44,20 +84,38 @@ public class JSONLeagueDatabase implements LeagueDatabase { } @Override - public void addLeague(League league) { + public void addLeague(League league) throws IOException { + league.setId(nextLeagueID++); cache.putIfAbsent(league.getId(), league); save(); } @Override - public void removeLeague(League league) { + public void removeLeague(League league) throws IOException { cache.remove(league.getId()); save(); } @Override - public void updateLeague(League league) { + public void updateLeague(League league) throws IOException { cache.put(league.getId(), league); save(); } + + protected static class GolferUsernameSerializer extends JsonSerializer { + @Override + public void serialize(Golfer course, JsonGenerator gen, SerializerProvider serializers) throws IOException { + gen.writeString(course.getUsername()); + } + } + + protected static class GolferUsernameDeserializer extends JsonDeserializer { + PersonalDatabase personalDB = PersonalDatabase.instance(); + + @Override + public Golfer deserialize(JsonParser p, DeserializationContext context) throws IOException { + String username = p.getValueAsString(); + return personalDB.getGolfer(username); + } + } } -- cgit v1.2.3 From 708b2c1fca41f0fb5d7e73aa3470839ce2463892 Mon Sep 17 00:00:00 2001 From: sowgro Date: Sun, 9 Nov 2025 17:27:07 -0500 Subject: add serializer for leagues in golfer, reorganize serializers --- .../design/persistence/JSONLeagueDatabase.java | 31 ++++------------------ 1 file changed, 5 insertions(+), 26 deletions(-) (limited to 'src/main/java/design/persistence/JSONLeagueDatabase.java') 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 { - @Override - public void serialize(Golfer course, JsonGenerator gen, SerializerProvider serializers) throws IOException { - gen.writeString(course.getUsername()); - } - } - - protected static class GolferUsernameDeserializer extends JsonDeserializer { - PersonalDatabase personalDB = PersonalDatabase.instance(); - - @Override - public Golfer deserialize(JsonParser p, DeserializationContext context) throws IOException { - String username = p.getValueAsString(); - return personalDB.getGolfer(username); - } - } } -- cgit v1.2.3 From 9a0949d31a7a0e8c9c311b07e92852cff867cc66 Mon Sep 17 00:00:00 2001 From: sowgro Date: Wed, 12 Nov 2025 12:55:12 -0500 Subject: Fix some serialization stuff --- src/main/java/design/persistence/JSONLeagueDatabase.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/main/java/design/persistence/JSONLeagueDatabase.java') diff --git a/src/main/java/design/persistence/JSONLeagueDatabase.java b/src/main/java/design/persistence/JSONLeagueDatabase.java index 8b201e6..8a55065 100644 --- a/src/main/java/design/persistence/JSONLeagueDatabase.java +++ b/src/main/java/design/persistence/JSONLeagueDatabase.java @@ -3,7 +3,9 @@ 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; @@ -36,7 +38,7 @@ public class JSONLeagueDatabase implements LeagueDatabase { public JSONLeagueDatabase(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(); SimpleModule module = new SimpleModule(); module.addDeserializer(Course.class, new Serializers.CourseIdDeserializer()); -- cgit v1.2.3