diff options
Diffstat (limited to 'src/main/java/com/stileeducation/markr/service')
3 files changed, 19 insertions, 12 deletions
diff --git a/src/main/java/com/stileeducation/markr/service/StudentService.java b/src/main/java/com/stileeducation/markr/service/StudentService.java index 3ce28c0..95ce182 100644 --- a/src/main/java/com/stileeducation/markr/service/StudentService.java +++ b/src/main/java/com/stileeducation/markr/service/StudentService.java @@ -2,7 +2,6 @@ package com.stileeducation.markr.service; import com.stileeducation.markr.entity.Student; import com.stileeducation.markr.repository.StudentRepository; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Optional; @@ -10,8 +9,11 @@ import java.util.Optional; @Service public class StudentService { - @Autowired - private StudentRepository studentRepository; + private final StudentRepository studentRepository; + + public StudentService(StudentRepository studentRepository) { + this.studentRepository = studentRepository; + } public Student findOrCreateStudent(String firstName, String lastName, String studentNumber) { Optional<Student> optionalStudent = studentRepository.findByStudentNumber(studentNumber); diff --git a/src/main/java/com/stileeducation/markr/service/TestResultsService.java b/src/main/java/com/stileeducation/markr/service/TestResultsService.java index 51efe95..0c0fa66 100644 --- a/src/main/java/com/stileeducation/markr/service/TestResultsService.java +++ b/src/main/java/com/stileeducation/markr/service/TestResultsService.java @@ -10,7 +10,6 @@ import com.stileeducation.markr.entity.TestResult; import com.stileeducation.markr.repository.TestResultRepository; import org.apache.commons.math3.stat.descriptive.moment.StandardDeviation; import org.apache.commons.math3.stat.descriptive.rank.Percentile; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -21,14 +20,17 @@ public class TestResultsService { public static final boolean IS_BIAS_CORRECTED = false; - @Autowired - private TestResultRepository testResultRepository; + private final TestResultRepository testResultRepository; - @Autowired - private StudentService studentService; + private final StudentService studentService; - @Autowired - private TestService testService; + private final TestService testService; + + public TestResultsService(TestResultRepository testResultRepository, StudentService studentService, TestService testService) { + this.testResultRepository = testResultRepository; + this.studentService = studentService; + this.testService = testService; + } public TestResult findOrCreateTestResult(Student student, Test test, Integer marksAwarded) { Optional<TestResult> optionalTestResult = testResultRepository.findByStudentAndTest(student, test); diff --git a/src/main/java/com/stileeducation/markr/service/TestService.java b/src/main/java/com/stileeducation/markr/service/TestService.java index f3231b9..0478c3a 100644 --- a/src/main/java/com/stileeducation/markr/service/TestService.java +++ b/src/main/java/com/stileeducation/markr/service/TestService.java @@ -2,7 +2,6 @@ package com.stileeducation.markr.service; import com.stileeducation.markr.entity.Test; import com.stileeducation.markr.repository.TestRepository; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Optional; @@ -10,9 +9,13 @@ import java.util.Optional; @Service public class TestService { - @Autowired + final TestRepository testRepository; + public TestService(TestRepository testRepository) { + this.testRepository = testRepository; + } + public Test findOrCreateTest(String testId, Integer marksAvailable) { Optional<Test> optionalTest = testRepository.findByTestId(testId); if (optionalTest.isPresent()) { |