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 ---------- 7 files changed, 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 (limited to 'src/main') 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; - } -} -- 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 ++++ 15 files changed, 458 insertions(+) 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 (limited to 'src/main') 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 -- cgit v1.2.3