From a1476f9d42149b364a5f1ec67f525d1061da334f Mon Sep 17 00:00:00 2001 From: mohamed tizaoui Date: Tue, 7 Jan 2025 11:16:30 +0100 Subject: [PATCH] story #13791: clean code --- .../server/rest/AgencyExternalController.java | 2 +- .../rest/SchemaUnitExternalController.java | 4 --- .../SecurityProfileExternalController.java | 2 +- .../server/rest/UnitExternalController.java | 4 +-- .../service/agency/AgencyExternalService.java | 2 +- .../IngestContractExternalService.java | 6 ++-- .../SecurityProfileExternalService.java | 3 +- ...lService.java => UnitExternalService.java} | 6 ++-- .../SchemaUnitExternalControllerTest.java | 20 ----------- ...st.java => AgencyExternalServiceTest.java} | 2 +- ...t.java => ContextExternalServiceTest.java} | 2 +- ...ava => FileFormatExternalServiceTest.java} | 2 +- ...=> IngestContractExternalServiceTest.java} | 2 +- ...nagementOperationExternalServiceTest.java} | 2 +- ....java => OntologyExternalServiceTest.java} | 2 +- ...> SecurityProfileExternalServiceTest.java} | 2 +- ...Test.java => UnitExternalServiceTest.java} | 34 +++++++++---------- ...=> AccessContractExternalServiceTest.java} | 2 +- ...AccessionRegisterExternalServiceTest.java} | 6 ++-- ...anagementContractExternalServiceTest.java} | 2 +- ...java => OperationExternalServiceTest.java} | 2 +- ...=> ProbativeValueExternalServiceTest.java} | 8 ++--- 22 files changed, 47 insertions(+), 70 deletions(-) rename api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/service/unit/{UnitExtternalService.java => UnitExternalService.java} (98%) rename api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/{AgencyInternalServiceTest.java => AgencyExternalServiceTest.java} (99%) rename api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/{ContextInternalServiceTest.java => ContextExternalServiceTest.java} (99%) rename api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/{FileFormatInternalServiceTest.java => FileFormatExternalServiceTest.java} (99%) rename api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/{IngestContractInternalServiceTest.java => IngestContractExternalServiceTest.java} (99%) rename api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/{LogbookManagementOperationInternalServiceTest.java => LogbookManagementOperationExternalServiceTest.java} (99%) rename api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/{OntologyInternalServiceTest.java => OntologyExternalServiceTest.java} (99%) rename api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/{SecurityProfileInternalServiceTest.java => SecurityProfileExternalServiceTest.java} (99%) rename api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/{UnitInternalServiceTest.java => UnitExternalServiceTest.java} (89%) rename api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/accesscontract/{AccessContractInternalServiceTest.java => AccessContractExternalServiceTest.java} (99%) rename api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/accessionregister/{AccessionRegisterInternalServiceTest.java => AccessionRegisterExternalServiceTest.java} (96%) rename api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/managementContracts/{ManagementContractInternalServiceTest.java => ManagementContractExternalServiceTest.java} (99%) rename api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/operation/{OperationInternalServiceTest.java => OperationExternalServiceTest.java} (99%) rename api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/probativevalue/{ProbativeValueInternalServiceTest.java => ProbativeValueExternalServiceTest.java} (97%) diff --git a/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/rest/AgencyExternalController.java b/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/rest/AgencyExternalController.java index 5caa9b2e4b9..1e938833363 100644 --- a/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/rest/AgencyExternalController.java +++ b/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/rest/AgencyExternalController.java @@ -101,7 +101,7 @@ public class AgencyExternalController { public Collection getAll(final Optional criteria) { SanityChecker.sanitizeCriteria(criteria); LOGGER.debug("get all customer criteria={}", criteria); - return agencyExternalService.getAll(criteria); + return agencyExternalService.getAll(); } @Secured(ServicesData.ROLE_GET_AGENCIES) diff --git a/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/rest/SchemaUnitExternalController.java b/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/rest/SchemaUnitExternalController.java index 7ad541ed8a6..e0419381c32 100644 --- a/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/rest/SchemaUnitExternalController.java +++ b/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/rest/SchemaUnitExternalController.java @@ -31,7 +31,6 @@ import fr.gouv.vitamui.common.security.SanityChecker; import fr.gouv.vitamui.commons.api.CommonConstants; import fr.gouv.vitamui.commons.api.domain.ServicesData; -import fr.gouv.vitamui.commons.rest.client.InternalHttpContext; import fr.gouv.vitamui.iam.security.service.ExternalSecurityService; import fr.gouv.vitamui.referential.external.server.service.schema.SchemaExternalService; import org.slf4j.Logger; @@ -71,9 +70,6 @@ public ResponseEntity importUnitSchemas(@RequestParam("file") MultipartFil } SafeFileChecker.checkSafeFilePath(file.getOriginalFilename()); SanityChecker.isValidFileName(file.getOriginalFilename()); - InternalHttpContext internalHttpContext = InternalHttpContext.buildFromExternalHttpContext( - externalSecurityService.getHttpContext() - ); return schemaExternalService.importUnitSchema(file); } } diff --git a/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/rest/SecurityProfileExternalController.java b/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/rest/SecurityProfileExternalController.java index 885aa632699..cb8bf3f114d 100644 --- a/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/rest/SecurityProfileExternalController.java +++ b/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/rest/SecurityProfileExternalController.java @@ -93,7 +93,7 @@ public class SecurityProfileExternalController { public Collection getAll(final Optional criteria) { LOGGER.debug("get all customer criteria={}", criteria); SanityChecker.sanitizeCriteria(criteria); - return securityProfileExternalService.getAll(criteria); + return securityProfileExternalService.getAll(); } @Secured(ServicesData.ROLE_GET_SECURITY_PROFILES) diff --git a/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/rest/UnitExternalController.java b/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/rest/UnitExternalController.java index 40085e2af70..1513b407b86 100644 --- a/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/rest/UnitExternalController.java +++ b/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/rest/UnitExternalController.java @@ -46,7 +46,7 @@ import fr.gouv.vitamui.commons.api.domain.ServicesData; import fr.gouv.vitamui.commons.vitam.api.dto.VitamUISearchResponseDto; import fr.gouv.vitamui.referential.common.rest.RestApi; -import fr.gouv.vitamui.referential.external.server.service.unit.UnitExtternalService; +import fr.gouv.vitamui.referential.external.server.service.unit.UnitExternalService; import lombok.Getter; import lombok.Setter; import org.springframework.beans.factory.annotation.Autowired; @@ -67,7 +67,7 @@ public class UnitExternalController { @Autowired - private UnitExtternalService unitExternalService; + private UnitExternalService unitExternalService; @GetMapping(CommonConstants.PATH_ID) @Secured(ServicesData.ROLE_GET_UNITS) diff --git a/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/service/agency/AgencyExternalService.java b/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/service/agency/AgencyExternalService.java index b19a50b08a1..5d686eee68a 100644 --- a/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/service/agency/AgencyExternalService.java +++ b/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/service/agency/AgencyExternalService.java @@ -156,7 +156,7 @@ public List getAll(VitamContext vitamContext) { } } - public List getAll(final Optional criteria) { + public List getAll() { final VitamContext vitamContext = this.buildVitamContext(); return this.getAll(vitamContext); diff --git a/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/service/ingestcontract/IngestContractExternalService.java b/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/service/ingestcontract/IngestContractExternalService.java index c2712d44732..e0fa3952fc5 100644 --- a/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/service/ingestcontract/IngestContractExternalService.java +++ b/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/service/ingestcontract/IngestContractExternalService.java @@ -183,10 +183,10 @@ public List getAll(VitamContext vitamContext) { public PaginatedValuesDto getAllPaginated( final Integer pageNumber, final Integer size, + Optional criteria, final Optional orderBy, final Optional direction, - VitamContext vitamContext, - Optional criteria + VitamContext vitamContext ) { Map vitamCriteria = new HashMap<>(); LOGGER.debug("All Ingest Contracts EvIdAppSession : {} ", vitamContext.getApplicationSessionId()); @@ -567,7 +567,7 @@ public PaginatedValuesDto getAllPaginated( Optional direction ) { VitamContext vitamContext = buildVitamContext(); - return this.getAllPaginated(page, size, orderBy, direction, vitamContext, criteria); + return this.getAllPaginated(page, size, criteria, orderBy, direction, vitamContext); } public Boolean check(IngestContractDto ingestContractDto) { diff --git a/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/service/securityprofile/SecurityProfileExternalService.java b/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/service/securityprofile/SecurityProfileExternalService.java index 4547b690a7d..50a507d0420 100644 --- a/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/service/securityprofile/SecurityProfileExternalService.java +++ b/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/service/securityprofile/SecurityProfileExternalService.java @@ -312,8 +312,7 @@ public SecurityProfileDto getOne(final String id) { return getOne(vitamContext, id); } - public List getAll(final Optional criteria) { - LOGGER.debug("Fetching all Security Profiles with criteria: {}", criteria); + public List getAll() { VitamContext vitamContext = buildVitamContext(); return getAll(vitamContext); } diff --git a/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/service/unit/UnitExtternalService.java b/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/service/unit/UnitExternalService.java similarity index 98% rename from api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/service/unit/UnitExtternalService.java rename to api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/service/unit/UnitExternalService.java index a5437a0e4b4..4f5bf062340 100644 --- a/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/service/unit/UnitExtternalService.java +++ b/api/api-referential/referential-external/src/main/java/fr/gouv/vitamui/referential/external/server/service/unit/UnitExternalService.java @@ -68,9 +68,9 @@ import static fr.gouv.vitam.common.database.builder.query.VitamFieldsHelper.unitType; @Service -public class UnitExtternalService extends AbstractService { +public class UnitExternalService extends AbstractService { - private static final Logger LOGGER = LoggerFactory.getLogger(UnitExtternalService.class); + private static final Logger LOGGER = LoggerFactory.getLogger(UnitExternalService.class); private final UnitService unitService; @@ -91,7 +91,7 @@ public class UnitExtternalService extends AbstractService { }; @Autowired - public UnitExtternalService( + public UnitExternalService( final UnitService unitService, final ObjectMapper objectMapper, ExternalSecurityService externalSecurityService diff --git a/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/rest/SchemaUnitExternalControllerTest.java b/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/rest/SchemaUnitExternalControllerTest.java index 823b7decd26..54b7f07c500 100644 --- a/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/rest/SchemaUnitExternalControllerTest.java +++ b/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/rest/SchemaUnitExternalControllerTest.java @@ -149,24 +149,4 @@ void testImportSchemas_ExternalServiceException() throws IOException { "The exception message should match the mocked message." ); } - - @Test - @DisplayName("Test importUnitSchema when HTTP context is null") - void testImportSchemas_NullHttpContext() throws IOException { - // Given - MockMultipartFile validFile = new MockMultipartFile( - "file", - TEST_FILE_NAME_INVALID, - TEST_FILE_CONTENT_TYPE, - "valid content".getBytes() - ); - when(externalSecurityService.getHttpContext()).thenReturn(null); - - // When & Then - assertThrows( - NullPointerException.class, - () -> schemaExternalController.importUnitSchemas(validFile), - "An exception should be thrown when the HTTP context is null." - ); - } } diff --git a/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/AgencyInternalServiceTest.java b/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/AgencyExternalServiceTest.java similarity index 99% rename from api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/AgencyInternalServiceTest.java rename to api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/AgencyExternalServiceTest.java index 976d8455cf7..fec075b34bf 100644 --- a/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/AgencyInternalServiceTest.java +++ b/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/AgencyExternalServiceTest.java @@ -79,7 +79,7 @@ import static org.mockito.Mockito.when; @ExtendWith(SpringExtension.class) -public class AgencyInternalServiceTest { +public class AgencyExternalServiceTest { @Mock private AgencyService agencyService; diff --git a/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/ContextInternalServiceTest.java b/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/ContextExternalServiceTest.java similarity index 99% rename from api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/ContextInternalServiceTest.java rename to api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/ContextExternalServiceTest.java index 632ef413ac4..2e28594cb88 100644 --- a/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/ContextInternalServiceTest.java +++ b/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/ContextExternalServiceTest.java @@ -72,7 +72,7 @@ import static org.mockito.Mockito.when; @ExtendWith(SpringExtension.class) -public class ContextInternalServiceTest { +public class ContextExternalServiceTest { @Mock private VitamContextService vitamContextService; diff --git a/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/FileFormatInternalServiceTest.java b/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/FileFormatExternalServiceTest.java similarity index 99% rename from api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/FileFormatInternalServiceTest.java rename to api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/FileFormatExternalServiceTest.java index 78bb563ebcc..5a0fa0c7d55 100644 --- a/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/FileFormatInternalServiceTest.java +++ b/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/FileFormatExternalServiceTest.java @@ -80,7 +80,7 @@ import static org.mockito.Mockito.when; @ExtendWith(SpringExtension.class) -public class FileFormatInternalServiceTest { +public class FileFormatExternalServiceTest { @Mock private LogbookService logbookService; diff --git a/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/IngestContractInternalServiceTest.java b/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/IngestContractExternalServiceTest.java similarity index 99% rename from api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/IngestContractInternalServiceTest.java rename to api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/IngestContractExternalServiceTest.java index 5b5addb4e0c..61f40d46128 100644 --- a/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/IngestContractInternalServiceTest.java +++ b/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/IngestContractExternalServiceTest.java @@ -93,7 +93,7 @@ import static org.mockito.Mockito.when; @ExtendWith(SpringExtension.class) -public class IngestContractInternalServiceTest { +public class IngestContractExternalServiceTest { @Mock private IngestContractService ingestContractService; diff --git a/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/LogbookManagementOperationInternalServiceTest.java b/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/LogbookManagementOperationExternalServiceTest.java similarity index 99% rename from api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/LogbookManagementOperationInternalServiceTest.java rename to api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/LogbookManagementOperationExternalServiceTest.java index 9ad29a96dfe..cd9a61d05e7 100644 --- a/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/LogbookManagementOperationInternalServiceTest.java +++ b/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/LogbookManagementOperationExternalServiceTest.java @@ -54,7 +54,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; -public class LogbookManagementOperationInternalServiceTest { +public class LogbookManagementOperationExternalServiceTest { @Mock private ObjectMapper objectMapper; diff --git a/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/OntologyInternalServiceTest.java b/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/OntologyExternalServiceTest.java similarity index 99% rename from api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/OntologyInternalServiceTest.java rename to api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/OntologyExternalServiceTest.java index 216fbb95abf..0cc30a698dc 100644 --- a/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/OntologyInternalServiceTest.java +++ b/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/OntologyExternalServiceTest.java @@ -82,7 +82,7 @@ import static org.mockito.Mockito.when; @ExtendWith(SpringExtension.class) -public class OntologyInternalServiceTest { +public class OntologyExternalServiceTest { @Mock private OntologyService ontologyService; diff --git a/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/SecurityProfileInternalServiceTest.java b/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/SecurityProfileExternalServiceTest.java similarity index 99% rename from api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/SecurityProfileInternalServiceTest.java rename to api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/SecurityProfileExternalServiceTest.java index b2022c07162..ce85a489c9f 100644 --- a/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/SecurityProfileInternalServiceTest.java +++ b/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/SecurityProfileExternalServiceTest.java @@ -73,7 +73,7 @@ import static org.mockito.Mockito.when; @ExtendWith(SpringExtension.class) -public class SecurityProfileInternalServiceTest { +public class SecurityProfileExternalServiceTest { @Mock private VitamSecurityProfileService vitamSecurityProfileService; diff --git a/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/UnitInternalServiceTest.java b/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/UnitExternalServiceTest.java similarity index 89% rename from api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/UnitInternalServiceTest.java rename to api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/UnitExternalServiceTest.java index 714ce92d990..af7853aa707 100644 --- a/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/UnitInternalServiceTest.java +++ b/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/UnitExternalServiceTest.java @@ -46,7 +46,7 @@ import fr.gouv.vitam.common.model.RequestResponseOK; import fr.gouv.vitamui.commons.vitam.api.access.UnitService; import fr.gouv.vitamui.iam.security.service.ExternalSecurityService; -import fr.gouv.vitamui.referential.external.server.service.unit.UnitExtternalService; +import fr.gouv.vitamui.referential.external.server.service.unit.UnitExternalService; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -62,7 +62,7 @@ import static org.mockito.Mockito.when; @ExtendWith(SpringExtension.class) -public class UnitInternalServiceTest { +public class UnitExternalServiceTest { @Mock private UnitService unitService; @@ -74,13 +74,13 @@ public class UnitInternalServiceTest { private ObjectMapper objectMapper; @InjectMocks - private UnitExtternalService unitExtternalService; + private UnitExternalService unitExternalService; public final String FILLING_HOLDING_SCHEME_QUERY = "data/fillingholding/expected_unitType_query.json"; @BeforeEach public void setUp() { - unitExtternalService = new UnitExtternalService(unitService, objectMapper, externalSecurityService); + unitExternalService = new UnitExternalService(unitService, objectMapper, externalSecurityService); } @Test @@ -93,7 +93,7 @@ public void searchUnits_should_return_ok_when_vitamclient_ok() throws VitamClien ); assertThatCode(() -> { - unitExtternalService.searchUnits(dslQuery, vitamContext); + unitExternalService.searchUnits(dslQuery, vitamContext); }).doesNotThrowAnyException(); } @@ -107,7 +107,7 @@ public void searchUnits_should_return_ok_when_vitamclient_400() throws VitamClie ); assertThatCode(() -> { - unitExtternalService.searchUnits(dslQuery, vitamContext); + unitExternalService.searchUnits(dslQuery, vitamContext); }).doesNotThrowAnyException(); } @@ -122,7 +122,7 @@ public void searchUnits_should_throw_VitamClientException_when_vitamclient_throw ); assertThatCode(() -> { - unitExtternalService.searchUnits(dslQuery, vitamContext); + unitExternalService.searchUnits(dslQuery, vitamContext); }).isInstanceOf(VitamClientException.class); } @@ -136,7 +136,7 @@ public void searchUnitsWithErrors_should_return_ok_when_vitamclient_ok() throws ).thenReturn(new RequestResponseOK().setHttpCode(200)); assertThatCode(() -> { - unitExtternalService.searchUnitsWithErrors(Optional.empty(), dslQuery, vitamContext); + unitExternalService.searchUnitsWithErrors(Optional.empty(), dslQuery, vitamContext); }).doesNotThrowAnyException(); } @@ -150,7 +150,7 @@ public void searchUnitsWithErrors_should_return_ok_when_vitamclient_400() throws ).thenReturn(new RequestResponseOK().setHttpCode(400)); assertThatCode(() -> { - unitExtternalService.searchUnitsWithErrors(Optional.empty(), dslQuery, vitamContext); + unitExternalService.searchUnitsWithErrors(Optional.empty(), dslQuery, vitamContext); }).doesNotThrowAnyException(); } @@ -165,7 +165,7 @@ public void searchUnitsWithErrors_should_throw_VitamClientException_when_vitamcl ).thenThrow(new VitamClientException("Exception thrown by vitam")); assertThatCode(() -> { - unitExtternalService.searchUnitsWithErrors(Optional.empty(), dslQuery, vitamContext); + unitExternalService.searchUnitsWithErrors(Optional.empty(), dslQuery, vitamContext); }).isInstanceOf(VitamClientException.class); } @@ -179,7 +179,7 @@ public void findUnitById_should_return_ok_when_vitamclient_ok() throws VitamClie ); assertThatCode(() -> { - unitExtternalService.findUnitById(unitId, vitamContext); + unitExternalService.findUnitById(unitId, vitamContext); }).doesNotThrowAnyException(); } @@ -193,7 +193,7 @@ public void findUnitById_should_return_ok_when_vitamclient_400() throws VitamCli ); assertThatCode(() -> { - unitExtternalService.findUnitById(unitId, vitamContext); + unitExternalService.findUnitById(unitId, vitamContext); }).doesNotThrowAnyException(); } @@ -208,7 +208,7 @@ public void findUnitById_should_throw_VitamClientException_when_vitamclient_thro ); assertThatCode(() -> { - unitExtternalService.findUnitById(unitId, vitamContext); + unitExternalService.findUnitById(unitId, vitamContext); }).isInstanceOf(VitamClientException.class); } @@ -223,7 +223,7 @@ public void findObjectMetadataById_should_return_ok_when_vitamclient_ok() throws ).thenReturn(new RequestResponseOK().setHttpCode(200)); assertThatCode(() -> { - unitExtternalService.findObjectMetadataById(unitId, dslQuery, vitamContext); + unitExternalService.findObjectMetadataById(unitId, dslQuery, vitamContext); }).doesNotThrowAnyException(); } @@ -238,7 +238,7 @@ public void findObjectMetadataById_should_return_ok_when_vitamclient_400() throw ).thenReturn(new RequestResponseOK().setHttpCode(400)); assertThatCode(() -> { - unitExtternalService.findObjectMetadataById(unitId, dslQuery, vitamContext); + unitExternalService.findObjectMetadataById(unitId, dslQuery, vitamContext); }).doesNotThrowAnyException(); } @@ -254,7 +254,7 @@ public void findObjectMetadataById_should_throw_VitamClientException_when_vitamc ).thenThrow(new VitamClientException("Exception thrown by vitam")); assertThatCode(() -> { - unitExtternalService.findObjectMetadataById(unitId, dslQuery, vitamContext); + unitExternalService.findObjectMetadataById(unitId, dslQuery, vitamContext); }).isInstanceOf(VitamClientException.class); } @@ -264,7 +264,7 @@ public void getFinalFillingHoldingSchemeQueryWithAllProjectionFields() throws Ex JsonNode expectedQuery = JsonHandler.getFromFile(PropertiesUtils.findFile(FILLING_HOLDING_SCHEME_QUERY)); // When - JsonNode givenQuery = unitExtternalService.createQueryForFillingOrHoldingUnit(); + JsonNode givenQuery = unitExternalService.createQueryForFillingOrHoldingUnit(); // Then Assertions.assertThat(expectedQuery.toString()).hasToString(String.valueOf(givenQuery)); diff --git a/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/accesscontract/AccessContractInternalServiceTest.java b/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/accesscontract/AccessContractExternalServiceTest.java similarity index 99% rename from api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/accesscontract/AccessContractInternalServiceTest.java rename to api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/accesscontract/AccessContractExternalServiceTest.java index 14986527045..b9db895bfc3 100644 --- a/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/accesscontract/AccessContractInternalServiceTest.java +++ b/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/accesscontract/AccessContractExternalServiceTest.java @@ -99,7 +99,7 @@ import static org.mockito.Mockito.when; @ExtendWith(SpringExtension.class) -public class AccessContractInternalServiceTest { +public class AccessContractExternalServiceTest { @Mock private AccessContractService accessContractService; diff --git a/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/accessionregister/AccessionRegisterInternalServiceTest.java b/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/accessionregister/AccessionRegisterExternalServiceTest.java similarity index 96% rename from api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/accessionregister/AccessionRegisterInternalServiceTest.java rename to api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/accessionregister/AccessionRegisterExternalServiceTest.java index 22a5ae62aa3..6600886f4c0 100644 --- a/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/accessionregister/AccessionRegisterInternalServiceTest.java +++ b/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/accessionregister/AccessionRegisterExternalServiceTest.java @@ -74,7 +74,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -class AccessionRegisterInternalServiceTest { +class AccessionRegisterExternalServiceTest { @InjectMocks AccessionRegisterExternalService accessionRegisterExternalService; @@ -148,7 +148,9 @@ void should_call_appropriate_api_once_when_get_paginated_is_invoked() private RequestResponse buildResponseFrom(String filename, Class clazz) throws IOException, InvalidParseOperationException { InputStream inputStream = - AccessionRegisterInternalServiceTest.class.getClassLoader().getResourceAsStream(filename); + fr.gouv.vitamui.referential.internal.server.service + .AccessionRegisterExternalServiceTest.class.getClassLoader() + .getResourceAsStream(filename); assert inputStream != null; JsonNode data = objectMapper.readValue(ByteStreams.toByteArray(inputStream), JsonNode.class); return RequestResponseOK.getFromJsonNode(data, clazz); diff --git a/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/managementContracts/ManagementContractInternalServiceTest.java b/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/managementContracts/ManagementContractExternalServiceTest.java similarity index 99% rename from api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/managementContracts/ManagementContractInternalServiceTest.java rename to api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/managementContracts/ManagementContractExternalServiceTest.java index a4d405865b6..a4720d33308 100644 --- a/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/managementContracts/ManagementContractInternalServiceTest.java +++ b/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/managementContracts/ManagementContractExternalServiceTest.java @@ -57,7 +57,7 @@ import static org.mockito.Mockito.when; @ExtendWith(SpringExtension.class) -public class ManagementContractInternalServiceTest { +public class ManagementContractExternalServiceTest { @Mock private LogbookService logbookService; diff --git a/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/operation/OperationInternalServiceTest.java b/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/operation/OperationExternalServiceTest.java similarity index 99% rename from api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/operation/OperationInternalServiceTest.java rename to api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/operation/OperationExternalServiceTest.java index 360c653499d..1922de236c3 100644 --- a/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/operation/OperationInternalServiceTest.java +++ b/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/operation/OperationExternalServiceTest.java @@ -25,7 +25,7 @@ import static org.assertj.core.api.Assertions.assertThatCode; -class OperationInternalServiceTest { +class OperationExternalServiceTest { public static final String DSL_QUERY_PROJECTION = "$projection"; private final String AUDIT_FILE_CONSISTENCY = "AUDIT_FILE_CONSISTENCY"; diff --git a/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/probativevalue/ProbativeValueInternalServiceTest.java b/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/probativevalue/ProbativeValueExternalServiceTest.java similarity index 97% rename from api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/probativevalue/ProbativeValueInternalServiceTest.java rename to api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/probativevalue/ProbativeValueExternalServiceTest.java index d7003ea7851..f9eec69c885 100644 --- a/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/probativevalue/ProbativeValueInternalServiceTest.java +++ b/api/api-referential/referential-external/src/test/java/fr/gouv/vitamui/referential/external/server/service/probativevalue/ProbativeValueExternalServiceTest.java @@ -72,7 +72,7 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; -public class ProbativeValueInternalServiceTest { +public class ProbativeValueExternalServiceTest { @InjectMocks private ProbativeValueExternalService probativeValueExternalService; @@ -223,7 +223,7 @@ private InputStream buildVitamProbativeReport(String filename) ObjectMapper objectMapper = new ObjectMapper(); objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); InputStream inputStream = - ProbativeValueInternalServiceTest.class.getClassLoader().getResourceAsStream(filename); + ProbativeValueExternalServiceTest.class.getClassLoader().getResourceAsStream(filename); return inputStream; } @@ -232,7 +232,7 @@ private VitamUISearchResponseDto buildVitamUISearchResponseDto(String filename) ObjectMapper objectMapper = new ObjectMapper(); objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); InputStream inputStream = - ProbativeValueInternalServiceTest.class.getClassLoader().getResourceAsStream(filename); + ProbativeValueExternalServiceTest.class.getClassLoader().getResourceAsStream(filename); return objectMapper.readValue(ByteStreams.toByteArray(inputStream), VitamUISearchResponseDto.class); } @@ -241,7 +241,7 @@ private RequestResponse buildGotMetadataResponse(String filename) ObjectMapper objectMapper = new ObjectMapper(); objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); InputStream inputStream = - ProbativeValueInternalServiceTest.class.getClassLoader().getResourceAsStream(filename); + ProbativeValueExternalServiceTest.class.getClassLoader().getResourceAsStream(filename); return RequestResponseOK.getFromJsonNode( objectMapper.readValue(ByteStreams.toByteArray(inputStream), JsonNode.class) );