summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/design/HelloWorld.java21
-rw-r--r--src/main/java/design/model/Course.java9
-rw-r--r--src/main/java/design/model/Golfer.java17
-rw-r--r--src/main/java/design/model/Play.java6
-rw-r--r--src/main/java/design/model/Round.java10
-rw-r--r--src/main/java/design/persistence/CSVMasterDatabase.java17
-rw-r--r--src/main/java/design/persistence/JSONPersonalDatabase.java40
-rw-r--r--src/main/java/design/persistence/MasterDatabase.java4
-rw-r--r--src/main/java/design/persistence/PersonalDatabase.java2
9 files changed, 108 insertions, 18 deletions
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<Hole> holes;
- public Course(String name, int difficultyRating, String location, int holeCount, int totalPar, List<Hole> holes) {
+ public Course(int id, String name, int difficultyRating, String location, int holeCount, int totalPar, List<Hole> 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<Course> courses; // might be better to make this like a courseID or something
+ private final List<Course> courses;
private final List<Round> rounds;
+ // for deserialization
+ public Golfer(String username, int passwordHash, String fullName, List<Course> courses, List<Round> 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<Swing> swings;
+ // for deserialization
+ private Play(int distance, List<Swing> 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<Play> plays;
+ // for deserialization
+ private Round(Course course, LocalDateTime dateTime, Hole startingHole, List<Play> 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<Course> {
+ 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<Course> {
+ @Override
+ public void serialize(Course course, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+ gen.writeNumber(course.getId());
+ }
+ }
+
+ private static class CourseIdDeserializer extends JsonDeserializer<Course> {
+ 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;
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-27 21:01:06 +0000