ProgrammeVitam · mohatizaoui · Jan 7, 2025 · ebernard · Feb 17, 2025 · hazco75
diff --git a/.../main/java/fr/gouv/vitamui/referential/external/server/rest/AgencyExternalController.java b/.../main/java/fr/gouv/vitamui/referential/external/server/rest/AgencyExternalController.java
@@ -101,7 +101,7 @@ public class AgencyExternalController {
     public Collection<AgencyDto> getAll(final Optional<String> 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/...n/java/fr/gouv/vitamui/referential/external/server/rest/SchemaUnitExternalController.java b/...n/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<Void> 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/...a/fr/gouv/vitamui/referential/external/server/rest/SecurityProfileExternalController.java b/...a/fr/gouv/vitamui/referential/external/server/rest/SecurityProfileExternalController.java
@@ -93,7 +93,7 @@ public class SecurityProfileExternalController {
     public Collection<SecurityProfileDto> getAll(final Optional<String> 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/...rc/main/java/fr/gouv/vitamui/referential/external/server/rest/UnitExternalController.java b/...rc/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/...ava/fr/gouv/vitamui/referential/external/server/service/agency/AgencyExternalService.java b/...ava/fr/gouv/vitamui/referential/external/server/service/agency/AgencyExternalService.java
@@ -156,7 +156,7 @@ public List<AgencyDto> getAll(VitamContext vitamContext) {
         }
     }
 
-    public List<AgencyDto> getAll(final Optional<String> criteria) {
+    public List<AgencyDto> getAll() {
         final VitamContext vitamContext = this.buildVitamContext();
 
         return this.getAll(vitamContext);

diff --git a/...mui/referential/external/server/service/ingestcontract/IngestContractExternalService.java b/...mui/referential/external/server/service/ingestcontract/IngestContractExternalService.java
@@ -183,10 +183,10 @@ public List<IngestContractDto> getAll(VitamContext vitamContext) {
     public PaginatedValuesDto<IngestContractDto> getAllPaginated(
         final Integer pageNumber,
         final Integer size,
+        Optional<String> criteria,
         final Optional<String> orderBy,
         final Optional<DirectionDto> direction,
-        VitamContext vitamContext,
-        Optional<String> criteria
+        VitamContext vitamContext
     ) {
         Map<String, Object> vitamCriteria = new HashMap<>();
         LOGGER.debug("All Ingest Contracts EvIdAppSession : {} ", vitamContext.getApplicationSessionId());
@@ -567,7 +567,7 @@ public PaginatedValuesDto<IngestContractDto> getAllPaginated(
         Optional<DirectionDto> 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/...i/referential/external/server/service/securityprofile/SecurityProfileExternalService.java b/...i/referential/external/server/service/securityprofile/SecurityProfileExternalService.java
@@ -312,8 +312,7 @@ public SecurityProfileDto getOne(final String id) {
         return getOne(vitamContext, id);
     }
 
-    public List<SecurityProfileDto> getAll(final Optional<String> criteria) {
-        LOGGER.debug("Fetching all Security Profiles with criteria: {}", criteria);
+    public List<SecurityProfileDto> getAll() {
         VitamContext vitamContext = buildVitamContext();
         return getAll(vitamContext);
     }

diff --git a/...er/service/unit/UnitExtternalService.java → ...ver/service/unit/UnitExternalService.java b/...er/service/unit/UnitExtternalService.java → ...ver/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/...va/fr/gouv/vitamui/referential/external/server/rest/SchemaUnitExternalControllerTest.java b/...va/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/...er/service/AgencyInternalServiceTest.java → ...er/service/AgencyExternalServiceTest.java b/...er/service/AgencyInternalServiceTest.java → ...er/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/...r/service/ContextInternalServiceTest.java → ...r/service/ContextExternalServiceTest.java b/...r/service/ContextInternalServiceTest.java → ...r/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/...ervice/FileFormatInternalServiceTest.java → ...ervice/FileFormatExternalServiceTest.java b/...ervice/FileFormatInternalServiceTest.java → ...ervice/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/...ce/IngestContractInternalServiceTest.java → ...ce/IngestContractExternalServiceTest.java b/...ce/IngestContractInternalServiceTest.java → ...ce/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/...nagementOperationInternalServiceTest.java → ...nagementOperationExternalServiceTest.java b/...nagementOperationInternalServiceTest.java → ...nagementOperationExternalServiceTest.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/.../service/OntologyInternalServiceTest.java → .../service/OntologyExternalServiceTest.java b/.../service/OntologyInternalServiceTest.java → .../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/...e/SecurityProfileInternalServiceTest.java → ...e/SecurityProfileExternalServiceTest.java b/...e/SecurityProfileInternalServiceTest.java → ...e/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/...rver/service/UnitInternalServiceTest.java → ...rver/service/UnitExternalServiceTest.java b/...rver/service/UnitInternalServiceTest.java → ...rver/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<JsonNode>().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<JsonNode>().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<JsonNode>().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<JsonNode>().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/...ct/AccessContractInternalServiceTest.java → ...ct/AccessContractExternalServiceTest.java b/...ct/AccessContractInternalServiceTest.java → ...ct/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/...AccessionRegisterInternalServiceTest.java → ...AccessionRegisterExternalServiceTest.java b/...AccessionRegisterInternalServiceTest.java → ...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 <T> RequestResponse<T> buildResponseFrom(String filename, Class<T> 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/...anagementContractInternalServiceTest.java → ...anagementContractExternalServiceTest.java b/...anagementContractInternalServiceTest.java → ...anagementContractExternalServiceTest.java
@@ -57,7 +57,7 @@
 import static org.mockito.Mockito.when;
 
 @ExtendWith(SpringExtension.class)
-public class ManagementContractInternalServiceTest {
+public class ManagementContractExternalServiceTest {
 
     @Mock
     private LogbookService logbookService;