Skip to content

Commit a74db47

Browse files
sumathi-thirumanisumathi-thirumani
committed
Sonar fixes.
1 parent 461e65f commit a74db47

21 files changed

+55
-180
lines changed

‎api/src/main/java/ca/bc/gov/educ/api/course/controller/CourseAlgorithmController.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
import io.swagger.v3.oas.annotations.responses.ApiResponse;
1414
import io.swagger.v3.oas.annotations.responses.ApiResponses;
1515
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
16+
import lombok.AllArgsConstructor;
1617
import org.slf4j.Logger;
1718
import org.slf4j.LoggerFactory;
18-
import org.springframework.beans.factory.annotation.Autowired;
1919
import org.springframework.http.ResponseEntity;
2020
import org.springframework.security.access.prepost.PreAuthorize;
2121
import org.springframework.web.bind.ServletRequestDataBinder;
@@ -30,6 +30,7 @@
3030
@OpenAPIDefinition(info = @Info(title = "API for Course Algorithm Data.",
3131
description = "This API is for Course Algorithm data.", version = "1"),
3232
security = {@SecurityRequirement(name = "OAUTH2", scopes = {"READ_GRAD_COURSE_DATA","READ_GRAD_COURSE_REQUIREMENT_DATA"})})
33+
@AllArgsConstructor
3334
public class CourseAlgorithmController {
3435

3536
private static Logger logger = LoggerFactory.getLogger(CourseAlgorithmController.class);
@@ -39,13 +40,10 @@ protected void initBinder(HttpServletRequest request, ServletRequestDataBinder b
3940
binder.registerCustomEditor(Date.class, null, new GradDateEditor());
4041
}
4142

42-
@Autowired
4343
CourseAlgorithmService courseAlgorithmService;
4444

45-
@Autowired
4645
GradValidation validation;
4746

48-
@Autowired
4947
ResponseHelper response;
5048

5149
@GetMapping(EducCourseApiConstants.GET_COURSE_ALGORITHM_DATA_BY_PEN_MAPPING)

‎api/src/main/java/ca/bc/gov/educ/api/course/controller/CourseController.java

+2-6
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
import jakarta.servlet.http.HttpServletRequest;
77

8+
import lombok.AllArgsConstructor;
89
import org.apache.commons.lang3.StringUtils;
910
import org.slf4j.Logger;
1011
import org.slf4j.LoggerFactory;
11-
import org.springframework.beans.factory.annotation.Autowired;
1212
import org.springframework.http.HttpStatus;
1313
import org.springframework.http.ResponseEntity;
1414
import org.springframework.security.access.prepost.PreAuthorize;
@@ -43,6 +43,7 @@
4343
@OpenAPIDefinition(info = @Info(title = "API for Course Management.",
4444
description = "This API is for Managing Course data.", version = "1"),
4545
security = {@SecurityRequirement(name = "OAUTH2", scopes = {"READ_GRAD_COURSE_DATA","READ_GRAD_COURSE_REQUIREMENT_DATA"})})
46+
@AllArgsConstructor
4647
public class CourseController {
4748

4849
private static final Logger logger = LoggerFactory.getLogger(CourseController.class);
@@ -52,19 +53,14 @@ protected void initBinder(HttpServletRequest request, ServletRequestDataBinder b
5253
binder.registerCustomEditor(Date.class, null, new GradDateEditor());
5354
}
5455

55-
@Autowired
5656
CourseService courseService;
5757

58-
@Autowired
5958
CourseRequirementService courseRequirementService;
6059

61-
@Autowired
6260
CourseRestrictionService courseRestrictionService;
6361

64-
@Autowired
6562
GradValidation validation;
6663

67-
@Autowired
6864
ResponseHelper response;
6965

7066
@GetMapping

‎api/src/main/java/ca/bc/gov/educ/api/course/controller/StudentExamController.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import java.util.List;
44

5+
import lombok.AllArgsConstructor;
56
import org.slf4j.Logger;
67
import org.slf4j.LoggerFactory;
7-
import org.springframework.beans.factory.annotation.Autowired;
88
import org.springframework.http.HttpStatus;
99
import org.springframework.http.ResponseEntity;
1010
import org.springframework.security.access.prepost.PreAuthorize;
@@ -34,20 +34,17 @@
3434
@RequestMapping(EducCourseApiConstants.STUDENT_EXAM_URL_MAPPING)
3535
@OpenAPIDefinition(info = @Info(title = "API for Student Exam Data.", description = "This API is for Reading Student Exam data.", version = "1"),
3636
security = {@SecurityRequirement(name = "OAUTH2", scopes = {"READ_GRAD_STUDENT_COURSE_DATA"})})
37+
@AllArgsConstructor
3738
public class StudentExamController {
3839

3940
private static final Logger logger = LoggerFactory.getLogger(StudentExamController.class);
4041

41-
@Autowired
4242
TraxStudentCourseService traxStudentCourseService;
4343

44-
@Autowired
4544
TraxStudentExamService traxStudentExamService;
4645

47-
@Autowired
4846
GradValidation validation;
4947

50-
@Autowired
5148
ResponseHelper response;
5249

5350
@GetMapping(EducCourseApiConstants.GET_STUDENT_EXAM_BY_PEN_MAPPING)

‎api/src/main/java/ca/bc/gov/educ/api/course/controller/v2/StudentCourseController.java

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
security = {@SecurityRequirement(name = "OAUTH2", scopes = {"READ_GRAD_STUDENT_COURSE_DATA"})})
3030
public class StudentCourseController {
3131

32+
@SuppressWarnings("unused")
3233
private static final String BEARER = "Bearer ";
3334

3435
StudentCourseService studentCourseService;

‎api/src/main/java/ca/bc/gov/educ/api/course/repository/CourseRequirementRepository.java

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package ca.bc.gov.educ.api.course.repository;
22

33
import java.util.List;
4-
import java.util.Optional;
54
import java.util.UUID;
65

76
import ca.bc.gov.educ.api.course.model.entity.CourseRequirementCodeEntity;

‎api/src/main/java/ca/bc/gov/educ/api/course/service/CourseAlgorithmService.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import org.springframework.stereotype.Service;
66

77
import java.util.List;
8-
import java.util.stream.Collectors;
98

109
@Service
1110
public class CourseAlgorithmService {
@@ -32,7 +31,7 @@ public CourseAlgorithmData getCourseAlgorithmData(String pen, boolean sortForUI)
3231
List<String> courseCodes = traxStudentCours.stream()
3332
.map(TraxStudentCourse::getCourseCode)
3433
.distinct()
35-
.collect(Collectors.toList());
34+
.toList();
3635
CourseList courseList = new CourseList();
3736
courseList.setCourseCodes(courseCodes);
3837

‎api/src/main/java/ca/bc/gov/educ/api/course/service/CourseRequirementService.java

+7-14
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
import ca.bc.gov.educ.api.course.util.criteria.CriteriaSpecification;
1010
import com.fasterxml.jackson.core.type.TypeReference;
1111
import io.github.resilience4j.retry.annotation.Retry;
12+
import lombok.AllArgsConstructor;
1213
import org.apache.commons.lang3.StringUtils;
1314
import org.slf4j.Logger;
1415
import org.slf4j.LoggerFactory;
1516
import org.springframework.beans.BeanUtils;
16-
import org.springframework.beans.factory.annotation.Autowired;
1717
import org.springframework.data.domain.Page;
1818
import org.springframework.data.domain.PageRequest;
1919
import org.springframework.data.domain.Pageable;
@@ -28,31 +28,24 @@
2828
import ca.bc.gov.educ.api.course.util.EducCourseApiConstants;
2929

3030
@Service
31+
@AllArgsConstructor
3132
public class CourseRequirementService {
3233

33-
@Autowired
3434
private CourseRequirementRepository courseRequirementRepository;
3535

36-
@Autowired
3736
private CourseRequirementTransformer courseRequirementTransformer;
3837

39-
@Autowired
4038
private CourseRequirementCodeRepository courseRequirementCodeRepository;
4139

42-
@Autowired
43-
CourseRequirements courseRequirements;
40+
private CourseRequirements courseRequirements;
4441

45-
@Autowired
46-
CourseService courseService;
42+
private CourseService courseService;
4743

48-
@Autowired
49-
EducCourseApiConstants constants;
44+
private EducCourseApiConstants constants;
5045

51-
@Autowired
52-
RESTService restService;
46+
private RESTService restService;
5347

54-
@Autowired
55-
JsonTransformer jsonTransformer;
48+
private JsonTransformer jsonTransformer;
5649

5750
private static Logger logger = LoggerFactory.getLogger(CourseRequirementService.class);
5851

‎api/src/main/java/ca/bc/gov/educ/api/course/service/CourseRestrictionService.java

+4-6
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
import ca.bc.gov.educ.api.course.model.entity.CourseRestrictionsEntity;
77
import io.github.resilience4j.retry.annotation.Retry;
8+
import lombok.AllArgsConstructor;
89
import org.apache.commons.lang3.StringUtils;
910
import org.slf4j.Logger;
1011
import org.slf4j.LoggerFactory;
1112
import org.springframework.beans.BeanUtils;
12-
import org.springframework.beans.factory.annotation.Autowired;
1313
import org.springframework.stereotype.Service;
1414

1515
import ca.bc.gov.educ.api.course.model.dto.CourseList;
@@ -19,16 +19,14 @@
1919
import ca.bc.gov.educ.api.course.repository.CourseRestrictionRepository;
2020

2121
@Service
22+
@AllArgsConstructor
2223
public class CourseRestrictionService {
2324

24-
@Autowired
2525
private CourseRestrictionRepository courseRestrictionRepository;
2626

27-
@Autowired
2827
private CourseRestrictionsTransformer courseRestrictionTransformer;
29-
30-
@Autowired
31-
CourseRestrictions courseRestrictions;
28+
29+
private CourseRestrictions courseRestrictions;
3230

3331
@SuppressWarnings("unused")
3432
private static Logger logger = LoggerFactory.getLogger(CourseRestrictionService.class);

‎api/src/main/java/ca/bc/gov/educ/api/course/service/CourseService.java

+4-11
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,27 @@
99
import ca.bc.gov.educ.api.course.util.criteria.GradCriteria.OperationEnum;
1010
import ca.bc.gov.educ.api.course.util.criteria.CriteriaSpecification;
1111
import io.github.resilience4j.retry.annotation.Retry;
12+
import lombok.AllArgsConstructor;
1213
import org.apache.commons.lang3.StringUtils;
1314
import org.slf4j.Logger;
1415
import org.slf4j.LoggerFactory;
15-
import org.springframework.beans.factory.annotation.Autowired;
1616
import org.springframework.data.jpa.domain.Specification;
1717
import org.springframework.stereotype.Service;
1818

1919
import java.util.Date;
2020
import java.util.List;
2121

2222
@Service
23+
@AllArgsConstructor
2324
public class CourseService {
2425

2526
private static final String START_DATE = "startDate";
2627
private static final String END_DATE = "endDate";
2728
private static final String LANGUAGE= "language";
2829
private static final String COURSE_NAME= "courseName";
2930

30-
@Autowired
3131
private CourseRepository courseRepo;
3232

33-
@Autowired
3433
private CourseTransformer courseTransformer;
3534

3635
@SuppressWarnings("unused")
@@ -56,18 +55,12 @@ public Course getCourseDetails(String crseCode, String crseLvl) {
5655

5756
@Retry(name = "generalgetcall")
5857
public boolean hasFrenchLanguageCourse(String courseCode, String courseLevel) {
59-
if (this.courseRepo.countTabCourses(courseCode, courseLevel, "F") > 0L) {
60-
return true;
61-
}
62-
return false;
58+
return this.courseRepo.countTabCourses(courseCode, courseLevel, "F") > 0L;
6359
}
6460

6561
@Retry(name = "generalgetcall")
6662
public boolean hasBlankLanguageCourse(String courseCode, String courseLevel) {
67-
if (this.courseRepo.countTabCourses(courseCode, courseLevel, " ") > 0L) {
68-
return true;
69-
}
70-
return false;
63+
return this.courseRepo.countTabCourses(courseCode, courseLevel, " ") > 0L;
7164
}
7265

7366
@Retry(name = "generalgetcall")

‎api/src/test/java/ca/bc/gov/educ/api/course/EducGradCourseApiApplicationTests.java

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ class EducGradCourseApiApplicationTests {
77

88
//@Test
99
void contextLoads() {
10+
//Placeholder method
1011
}
1112

1213
}

‎api/src/test/java/ca/bc/gov/educ/api/course/controller/CourseControllerTest.java

+1-51
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.util.Arrays;
2121
import java.util.UUID;
2222

23-
import static org.mockito.ArgumentMatchers.eq;
2423
import static org.assertj.core.api.Assertions.assertThat;
2524

2625
@RunWith(MockitoJUnitRunner.class)
@@ -65,7 +64,7 @@ public void testGetCourseDetails() {
6564
course.setCourseLevel("12");
6665
course.setCourseName("Test1 Name");
6766

68-
Mockito.when(courseService.getCourseDetails(eq("MAIN"), eq("12"))).thenReturn(course);
67+
Mockito.when(courseService.getCourseDetails("MAIN", "12")).thenReturn(course);
6968
courseController.getCourseDetails("MAIN", "12");
7069
Mockito.verify(courseService).getCourseDetails("MAIN", "12");
7170
}
@@ -98,31 +97,6 @@ public void testGetCourseDetailsByCourse() {
9897
Mockito.verify(courseService).getCourseDetails("Test", " ");
9998
}
10099

101-
/*@Test
102-
public void testGetAllCoursesRequirement() {
103-
// All Course Requirements
104-
AllCourseRequirements allCourseRequirements = new AllCourseRequirements();
105-
allCourseRequirements.setCourseRequirementId(UUID.randomUUID());
106-
allCourseRequirements.setCourseCode("MAIN");
107-
allCourseRequirements.setCourseLevel("12");
108-
allCourseRequirements.setRequirementName("REQ");
109-
allCourseRequirements.setRequirementProgram("2018-EN");
110-
allCourseRequirements.setRuleCode("RuleCd");
111-
112-
Authentication authentication = Mockito.mock(Authentication.class);
113-
OAuth2AuthenticationDetails details = Mockito.mock(OAuth2AuthenticationDetails.class);
114-
// Mockito.whens() for your authorization object
115-
SecurityContext securityContext = Mockito.mock(SecurityContext.class);
116-
Mockito.when(securityContext.getAuthentication()).thenReturn(authentication);
117-
Mockito.when(authentication.getDetails()).thenReturn(details);
118-
SecurityContextHolder.setContext(securityContext);
119-
120-
Mockito.when(courseRequirementService.getAllCourseRequirementList(1,5, null)).thenReturn(Arrays.asList(allCourseRequirements));
121-
courseController.getAllCoursesRequirement(1,5);
122-
Mockito.verify(courseRequirementService).getAllCourseRequirementList(1,5,null);
123-
}*/
124-
125-
126100
@Test
127101
public void testGetAllCoursesRequirementByRule() {
128102
// Course Requirement Code
@@ -192,30 +166,6 @@ public void testGetCourseRequirementsByCourseAndLevel() {
192166
Mockito.verify(courseRequirementService).getCourseRequirements("MAIN", "12");
193167
}
194168

195-
/*@Test
196-
public void testGetCoursesRequirementSearch() {
197-
// All Course Requirements
198-
AllCourseRequirements allCourseRequirements = new AllCourseRequirements();
199-
allCourseRequirements.setCourseRequirementId(UUID.randomUUID());
200-
allCourseRequirements.setCourseCode("MAIN");
201-
allCourseRequirements.setCourseLevel("12");
202-
allCourseRequirements.setRequirementName("REQ");
203-
allCourseRequirements.setRequirementProgram("2018-EN");
204-
allCourseRequirements.setRuleCode("RuleCd");
205-
206-
Authentication authentication = Mockito.mock(Authentication.class);
207-
OAuth2AuthenticationDetails details = Mockito.mock(OAuth2AuthenticationDetails.class);
208-
// Mockito.whens() for your authorization object
209-
SecurityContext securityContext = Mockito.mock(SecurityContext.class);
210-
Mockito.when(securityContext.getAuthentication()).thenReturn(authentication);
211-
Mockito.when(authentication.getDetails()).thenReturn(details);
212-
SecurityContextHolder.setContext(securityContext);
213-
214-
Mockito.when(courseRequirementService.getCourseRequirementSearchList("MAIN", "12", "RuleCd", null)).thenReturn(Arrays.asList(allCourseRequirements));
215-
courseController.getCoursesRequirementSearch("MAIN", "12", "RuleCd");
216-
Mockito.verify(courseRequirementService).getCourseRequirementSearchList("MAIN", "12", "RuleCd", null);
217-
}*/
218-
219169
@Test
220170
public void testGetCoursesRequirementByCourse() {
221171
// Course Requirement Code

‎api/src/test/java/ca/bc/gov/educ/api/course/controller/TraxStudentCourseControllerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void testGetStudentCoursesByPEN() {
4444
traxStudentCourse.setLanguage("en");
4545

4646
Mockito.when(traxStudentCourseService.getStudentCourseList(traxStudentCourse.getPen(), true)).thenReturn(Arrays.asList(traxStudentCourse));
47-
var result = studentCourseController.getStudentCourseByPEN(traxStudentCourse.getPen(), true);
47+
studentCourseController.getStudentCourseByPEN(traxStudentCourse.getPen(), true);
4848
Mockito.verify(traxStudentCourseService).getStudentCourseList(traxStudentCourse.getPen(), true);
4949
}
5050

‎api/src/test/java/ca/bc/gov/educ/api/course/service/CourseAlgorithmServiceTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ public void testGetCourseAlgorithmData_whenGivenPenNumber_thenReturnSuccess() {
104104
var result = courseAlgorithmService.getCourseAlgorithmData(traxStudentCourse.getPen(), false);
105105

106106
assertThat(result).isNotNull();
107-
assertThat(result.getStudentCourses().isEmpty()).isFalse();
108-
assertThat(result.getCourseRequirements().isEmpty()).isFalse();
109-
assertThat(result.getCourseRestrictions().isEmpty()).isFalse();
107+
assertThat(result.getStudentCourses()).isNotEmpty();
108+
assertThat(result.getCourseRequirements()).isNotEmpty();
109+
assertThat(result.getCourseRestrictions()).isNotEmpty();
110110
}
111111
}

0 commit comments

Comments
 (0)