From 7a87c716e85a12c72c24173b88b2e07729d85241 Mon Sep 17 00:00:00 2001 From: sowgro Date: Sun, 9 Nov 2025 01:01:03 -0500 Subject: complete serialization --- src/main/java/design/persistence/JSONPersonalDatabase.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/main/java/design/persistence/JSONPersonalDatabase.java') diff --git a/src/main/java/design/persistence/JSONPersonalDatabase.java b/src/main/java/design/persistence/JSONPersonalDatabase.java index 70aa1ab..00b6398 100644 --- a/src/main/java/design/persistence/JSONPersonalDatabase.java +++ b/src/main/java/design/persistence/JSONPersonalDatabase.java @@ -11,13 +11,11 @@ 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.Club; import design.model.Course; import design.model.Golfer; import java.io.File; import java.io.IOException; -import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -102,14 +100,14 @@ public class JSONPersonalDatabase implements PersonalDatabase { save(); } - private static class CourseIdSerializer extends JsonSerializer { + protected static class CourseIdSerializer extends JsonSerializer { @Override public void serialize(Course course, JsonGenerator gen, SerializerProvider serializers) throws IOException { gen.writeNumber(course.getId()); } } - private static class CourseIdDeserializer extends JsonDeserializer { + protected static class CourseIdDeserializer extends JsonDeserializer { MasterDatabase masterDB = MasterDatabase.instance(); @Override @@ -119,7 +117,7 @@ public class JSONPersonalDatabase implements PersonalDatabase { } } - private static class CustomPrettyPrinter extends DefaultPrettyPrinter { + protected static class CustomPrettyPrinter extends DefaultPrettyPrinter { public CustomPrettyPrinter() { super._arrayIndenter = new DefaultIndenter(); super._objectFieldValueSeparatorWithSpaces = _separators.getObjectFieldValueSeparator() + " "; -- 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/JSONPersonalDatabase.java | 43 +++------------------- 1 file changed, 6 insertions(+), 37 deletions(-) (limited to 'src/main/java/design/persistence/JSONPersonalDatabase.java') 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 { - @Override - public void serialize(Course course, JsonGenerator gen, SerializerProvider serializers) throws IOException { - gen.writeNumber(course.getId()); - } - } - - protected static class CourseIdDeserializer extends JsonDeserializer { - 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(); - } - } } -- 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/JSONPersonalDatabase.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/main/java/design/persistence/JSONPersonalDatabase.java') diff --git a/src/main/java/design/persistence/JSONPersonalDatabase.java b/src/main/java/design/persistence/JSONPersonalDatabase.java index 0e95437..30c280a 100644 --- a/src/main/java/design/persistence/JSONPersonalDatabase.java +++ b/src/main/java/design/persistence/JSONPersonalDatabase.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; @@ -34,7 +36,7 @@ public class JSONPersonalDatabase implements PersonalDatabase { private JSONPersonalDatabase(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();; // TODO: Once the saved JSON matches the model, consider removing. // TEMP: tolerate unknown props while the model stabilizes -- cgit v1.2.3