diff --git a/docs/NEW_MODULE_TEMPLATE.md b/docs/NEW_MODULE_TEMPLATE.md index c1484524..37d62a62 100644 --- a/docs/NEW_MODULE_TEMPLATE.md +++ b/docs/NEW_MODULE_TEMPLATE.md @@ -67,11 +67,14 @@ import java.util.stream.Collectors; @Service public class CheckinService { - @Autowired - private CheckinRepository checkinRepo; + private final CheckinRepository checkinRepo; + private final StudentRepository studentRepo; @Autowired - private StudentRepository studentRepo; + public CheckinService(CheckinRepository checkinRepo, StudentRepository studentRepo) { + this.checkinRepo = checkinRepo; + this.studentRepo = studentRepo; + } public Checkin save(Checkin checkin) { if (checkin.getDate() == null) { @@ -130,8 +133,12 @@ import java.util.List; @RequestMapping("/checkin") public class CheckinController { + private final CheckinService checkinService; + @Autowired - private CheckinService checkinService; + public CheckinController(CheckinService checkinService) { + this.checkinService = checkinService; + } @GetMapping("/") public String home(ModelMap model) { @@ -198,7 +205,7 @@ public class CheckinController { - Use `checkin/read.html` as a resource, not a template -```HTML +```HTML
@@ -242,7 +249,7 @@ public class CheckinController { - findAll() { - return checkinRepo.findAll().stream().sorted(Comparator.comparing(Checkin::getDate).reversed()).collect(Collectors.toList()); + return checkinRepo.findAll().stream().sorted(Comparator.comparing(Checkin::getDate).reversed()) + .collect(Collectors.toList()); } public Checkin findById(Long id) { @@ -57,7 +58,7 @@ public void delete(Checkin checkin) { } public List findByUid(String uid) { - return checkinRepo.findByUid(uid).stream().sorted(Comparator.comparing(Checkin::getDate).reversed()).collect(Collectors.toList()); + return checkinRepo.findByUid(uid).stream().sorted(Comparator.comparing(Checkin::getDate).reversed()) + .collect(Collectors.toList()); } } - diff --git a/src/main/java/com/coderscampus/cp/service/CodingCategoryService.java b/src/main/java/com/coderscampus/cp/service/CodingCategoryService.java index 060fc981..3f8af523 100644 --- a/src/main/java/com/coderscampus/cp/service/CodingCategoryService.java +++ b/src/main/java/com/coderscampus/cp/service/CodingCategoryService.java @@ -10,8 +10,12 @@ @Service public class CodingCategoryService { + private final CodingCategoryRepository codingCategoryRepo; + @Autowired - private CodingCategoryRepository codingCategoryRepo; + public CodingCategoryService(CodingCategoryRepository codingCategoryRepo) { + this.codingCategoryRepo = codingCategoryRepo; + } public CodingCategory save(CodingCategory codingCategory) { return codingCategoryRepo.save(codingCategory); diff --git a/src/main/java/com/coderscampus/cp/service/FoobarService.java b/src/main/java/com/coderscampus/cp/service/FoobarService.java index 8fe62086..59455835 100644 --- a/src/main/java/com/coderscampus/cp/service/FoobarService.java +++ b/src/main/java/com/coderscampus/cp/service/FoobarService.java @@ -12,11 +12,14 @@ @Service public class FoobarService { - @Autowired - private FoobarRepository foobarRepo; + private final FoobarRepository foobarRepo; + private final StudentRepository studentRepo; @Autowired - private StudentRepository studentRepo; + public FoobarService(FoobarRepository foobarRepo, StudentRepository studentRepo) { + this.foobarRepo = foobarRepo; + this.studentRepo = studentRepo; + } public Foobar save(Foobar foobar) { System.out.println("FoobarService.java save method| Foobar is: " + foobar); diff --git a/src/main/java/com/coderscampus/cp/service/SpringProjectService.java b/src/main/java/com/coderscampus/cp/service/SpringProjectService.java index 0830b530..aeb53cf0 100644 --- a/src/main/java/com/coderscampus/cp/service/SpringProjectService.java +++ b/src/main/java/com/coderscampus/cp/service/SpringProjectService.java @@ -11,8 +11,12 @@ @Service public class SpringProjectService { + private final SpringProjectRepository springRepo; + @Autowired - SpringProjectRepository springRepo; + public SpringProjectService(SpringProjectRepository springRepo) { + this.springRepo = springRepo; + } public List findAll() { return springRepo.findAll(); @@ -22,4 +26,3 @@ public Optional findById(Long springProjectId) { return springRepo.findById(springProjectId); } } - \ No newline at end of file diff --git a/src/main/java/com/coderscampus/cp/service/StudentService.java b/src/main/java/com/coderscampus/cp/service/StudentService.java index eaa67366..57f8367e 100644 --- a/src/main/java/com/coderscampus/cp/service/StudentService.java +++ b/src/main/java/com/coderscampus/cp/service/StudentService.java @@ -14,8 +14,12 @@ @Service public class StudentService { + private final StudentRepository studentRepo; + @Autowired - private StudentRepository studentRepo; + public StudentService(StudentRepository studentRepo) { + this.studentRepo = studentRepo; + } public void save(Student student) { if (isValidNewStudent(student)) { @@ -25,6 +29,7 @@ public void save(Student student) { studentRepo.save(student); } } + @Transactional public StudentDTO saveByUid(Student student, String uid) { Student foundStudent = studentRepo.findByUid(uid); @@ -37,7 +42,6 @@ public StudentDTO saveByUid(Student student, String uid) { return returnStudent; } - boolean doesStudentExistInRepository(Student student) { Optional existingStudent = studentRepo.findById(student.getId()); diff --git a/src/main/java/com/coderscampus/cp/service/UserHistoryService.java b/src/main/java/com/coderscampus/cp/service/UserHistoryService.java index 31a102e8..de8da250 100644 --- a/src/main/java/com/coderscampus/cp/service/UserHistoryService.java +++ b/src/main/java/com/coderscampus/cp/service/UserHistoryService.java @@ -13,8 +13,12 @@ @Service public class UserHistoryService { + private final UserHistoryRepository userHistoryRepo; + @Autowired - private UserHistoryRepository userHistoryRepo; + public UserHistoryService(UserHistoryRepository userHistoryRepo) { + this.userHistoryRepo = userHistoryRepo; + } public UserHistory save(UserHistory userHistory) { if (userHistory.getDate() == null) { @@ -24,7 +28,8 @@ public UserHistory save(UserHistory userHistory) { } public List findAll() { - return userHistoryRepo.findAll().stream().sorted(Comparator.comparing(UserHistory::getDate).reversed()).collect(Collectors.toList()); + return userHistoryRepo.findAll().stream().sorted(Comparator.comparing(UserHistory::getDate).reversed()) + .collect(Collectors.toList()); } public UserHistory findById(Long id) { diff --git a/src/main/java/com/coderscampus/cp/web/ActivityLogController.java b/src/main/java/com/coderscampus/cp/web/ActivityLogController.java index 2a7168d4..4490172a 100644 --- a/src/main/java/com/coderscampus/cp/web/ActivityLogController.java +++ b/src/main/java/com/coderscampus/cp/web/ActivityLogController.java @@ -11,8 +11,13 @@ @Controller @RequestMapping("/activityLog") public class ActivityLogController { + + private final ActivityLogService activityLogService; + @Autowired - private ActivityLogService activityLogService; + public ActivityLogController(ActivityLogService activityLogService) { + this.activityLogService = activityLogService; + } @PostMapping("/create") public String postCreate(ActivityLog activityLog, @RequestParam("uid") String uid) { diff --git a/src/main/java/com/coderscampus/cp/web/CheckinController.java b/src/main/java/com/coderscampus/cp/web/CheckinController.java index 3520a136..5b328934 100644 --- a/src/main/java/com/coderscampus/cp/web/CheckinController.java +++ b/src/main/java/com/coderscampus/cp/web/CheckinController.java @@ -4,6 +4,8 @@ import com.coderscampus.cp.domain.Checkin; import com.coderscampus.cp.service.CheckinService; import jakarta.servlet.http.HttpSession; + +import org.hibernate.annotations.DialectOverride.Check; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; @@ -15,8 +17,12 @@ @RequestMapping("/checkin") public class CheckinController { + private final CheckinService checkinService; + @Autowired - private CheckinService checkinService; + public CheckinController(CheckinService checkinService) { + this.checkinService = checkinService; + } @GetMapping("/") public String home(ModelMap model, HttpSession httpSession) { @@ -55,7 +61,8 @@ public String fetch(ModelMap model, @PathVariable Long id) { } @PostMapping("/update/{id}") - public String update(@ModelAttribute("checkin") Checkin checkin, @ModelAttribute("activityLog") ActivityLog activityLog) { + public String update(@ModelAttribute("checkin") Checkin checkin, + @ModelAttribute("activityLog") ActivityLog activityLog) { checkin.getActivityLog().add(activityLog); return "redirect:/checkin/"; } diff --git a/src/main/java/com/coderscampus/cp/web/CodingCategoryController.java b/src/main/java/com/coderscampus/cp/web/CodingCategoryController.java index 9d6b0422..6278651c 100644 --- a/src/main/java/com/coderscampus/cp/web/CodingCategoryController.java +++ b/src/main/java/com/coderscampus/cp/web/CodingCategoryController.java @@ -16,8 +16,12 @@ @RequestMapping("coding-category") public class CodingCategoryController { + private final CodingCategoryService codingCategoryService; + @Autowired - private CodingCategoryService codingCategoryService; + public CodingCategoryController(CodingCategoryService codingCategoryService) { + this.codingCategoryService = codingCategoryService; + } @GetMapping("/") public String home(ModelMap model) { diff --git a/src/main/java/com/coderscampus/cp/web/FoobarController.java b/src/main/java/com/coderscampus/cp/web/FoobarController.java index abeccaeb..9cbe0934 100644 --- a/src/main/java/com/coderscampus/cp/web/FoobarController.java +++ b/src/main/java/com/coderscampus/cp/web/FoobarController.java @@ -13,8 +13,12 @@ @RequestMapping("/foobar") public class FoobarController { + private final FoobarService foobarService; + @Autowired - private FoobarService foobarService; + public FoobarController(FoobarService foobarService) { + this.foobarService = foobarService; + } @GetMapping("/") public String home(ModelMap model) { diff --git a/src/main/java/com/coderscampus/cp/web/UserHistoryController.java b/src/main/java/com/coderscampus/cp/web/UserHistoryController.java index a7f58882..16477313 100644 --- a/src/main/java/com/coderscampus/cp/web/UserHistoryController.java +++ b/src/main/java/com/coderscampus/cp/web/UserHistoryController.java @@ -16,8 +16,12 @@ @RequestMapping("/user-history") public class UserHistoryController { + private final UserHistoryService userHistoryService; + @Autowired - private UserHistoryService userHistoryService; + public UserHistoryController(UserHistoryService userHistoryService) { + this.userHistoryService = userHistoryService; + } @GetMapping("/") public String home(ModelMap model) { @@ -43,7 +47,6 @@ public String create(UserHistory userHistory) { return "redirect:/user-history/"; } - @GetMapping("/update/{id}") public String fetch(ModelMap model, @PathVariable Long id) { UserHistory userHistory = userHistoryService.findById(id); diff --git a/xmpl/SeedService.java b/xmpl/SeedService.java index a9f3633c..7ba74d11 100644 --- a/xmpl/SeedService.java +++ b/xmpl/SeedService.java @@ -25,26 +25,32 @@ @Service public class SeedService { Map cars = new LinkedHashMap<>(); - @Autowired - private AirplaneRepository airRepo; - @Autowired - private FrogRepository frogRepo; - @Autowired - private DogRepository dogRepo; - @Autowired - private DataFileService dataFileService; - @Autowired - private TruckRepository truckRepo; - @Autowired - private CarRepository carRepo; - @Autowired - private MovieRepository movieRepo; + private final AirplaneRepository airRepo; + private final FrogRepository frogRepo; + private final DogRepository dogRepo; + private final DataFileService dataFileService; + private final TruckRepository truckRepo; + private final CarRepository carRepo; + private final MovieRepository movieRepo; private Random random = new Random(); private String[] names = null; - private String[] colors = {"Yellow", "Red", "Blue", "Orange", "Purple", "White", "Black", "Grey"}; + private String[] colors = { "Yellow", "Red", "Blue", "Orange", "Purple", "White", "Black", "Grey" }; + + @Autowired + public SeedService(AirplaneRepository airRepo, FrogRepository frogRepo, DogRepository dogRepo, + DataFileService dataFileService, TruckRepository truckRepo, CarRepository carRepo, + MovieRepository movieRepo) { + this.airRepo = airRepo; + this.frogRepo = frogRepo; + this.dogRepo = dogRepo; + this.dataFileService = dataFileService; + this.truckRepo = truckRepo; + this.carRepo = carRepo; + this.movieRepo = movieRepo; + } public void populateData() { @@ -89,7 +95,7 @@ private void seedDataMovies() { int yearOf = Integer.parseInt(line.substring(line.indexOf("|") + 1, line.length())); movie.setYearOf(yearOf); movie.setName(line.substring(0, line.indexOf("|")).trim()); - String[] movieRatings = {"1", "2", "3", "4", "5"}; + String[] movieRatings = { "1", "2", "3", "4", "5" }; movie.setGenre("unknown"); movie.setRating(movieRatings[random.nextInt(movieRatings.length - 1)]); movieRepo.save(movie); @@ -101,7 +107,7 @@ private void seedDataFrogs() { List frogs = frogRepo.findAll(); if (frogs.size() < 10) { String[] frogSpecies = dataFileService.getData("src/main/resources/data/frogs.txt"); - String[] frogAge = {"young", "old"}; + String[] frogAge = { "young", "old" }; for (int i = 0; i < 10; i++) { @@ -121,7 +127,7 @@ private void seedDataDogs() { if (dogs.size() < 10) { String[] dogBreed = dataFileService.getData("src/main/resources/data/dogs.txt"); String[] dogName = names; - String[] dogAge = {"young", "old", "young", "old"}; + String[] dogAge = { "young", "old", "young", "old" }; for (int i = 0; i < 10; i++) { @@ -142,7 +148,7 @@ private void seedDataTrucks() { List trucks = truckRepo.findAll(); if (trucks.size() < 10) { String[] trucksData = dataFileService.getData("src/main/resources/data/trucks.txt"); - Integer[] motorSizes = {10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20}; + Integer[] motorSizes = { 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20 }; for (int i = 0; i < 10; i++) { @@ -162,7 +168,7 @@ private void seedDataTrucks() { } String randomTransmission() { - String[] transmission = {"Automatic", "Manual", "Automatic", "Manual"}; + String[] transmission = { "Automatic", "Manual", "Automatic", "Manual" }; return transmission[random.nextInt(transmission.length - 1)]; } @@ -171,8 +177,8 @@ private void seedDataCars() { List cars = carRepo.findAll(); if (cars.size() < 30) { String[] carsData = dataFileService.getData("src/main/resources/data/cars.txt"); - Integer[] motorSizes = {10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20}; - Integer[] wheelSizes = {14, 15, 16, 17, 18, 19, 20, 21}; + Integer[] motorSizes = { 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20 }; + Integer[] wheelSizes = { 14, 15, 16, 17, 18, 19, 20, 21 }; for (int i = 0; i < 10; i++) { diff --git a/xmpl/XmplDataController.java b/xmpl/XmplDataController.java index 1d274144..30df22b9 100644 --- a/xmpl/XmplDataController.java +++ b/xmpl/XmplDataController.java @@ -12,8 +12,12 @@ @CrossOrigin(origins = "*") public class XmplDataController { + private final XmplDataService xmplDataService; + @Autowired - private XmplDataService xmplDataService; + public XmplDataController(XmplDataService xmplDataService) { + this.xmplDataService = xmplDataService; + } @PostMapping("/xmpl/data") public ResponseEntity getData() {