Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sonar fixes. #404

Open
wants to merge 1 commit into
base: grad-release
Choose a base branch
from
Open

Sonar fixes. #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions api/src/main/java/ca/bc/gov/educ/api/trax/controller/CodeController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
Expand All @@ -29,11 +29,11 @@
scopes = {"READ_GRAD_COUNTRY_CODE_DATA",
"READ_GRAD_PROVINCE_CODE_DATA",
})})
@AllArgsConstructor
public class CodeController {

@Autowired
CodeService codeService;
@Autowired

ResponseHelper response;

@GetMapping(EducGradTraxApiConstants.GRAD_TRAX_CODE_URL_MAPPING_V1 + EducGradTraxApiConstants.GET_ALL_COUNTRY_MAPPING)
Expand Down
6 changes: 3 additions & 3 deletions api/src/main/java/ca/bc/gov/educ/api/trax/controller/DistrictController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import org.springframework.beans.factory.annotation.Autowired;
import lombok.AllArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
Expand All @@ -23,11 +23,11 @@
//@RequestMapping(EducGradTraxApiConstants.GRAD_DISTRICT_URL_MAPPING)
@OpenAPIDefinition(info = @Info(title = "API for School Data.", description = "This Read API is for Reading school data.", version = "1"),
security = {@SecurityRequirement(name = "OAUTH2", scopes = {"READ_GRAD_SCHOOL_DATA"})})
@AllArgsConstructor
public class DistrictController {

@Autowired
DistrictService districtService;
@Autowired

ResponseHelper response;


Expand Down
6 changes: 2 additions & 4 deletions api/src/main/java/ca/bc/gov/educ/api/trax/controller/EdwController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
Expand All @@ -27,18 +27,16 @@
//@RequestMapping(EducGradTraxApiConstants.GRAD_EDW_URL_MAPPING)
@OpenAPIDefinition(info = @Info(title = "API for EDW Snapshot.", description = "This Read API is for Reading EDW Snapshot.", version = "1"),
security = {@SecurityRequirement(name = "OAUTH2", scopes = {"READ_GRAD_TRAX_STUDENT_DATA"})})
@AllArgsConstructor
public class EdwController {

private static final String GRAD_YEAR_PARAM = "GradYear";
private static final String SCHOOL_PARAM = "MinCode";

@Autowired
EdwService edwService;

@Autowired
GradValidation validation;

@Autowired
ResponseHelper response;

@GetMapping(EducGradTraxApiConstants.GRAD_EDW_URL_MAPPING_V1 + EducGradTraxApiConstants.GET_SCHOOLS_BY_GRAD_YEAR_MAPPING)
Expand Down
6 changes: 2 additions & 4 deletions api/src/main/java/ca/bc/gov/educ/api/trax/controller/PsiController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
import io.swagger.v3.oas.annotations.info.Info;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
Expand All @@ -25,15 +25,13 @@
@RestController
//@RequestMapping(EducGradTraxApiConstants.GRAD_PSI_URL_MAPPING)
@OpenAPIDefinition(info = @Info(title = "API for PSI Data.", description = "This API is for PSI.", version = "1"))
@AllArgsConstructor
public class PsiController {

@Autowired
PsiService psiService;

@Autowired
GradValidation validation;

@Autowired
ResponseHelper response;

@GetMapping(EducGradTraxApiConstants.GRAD_PSI_URL_MAPPING_V1)
Expand Down
6 changes: 2 additions & 4 deletions api/src/main/java/ca/bc/gov/educ/api/trax/controller/TraxCommonController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import io.swagger.v3.oas.annotations.info.Info;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
Expand All @@ -25,15 +25,13 @@
@RestController
//@RequestMapping(EducGradTraxApiConstants.GRAD_TRAX_COMMON_URL_MAPPING)
@OpenAPIDefinition(info = @Info(title = "API for TRAX Data.", description = "This API is for TRAX.", version = "1"))
@AllArgsConstructor
public class TraxCommonController {

@Autowired
TraxCommonService traxCommonService;

@Autowired
GradValidation validation;

@Autowired
ResponseHelper response;

@GetMapping(EducGradTraxApiConstants.GRAD_TRAX_COMMON_URL_MAPPING_V1 + EducGradTraxApiConstants.GET_TRAX_STUDENT_DEMOG_MAPPING)
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/ca/bc/gov/educ/api/trax/model/transformer/institute/DistrictTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@ public List<DistrictEntity> transformToEntity (List<District> districts ) {
return districts
.stream()
.map(district -> modelMapper.map(district, DistrictEntity.class))
.collect(Collectors.toList());
.toList();
}
}
15 changes: 3 additions & 12 deletions api/src/main/java/ca/bc/gov/educ/api/trax/service/CodeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
import ca.bc.gov.educ.api.trax.util.EducGradTraxApiConstants;
import ca.bc.gov.educ.api.trax.util.GradValidation;
import jakarta.transaction.Transactional;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.reactive.function.client.WebClient;
import java.util.List;
Expand All @@ -24,36 +24,27 @@

@Slf4j
@Service
@AllArgsConstructor
public class CodeService {

@Autowired
private GradCountryTransformer gradCountryTransformer;

@Autowired
private GradProvinceTransformer gradProvinceTransformer;

@Autowired
private GradCountryRepository gradCountryRepository;

@Autowired
private GradProvinceRepository gradProvinceRepository;

@Autowired
GradValidation validation;

@Autowired
private EducGradTraxApiConstants constants;

@Autowired
private WebClient webClient;

@Autowired
private RestUtils restUtils;

@SuppressWarnings("unused")
private static Logger logger = LoggerFactory.getLogger(CodeService.class);
private static final String EXCEPTION_MSG = "Exception: %s";
private static final String CREATED_BY="createdBy";
private static final String CREATED_TIMESTAMP="createdTimestamp";

@Transactional
public List<GradCountry> getAllCountryCodeList() {
Expand Down
8 changes: 4 additions & 4 deletions api/src/main/java/ca/bc/gov/educ/api/trax/service/DistrictService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@
import ca.bc.gov.educ.api.trax.model.entity.DistrictEntity;
import ca.bc.gov.educ.api.trax.model.transformer.DistrictTransformer;
import ca.bc.gov.educ.api.trax.repository.DistrictRepository;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;
import java.util.Optional;

@Service
@AllArgsConstructor
public class DistrictService {

@Autowired DistrictRepository districtRepository;
@Autowired DistrictTransformer districtTransformer;
DistrictRepository districtRepository;
DistrictTransformer districtTransformer;

@Autowired
private SchoolService schoolService;

@SuppressWarnings("unused")
Expand Down
8 changes: 3 additions & 5 deletions api/src/main/java/ca/bc/gov/educ/api/trax/service/PsiService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import ca.bc.gov.educ.api.trax.repository.PsiSearchCriteria;
import ca.bc.gov.educ.api.trax.repository.PsiSearchSpecification;
import ca.bc.gov.educ.api.trax.repository.StudentPsiRepository;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -24,19 +25,16 @@
import java.util.Optional;

@Service
@AllArgsConstructor
public class PsiService {

@Autowired
private PsiRepository psiRepository;

@Autowired
private PsiTransformer psiTransformer;

@Autowired
private StudentPsiRepository studentPsiRepository;

@Autowired
CodeService codeService;
private CodeService codeService;

@SuppressWarnings("unused")
private static Logger logger = LoggerFactory.getLogger(PsiService.class);
Expand Down
6 changes: 3 additions & 3 deletions api/src/main/java/ca/bc/gov/educ/api/trax/service/RESTService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public <T> T get(String url, Class<T> clazz, WebClient webClient) {
obj = webClient
.get()
.uri(url)
.headers(h -> { h.set(EducGradTraxApiConstants.CORRELATION_ID, ThreadLocalStateUtil.getCorrelationID()); })
.headers(h -> h.set(EducGradTraxApiConstants.CORRELATION_ID, ThreadLocalStateUtil.getCorrelationID()))
.retrieve()
// if 5xx errors, throw Service error
.onStatus(HttpStatusCode::is5xxServerError,
Expand All @@ -96,7 +96,7 @@ public <T> T get(String url, Class<T> clazz, WebClient webClient) {
// catches IOExceptions and the like
throw new ServiceException(
getErrorMessage(url, e.getLocalizedMessage()),
(e instanceof WebClientResponseException) ? ((WebClientResponseException) e).getStatusCode().value() : HttpStatus.SERVICE_UNAVAILABLE.value(),
(e instanceof WebClientResponseException webClientResponseException) ? webClientResponseException.getStatusCode().value() : HttpStatus.SERVICE_UNAVAILABLE.value(),
e);
}
return obj;
Expand Down Expand Up @@ -141,7 +141,7 @@ public <T> T post(String url, Object body, Class<T> clazz, WebClient webClient)
try {
obj = webClient.post()
.uri(url)
.headers(h -> { h.set(EducGradTraxApiConstants.CORRELATION_ID, ThreadLocalStateUtil.getCorrelationID()); })
.headers(h -> h.set(EducGradTraxApiConstants.CORRELATION_ID, ThreadLocalStateUtil.getCorrelationID()))
.body(BodyInserters.fromValue(body))
.retrieve()
.onStatus(HttpStatusCode::is5xxServerError,
Expand Down
28 changes: 8 additions & 20 deletions api/src/main/java/ca/bc/gov/educ/api/trax/service/institute/ServiceHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

import ca.bc.gov.educ.api.trax.constant.CacheKey;
import ca.bc.gov.educ.api.trax.constant.CacheStatus;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import redis.clients.jedis.JedisCluster;

@Slf4j
@Component
@AllArgsConstructor
public class ServiceHelper<T> {

@Autowired
JedisCluster jedisCluster;

public void initializeCache(boolean force, CacheKey cacheKey, T service) {
Expand Down Expand Up @@ -42,39 +42,27 @@ private void loadCache(CacheKey cacheKey, T service) {
private void loadDataIntoRedisCache(CacheKey cacheKey, T service) {
try {
switch (cacheKey) {
case SCHOOL_CATEGORY_CODE_CACHE -> {
case SCHOOL_CATEGORY_CODE_CACHE ->
((CodeService)service).loadSchoolCategoryCodesIntoRedisCache(
((CodeService)service).getSchoolCategoryCodesFromInstituteApi()
);
break;
}
case SCHOOL_FUNDING_GROUP_CODE_CACHE -> {
case SCHOOL_FUNDING_GROUP_CODE_CACHE ->
((CodeService)service).loadSchoolFundingGroupCodesIntoRedisCache(
((CodeService)service).getSchoolFundingGroupCodesFromInstituteApi()
);
break;
}
case DISTRICT_CACHE -> {
case DISTRICT_CACHE ->
((DistrictService)service).loadDistrictsIntoRedisCache(
((DistrictService)service).getDistrictsFromInstituteApi()
);
break;
}
case SCHOOL_CACHE -> {
case SCHOOL_CACHE ->
((SchoolService)service).loadSchoolsIntoRedisCache(
((SchoolService)service).getSchoolsFromInstituteApi()
);
break;
}
case SCHOOL_DETAIL_CACHE -> {
case SCHOOL_DETAIL_CACHE ->
((SchoolService)service).loadSchoolDetailsIntoRedisCache(
((SchoolService)service).getSchoolDetailsFromInstituteApi()
);
break;
}
default -> {
log.info(String.format("Invalid Cache Key %s", cacheKey));
}
default -> log.info(String.format("Invalid Cache Key %s", cacheKey));
}
} catch (Exception e) {
log.info(String.format("Exception thrown while loading cache %s. \n%s", cacheKey, e));
Expand Down
4 changes: 1 addition & 3 deletions api/src/main/java/ca/bc/gov/educ/api/trax/util/CommonSchoolCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,7 @@ private List<CommonSchool> getCommonSchools() {
List<CommonSchool> commonSchools = new ArrayList<>();
try {
commonSchools = webClient.get().uri(constants.getAllSchoolSchoolApiUrl())
.headers(h -> {
h.set(EducGradTraxApiConstants.CORRELATION_ID, ThreadLocalStateUtil.getCorrelationID());
})
.headers(h -> h.set(EducGradTraxApiConstants.CORRELATION_ID, ThreadLocalStateUtil.getCorrelationID()))
.retrieve().bodyToMono(new ParameterizedTypeReference<List<CommonSchool>>() {
}).block();
} catch (Exception e) {
Expand Down
6 changes: 5 additions & 1 deletion api/src/test/java/ca/bc/gov/educ/api/trax/EducGradTraxApiApplicationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
class EducGradTraxApiApplicationTests {

//@Test
void contextLoads() {}
void contextLoads() {
/**
* Placeholder method
*/
}

}
1 change: 1 addition & 0 deletions api/src/test/java/ca/bc/gov/educ/api/trax/controller/SchoolControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ public void testGetCommonsSchoolByMincode_expect200Ok(){
Mockito.verify(schoolService).getCommonSchool("1234567");
}

@SuppressWarnings("unused")
private void mockCommonSchool(String minCode, String schoolName) {
CommonSchool commonSchool = new CommonSchool();
commonSchool.setSchlNo(minCode);
Expand Down
Loading
Loading