From c9dbbbf82277036d15a180b0e8609b6dfccb50bd Mon Sep 17 00:00:00 2001 From: WillemDalton Date: Mon, 29 Sep 2025 18:26:42 -0400 Subject: progress on implementing strategy pattern --- src/main/java/design/model/Club.java | 37 ------------------ src/main/java/design/model/Course.java | 45 ---------------------- src/main/java/design/model/Golfer.java | 66 -------------------------------- src/main/java/design/model/Hole.java | 19 --------- src/main/java/design/model/Play.java | 30 --------------- src/main/java/design/model/Round.java | 45 ---------------------- src/main/java/design/model/Swing.java | 19 --------- src/model/Club.java | 37 ++++++++++++++++++ src/model/Course.java | 45 ++++++++++++++++++++++ src/model/Golfer.java | 66 ++++++++++++++++++++++++++++++++ src/model/Hole.java | 19 +++++++++ src/model/Play.java | 30 +++++++++++++++ src/model/Round.java | 45 ++++++++++++++++++++++ src/model/Swing.java | 19 +++++++++ src/model/course-search/CourseList.java | 51 ++++++++++++++++++++++++ src/model/course-search/CourseSorter | 5 +++ src/model/course-search/SortByHoles.java | 10 +++++ 17 files changed, 327 insertions(+), 261 deletions(-) delete mode 100644 src/main/java/design/model/Club.java delete mode 100644 src/main/java/design/model/Course.java delete mode 100644 src/main/java/design/model/Golfer.java delete mode 100644 src/main/java/design/model/Hole.java delete mode 100644 src/main/java/design/model/Play.java delete mode 100644 src/main/java/design/model/Round.java delete mode 100644 src/main/java/design/model/Swing.java create mode 100644 src/model/Club.java create mode 100644 src/model/Course.java create mode 100644 src/model/Golfer.java create mode 100644 src/model/Hole.java create mode 100644 src/model/Play.java create mode 100644 src/model/Round.java create mode 100644 src/model/Swing.java create mode 100644 src/model/course-search/CourseList.java create mode 100644 src/model/course-search/CourseSorter create mode 100644 src/model/course-search/SortByHoles.java (limited to 'src') diff --git a/src/main/java/design/model/Club.java b/src/main/java/design/model/Club.java deleted file mode 100644 index 57a43d1..0000000 --- a/src/main/java/design/model/Club.java +++ /dev/null @@ -1,37 +0,0 @@ -package design.model; - -public class Club { - - public enum ClubType { - DRIVER, - WOOD, - IRON, - HYBRID, - PITCHING_WEDGE, - SAND_WEDGE, - LOB_WEDGE, - PUTTER - } - - private final String manufacture; - private final String nickname; - private final ClubType clubType; - - public Club(String manufacture, String nickname, ClubType clubType) { - this.manufacture = manufacture; - this.nickname = nickname; - this.clubType = clubType; - } - - public String getManufacture() { - return manufacture; - } - - public String getNickname() { - return nickname; - } - - public ClubType getClubType() { - return clubType; - } -} diff --git a/src/main/java/design/model/Course.java b/src/main/java/design/model/Course.java deleted file mode 100644 index 5f8c43d..0000000 --- a/src/main/java/design/model/Course.java +++ /dev/null @@ -1,45 +0,0 @@ -package design.model; - -import java.util.List; - -public class Course { - private final String name; - private final int difficultyRating; - private final String location; - private final int holeCount; - private final int totalPar; - private final List holes; - - public Course(String name, int difficultyRating, String location, int holeCount, int totalPar, List holes) { - this.name = name; - this.difficultyRating = difficultyRating; - this.location = location; - this.holeCount = holeCount; - this.totalPar = totalPar; - this.holes = holes; - } - - public String getName() { - return name; - } - - public int getDifficultyRating() { - return difficultyRating; - } - - public String getLocation() { - return location; - } - - public int getHoleCount() { - return holeCount; - } - - public int getTotalPar() { - return totalPar; - } - - public List getHoles() { - return holes; - } -} diff --git a/src/main/java/design/model/Golfer.java b/src/main/java/design/model/Golfer.java deleted file mode 100644 index 8f09067..0000000 --- a/src/main/java/design/model/Golfer.java +++ /dev/null @@ -1,66 +0,0 @@ -package design.model; - -import java.util.ArrayList; -import java.util.List; - -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 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(); - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getFullName() { - return fullName; - } - - public void setFullName(String fullName) { - this.fullName = fullName; - } - - public void setPassword(String password) { - this.passwordHash = password.hashCode(); - } - - public boolean checkPassword(String password) { - return passwordHash == password.hashCode(); - } - - public Course[] getCourses() { - return courses.toArray(Course[]::new); - } - - public void addCourse(Course course) { - courses.add(course); - } - - public void removeCourse(Course course) { - courses.remove(course); - } - - public Round[] getRounds() { - return rounds.toArray(Round[]::new); - } - - public void addRound(Round round) { - rounds.add(round); - } - - -} diff --git a/src/main/java/design/model/Hole.java b/src/main/java/design/model/Hole.java deleted file mode 100644 index bc9fdb9..0000000 --- a/src/main/java/design/model/Hole.java +++ /dev/null @@ -1,19 +0,0 @@ -package design.model; - -public class Hole { - private final int number; - private final int par; - - public Hole(int number, int par) { - this.number = number; - this.par = par; - } - - public int getNumber() { - return number; - } - - public int getPar() { - return par; - } -} diff --git a/src/main/java/design/model/Play.java b/src/main/java/design/model/Play.java deleted file mode 100644 index b61228b..0000000 --- a/src/main/java/design/model/Play.java +++ /dev/null @@ -1,30 +0,0 @@ -package design.model; - -import java.util.ArrayList; -import java.util.List; - -public class Play { - private final int distance; - private final List swings; - - public Play(int distance) { - this.swings = new ArrayList<>(); - this.distance = distance; - } - - public int getDistance() { - return distance; - } - - public void addSwing(Swing swing) { - swings.add(swing); - } - - public Swing[] getSwings() { - return swings.toArray(Swing[]::new); - } - - public int getSwingCount() { - return swings.size(); - } -} diff --git a/src/main/java/design/model/Round.java b/src/main/java/design/model/Round.java deleted file mode 100644 index 38975da..0000000 --- a/src/main/java/design/model/Round.java +++ /dev/null @@ -1,45 +0,0 @@ -package design.model; - -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; - -public class Round { - private final transient Course course; - private final LocalDateTime dateTime; - private final Hole startingHole; - private final List plays; - - public Round(Course course, LocalDateTime dateTime, Hole startingHole) { - this.course = course; - this.dateTime = dateTime; - this.startingHole = startingHole; - plays = new ArrayList<>(); - } - - public int getTotalSwings() { - return plays.stream() - .map(Play::getSwingCount) - .reduce(0, Integer::sum); - } - - public Course getCourse() { - return course; - } - - public LocalDateTime getDateTime() { - return dateTime; - } - - public Hole getStartingHole() { - return startingHole; - } - - public Play[] getPlays() { - return plays.toArray(Play[]::new); - } - - public void addPlay(Play play) { - plays.add(play); - } -} diff --git a/src/main/java/design/model/Swing.java b/src/main/java/design/model/Swing.java deleted file mode 100644 index a93b66f..0000000 --- a/src/main/java/design/model/Swing.java +++ /dev/null @@ -1,19 +0,0 @@ -package design.model; - -public class Swing { - private final int distance; - private final Club clubUsed; - - public Swing(int distance, Club clubUsed) { - this.distance = distance; - this.clubUsed = clubUsed; - } - - public int getDistance() { - return distance; - } - - public Club getClubUsed() { - return clubUsed; - } -} diff --git a/src/model/Club.java b/src/model/Club.java new file mode 100644 index 0000000..57a43d1 --- /dev/null +++ b/src/model/Club.java @@ -0,0 +1,37 @@ +package design.model; + +public class Club { + + public enum ClubType { + DRIVER, + WOOD, + IRON, + HYBRID, + PITCHING_WEDGE, + SAND_WEDGE, + LOB_WEDGE, + PUTTER + } + + private final String manufacture; + private final String nickname; + private final ClubType clubType; + + public Club(String manufacture, String nickname, ClubType clubType) { + this.manufacture = manufacture; + this.nickname = nickname; + this.clubType = clubType; + } + + public String getManufacture() { + return manufacture; + } + + public String getNickname() { + return nickname; + } + + public ClubType getClubType() { + return clubType; + } +} diff --git a/src/model/Course.java b/src/model/Course.java new file mode 100644 index 0000000..5f8c43d --- /dev/null +++ b/src/model/Course.java @@ -0,0 +1,45 @@ +package design.model; + +import java.util.List; + +public class Course { + private final String name; + private final int difficultyRating; + private final String location; + private final int holeCount; + private final int totalPar; + private final List holes; + + public Course(String name, int difficultyRating, String location, int holeCount, int totalPar, List holes) { + this.name = name; + this.difficultyRating = difficultyRating; + this.location = location; + this.holeCount = holeCount; + this.totalPar = totalPar; + this.holes = holes; + } + + public String getName() { + return name; + } + + public int getDifficultyRating() { + return difficultyRating; + } + + public String getLocation() { + return location; + } + + public int getHoleCount() { + return holeCount; + } + + public int getTotalPar() { + return totalPar; + } + + public List getHoles() { + return holes; + } +} diff --git a/src/model/Golfer.java b/src/model/Golfer.java new file mode 100644 index 0000000..8f09067 --- /dev/null +++ b/src/model/Golfer.java @@ -0,0 +1,66 @@ +package design.model; + +import java.util.ArrayList; +import java.util.List; + +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 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(); + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getFullName() { + return fullName; + } + + public void setFullName(String fullName) { + this.fullName = fullName; + } + + public void setPassword(String password) { + this.passwordHash = password.hashCode(); + } + + public boolean checkPassword(String password) { + return passwordHash == password.hashCode(); + } + + public Course[] getCourses() { + return courses.toArray(Course[]::new); + } + + public void addCourse(Course course) { + courses.add(course); + } + + public void removeCourse(Course course) { + courses.remove(course); + } + + public Round[] getRounds() { + return rounds.toArray(Round[]::new); + } + + public void addRound(Round round) { + rounds.add(round); + } + + +} diff --git a/src/model/Hole.java b/src/model/Hole.java new file mode 100644 index 0000000..bc9fdb9 --- /dev/null +++ b/src/model/Hole.java @@ -0,0 +1,19 @@ +package design.model; + +public class Hole { + private final int number; + private final int par; + + public Hole(int number, int par) { + this.number = number; + this.par = par; + } + + public int getNumber() { + return number; + } + + public int getPar() { + return par; + } +} diff --git a/src/model/Play.java b/src/model/Play.java new file mode 100644 index 0000000..b61228b --- /dev/null +++ b/src/model/Play.java @@ -0,0 +1,30 @@ +package design.model; + +import java.util.ArrayList; +import java.util.List; + +public class Play { + private final int distance; + private final List swings; + + public Play(int distance) { + this.swings = new ArrayList<>(); + this.distance = distance; + } + + public int getDistance() { + return distance; + } + + public void addSwing(Swing swing) { + swings.add(swing); + } + + public Swing[] getSwings() { + return swings.toArray(Swing[]::new); + } + + public int getSwingCount() { + return swings.size(); + } +} diff --git a/src/model/Round.java b/src/model/Round.java new file mode 100644 index 0000000..38975da --- /dev/null +++ b/src/model/Round.java @@ -0,0 +1,45 @@ +package design.model; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +public class Round { + private final transient Course course; + private final LocalDateTime dateTime; + private final Hole startingHole; + private final List plays; + + public Round(Course course, LocalDateTime dateTime, Hole startingHole) { + this.course = course; + this.dateTime = dateTime; + this.startingHole = startingHole; + plays = new ArrayList<>(); + } + + public int getTotalSwings() { + return plays.stream() + .map(Play::getSwingCount) + .reduce(0, Integer::sum); + } + + public Course getCourse() { + return course; + } + + public LocalDateTime getDateTime() { + return dateTime; + } + + public Hole getStartingHole() { + return startingHole; + } + + public Play[] getPlays() { + return plays.toArray(Play[]::new); + } + + public void addPlay(Play play) { + plays.add(play); + } +} diff --git a/src/model/Swing.java b/src/model/Swing.java new file mode 100644 index 0000000..a93b66f --- /dev/null +++ b/src/model/Swing.java @@ -0,0 +1,19 @@ +package design.model; + +public class Swing { + private final int distance; + private final Club clubUsed; + + public Swing(int distance, Club clubUsed) { + this.distance = distance; + this.clubUsed = clubUsed; + } + + public int getDistance() { + return distance; + } + + public Club getClubUsed() { + return clubUsed; + } +} diff --git a/src/model/course-search/CourseList.java b/src/model/course-search/CourseList.java new file mode 100644 index 0000000..2766e11 --- /dev/null +++ b/src/model/course-search/CourseList.java @@ -0,0 +1,51 @@ +package design.model; + +import java.util.ArrayList; +import java.util.List; + +import Course; + +/* + * Defines a list of courses that can be sorted, added to or removed from. + * Created by Willem Dalton + */ +public class CourseList { + private CourseSorter sorter; + private List courses; + + public CourseList() + { + courses = new ArrayList<>(); + sorter = new CourseSorter(); + } + + public List getCourses() + { + return courses; + } + + public setCourses(List courses) + { + this.courses = courses; + } + + setSorter(CourseSorter courseSorter) + { + sorter = courseSorter; + } + + add(Course course) + { + courses.add(course); + } + + remove(Course course) + { + courses.remove(course); + } + + sort() + { + sorter.sortCourses(courses); + } +} diff --git a/src/model/course-search/CourseSorter b/src/model/course-search/CourseSorter new file mode 100644 index 0000000..ae2863d --- /dev/null +++ b/src/model/course-search/CourseSorter @@ -0,0 +1,5 @@ +package design.model; + +public interface CourseSorter { + public sortCourses(List courses); +} \ No newline at end of file diff --git a/src/model/course-search/SortByHoles.java b/src/model/course-search/SortByHoles.java new file mode 100644 index 0000000..39e3610 --- /dev/null +++ b/src/model/course-search/SortByHoles.java @@ -0,0 +1,10 @@ +package design.model; + +import CourseSorter; + +public class SortByHoles implements CourseSorter { + sortCourses(List courses) + { + + } +} \ No newline at end of file -- cgit v1.2.3 From c03d30761e74e27815e6b7639f9ff4ec4e5c185a Mon Sep 17 00:00:00 2001 From: WillemDalton Date: Mon, 29 Sep 2025 18:55:22 -0400 Subject: implemented logic for sorting algorithms --- src/model/course-search/SortByDifficulty.java | 10 ++++++++++ src/model/course-search/SortByHoles.java | 2 +- src/model/course-search/SortByLocation.java | 10 ++++++++++ src/model/course-search/SortByName.java | 10 ++++++++++ src/model/course-search/SortByPar.java | 10 ++++++++++ 5 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 src/model/course-search/SortByDifficulty.java create mode 100644 src/model/course-search/SortByLocation.java create mode 100644 src/model/course-search/SortByName.java create mode 100644 src/model/course-search/SortByPar.java (limited to 'src') diff --git a/src/model/course-search/SortByDifficulty.java b/src/model/course-search/SortByDifficulty.java new file mode 100644 index 0000000..2c3634b --- /dev/null +++ b/src/model/course-search/SortByDifficulty.java @@ -0,0 +1,10 @@ +package design.model; + +import CourseSorter; + +public class SortByDifficulty implements CourseSorter { + sortCourses(List courses) + { + courses.sort(courses, (Course c1, Course c2) -> (c1.getDifficultyRating > c2.getDifficultyRating)); + } +} \ No newline at end of file diff --git a/src/model/course-search/SortByHoles.java b/src/model/course-search/SortByHoles.java index 39e3610..9aa7626 100644 --- a/src/model/course-search/SortByHoles.java +++ b/src/model/course-search/SortByHoles.java @@ -5,6 +5,6 @@ import CourseSorter; public class SortByHoles implements CourseSorter { sortCourses(List courses) { - + courses.sort(courses, (c1, c2) -> (c1.getHoleCount() - c2.getHoleCount())); } } \ No newline at end of file diff --git a/src/model/course-search/SortByLocation.java b/src/model/course-search/SortByLocation.java new file mode 100644 index 0000000..d9e7663 --- /dev/null +++ b/src/model/course-search/SortByLocation.java @@ -0,0 +1,10 @@ +package design.model; + +import CourseSorter; + +public class SortByLocation implements CourseSorter { + sortCourses(List courses) + { + courses.sort(courses, (Course c1, Course c2) -> (c1.getLocation().compareTo(c2.getLocation()))); + } +} \ No newline at end of file diff --git a/src/model/course-search/SortByName.java b/src/model/course-search/SortByName.java new file mode 100644 index 0000000..d899982 --- /dev/null +++ b/src/model/course-search/SortByName.java @@ -0,0 +1,10 @@ +package design.model; + +import CourseSorter; + +public class SortByName implements CourseSorter { + sortCourses(List courses) + { + courses.sort(courses, (Course c1, Course c2) -> (c1.getName().compareTo(c2.getName()))); + } +} \ No newline at end of file diff --git a/src/model/course-search/SortByPar.java b/src/model/course-search/SortByPar.java new file mode 100644 index 0000000..7b782ec --- /dev/null +++ b/src/model/course-search/SortByPar.java @@ -0,0 +1,10 @@ +package design.model; + +import CourseSorter; + +public class SortByPar implements CourseSorter { + sortCourses(List courses) + { + courses.sort(courses, (Course c1, Course c2) -> (c1.getTotalPar() > c2.getTotalPar())); + } +} \ No newline at end of file -- cgit v1.2.3 From e218e35f333f8a30d213c7d3eebeb6f5f6bbcea3 Mon Sep 17 00:00:00 2001 From: WillemDalton Date: Thu, 2 Oct 2025 08:55:33 -0400 Subject: more progress on the strategy, unit testing --- src/main/java/design/model/Club.java | 37 +++++++++ src/main/java/design/model/Course.java | 45 +++++++++++ src/main/java/design/model/Golfer.java | 66 ++++++++++++++++ src/main/java/design/model/Hole.java | 19 +++++ src/main/java/design/model/ICourse.java | 16 ++++ src/main/java/design/model/Play.java | 30 ++++++++ src/main/java/design/model/Round.java | 45 +++++++++++ src/main/java/design/model/Swing.java | 19 +++++ .../design/model/course_search/CourseList.java | 89 ++++++++++++++++++++++ .../design/model/course_search/CourseSorter.java | 12 +++ .../model/course_search/SortByDifficulty.java | 16 ++++ .../design/model/course_search/SortByHoles.java | 16 ++++ .../design/model/course_search/SortByLocation.java | 16 ++++ .../design/model/course_search/SortByName.java | 16 ++++ .../java/design/model/course_search/SortByPar.java | 16 ++++ src/model/Club.java | 37 --------- src/model/Course.java | 45 ----------- src/model/Golfer.java | 66 ---------------- src/model/Hole.java | 19 ----- src/model/Play.java | 30 -------- src/model/Round.java | 45 ----------- src/model/Swing.java | 19 ----- src/model/course-search/CourseList.java | 51 ------------- src/model/course-search/CourseSorter | 5 -- src/model/course-search/SortByDifficulty.java | 10 --- src/model/course-search/SortByHoles.java | 10 --- src/model/course-search/SortByLocation.java | 10 --- src/model/course-search/SortByName.java | 10 --- src/model/course-search/SortByPar.java | 10 --- src/test/java/design/TestCourseList.java | 86 +++++++++++++++++++++ 30 files changed, 544 insertions(+), 367 deletions(-) create mode 100644 src/main/java/design/model/Club.java create mode 100644 src/main/java/design/model/Course.java create mode 100644 src/main/java/design/model/Golfer.java create mode 100644 src/main/java/design/model/Hole.java create mode 100644 src/main/java/design/model/ICourse.java create mode 100644 src/main/java/design/model/Play.java create mode 100644 src/main/java/design/model/Round.java create mode 100644 src/main/java/design/model/Swing.java create mode 100644 src/main/java/design/model/course_search/CourseList.java create mode 100644 src/main/java/design/model/course_search/CourseSorter.java create mode 100644 src/main/java/design/model/course_search/SortByDifficulty.java create mode 100644 src/main/java/design/model/course_search/SortByHoles.java create mode 100644 src/main/java/design/model/course_search/SortByLocation.java create mode 100644 src/main/java/design/model/course_search/SortByName.java create mode 100644 src/main/java/design/model/course_search/SortByPar.java delete mode 100644 src/model/Club.java delete mode 100644 src/model/Course.java delete mode 100644 src/model/Golfer.java delete mode 100644 src/model/Hole.java delete mode 100644 src/model/Play.java delete mode 100644 src/model/Round.java delete mode 100644 src/model/Swing.java delete mode 100644 src/model/course-search/CourseList.java delete mode 100644 src/model/course-search/CourseSorter delete mode 100644 src/model/course-search/SortByDifficulty.java delete mode 100644 src/model/course-search/SortByHoles.java delete mode 100644 src/model/course-search/SortByLocation.java delete mode 100644 src/model/course-search/SortByName.java delete mode 100644 src/model/course-search/SortByPar.java create mode 100644 src/test/java/design/TestCourseList.java (limited to 'src') diff --git a/src/main/java/design/model/Club.java b/src/main/java/design/model/Club.java new file mode 100644 index 0000000..57a43d1 --- /dev/null +++ b/src/main/java/design/model/Club.java @@ -0,0 +1,37 @@ +package design.model; + +public class Club { + + public enum ClubType { + DRIVER, + WOOD, + IRON, + HYBRID, + PITCHING_WEDGE, + SAND_WEDGE, + LOB_WEDGE, + PUTTER + } + + private final String manufacture; + private final String nickname; + private final ClubType clubType; + + public Club(String manufacture, String nickname, ClubType clubType) { + this.manufacture = manufacture; + this.nickname = nickname; + this.clubType = clubType; + } + + public String getManufacture() { + return manufacture; + } + + public String getNickname() { + return nickname; + } + + public ClubType getClubType() { + return clubType; + } +} diff --git a/src/main/java/design/model/Course.java b/src/main/java/design/model/Course.java new file mode 100644 index 0000000..8dfecd8 --- /dev/null +++ b/src/main/java/design/model/Course.java @@ -0,0 +1,45 @@ +package design.model; + +import java.util.List; + +public class Course implements ICourse { + private final String name; + private final int difficultyRating; + private final String location; + private final int holeCount; + private final int totalPar; + private final List holes; + + public Course(String name, int difficultyRating, String location, int holeCount, int totalPar, List holes) { + this.name = name; + this.difficultyRating = difficultyRating; + this.location = location; + this.holeCount = holeCount; + this.totalPar = totalPar; + this.holes = holes; + } + + public String getName() { + return name; + } + + public float getDifficultyRating() { + return difficultyRating; + } + + public String getLocation() { + return location; + } + + public int getHoleCount() { + return holeCount; + } + + public int getTotalPar() { + return totalPar; + } + + public List getHoles() { + return holes; + } +} diff --git a/src/main/java/design/model/Golfer.java b/src/main/java/design/model/Golfer.java new file mode 100644 index 0000000..8f09067 --- /dev/null +++ b/src/main/java/design/model/Golfer.java @@ -0,0 +1,66 @@ +package design.model; + +import java.util.ArrayList; +import java.util.List; + +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 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(); + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getFullName() { + return fullName; + } + + public void setFullName(String fullName) { + this.fullName = fullName; + } + + public void setPassword(String password) { + this.passwordHash = password.hashCode(); + } + + public boolean checkPassword(String password) { + return passwordHash == password.hashCode(); + } + + public Course[] getCourses() { + return courses.toArray(Course[]::new); + } + + public void addCourse(Course course) { + courses.add(course); + } + + public void removeCourse(Course course) { + courses.remove(course); + } + + public Round[] getRounds() { + return rounds.toArray(Round[]::new); + } + + public void addRound(Round round) { + rounds.add(round); + } + + +} diff --git a/src/main/java/design/model/Hole.java b/src/main/java/design/model/Hole.java new file mode 100644 index 0000000..bc9fdb9 --- /dev/null +++ b/src/main/java/design/model/Hole.java @@ -0,0 +1,19 @@ +package design.model; + +public class Hole { + private final int number; + private final int par; + + public Hole(int number, int par) { + this.number = number; + this.par = par; + } + + public int getNumber() { + return number; + } + + public int getPar() { + return par; + } +} diff --git a/src/main/java/design/model/ICourse.java b/src/main/java/design/model/ICourse.java new file mode 100644 index 0000000..fd171d3 --- /dev/null +++ b/src/main/java/design/model/ICourse.java @@ -0,0 +1,16 @@ +package design.model; + +import java.util.List; + +/* + * Defines the interface for courses to implement + * Willem Dalton + */ +public interface ICourse { + String getName(); + float getDifficultyRating(); + String getLocation(); + List getHoles(); + int getHoleCount(); + int getTotalPar(); +} diff --git a/src/main/java/design/model/Play.java b/src/main/java/design/model/Play.java new file mode 100644 index 0000000..b61228b --- /dev/null +++ b/src/main/java/design/model/Play.java @@ -0,0 +1,30 @@ +package design.model; + +import java.util.ArrayList; +import java.util.List; + +public class Play { + private final int distance; + private final List swings; + + public Play(int distance) { + this.swings = new ArrayList<>(); + this.distance = distance; + } + + public int getDistance() { + return distance; + } + + public void addSwing(Swing swing) { + swings.add(swing); + } + + public Swing[] getSwings() { + return swings.toArray(Swing[]::new); + } + + public int getSwingCount() { + return swings.size(); + } +} diff --git a/src/main/java/design/model/Round.java b/src/main/java/design/model/Round.java new file mode 100644 index 0000000..38975da --- /dev/null +++ b/src/main/java/design/model/Round.java @@ -0,0 +1,45 @@ +package design.model; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +public class Round { + private final transient Course course; + private final LocalDateTime dateTime; + private final Hole startingHole; + private final List plays; + + public Round(Course course, LocalDateTime dateTime, Hole startingHole) { + this.course = course; + this.dateTime = dateTime; + this.startingHole = startingHole; + plays = new ArrayList<>(); + } + + public int getTotalSwings() { + return plays.stream() + .map(Play::getSwingCount) + .reduce(0, Integer::sum); + } + + public Course getCourse() { + return course; + } + + public LocalDateTime getDateTime() { + return dateTime; + } + + public Hole getStartingHole() { + return startingHole; + } + + public Play[] getPlays() { + return plays.toArray(Play[]::new); + } + + public void addPlay(Play play) { + plays.add(play); + } +} diff --git a/src/main/java/design/model/Swing.java b/src/main/java/design/model/Swing.java new file mode 100644 index 0000000..a93b66f --- /dev/null +++ b/src/main/java/design/model/Swing.java @@ -0,0 +1,19 @@ +package design.model; + +public class Swing { + private final int distance; + private final Club clubUsed; + + public Swing(int distance, Club clubUsed) { + this.distance = distance; + this.clubUsed = clubUsed; + } + + public int getDistance() { + return distance; + } + + public Club getClubUsed() { + return clubUsed; + } +} 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 courses; + + public CourseList() + { + courses = new ArrayList<>(); + } + + /* + * Grab the list of courses + */ + public List getCourses() + { + return courses; + } + + /* + * Set the list of courses equal to an existing list + */ + public void setCourses(List 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 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..a3d1186 --- /dev/null +++ b/src/main/java/design/model/course_search/CourseSorter.java @@ -0,0 +1,12 @@ +package design.model.course_search; + +import design.model.*; +import java.util.List; + +/* + * Defines an interface that concrete strategies will implement + * Willem Dalton + */ +public interface CourseSorter { + public void sortCourses(List courses); +} \ No newline at end of file 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..c006a40 --- /dev/null +++ b/src/main/java/design/model/course_search/SortByDifficulty.java @@ -0,0 +1,16 @@ +package design.model.course_search; + +import design.model.*; +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 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..da98d4f --- /dev/null +++ b/src/main/java/design/model/course_search/SortByHoles.java @@ -0,0 +1,16 @@ +package design.model.course_search; + +import design.model.*; +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 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..ae9bd8b --- /dev/null +++ b/src/main/java/design/model/course_search/SortByLocation.java @@ -0,0 +1,16 @@ +package design.model.course_search; + +import design.model.*; +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 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..04625c6 --- /dev/null +++ b/src/main/java/design/model/course_search/SortByName.java @@ -0,0 +1,16 @@ +package design.model.course_search; + +import design.model.*; +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 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..2fa388c --- /dev/null +++ b/src/main/java/design/model/course_search/SortByPar.java @@ -0,0 +1,16 @@ +package design.model.course_search; + +import design.model.*; +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 courses) + { + courses.sort(Comparator.comparing(ICourse::getTotalPar)); + } +} \ No newline at end of file diff --git a/src/model/Club.java b/src/model/Club.java deleted file mode 100644 index 57a43d1..0000000 --- a/src/model/Club.java +++ /dev/null @@ -1,37 +0,0 @@ -package design.model; - -public class Club { - - public enum ClubType { - DRIVER, - WOOD, - IRON, - HYBRID, - PITCHING_WEDGE, - SAND_WEDGE, - LOB_WEDGE, - PUTTER - } - - private final String manufacture; - private final String nickname; - private final ClubType clubType; - - public Club(String manufacture, String nickname, ClubType clubType) { - this.manufacture = manufacture; - this.nickname = nickname; - this.clubType = clubType; - } - - public String getManufacture() { - return manufacture; - } - - public String getNickname() { - return nickname; - } - - public ClubType getClubType() { - return clubType; - } -} diff --git a/src/model/Course.java b/src/model/Course.java deleted file mode 100644 index 5f8c43d..0000000 --- a/src/model/Course.java +++ /dev/null @@ -1,45 +0,0 @@ -package design.model; - -import java.util.List; - -public class Course { - private final String name; - private final int difficultyRating; - private final String location; - private final int holeCount; - private final int totalPar; - private final List holes; - - public Course(String name, int difficultyRating, String location, int holeCount, int totalPar, List holes) { - this.name = name; - this.difficultyRating = difficultyRating; - this.location = location; - this.holeCount = holeCount; - this.totalPar = totalPar; - this.holes = holes; - } - - public String getName() { - return name; - } - - public int getDifficultyRating() { - return difficultyRating; - } - - public String getLocation() { - return location; - } - - public int getHoleCount() { - return holeCount; - } - - public int getTotalPar() { - return totalPar; - } - - public List getHoles() { - return holes; - } -} diff --git a/src/model/Golfer.java b/src/model/Golfer.java deleted file mode 100644 index 8f09067..0000000 --- a/src/model/Golfer.java +++ /dev/null @@ -1,66 +0,0 @@ -package design.model; - -import java.util.ArrayList; -import java.util.List; - -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 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(); - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getFullName() { - return fullName; - } - - public void setFullName(String fullName) { - this.fullName = fullName; - } - - public void setPassword(String password) { - this.passwordHash = password.hashCode(); - } - - public boolean checkPassword(String password) { - return passwordHash == password.hashCode(); - } - - public Course[] getCourses() { - return courses.toArray(Course[]::new); - } - - public void addCourse(Course course) { - courses.add(course); - } - - public void removeCourse(Course course) { - courses.remove(course); - } - - public Round[] getRounds() { - return rounds.toArray(Round[]::new); - } - - public void addRound(Round round) { - rounds.add(round); - } - - -} diff --git a/src/model/Hole.java b/src/model/Hole.java deleted file mode 100644 index bc9fdb9..0000000 --- a/src/model/Hole.java +++ /dev/null @@ -1,19 +0,0 @@ -package design.model; - -public class Hole { - private final int number; - private final int par; - - public Hole(int number, int par) { - this.number = number; - this.par = par; - } - - public int getNumber() { - return number; - } - - public int getPar() { - return par; - } -} diff --git a/src/model/Play.java b/src/model/Play.java deleted file mode 100644 index b61228b..0000000 --- a/src/model/Play.java +++ /dev/null @@ -1,30 +0,0 @@ -package design.model; - -import java.util.ArrayList; -import java.util.List; - -public class Play { - private final int distance; - private final List swings; - - public Play(int distance) { - this.swings = new ArrayList<>(); - this.distance = distance; - } - - public int getDistance() { - return distance; - } - - public void addSwing(Swing swing) { - swings.add(swing); - } - - public Swing[] getSwings() { - return swings.toArray(Swing[]::new); - } - - public int getSwingCount() { - return swings.size(); - } -} diff --git a/src/model/Round.java b/src/model/Round.java deleted file mode 100644 index 38975da..0000000 --- a/src/model/Round.java +++ /dev/null @@ -1,45 +0,0 @@ -package design.model; - -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; - -public class Round { - private final transient Course course; - private final LocalDateTime dateTime; - private final Hole startingHole; - private final List plays; - - public Round(Course course, LocalDateTime dateTime, Hole startingHole) { - this.course = course; - this.dateTime = dateTime; - this.startingHole = startingHole; - plays = new ArrayList<>(); - } - - public int getTotalSwings() { - return plays.stream() - .map(Play::getSwingCount) - .reduce(0, Integer::sum); - } - - public Course getCourse() { - return course; - } - - public LocalDateTime getDateTime() { - return dateTime; - } - - public Hole getStartingHole() { - return startingHole; - } - - public Play[] getPlays() { - return plays.toArray(Play[]::new); - } - - public void addPlay(Play play) { - plays.add(play); - } -} diff --git a/src/model/Swing.java b/src/model/Swing.java deleted file mode 100644 index a93b66f..0000000 --- a/src/model/Swing.java +++ /dev/null @@ -1,19 +0,0 @@ -package design.model; - -public class Swing { - private final int distance; - private final Club clubUsed; - - public Swing(int distance, Club clubUsed) { - this.distance = distance; - this.clubUsed = clubUsed; - } - - public int getDistance() { - return distance; - } - - public Club getClubUsed() { - return clubUsed; - } -} diff --git a/src/model/course-search/CourseList.java b/src/model/course-search/CourseList.java deleted file mode 100644 index 2766e11..0000000 --- a/src/model/course-search/CourseList.java +++ /dev/null @@ -1,51 +0,0 @@ -package design.model; - -import java.util.ArrayList; -import java.util.List; - -import Course; - -/* - * Defines a list of courses that can be sorted, added to or removed from. - * Created by Willem Dalton - */ -public class CourseList { - private CourseSorter sorter; - private List courses; - - public CourseList() - { - courses = new ArrayList<>(); - sorter = new CourseSorter(); - } - - public List getCourses() - { - return courses; - } - - public setCourses(List courses) - { - this.courses = courses; - } - - setSorter(CourseSorter courseSorter) - { - sorter = courseSorter; - } - - add(Course course) - { - courses.add(course); - } - - remove(Course course) - { - courses.remove(course); - } - - sort() - { - sorter.sortCourses(courses); - } -} diff --git a/src/model/course-search/CourseSorter b/src/model/course-search/CourseSorter deleted file mode 100644 index ae2863d..0000000 --- a/src/model/course-search/CourseSorter +++ /dev/null @@ -1,5 +0,0 @@ -package design.model; - -public interface CourseSorter { - public sortCourses(List courses); -} \ No newline at end of file diff --git a/src/model/course-search/SortByDifficulty.java b/src/model/course-search/SortByDifficulty.java deleted file mode 100644 index 2c3634b..0000000 --- a/src/model/course-search/SortByDifficulty.java +++ /dev/null @@ -1,10 +0,0 @@ -package design.model; - -import CourseSorter; - -public class SortByDifficulty implements CourseSorter { - sortCourses(List courses) - { - courses.sort(courses, (Course c1, Course c2) -> (c1.getDifficultyRating > c2.getDifficultyRating)); - } -} \ No newline at end of file diff --git a/src/model/course-search/SortByHoles.java b/src/model/course-search/SortByHoles.java deleted file mode 100644 index 9aa7626..0000000 --- a/src/model/course-search/SortByHoles.java +++ /dev/null @@ -1,10 +0,0 @@ -package design.model; - -import CourseSorter; - -public class SortByHoles implements CourseSorter { - sortCourses(List courses) - { - courses.sort(courses, (c1, c2) -> (c1.getHoleCount() - c2.getHoleCount())); - } -} \ No newline at end of file diff --git a/src/model/course-search/SortByLocation.java b/src/model/course-search/SortByLocation.java deleted file mode 100644 index d9e7663..0000000 --- a/src/model/course-search/SortByLocation.java +++ /dev/null @@ -1,10 +0,0 @@ -package design.model; - -import CourseSorter; - -public class SortByLocation implements CourseSorter { - sortCourses(List courses) - { - courses.sort(courses, (Course c1, Course c2) -> (c1.getLocation().compareTo(c2.getLocation()))); - } -} \ No newline at end of file diff --git a/src/model/course-search/SortByName.java b/src/model/course-search/SortByName.java deleted file mode 100644 index d899982..0000000 --- a/src/model/course-search/SortByName.java +++ /dev/null @@ -1,10 +0,0 @@ -package design.model; - -import CourseSorter; - -public class SortByName implements CourseSorter { - sortCourses(List courses) - { - courses.sort(courses, (Course c1, Course c2) -> (c1.getName().compareTo(c2.getName()))); - } -} \ No newline at end of file diff --git a/src/model/course-search/SortByPar.java b/src/model/course-search/SortByPar.java deleted file mode 100644 index 7b782ec..0000000 --- a/src/model/course-search/SortByPar.java +++ /dev/null @@ -1,10 +0,0 @@ -package design.model; - -import CourseSorter; - -public class SortByPar implements CourseSorter { - sortCourses(List courses) - { - courses.sort(courses, (Course c1, Course c2) -> (c1.getTotalPar() > c2.getTotalPar())); - } -} \ No newline at end of file diff --git a/src/test/java/design/TestCourseList.java b/src/test/java/design/TestCourseList.java new file mode 100644 index 0000000..e18b9ab --- /dev/null +++ b/src/test/java/design/TestCourseList.java @@ -0,0 +1,86 @@ +package design; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; +import design.model.course_search.*; +import design.model.*; + +import java.util.List; + +class TestCourseList { + + // A dummy Course implementation for testing + private static class DummyCourse implements ICourse { + private final String name; + private final float difficulty; + + public DummyCourse(String name, float difficulty) { + this.name = name; + this.difficulty = difficulty; + } + + @Override + public String getName() { return name; } + + @Override + public float getDifficultyRating() { return difficulty; } + + @Override + public String getLocation() { return ""; } + + @Override + public int getTotalPar() { return 0; } + + @Override + public int getHoleCount() { return 0; } + + @Override + public List getHoles() { return null; } + } + + // A simple sorter that sorts courses by difficulty + private static class SortByDifficultyTest implements CourseSorter { + @Override + public void sortCourses(List courses) { + courses.sort((c1, c2) -> Float.compare(c1.getDifficultyRating(), c2.getDifficultyRating())); + } + } + + @Test + public void testAddAndRemoveCourses() { + CourseList courseList = new CourseList(); + ICourse course1 = new DummyCourse("Course A", 2.0f); + ICourse course2 = new DummyCourse("Course B", 5.0f); + + courseList.add(course1); + courseList.add(course2); + + assertEquals(2, courseList.getCourses().size(), "Should have 2 courses after adding"); + assertTrue(courseList.getCourses().contains(course1), "Course A should be in the list"); + assertTrue(courseList.getCourses().contains(course2), "Course B should be in the list"); + + courseList.remove(course1); + assertEquals(1, courseList.getCourses().size(), "Should have 1 course after removal"); + assertTrue(!courseList.getCourses().contains(course1), "Course A should no longer be in the list"); + } + + @Test + public void testSortCourses() { + CourseList courseList = new CourseList(); + courseList.add(new DummyCourse("Course A", 3.0f)); + courseList.add(new DummyCourse("Course B", 1.0f)); + courseList.add(new DummyCourse("Course C", 2.0f)); + + // Set sorting strategy + courseList.setSorter(new SortByDifficultyTest()); + + courseList.sort(); + + List sorted = courseList.getCourses(); + assertEquals("Course B", sorted.get(0).getName(), "First course should have lowest difficulty"); + assertEquals("Course C", sorted.get(1).getName(), "Second course should have medium difficulty"); + assertEquals("Course A", sorted.get(2).getName(), "Last course should have highest difficulty"); + } +} \ No newline at end of file -- cgit v1.2.3 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') 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') 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') 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') 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 From 42fcc633ddc0e328561f984a6aa0b8593765dcf2 Mon Sep 17 00:00:00 2001 From: sowgro Date: Fri, 3 Oct 2025 21:52:50 -0400 Subject: minor project reorganization --- src/main/java/design/HelloWorld.java | 24 ---------------------- src/main/java/design/ParPal.java | 14 +++++++++++++ src/main/java/design/model/Course.java | 2 ++ src/main/java/design/model/ICourse.java | 16 --------------- .../design/model/course_search/CourseSorter.java | 1 - .../java/design/model/course_search/ICourse.java | 18 ++++++++++++++++ .../model/course_search/SortByDifficulty.java | 1 - .../design/model/course_search/SortByHoles.java | 1 - .../design/model/course_search/SortByLocation.java | 1 - .../design/model/course_search/SortByName.java | 1 - .../java/design/model/course_search/SortByPar.java | 1 - .../java/design/persistence/MasterDatabase.java | 2 +- .../java/design/persistence/PersonalDatabase.java | 2 +- 13 files changed, 36 insertions(+), 48 deletions(-) delete mode 100644 src/main/java/design/HelloWorld.java create mode 100644 src/main/java/design/ParPal.java delete mode 100644 src/main/java/design/model/ICourse.java create mode 100644 src/main/java/design/model/course_search/ICourse.java (limited to 'src') diff --git a/src/main/java/design/HelloWorld.java b/src/main/java/design/HelloWorld.java deleted file mode 100644 index 5e16cec..0000000 --- a/src/main/java/design/HelloWorld.java +++ /dev/null @@ -1,24 +0,0 @@ -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) 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/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 f90c8d9..f907622 100644 --- a/src/main/java/design/model/Course.java +++ b/src/main/java/design/model/Course.java @@ -1,5 +1,7 @@ package design.model; +import design.model.course_search.ICourse; + import java.util.List; public class Course implements ICourse { diff --git a/src/main/java/design/model/ICourse.java b/src/main/java/design/model/ICourse.java deleted file mode 100644 index fd171d3..0000000 --- a/src/main/java/design/model/ICourse.java +++ /dev/null @@ -1,16 +0,0 @@ -package design.model; - -import java.util.List; - -/* - * Defines the interface for courses to implement - * Willem Dalton - */ -public interface ICourse { - String getName(); - float getDifficultyRating(); - String getLocation(); - List getHoles(); - int getHoleCount(); - int getTotalPar(); -} diff --git a/src/main/java/design/model/course_search/CourseSorter.java b/src/main/java/design/model/course_search/CourseSorter.java index a3d1186..7549645 100644 --- a/src/main/java/design/model/course_search/CourseSorter.java +++ b/src/main/java/design/model/course_search/CourseSorter.java @@ -1,6 +1,5 @@ package design.model.course_search; -import design.model.*; import java.util.List; /* 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 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 index c006a40..8c3251c 100644 --- a/src/main/java/design/model/course_search/SortByDifficulty.java +++ b/src/main/java/design/model/course_search/SortByDifficulty.java @@ -1,6 +1,5 @@ package design.model.course_search; -import design.model.*; import java.util.List; import java.util.Comparator; diff --git a/src/main/java/design/model/course_search/SortByHoles.java b/src/main/java/design/model/course_search/SortByHoles.java index da98d4f..b1badab 100644 --- a/src/main/java/design/model/course_search/SortByHoles.java +++ b/src/main/java/design/model/course_search/SortByHoles.java @@ -1,6 +1,5 @@ package design.model.course_search; -import design.model.*; import java.util.List; import java.util.Comparator; diff --git a/src/main/java/design/model/course_search/SortByLocation.java b/src/main/java/design/model/course_search/SortByLocation.java index ae9bd8b..0d8a8d2 100644 --- a/src/main/java/design/model/course_search/SortByLocation.java +++ b/src/main/java/design/model/course_search/SortByLocation.java @@ -1,6 +1,5 @@ package design.model.course_search; -import design.model.*; import java.util.List; import java.util.Comparator; diff --git a/src/main/java/design/model/course_search/SortByName.java b/src/main/java/design/model/course_search/SortByName.java index 04625c6..2847d3e 100644 --- a/src/main/java/design/model/course_search/SortByName.java +++ b/src/main/java/design/model/course_search/SortByName.java @@ -1,6 +1,5 @@ package design.model.course_search; -import design.model.*; import java.util.List; import java.util.Comparator; diff --git a/src/main/java/design/model/course_search/SortByPar.java b/src/main/java/design/model/course_search/SortByPar.java index 2fa388c..9a3eaf9 100644 --- a/src/main/java/design/model/course_search/SortByPar.java +++ b/src/main/java/design/model/course_search/SortByPar.java @@ -1,6 +1,5 @@ package design.model.course_search; -import design.model.*; import java.util.List; import java.util.Comparator; diff --git a/src/main/java/design/persistence/MasterDatabase.java b/src/main/java/design/persistence/MasterDatabase.java index 2852349..ddc0434 100644 --- a/src/main/java/design/persistence/MasterDatabase.java +++ b/src/main/java/design/persistence/MasterDatabase.java @@ -3,7 +3,7 @@ package design.persistence; import design.model.Course; public interface MasterDatabase { - public static final MasterDatabase INSTANCE = new CSVMasterDatabase("data/golf_courses_1000.csv"); + MasterDatabase INSTANCE = new CSVMasterDatabase("data/golf_courses_1000.csv"); Course[] getCourses(); Course getCourse(int id); diff --git a/src/main/java/design/persistence/PersonalDatabase.java b/src/main/java/design/persistence/PersonalDatabase.java index 524263b..a045d59 100644 --- a/src/main/java/design/persistence/PersonalDatabase.java +++ b/src/main/java/design/persistence/PersonalDatabase.java @@ -5,7 +5,7 @@ import design.model.Golfer; import java.io.IOException; public interface PersonalDatabase { - public static final PersonalDatabase INSTANCE = new JSONPersonalDatabase("data/personaldb.json"); + PersonalDatabase INSTANCE = new JSONPersonalDatabase("data/personaldb.json"); Golfer[] getGolfers(); Golfer getGolfer(String name); -- cgit v1.2.3