From d7249ab93dad3ba9be0389f402c1378d7f1eb5ad Mon Sep 17 00:00:00 2001 From: sowgro Date: Thu, 2 Oct 2025 22:09:13 -0400 Subject: Implement basic serialization --- .../java/design/persistence/CSVMasterDatabase.java | 76 ++++++++++++++++++++++ .../design/persistence/JSONPersonalDatabase.java | 65 ++++++++++++++++++ .../java/design/persistence/PersonalDatabase.java | 8 ++- 3 files changed, 146 insertions(+), 3 deletions(-) create mode 100644 src/main/java/design/persistence/CSVMasterDatabase.java create mode 100644 src/main/java/design/persistence/JSONPersonalDatabase.java (limited to 'src/main/java/design') diff --git a/src/main/java/design/persistence/CSVMasterDatabase.java b/src/main/java/design/persistence/CSVMasterDatabase.java new file mode 100644 index 0000000..94ac470 --- /dev/null +++ b/src/main/java/design/persistence/CSVMasterDatabase.java @@ -0,0 +1,76 @@ +package design.persistence; + +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.MappingIterator; +import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.fasterxml.jackson.dataformat.csv.CsvMapper; +import com.fasterxml.jackson.dataformat.csv.CsvSchema; +import design.model.Course; +import design.model.Hole; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +public class CSVMasterDatabase implements MasterDatabase { + + private final List cache; + private final CsvMapper mapper; + private final File file; + + public CSVMasterDatabase(String filename) throws IOException { + this.cache = new ArrayList<>(); + this.mapper = new CsvMapper(); + this.file = new File(filename); + + SimpleModule module = new SimpleModule(); + module.addDeserializer(Course.class, new CourseDeserializer()); + mapper.registerModule(module); + + load(); + } + + public void load() throws IOException { + MappingIterator it = mapper + .readerFor(Course.class) + .with(CsvSchema.emptySchema().withHeader()) + .readValues(file); + + cache.addAll(it.readAll()); + } + + @Override + public Course[] getCourses() { + return cache.toArray(Course[]::new); + } + + @Override + public Course getCourse(String name) { + return null; + } + + private static class CourseDeserializer extends JsonDeserializer { + @Override + public Course deserialize(JsonParser p, DeserializationContext ctxt) throws IOException { + ObjectNode node = p.getCodec().readTree(p); + + String name = node.get("Course Name").asText(); + double difficulty = node.get("Difficulty Rating").asDouble(); + String location = node.get("Location").asText(); + int holes = node.get("Number of Holes").asInt(); + int totalPar = node.get("Total Par").asInt(); + + String[] parValues = node.get("Par Per Hole").asText().split(";"); + List holeList = new ArrayList<>(); + for (int i = 0; i < parValues.length; i++) { + holeList.add(new Hole(i + 1, Integer.parseInt(parValues[i].trim()))); + } + + return new Course(name, (int) difficulty, location, holes, totalPar, holeList); + } + } +} diff --git a/src/main/java/design/persistence/JSONPersonalDatabase.java b/src/main/java/design/persistence/JSONPersonalDatabase.java new file mode 100644 index 0000000..3ec0012 --- /dev/null +++ b/src/main/java/design/persistence/JSONPersonalDatabase.java @@ -0,0 +1,65 @@ +package design.persistence; + +import com.fasterxml.jackson.databind.ObjectMapper; +import design.model.Golfer; + +import java.io.File; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +public class JSONPersonalDatabase implements PersonalDatabase { + + private final Map cache; + private final ObjectMapper mapper; + private final File file; + + public JSONPersonalDatabase(String filename) throws IOException { + this.file = new File(filename); + this.cache = new HashMap<>(); + this.mapper = new ObjectMapper(); + + load(); + } + + private void load() throws IOException { + Golfer[] data = mapper.readValue(file, Golfer[].class); + cache.clear(); + for (Golfer i : data) { + cache.put(i.getUsername(), i); + } + } + + private void save() throws IOException { + Golfer[] data = cache.values().toArray(Golfer[]::new); + mapper.writeValue(file, data); + } + + @Override + public Golfer[] getGolfers() { + return new Golfer[0]; + } + + @Override + public Golfer getGolfer(String username) { + return cache.get(username); + } + + @Override + public void addGolfer(Golfer golfer) throws IOException { + cache.put(golfer.getUsername(), golfer); + save(); + } + + @Override + public void removeGolfer(Golfer golfer) throws IOException { + cache.remove(golfer.getUsername()); + save(); + } + + @Override + public void updateGolfer(Golfer golfer) throws IOException { + cache.put(golfer.getUsername(), golfer); + save(); + } +} diff --git a/src/main/java/design/persistence/PersonalDatabase.java b/src/main/java/design/persistence/PersonalDatabase.java index e1023cf..783e982 100644 --- a/src/main/java/design/persistence/PersonalDatabase.java +++ b/src/main/java/design/persistence/PersonalDatabase.java @@ -2,10 +2,12 @@ package design.persistence; import design.model.Golfer; +import java.io.IOException; + public interface PersonalDatabase { Golfer[] getGolfers(); Golfer getGolfer(String name); - void addGolfer(Golfer golfer); - void removeGolfer(Golfer golfer); - void updateGolfer(Golfer golfer); + void addGolfer(Golfer golfer) throws IOException; + void removeGolfer(Golfer golfer) throws IOException; + void updateGolfer(Golfer golfer) throws IOException; } -- cgit v1.2.3 From d982cfe8a22ec7eb89186fed875a483a51c3505f Mon Sep 17 00:00:00 2001 From: sowgro Date: Fri, 3 Oct 2025 00:31:02 -0400 Subject: Add code to handle id serialization --- src/main/java/design/HelloWorld.java | 21 ++++++++++-- src/main/java/design/model/Course.java | 9 ++++- src/main/java/design/model/Golfer.java | 17 ++++++--- src/main/java/design/model/Play.java | 6 ++++ src/main/java/design/model/Round.java | 10 +++++- .../java/design/persistence/CSVMasterDatabase.java | 17 ++++++--- .../design/persistence/JSONPersonalDatabase.java | 40 ++++++++++++++++++++-- .../java/design/persistence/MasterDatabase.java | 4 ++- .../java/design/persistence/PersonalDatabase.java | 2 ++ 9 files changed, 108 insertions(+), 18 deletions(-) (limited to 'src/main/java/design') diff --git a/src/main/java/design/HelloWorld.java b/src/main/java/design/HelloWorld.java index ea552f9..5e16cec 100644 --- a/src/main/java/design/HelloWorld.java +++ b/src/main/java/design/HelloWorld.java @@ -1,7 +1,24 @@ package design; +import design.model.Golfer; +import design.persistence.CSVMasterDatabase; +import design.persistence.JSONPersonalDatabase; +import design.persistence.MasterDatabase; +import design.persistence.PersonalDatabase; + +import java.io.IOException; + public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello, World!"); + public static void main(String[] args) throws IOException { + var mdb = MasterDatabase.INSTANCE; + var pdb = PersonalDatabase.INSTANCE; + +// Golfer g = new Golfer("Tyler Ferrari", "sowgro", "pass"); +// g.addCourse(mdb.getCourse(8)); +// +// pdb.addGolfer(g); + + System.out.println("done"); + } } diff --git a/src/main/java/design/model/Course.java b/src/main/java/design/model/Course.java index 8dfecd8..f90c8d9 100644 --- a/src/main/java/design/model/Course.java +++ b/src/main/java/design/model/Course.java @@ -3,6 +3,8 @@ package design.model; import java.util.List; public class Course implements ICourse { + + private final int id; private final String name; private final int difficultyRating; private final String location; @@ -10,7 +12,8 @@ public class Course implements ICourse { private final int totalPar; private final List holes; - public Course(String name, int difficultyRating, String location, int holeCount, int totalPar, List holes) { + public Course(int id, String name, int difficultyRating, String location, int holeCount, int totalPar, List holes) { + this.id = id; this.name = name; this.difficultyRating = difficultyRating; this.location = location; @@ -19,6 +22,10 @@ public class Course implements ICourse { this.holes = holes; } + public int getId() { + return id; + } + public String getName() { return name; } diff --git a/src/main/java/design/model/Golfer.java b/src/main/java/design/model/Golfer.java index 8f09067..1a6c7b6 100644 --- a/src/main/java/design/model/Golfer.java +++ b/src/main/java/design/model/Golfer.java @@ -7,15 +7,24 @@ public class Golfer { private String username; private int passwordHash; private String fullName; - private final transient List courses; // might be better to make this like a courseID or something + private final List courses; private final List rounds; + // for deserialization + public Golfer(String username, int passwordHash, String fullName, List courses, List rounds) { + this.username = username; + this.passwordHash = passwordHash; + this.fullName = fullName; + this.courses = courses; + this.rounds = rounds; + } + public Golfer(String fullName, String username, String password) { - this.courses = new ArrayList<>(); - this.rounds = new ArrayList<>(); this.fullName = fullName; this.username = username; this.passwordHash = password.hashCode(); + this.courses = new ArrayList<>(); + this.rounds = new ArrayList<>(); } public String getUsername() { @@ -61,6 +70,4 @@ public class Golfer { public void addRound(Round round) { rounds.add(round); } - - } diff --git a/src/main/java/design/model/Play.java b/src/main/java/design/model/Play.java index b61228b..cf44cd8 100644 --- a/src/main/java/design/model/Play.java +++ b/src/main/java/design/model/Play.java @@ -7,6 +7,12 @@ public class Play { private final int distance; private final List swings; + // for deserialization + private Play(int distance, List swings) { + this.distance = distance; + this.swings = swings; + } + public Play(int distance) { this.swings = new ArrayList<>(); this.distance = distance; diff --git a/src/main/java/design/model/Round.java b/src/main/java/design/model/Round.java index 38975da..39de907 100644 --- a/src/main/java/design/model/Round.java +++ b/src/main/java/design/model/Round.java @@ -5,11 +5,19 @@ import java.util.ArrayList; import java.util.List; public class Round { - private final transient Course course; + private final Course course; private final LocalDateTime dateTime; private final Hole startingHole; private final List plays; + // for deserialization + private Round(Course course, LocalDateTime dateTime, Hole startingHole, List plays) { + this.course = course; + this.dateTime = dateTime; + this.startingHole = startingHole; + this.plays = plays; + } + public Round(Course course, LocalDateTime dateTime, Hole startingHole) { this.course = course; this.dateTime = dateTime; diff --git a/src/main/java/design/persistence/CSVMasterDatabase.java b/src/main/java/design/persistence/CSVMasterDatabase.java index 94ac470..fe89191 100644 --- a/src/main/java/design/persistence/CSVMasterDatabase.java +++ b/src/main/java/design/persistence/CSVMasterDatabase.java @@ -22,7 +22,7 @@ public class CSVMasterDatabase implements MasterDatabase { private final CsvMapper mapper; private final File file; - public CSVMasterDatabase(String filename) throws IOException { + public CSVMasterDatabase(String filename) { this.cache = new ArrayList<>(); this.mapper = new CsvMapper(); this.file = new File(filename); @@ -31,7 +31,11 @@ public class CSVMasterDatabase implements MasterDatabase { module.addDeserializer(Course.class, new CourseDeserializer()); mapper.registerModule(module); - load(); + try { + load(); + } catch (IOException ex) { + throw new RuntimeException(ex); + } } public void load() throws IOException { @@ -49,15 +53,18 @@ public class CSVMasterDatabase implements MasterDatabase { } @Override - public Course getCourse(String name) { - return null; + public Course getCourse(int id) { + return cache.get(id); } private static class CourseDeserializer extends JsonDeserializer { + int curID = 0; + @Override public Course deserialize(JsonParser p, DeserializationContext ctxt) throws IOException { ObjectNode node = p.getCodec().readTree(p); + int id = curID++; String name = node.get("Course Name").asText(); double difficulty = node.get("Difficulty Rating").asDouble(); String location = node.get("Location").asText(); @@ -70,7 +77,7 @@ public class CSVMasterDatabase implements MasterDatabase { holeList.add(new Hole(i + 1, Integer.parseInt(parValues[i].trim()))); } - return new Course(name, (int) difficulty, location, holes, totalPar, holeList); + return new Course(id, name, (int) difficulty, location, holes, totalPar, holeList); } } } diff --git a/src/main/java/design/persistence/JSONPersonalDatabase.java b/src/main/java/design/persistence/JSONPersonalDatabase.java index 3ec0012..511d962 100644 --- a/src/main/java/design/persistence/JSONPersonalDatabase.java +++ b/src/main/java/design/persistence/JSONPersonalDatabase.java @@ -1,6 +1,12 @@ package design.persistence; -import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +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 design.model.Course; import design.model.Golfer; import java.io.File; @@ -14,12 +20,23 @@ public class JSONPersonalDatabase implements PersonalDatabase { private final ObjectMapper mapper; private final File file; - public JSONPersonalDatabase(String filename) throws IOException { + public JSONPersonalDatabase(String filename) { this.file = new File(filename); this.cache = new HashMap<>(); this.mapper = new ObjectMapper(); - load(); + SimpleModule module = new SimpleModule(); + module.addDeserializer(Course.class, new CourseIdDeserializer()); + module.addSerializer(Course.class, new CourseIdSerializer()); + mapper.registerModule(module); + mapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY); + mapper.writerWithDefaultPrettyPrinter(); + + try { + load(); + } catch (IOException ex) { + throw new RuntimeException(ex); + } } private void load() throws IOException { @@ -62,4 +79,21 @@ public class JSONPersonalDatabase implements PersonalDatabase { cache.put(golfer.getUsername(), golfer); save(); } + + private 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 { + MasterDatabase masterDB = MasterDatabase.INSTANCE; + + @Override + public Course deserialize(JsonParser p, DeserializationContext context) throws IOException { + int id = p.getValueAsInt(); + return masterDB.getCourse(id); + } + } } diff --git a/src/main/java/design/persistence/MasterDatabase.java b/src/main/java/design/persistence/MasterDatabase.java index 9dcfc1f..2852349 100644 --- a/src/main/java/design/persistence/MasterDatabase.java +++ b/src/main/java/design/persistence/MasterDatabase.java @@ -3,6 +3,8 @@ package design.persistence; import design.model.Course; public interface MasterDatabase { + public static final MasterDatabase INSTANCE = new CSVMasterDatabase("data/golf_courses_1000.csv"); + Course[] getCourses(); - Course getCourse(String name); + Course getCourse(int id); } diff --git a/src/main/java/design/persistence/PersonalDatabase.java b/src/main/java/design/persistence/PersonalDatabase.java index 783e982..524263b 100644 --- a/src/main/java/design/persistence/PersonalDatabase.java +++ b/src/main/java/design/persistence/PersonalDatabase.java @@ -5,6 +5,8 @@ import design.model.Golfer; import java.io.IOException; public interface PersonalDatabase { + public static final PersonalDatabase INSTANCE = new JSONPersonalDatabase("data/personaldb.json"); + Golfer[] getGolfers(); Golfer getGolfer(String name); void addGolfer(Golfer golfer) throws IOException; -- cgit v1.2.3 From 29c4a7caffea3957b8ac5f6be13d640c1a798989 Mon Sep 17 00:00:00 2001 From: sowgro Date: Fri, 3 Oct 2025 20:37:43 -0400 Subject: Serialization fully working --- src/main/java/design/model/Golfer.java | 6 ++++-- src/main/java/design/model/Play.java | 4 +++- src/main/java/design/model/Round.java | 4 +++- src/main/java/design/persistence/JSONPersonalDatabase.java | 6 ++++-- 4 files changed, 14 insertions(+), 6 deletions(-) (limited to 'src/main/java/design') diff --git a/src/main/java/design/model/Golfer.java b/src/main/java/design/model/Golfer.java index 1a6c7b6..04ad8bc 100644 --- a/src/main/java/design/model/Golfer.java +++ b/src/main/java/design/model/Golfer.java @@ -1,5 +1,7 @@ package design.model; +import com.fasterxml.jackson.annotation.JsonCreator; + import java.util.ArrayList; import java.util.List; @@ -10,8 +12,8 @@ public class Golfer { private final List courses; private final List rounds; - // for deserialization - public Golfer(String username, int passwordHash, String fullName, List courses, List rounds) { + @JsonCreator + private Golfer(String username, int passwordHash, String fullName, List courses, List rounds) { this.username = username; this.passwordHash = passwordHash; this.fullName = fullName; diff --git a/src/main/java/design/model/Play.java b/src/main/java/design/model/Play.java index cf44cd8..ca6dac2 100644 --- a/src/main/java/design/model/Play.java +++ b/src/main/java/design/model/Play.java @@ -1,5 +1,7 @@ package design.model; +import com.fasterxml.jackson.annotation.JsonCreator; + import java.util.ArrayList; import java.util.List; @@ -7,7 +9,7 @@ public class Play { private final int distance; private final List swings; - // for deserialization + @JsonCreator private Play(int distance, List swings) { this.distance = distance; this.swings = swings; diff --git a/src/main/java/design/model/Round.java b/src/main/java/design/model/Round.java index 39de907..048a21a 100644 --- a/src/main/java/design/model/Round.java +++ b/src/main/java/design/model/Round.java @@ -1,5 +1,7 @@ package design.model; +import com.fasterxml.jackson.annotation.JsonCreator; + import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -10,7 +12,7 @@ public class Round { private final Hole startingHole; private final List plays; - // for deserialization + @JsonCreator private Round(Course course, LocalDateTime dateTime, Hole startingHole, List plays) { this.course = course; this.dateTime = dateTime; diff --git a/src/main/java/design/persistence/JSONPersonalDatabase.java b/src/main/java/design/persistence/JSONPersonalDatabase.java index 511d962..dd63407 100644 --- a/src/main/java/design/persistence/JSONPersonalDatabase.java +++ b/src/main/java/design/persistence/JSONPersonalDatabase.java @@ -1,11 +1,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.databind.*; import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.module.paramnames.ParameterNamesModule; import design.model.Course; import design.model.Golfer; @@ -30,7 +32,7 @@ public class JSONPersonalDatabase implements PersonalDatabase { module.addSerializer(Course.class, new CourseIdSerializer()); mapper.registerModule(module); mapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY); - mapper.writerWithDefaultPrettyPrinter(); + mapper.registerModule(new ParameterNamesModule(JsonCreator.Mode.PROPERTIES)); try { load(); @@ -49,7 +51,7 @@ public class JSONPersonalDatabase implements PersonalDatabase { private void save() throws IOException { Golfer[] data = cache.values().toArray(Golfer[]::new); - mapper.writeValue(file, data); + mapper.writerWithDefaultPrettyPrinter().writeValue(file, data); } @Override -- cgit v1.2.3 From 0d9775a779f656ab55a22e5df5f6f83f7069fa95 Mon Sep 17 00:00:00 2001 From: sowgro Date: Fri, 3 Oct 2025 21:40:23 -0400 Subject: tweak pretty print and datetime serialization --- .../java/design/persistence/JSONPersonalDatabase.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'src/main/java/design') diff --git a/src/main/java/design/persistence/JSONPersonalDatabase.java b/src/main/java/design/persistence/JSONPersonalDatabase.java index dd63407..0efa362 100644 --- a/src/main/java/design/persistence/JSONPersonalDatabase.java +++ b/src/main/java/design/persistence/JSONPersonalDatabase.java @@ -5,8 +5,11 @@ 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; @@ -33,6 +36,7 @@ public class JSONPersonalDatabase implements PersonalDatabase { mapper.registerModule(module); mapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY); mapper.registerModule(new ParameterNamesModule(JsonCreator.Mode.PROPERTIES)); + mapper.registerModule(new JavaTimeModule()); try { load(); @@ -51,7 +55,7 @@ public class JSONPersonalDatabase implements PersonalDatabase { private void save() throws IOException { Golfer[] data = cache.values().toArray(Golfer[]::new); - mapper.writerWithDefaultPrettyPrinter().writeValue(file, data); + mapper.writer(new CustomPrettyPrinter()).writeValue(file, data); } @Override @@ -98,4 +102,17 @@ public class JSONPersonalDatabase implements PersonalDatabase { return masterDB.getCourse(id); } } + + private 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