From b2b2068766012c4ee3e57122a65b99b0389733e3 Mon Sep 17 00:00:00 2001 From: Philipp Schweizer Date: Mon, 10 May 2021 11:03:10 +0200 Subject: [PATCH] fix: formatted --- .../consultingtype/ConsultingTypeManager.java | 14 +++++++------- .../api/service/ConsultingTypeService.java | 16 +++++++--------- .../ConsultingTypeManagerIT.java | 19 ++++++++++++------- ...tendedConsultingTypeResponseDTOHelper.java | 14 ++++++++------ 4 files changed, 34 insertions(+), 29 deletions(-) diff --git a/src/main/java/de/caritas/cob/agencyservice/api/manager/consultingtype/ConsultingTypeManager.java b/src/main/java/de/caritas/cob/agencyservice/api/manager/consultingtype/ConsultingTypeManager.java index aac079da..2b4780fe 100644 --- a/src/main/java/de/caritas/cob/agencyservice/api/manager/consultingtype/ConsultingTypeManager.java +++ b/src/main/java/de/caritas/cob/agencyservice/api/manager/consultingtype/ConsultingTypeManager.java @@ -1,8 +1,8 @@ package de.caritas.cob.agencyservice.api.manager.consultingtype; +import de.caritas.cob.agencyservice.api.exception.MissingConsultingTypeException; import de.caritas.cob.agencyservice.api.service.ConsultingTypeService; import de.caritas.cob.agencyservice.consultingtypeservice.generated.web.model.ExtendedConsultingTypeResponseDTO; -import de.caritas.cob.agencyservice.api.exception.MissingConsultingTypeException; import lombok.Getter; import lombok.NonNull; import lombok.RequiredArgsConstructor; @@ -24,11 +24,11 @@ public class ConsultingTypeManager { * @throws MissingConsultingTypeException when no settings for provided consulting type where * found */ - public ExtendedConsultingTypeResponseDTO getConsultingTypeSettings(int consultingTypeId) throws MissingConsultingTypeException{ + public ExtendedConsultingTypeResponseDTO getConsultingTypeSettings(int consultingTypeId) + throws MissingConsultingTypeException { try { return consultingTypeService.getExtendedConsultingTypeResponseDTO(consultingTypeId); - } - catch(RestClientException ex) { + } catch (RestClientException ex) { throw new MissingConsultingTypeException( String.format("No settings for consulting type %s found.", consultingTypeId)); } @@ -42,9 +42,9 @@ public ExtendedConsultingTypeResponseDTO getConsultingTypeSettings(String consul public boolean isConsultantBoundedToAgency(int consultingTypeId) throws MissingConsultingTypeException { try { - return consultingTypeService.getExtendedConsultingTypeResponseDTO(consultingTypeId).getConsultantBoundedToConsultingType(); - } - catch(RestClientException ex) { + return consultingTypeService.getExtendedConsultingTypeResponseDTO(consultingTypeId) + .getConsultantBoundedToConsultingType(); + } catch (RestClientException ex) { throw new MissingConsultingTypeException( String.format("No settings for consulting type %s found.", consultingTypeId)); } diff --git a/src/main/java/de/caritas/cob/agencyservice/api/service/ConsultingTypeService.java b/src/main/java/de/caritas/cob/agencyservice/api/service/ConsultingTypeService.java index bf4447ee..23fa6d14 100644 --- a/src/main/java/de/caritas/cob/agencyservice/api/service/ConsultingTypeService.java +++ b/src/main/java/de/caritas/cob/agencyservice/api/service/ConsultingTypeService.java @@ -1,17 +1,15 @@ package de.caritas.cob.agencyservice.api.service; -import de.caritas.cob.agencyservice.api.exception.MissingConsultingTypeException; +import de.caritas.cob.agencyservice.api.service.securityheader.SecurityHeaderSupplier; import de.caritas.cob.agencyservice.config.ConsultingTypeCachingConfig; import de.caritas.cob.agencyservice.consultingtypeservice.generated.ApiClient; -import de.caritas.cob.agencyservice.consultingtypeservice.generated.web.model.ExtendedConsultingTypeResponseDTO; -import de.caritas.cob.agencyservice.api.service.securityheader.SecurityHeaderSupplier; import de.caritas.cob.agencyservice.consultingtypeservice.generated.web.ConsultingTypeControllerApi; +import de.caritas.cob.agencyservice.consultingtypeservice.generated.web.model.ExtendedConsultingTypeResponseDTO; import lombok.NonNull; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.Cacheable; import org.springframework.http.HttpHeaders; import org.springframework.stereotype.Component; -import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestClientException; /** @@ -25,24 +23,24 @@ public class ConsultingTypeService { private final @NonNull SecurityHeaderSupplier securityHeaderSupplier; /** - * Returns the {@link ExtendedConsultingTypeResponseDTO} for the provided consulting type ID. the ExtendedConsultingTypeResponseDTO will be cached for further - * requests. + * Returns the {@link ExtendedConsultingTypeResponseDTO} for the provided consulting type ID. the + * ExtendedConsultingTypeResponseDTO will be cached for further requests. * * @param consultingTypeId the consulting type ID for the extended consulting type response DTO * @return ExtendedConsultingTypeResponseDTO {@link ExtendedConsultingTypeResponseDTO} * @throws RestClientException if http response code is not 2xx */ @Cacheable(value = ConsultingTypeCachingConfig.CONSULTING_TYPE_CACHE, key = "#consultingTypeId") - public ExtendedConsultingTypeResponseDTO getExtendedConsultingTypeResponseDTO(int consultingTypeId) throws RestClientException { + public ExtendedConsultingTypeResponseDTO getExtendedConsultingTypeResponseDTO( + int consultingTypeId) throws RestClientException { addDefaultHeaders(this.consultingTypeControllerApi.getApiClient()); try { return this.consultingTypeControllerApi.getExtendedConsultingTypeById(consultingTypeId); - } catch(RestClientException ex) { + } catch (RestClientException ex) { throw ex; } } - private void addDefaultHeaders(ApiClient apiClient) { HttpHeaders headers = this.securityHeaderSupplier.getCsrfHttpHeaders(); headers.forEach((key, value) -> apiClient.addDefaultHeader(key, value.iterator().next())); diff --git a/src/test/java/de/caritas/cob/agencyservice/api/manager/consultingtype/ConsultingTypeManagerIT.java b/src/test/java/de/caritas/cob/agencyservice/api/manager/consultingtype/ConsultingTypeManagerIT.java index e8e7d93e..bc1a7a72 100644 --- a/src/test/java/de/caritas/cob/agencyservice/api/manager/consultingtype/ConsultingTypeManagerIT.java +++ b/src/test/java/de/caritas/cob/agencyservice/api/manager/consultingtype/ConsultingTypeManagerIT.java @@ -7,10 +7,10 @@ import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; -import de.caritas.cob.agencyservice.consultingtypeservice.generated.web.model.ExtendedConsultingTypeResponseDTO; import de.caritas.cob.agencyservice.AgencyServiceApplication; import de.caritas.cob.agencyservice.api.exception.MissingConsultingTypeException; import de.caritas.cob.agencyservice.api.service.ConsultingTypeService; +import de.caritas.cob.agencyservice.consultingtypeservice.generated.web.model.ExtendedConsultingTypeResponseDTO; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -35,8 +35,9 @@ public class ConsultingTypeManagerIT { private ConsultingTypeService consultingTypeService; @Test - public void getConsultantTypeSettings_Should_Throw_MissingConsultingTypeException_When_RestClientException(){ - when(consultingTypeService.getExtendedConsultingTypeResponseDTO(anyInt())).thenThrow(new RestClientException("")); + public void getConsultantTypeSettings_Should_Throw_MissingConsultingTypeException_When_RestClientException() { + when(consultingTypeService.getExtendedConsultingTypeResponseDTO(anyInt())) + .thenThrow(new RestClientException("")); assertThrows(MissingConsultingTypeException.class, () -> consultingTypeManager.getConsultingTypeSettings(anyInt())); @@ -46,9 +47,11 @@ public void getConsultantTypeSettings_Should_Throw_MissingConsultingTypeExceptio public void getConsultantTypeSettings_Should_Return_ExtendedConsultingTypeResponseDTO() throws MissingConsultingTypeException { ExtendedConsultingTypeResponseDTO extendedConsultingTypeResponseDTO = new ExtendedConsultingTypeResponseDTO(); - when(consultingTypeService.getExtendedConsultingTypeResponseDTO(anyInt())).thenReturn(extendedConsultingTypeResponseDTO); + when(consultingTypeService.getExtendedConsultingTypeResponseDTO(anyInt())) + .thenReturn(extendedConsultingTypeResponseDTO); - assertTrue(extendedConsultingTypeResponseDTO.equals(consultingTypeManager.getConsultingTypeSettings(anyInt()))); + assertTrue(extendedConsultingTypeResponseDTO + .equals(consultingTypeManager.getConsultingTypeSettings(anyInt()))); } @@ -57,7 +60,8 @@ public void isConsultantBoundedToAgency_Should_Return_True() throws MissingConsultingTypeException { ExtendedConsultingTypeResponseDTO extendedConsultingTypeResponseDTO = new ExtendedConsultingTypeResponseDTO(); extendedConsultingTypeResponseDTO.setConsultantBoundedToConsultingType(true); - when(consultingTypeService.getExtendedConsultingTypeResponseDTO(anyInt())).thenReturn(extendedConsultingTypeResponseDTO); + when(consultingTypeService.getExtendedConsultingTypeResponseDTO(anyInt())) + .thenReturn(extendedConsultingTypeResponseDTO); assertTrue(consultingTypeManager.isConsultantBoundedToAgency(anyInt())); } @@ -67,7 +71,8 @@ public void isConsultantBoundedToAgency_Should_Return_False() throws MissingConsultingTypeException { ExtendedConsultingTypeResponseDTO extendedConsultingTypeResponseDTO = new ExtendedConsultingTypeResponseDTO(); extendedConsultingTypeResponseDTO.setConsultantBoundedToConsultingType(false); - when(consultingTypeService.getExtendedConsultingTypeResponseDTO(anyInt())).thenReturn(extendedConsultingTypeResponseDTO); + when(consultingTypeService.getExtendedConsultingTypeResponseDTO(anyInt())) + .thenReturn(extendedConsultingTypeResponseDTO); assertFalse(consultingTypeManager.isConsultantBoundedToAgency(anyInt())); } diff --git a/src/test/java/de/caritas/cob/agencyservice/testHelper/ExtendedConsultingTypeResponseDTOHelper.java b/src/test/java/de/caritas/cob/agencyservice/testHelper/ExtendedConsultingTypeResponseDTOHelper.java index ff0442dd..7c4f2a9f 100644 --- a/src/test/java/de/caritas/cob/agencyservice/testHelper/ExtendedConsultingTypeResponseDTOHelper.java +++ b/src/test/java/de/caritas/cob/agencyservice/testHelper/ExtendedConsultingTypeResponseDTOHelper.java @@ -1,27 +1,29 @@ package de.caritas.cob.agencyservice.testHelper; -import de.caritas.cob.agencyservice.consultingtypeservice.generated.web.model.RegistrationDTO; -import de.caritas.cob.agencyservice.consultingtypeservice.generated.web.model.WhiteSpotDTO; import de.caritas.cob.agencyservice.api.manager.consultingtype.registration.Registration; import de.caritas.cob.agencyservice.api.manager.consultingtype.whiteSpot.WhiteSpot; import de.caritas.cob.agencyservice.consultingtypeservice.generated.web.model.ExtendedConsultingTypeResponseDTO; +import de.caritas.cob.agencyservice.consultingtypeservice.generated.web.model.RegistrationDTO; +import de.caritas.cob.agencyservice.consultingtypeservice.generated.web.model.WhiteSpotDTO; public class ExtendedConsultingTypeResponseDTOHelper { - public static ExtendedConsultingTypeResponseDTO createExtendedConsultingTypeResponseDTO(int id, WhiteSpot whiteSpot, Registration registration, Boolean isLockedAgencies) { + public static ExtendedConsultingTypeResponseDTO createExtendedConsultingTypeResponseDTO(int id, + WhiteSpot whiteSpot, Registration registration, Boolean isLockedAgencies) { var extendedConsultingTypeResponseDTO = new ExtendedConsultingTypeResponseDTO(); WhiteSpotDTO whiteSpotDTO = null; - if(whiteSpot != null) { + if (whiteSpot != null) { whiteSpotDTO = new WhiteSpotDTO(); - if(whiteSpot.getWhiteSpotAgencyId() != null) + if (whiteSpot.getWhiteSpotAgencyId() != null) { whiteSpotDTO.setWhiteSpotAgencyId(whiteSpot.getWhiteSpotAgencyId().intValue()); + } whiteSpotDTO.setWhiteSpotAgencyAssigned(whiteSpot.isWhiteSpotAgencyAssigned()); } RegistrationDTO registrationDTO = null; - if(registration != null){ + if (registration != null) { registrationDTO = new RegistrationDTO(); registrationDTO.setMinPostcodeSize(registration.getMinPostcodeSize()); }