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 ++++++++++++++++++++++ .../java/design/persistence/LeagueDatabase.java | 19 +++++++ .../java/design/persistence/MasterDatabase.java | 2 + 3 files changed, 84 insertions(+) create mode 100644 src/main/java/design/persistence/JSONLeagueDatabase.java create mode 100644 src/main/java/design/persistence/LeagueDatabase.java (limited to 'src/main/java/design/persistence') 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(); + } +} diff --git a/src/main/java/design/persistence/LeagueDatabase.java b/src/main/java/design/persistence/LeagueDatabase.java new file mode 100644 index 0000000..2ab3e30 --- /dev/null +++ b/src/main/java/design/persistence/LeagueDatabase.java @@ -0,0 +1,19 @@ +package design.persistence; + +import design.model.League; + +public interface LeagueDatabase { + static LeagueDatabase instance() { + return JSONLeagueDatabase.instance(); + } + + League getLeague(int id); + + League[] getLeagues(); + + void addLeague(League league); + + void removeLeague(League league); + + void updateLeague(League league); +} diff --git a/src/main/java/design/persistence/MasterDatabase.java b/src/main/java/design/persistence/MasterDatabase.java index 59e3ebd..86e326b 100644 --- a/src/main/java/design/persistence/MasterDatabase.java +++ b/src/main/java/design/persistence/MasterDatabase.java @@ -10,6 +10,8 @@ public interface MasterDatabase { } Course[] getCourses(); + CourseList getCourseList(); // unique from courses as this is a composite of ICourses. + Course getCourse(int id); } -- 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 +++++++++++++++++++--- .../design/persistence/JSONPersonalDatabase.java | 8 +-- .../java/design/persistence/LeagueDatabase.java | 8 ++- 3 files changed, 73 insertions(+), 15 deletions(-) (limited to 'src/main/java/design/persistence') 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); + } + } } 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() + " "; diff --git a/src/main/java/design/persistence/LeagueDatabase.java b/src/main/java/design/persistence/LeagueDatabase.java index 2ab3e30..953624d 100644 --- a/src/main/java/design/persistence/LeagueDatabase.java +++ b/src/main/java/design/persistence/LeagueDatabase.java @@ -2,6 +2,8 @@ package design.persistence; import design.model.League; +import java.io.IOException; + public interface LeagueDatabase { static LeagueDatabase instance() { return JSONLeagueDatabase.instance(); @@ -11,9 +13,9 @@ public interface LeagueDatabase { League[] getLeagues(); - void addLeague(League league); + void addLeague(League league) throws IOException; - void removeLeague(League league); + void removeLeague(League league) throws IOException; - void updateLeague(League league); + void updateLeague(League league) throws IOException; } -- 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 ++------- .../design/persistence/JSONPersonalDatabase.java | 43 ++---------- src/main/java/design/persistence/Serializers.java | 81 ++++++++++++++++++++++ 3 files changed, 92 insertions(+), 63 deletions(-) create mode 100644 src/main/java/design/persistence/Serializers.java (limited to 'src/main/java/design/persistence') 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); - } - } } 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(); - } - } } diff --git a/src/main/java/design/persistence/Serializers.java b/src/main/java/design/persistence/Serializers.java new file mode 100644 index 0000000..ab4b18b --- /dev/null +++ b/src/main/java/design/persistence/Serializers.java @@ -0,0 +1,81 @@ +package design.persistence; + +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.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.SerializerProvider; +import design.model.Course; +import design.model.Golfer; +import design.model.League; + +import java.io.IOException; + +public class Serializers { + public static class CustomPrettyPrinter extends DefaultPrettyPrinter { + public CustomPrettyPrinter() { + super._arrayIndenter = new DefaultIndenter(); + super._objectFieldValueSeparatorWithSpaces = _separators.getObjectFieldValueSeparator() + " "; + super._arrayEmptySeparator = ""; + } + + @Override + public CustomPrettyPrinter createInstance() { + return new CustomPrettyPrinter(); + } + } + + public static class CourseIdSerializer extends JsonSerializer { + @Override + public void serialize(Course course, JsonGenerator gen, SerializerProvider serializers) throws IOException { + gen.writeNumber(course.getId()); + } + } + + public 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); + } + } + + public static class LeagueIDSerializer extends JsonSerializer { + @Override + public void serialize(League value, JsonGenerator gen, SerializerProvider serializers) throws IOException { + gen.writeNumber(value.getId()); + } + } + + public static class LeagueIDDeserializer extends JsonDeserializer { + LeagueDatabase leagueDB = LeagueDatabase.instance(); + + @Override + public League deserialize(JsonParser p, DeserializationContext ctxt) throws IOException { + int id = p.getValueAsInt(); + return leagueDB.getLeague(id); + } + } + + public static class GolferUsernameSerializer extends JsonSerializer { + @Override + public void serialize(Golfer course, JsonGenerator gen, SerializerProvider serializers) throws IOException { + gen.writeString(course.getUsername()); + } + } + + public 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 05bf6a19f341e2b2cb2b107dea65660a08439a1c Mon Sep 17 00:00:00 2001 From: sowgro Date: Mon, 10 Nov 2025 15:29:14 -0500 Subject: fix circular dependency --- src/main/java/design/persistence/Serializers.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/main/java/design/persistence') 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 { - 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 { - 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 { - 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); } -- 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 +++- src/main/java/design/persistence/JSONPersonalDatabase.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src/main/java/design/persistence') 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()); 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