Merge pull request CSC207-UofT#47 from CSC207-UofT/tony-cleanup

Clean up (final) code for Phase 2
lt77777 · Dec 9, 2021 · a87b7ff · a87b7ff
2 parents 2f7d3be + 13d13bd
commit a87b7ff
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 13 deletions.
diff --git a/app/src/main/java/com/amigo/control/DatabaseController.java b/app/src/main/java/com/amigo/control/DatabaseController.java
@@ -1,11 +1,9 @@
 package com.amigo.control;
 
 import java.util.List;
-import java.util.Optional;
 
 import com.amigo.course.Course;
 import com.amigo.course.CourseRepository;
-// // import com.amigo.user.UserRepository;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

diff --git a/app/src/main/java/com/amigo/course/CourseSetFactory.java b/app/src/main/java/com/amigo/course/CourseSetFactory.java
@@ -4,13 +4,6 @@
 
 public class CourseSetFactory {
 
- /**
- * Constructor for CourseSetFactory
- */
-
- public CourseSetFactory() {
- }
-
  /**
  * Creates a course set using a string of course codes
  * @param stringOfCourseCodes a string containing course codes, each separated by commas

diff --git a/app/src/main/java/com/amigo/match/DemoMatching.java b/app/src/main/java/com/amigo/match/DemoMatching.java
@@ -23,7 +23,7 @@ public static Map<String, List<Match>> doMatching(User user) {
  * Creates the demo users
  */
  private static List<User> createDemoUsers() {
- ArrayList<User> users = new ArrayList<User>();
+ ArrayList<User> users = new ArrayList<>();
  ProfileFactory profileFactory = new ProfileFactory();
  CourseSetFactory courseSetFactory = new CourseSetFactory();
  UserFactory userFactory = new UserFactory();

diff --git a/app/src/main/java/com/amigo/match/Matcher.java b/app/src/main/java/com/amigo/match/Matcher.java
@@ -155,7 +155,6 @@ public int compare(Match m1, Match m2) {
  * Returns the metric representing the closeness of match between two users.
  */
  public double metric(User user1, User user2) {
- // TODO: Improve metric to include more than just courses
  double metric;
  Profile profile1 = user1.getProfile();
  Profile profile2 = user2.getProfile();

diff --git a/app/src/main/java/com/amigo/match/MatcherBeta.java b/app/src/main/java/com/amigo/match/MatcherBeta.java
@@ -125,7 +125,6 @@ private Map<String, List<Match>> matchPotential(List<User> users) {
  */
 
  public double metric(User user1, User user2) {
- // TODO: Improve metric to include more than just courses, should be done
  double temp_metric = 0;
  Profile profile1 = user1.getProfile();
  Profile profile2 = user2.getProfile();

diff --git a/app/src/main/java/com/amigo/validate/CourseValidator.java b/app/src/main/java/com/amigo/validate/CourseValidator.java
@@ -36,7 +36,6 @@ public boolean supports(Class<?> clazz) {
  */
  @Override
  public void validate(Object target, Errors errors) {
- // TODO: convert into nested validators to correctly identify fields
  CourseForm form = (CourseForm) target;
  if (!COURSE_PATTERN.matcher(form.getCourseCode()).matches()) {
  errors.reject(errorStrings.COURSE_INFO_FORMAT);