diff options
Diffstat (limited to '')
17 files changed, 463 insertions, 13 deletions
diff --git a/src/main/java/design/ParPal.java b/src/main/java/design/ParPal.java new file mode 100644 index 0000000..db6891e --- /dev/null +++ b/src/main/java/design/ParPal.java @@ -0,0 +1,14 @@ +package design; + +import design.persistence.MasterDatabase; +import design.persistence.PersonalDatabase; + +public class ParPal { + public static void main(String[] args) { + var mdb = MasterDatabase.INSTANCE; + var pdb = PersonalDatabase.INSTANCE; + + System.out.println("done"); + + } +} diff --git a/src/main/java/design/model/Course.java b/src/main/java/design/model/Course.java index 5f8c43d..f907622 100644 --- a/src/main/java/design/model/Course.java +++ b/src/main/java/design/model/Course.java @@ -1,8 +1,12 @@ package design.model; +import design.model.course_search.ICourse; + import java.util.List; -public class Course { +public class Course implements ICourse { + + private final int id; private final String name; private final int difficultyRating; private final String location; @@ -10,7 +14,8 @@ public class Course { 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,11 +24,15 @@ public class Course { this.holes = holes; } + public int getId() { + return id; + } + public String getName() { return name; } - public int getDifficultyRating() { + public float getDifficultyRating() { return difficultyRating; } diff --git a/src/main/java/design/model/Golfer.java b/src/main/java/design/model/Golfer.java index 8f09067..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; @@ -7,15 +9,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; + @JsonCreator + private 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 +72,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..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,6 +9,12 @@ public class Play { private final int distance; private final List<Swing> swings; + @JsonCreator + 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..048a21a 100644 --- a/src/main/java/design/model/Round.java +++ b/src/main/java/design/model/Round.java @@ -1,15 +1,25 @@ package design.model; +import com.fasterxml.jackson.annotation.JsonCreator; + import java.time.LocalDateTime; 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; + @JsonCreator + 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/model/course_search/CourseList.java b/src/main/java/design/model/course_search/CourseList.java new file mode 100644 index 0000000..82648c2 --- /dev/null +++ b/src/main/java/design/model/course_search/CourseList.java @@ -0,0 +1,89 @@ +package design.model.course_search; + +import java.util.ArrayList; +import java.util.List; + +import design.model.*; + +/* + * Defines a list of courses that can be sorted, added to or removed from. + * Willem Dalton + */ +public class CourseList implements ICourse { + private CourseSorter sorter; + private List<ICourse> courses; + + public CourseList() + { + courses = new ArrayList<>(); + } + + /* + * Grab the list of courses + */ + public List<ICourse> getCourses() + { + return courses; + } + + /* + * Set the list of courses equal to an existing list + */ + public void setCourses(List<ICourse> courses) + { + this.courses = courses; + } + + /* + * set the chosen sorting algorithm for the given list. + */ + public void setSorter(CourseSorter courseSorter) + { + sorter = courseSorter; + } + + /* + * Add a new course to the list. + */ + public void add(ICourse course) + { + courses.add(course); + } + + /* + * Remove a course from the list. + */ + public void remove(ICourse course) + { + courses.remove(course); + } + + /* + * Sort the list. + */ + public void sort() + { + sorter.sortCourses(courses); + } + + /* + * All overrides of the ICourse class. This is a drawback of the composite pattern, but it's pretty negligible here. return some dummy values. + */ + @Override + public String getName() { return "Course List"; } + + @Override + public float getDifficultyRating() { return 0; } + + @Override + public String getLocation() { return ""; } + + @Override + public int getTotalPar() { return 0; } + + @Override + public int getHoleCount() { return 0; } + + @Override + public List<Hole> getHoles() { return null; } +} diff --git a/src/main/java/design/model/course_search/CourseSorter.java b/src/main/java/design/model/course_search/CourseSorter.java new file mode 100644 index 0000000..7549645 --- /dev/null +++ b/src/main/java/design/model/course_search/CourseSorter.java @@ -0,0 +1,11 @@ +package design.model.course_search; + +import java.util.List; + +/* + * Defines an interface that concrete strategies will implement + * Willem Dalton + */ +public interface CourseSorter { + public void sortCourses(List<ICourse> courses); +}
\ No newline at end of file diff --git a/src/main/java/design/model/course_search/ICourse.java b/src/main/java/design/model/course_search/ICourse.java new file mode 100644 index 0000000..e50eb1b --- /dev/null +++ b/src/main/java/design/model/course_search/ICourse.java @@ -0,0 +1,18 @@ +package design.model.course_search; + +import design.model.Hole; + +import java.util.List; + +/* + * Defines the interface for courses to implement + * Willem Dalton + */ +public interface ICourse { + String getName(); + float getDifficultyRating(); + String getLocation(); + List<Hole> getHoles(); + int getHoleCount(); + int getTotalPar(); +} diff --git a/src/main/java/design/model/course_search/SortByDifficulty.java b/src/main/java/design/model/course_search/SortByDifficulty.java new file mode 100644 index 0000000..8c3251c --- /dev/null +++ b/src/main/java/design/model/course_search/SortByDifficulty.java @@ -0,0 +1,15 @@ +package design.model.course_search; + +import java.util.List; +import java.util.Comparator; + +/* + * Concrete strategy for sorting courses by their difficulty rating. + * Willem Dalton + */ +public class SortByDifficulty implements CourseSorter { + public void sortCourses(List<ICourse> courses) + { + courses.sort(Comparator.comparing(ICourse::getDifficultyRating)); + } +}
\ No newline at end of file diff --git a/src/main/java/design/model/course_search/SortByHoles.java b/src/main/java/design/model/course_search/SortByHoles.java new file mode 100644 index 0000000..b1badab --- /dev/null +++ b/src/main/java/design/model/course_search/SortByHoles.java @@ -0,0 +1,15 @@ +package design.model.course_search; + +import java.util.List; +import java.util.Comparator; + +/* + * Concrete strategy by sorting courses by their hole count (9 or 18) + * Willem Dalton + */ +public class SortByHoles implements CourseSorter { + public void sortCourses(List<ICourse> courses) + { + courses.sort(Comparator.comparing(ICourse::getHoleCount)); + } +}
\ No newline at end of file diff --git a/src/main/java/design/model/course_search/SortByLocation.java b/src/main/java/design/model/course_search/SortByLocation.java new file mode 100644 index 0000000..0d8a8d2 --- /dev/null +++ b/src/main/java/design/model/course_search/SortByLocation.java @@ -0,0 +1,15 @@ +package design.model.course_search; + +import java.util.List; +import java.util.Comparator; + +/* + * Concrete strategy for sorting courses by their location. + * Willem Dalton + */ +public class SortByLocation implements CourseSorter { + public void sortCourses(List<ICourse> courses) + { + courses.sort(Comparator.comparing(ICourse::getLocation)); + } +}
\ No newline at end of file diff --git a/src/main/java/design/model/course_search/SortByName.java b/src/main/java/design/model/course_search/SortByName.java new file mode 100644 index 0000000..2847d3e --- /dev/null +++ b/src/main/java/design/model/course_search/SortByName.java @@ -0,0 +1,15 @@ +package design.model.course_search; + +import java.util.List; +import java.util.Comparator; + +/* + * Concrete strategy for sorting courses base on their name. + * Willem Dalton + */ +public class SortByName implements CourseSorter { + public void sortCourses(List<ICourse> courses) + { + courses.sort(Comparator.comparing(ICourse::getName)); + } +}
\ No newline at end of file diff --git a/src/main/java/design/model/course_search/SortByPar.java b/src/main/java/design/model/course_search/SortByPar.java new file mode 100644 index 0000000..9a3eaf9 --- /dev/null +++ b/src/main/java/design/model/course_search/SortByPar.java @@ -0,0 +1,15 @@ +package design.model.course_search; + +import java.util.List; +import java.util.Comparator; + +/* + * Concrete strategy for sorting courses based on their total par. + * Willem Dalton + */ +public class SortByPar implements CourseSorter { + public void sortCourses(List<ICourse> courses) + { + courses.sort(Comparator.comparing(ICourse::getTotalPar)); + } +}
\ No newline at end of file diff --git a/src/main/java/design/persistence/CSVMasterDatabase.java b/src/main/java/design/persistence/CSVMasterDatabase.java new file mode 100644 index 0000000..fe89191 --- /dev/null +++ b/src/main/java/design/persistence/CSVMasterDatabase.java @@ -0,0 +1,83 @@ +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<Course> cache; + private final CsvMapper mapper; + private final File file; + + public CSVMasterDatabase(String filename) { + 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); + + try { + load(); + } catch (IOException ex) { + throw new RuntimeException(ex); + } + } + + public void load() throws IOException { + MappingIterator<Course> 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(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(); + 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<Hole> 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(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 new file mode 100644 index 0000000..0efa362 --- /dev/null +++ b/src/main/java/design/persistence/JSONPersonalDatabase.java @@ -0,0 +1,118 @@ +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 java.io.File; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +public class JSONPersonalDatabase implements PersonalDatabase { + + private final Map<String, Golfer> cache; + private final ObjectMapper mapper; + private final File file; + + public JSONPersonalDatabase(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()); + 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); + } + } + + 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.writer(new CustomPrettyPrinter()).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(); + } + + 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); + } + } + + 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(); + } + } +} diff --git a/src/main/java/design/persistence/MasterDatabase.java b/src/main/java/design/persistence/MasterDatabase.java index 9dcfc1f..ddc0434 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 { + 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 e1023cf..a045d59 100644 --- a/src/main/java/design/persistence/PersonalDatabase.java +++ b/src/main/java/design/persistence/PersonalDatabase.java @@ -2,10 +2,14 @@ package design.persistence; import design.model.Golfer; +import java.io.IOException; + public interface PersonalDatabase { + PersonalDatabase INSTANCE = new JSONPersonalDatabase("data/personaldb.json"); + 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; } |