Merge pull request #1933 from ProgrammeVitam/story_12306

Story #12306 build: upgrade to java 17
ProgrammeVitam · Jul 16, 2024 · 3fb0de0 · 3fb0de0
2 parents 45954b5 + 2de620d
commit 3fb0de0
Show file tree

Hide file tree

Showing 610 changed files with 5,077 additions and 8,920 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -59,7 +59,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: "temurin"
-          java-version: "11"
+          java-version: "17"
       - name: Restore maven cache # We're not using cache feature from actions/setup-java as it's not allowing to fine-tune it (in particular, we can't use restore-keys to load a previous cache if cache name mismatches)
         uses: actions/cache@v4
         with:

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -2,7 +2,7 @@ def IMPORTANT_BRANCH_OR_TAG = (env.BRANCH_NAME =~ /(develop|master_.*)/).matches
 
 pipeline {
     agent {
-        label 'contrib'
+        label 'java11'
     }
 
     environment {
@@ -17,6 +17,8 @@ pipeline {
         SERVICE_REPOSITORY_URL=credentials("service-repository-url")
 
         PUPPETEER_DOWNLOAD_HOST="${SERVICE_NEXUS_URL}repository/puppeteer-chrome"
+
+        JAVA_HOME="/usr/lib/jvm/java-17-openjdk-amd64"
     }
 
     options {

diff --git a/...ch-commons/src/main/java/fr/gouv/vitamui/archives/search/common/dsl/VitamQueryHelper.java b/...ch-commons/src/main/java/fr/gouv/vitamui/archives/search/common/dsl/VitamQueryHelper.java
@@ -34,10 +34,10 @@
 import fr.gouv.vitam.common.json.JsonHandler;
 import fr.gouv.vitam.common.model.QueryProjection;
 import fr.gouv.vitamui.commons.api.domain.DirectionDto;
-import fr.gouv.vitamui.commons.api.logger.VitamUILogger;
-import fr.gouv.vitamui.commons.api.logger.VitamUILoggerFactory;
 import fr.gouv.vitamui.commons.api.utils.ArchiveSearchConsts;
 import fr.gouv.vitamui.commons.api.utils.ArchiveSearchConsts.CriteriaOperators;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
@@ -63,7 +63,7 @@
 
 public class VitamQueryHelper {
 
-    private static final VitamUILogger LOGGER = VitamUILoggerFactory.getInstance(VitamQueryHelper.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(VitamQueryHelper.class);
 
     public static void addParameterCriteria(
         BooleanQuery query,

diff --git a/...archives/search/common/dto/converter/UpdateArchiveUnitDtoToUpdateMultiQueryConverter.java b/...archives/search/common/dto/converter/UpdateArchiveUnitDtoToUpdateMultiQueryConverter.java
@@ -34,8 +34,8 @@
 import fr.gouv.vitam.common.database.builder.request.exception.InvalidCreateOperationException;
 import fr.gouv.vitam.common.database.builder.request.multiple.UpdateMultiQuery;
 import fr.gouv.vitamui.archives.search.common.dto.UpdateArchiveUnitDto;
-import fr.gouv.vitamui.commons.api.logger.VitamUILogger;
-import fr.gouv.vitamui.commons.api.logger.VitamUILoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.stereotype.Service;
 
@@ -45,9 +45,7 @@
 public class UpdateArchiveUnitDtoToUpdateMultiQueryConverter
     implements Converter<UpdateArchiveUnitDto, UpdateMultiQuery> {
 
-    private static final VitamUILogger log = VitamUILoggerFactory.getInstance(
-        UpdateArchiveUnitDtoToUpdateMultiQueryConverter.class
-    );
+    private static final Logger log = LoggerFactory.getLogger(UpdateArchiveUnitDtoToUpdateMultiQueryConverter.class);
 
     @Override
     public UpdateMultiQuery convert(UpdateArchiveUnitDto source) {

diff --git a/...search-commons/src/test/java/fr/gouv/vitamui/archive/search/dsl/VitamQueryHelperTest.java b/...search-commons/src/test/java/fr/gouv/vitamui/archive/search/dsl/VitamQueryHelperTest.java
@@ -45,8 +45,6 @@
 import fr.gouv.vitam.common.exception.InvalidParseOperationException;
 import fr.gouv.vitam.common.json.JsonHandler;
 import fr.gouv.vitamui.archives.search.common.dsl.VitamQueryHelper;
-import fr.gouv.vitamui.commons.test.utils.ServerIdentityConfigurationBuilder;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -68,11 +66,6 @@ class VitamQueryHelperTest {
     public final String SEARCH_WITH_IDENTIFIER_QUERY = "data/query_with_identifier_criteria.json";
     public final String SEARCH_WITH_NAME_AND_IDENTIFIER_QUERY = "data/query_with_identifier_name_criteria.json";
 
-    @BeforeEach
-    public void setUp() {
-        ServerIdentityConfigurationBuilder.setup("identityName", "identityRole", 1, 0);
-    }
-
     @Test
     void search_query_with_one_originating_agency_name_as_criteria()
         throws FileNotFoundException, InvalidParseOperationException, InvalidCreateOperationException {

diff --git a/api/api-archive-search/archive-search-external-client/pom.xml b/api/api-archive-search/archive-search-external-client/pom.xml
@@ -57,7 +57,11 @@
         </dependency>
 
         <!-- TEST -->
-
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
@@ -68,31 +72,6 @@
             <artifactId>mockito-inline</artifactId>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-easymock</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>fr.gouv.vitamui.commons</groupId>
             <artifactId>commons-test</artifactId>

diff --git a/...java/fr/gouv/vitamui/archives/search/external/client/ArchiveSearchExternalRestClient.java b/...java/fr/gouv/vitamui/archives/search/external/client/ArchiveSearchExternalRestClient.java
@@ -38,13 +38,13 @@
 import fr.gouv.vitamui.commons.api.domain.PaginatedValuesDto;
 import fr.gouv.vitamui.commons.api.dtos.SearchCriteriaDto;
 import fr.gouv.vitamui.commons.api.dtos.VitamUiOntologyDto;
-import fr.gouv.vitamui.commons.api.logger.VitamUILogger;
-import fr.gouv.vitamui.commons.api.logger.VitamUILoggerFactory;
 import fr.gouv.vitamui.commons.rest.client.BasePaginatingAndSortingRestClient;
 import fr.gouv.vitamui.commons.rest.client.ExternalHttpContext;
 import fr.gouv.vitamui.commons.vitam.api.dto.PersistentIdentifierResponseDto;
 import fr.gouv.vitamui.commons.vitam.api.dto.ResultsDto;
 import fr.gouv.vitamui.commons.vitam.api.dto.VitamUISearchResponseDto;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.core.io.Resource;
 import org.springframework.http.HttpEntity;
@@ -60,7 +60,7 @@
 public class ArchiveSearchExternalRestClient
     extends BasePaginatingAndSortingRestClient<ArchiveUnitsDto, ExternalHttpContext> {
 
-    private static final VitamUILogger LOGGER = VitamUILoggerFactory.getInstance(ArchiveSearchExternalRestClient.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ArchiveSearchExternalRestClient.class);
 
     public ArchiveSearchExternalRestClient(final RestTemplate restTemplate, final String baseUrl) {
         super(restTemplate, baseUrl);

diff --git a/.../java/fr/gouv/vitamui/archives/search/external/client/ArchiveSearchExternalWebClient.java b/.../java/fr/gouv/vitamui/archives/search/external/client/ArchiveSearchExternalWebClient.java
@@ -27,10 +27,10 @@
 package fr.gouv.vitamui.archives.search.external.client;
 
 import fr.gouv.vitamui.archives.search.common.rest.RestApi;
-import fr.gouv.vitamui.commons.api.logger.VitamUILogger;
-import fr.gouv.vitamui.commons.api.logger.VitamUILoggerFactory;
 import fr.gouv.vitamui.commons.rest.client.BaseWebClient;
 import fr.gouv.vitamui.commons.rest.client.ExternalHttpContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.http.CacheControl;
@@ -42,7 +42,7 @@
 
 public class ArchiveSearchExternalWebClient extends BaseWebClient<ExternalHttpContext> {
 
-    private static final VitamUILogger LOGGER = VitamUILoggerFactory.getInstance(ArchiveSearchExternalWebClient.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ArchiveSearchExternalWebClient.class);
 
     public ArchiveSearchExternalWebClient(final WebClient webClient, final String baseUrl) {
         super(webClient, baseUrl);

diff --git a/...ouv/vitamui/archives/search/external/client/ArchiveSearchStreamingExternalRestClient.java b/...ouv/vitamui/archives/search/external/client/ArchiveSearchStreamingExternalRestClient.java
@@ -39,11 +39,11 @@
 import fr.gouv.vitamui.archives.search.common.rest.RestApi;
 import fr.gouv.vitamui.commons.api.CommonConstants;
 import fr.gouv.vitamui.commons.api.domain.PaginatedValuesDto;
-import fr.gouv.vitamui.commons.api.logger.VitamUILogger;
-import fr.gouv.vitamui.commons.api.logger.VitamUILoggerFactory;
 import fr.gouv.vitamui.commons.rest.client.BasePaginatingAndSortingRestClient;
 import fr.gouv.vitamui.commons.rest.client.ExternalHttpContext;
 import fr.gouv.vitamui.commons.vitam.api.dto.LogbookOperationDto;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.core.io.Resource;
@@ -65,9 +65,7 @@
 public class ArchiveSearchStreamingExternalRestClient
     extends BasePaginatingAndSortingRestClient<LogbookOperationDto, ExternalHttpContext> {
 
-    private static final VitamUILogger LOGGER = VitamUILoggerFactory.getInstance(
-        ArchiveSearchStreamingExternalRestClient.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ArchiveSearchStreamingExternalRestClient.class);
 
     public ArchiveSearchStreamingExternalRestClient(final RestTemplate restTemplate, final String baseUrl) {
         super(restTemplate, baseUrl);

diff --git a/.../src/main/java/fr/gouv/vitamui/archives/search/external/client/ArchiveUnitClientImpl.java b/.../src/main/java/fr/gouv/vitamui/archives/search/external/client/ArchiveUnitClientImpl.java
@@ -33,12 +33,12 @@
 import fr.gouv.vitamui.commons.api.dtos.JsonPatch;
 import fr.gouv.vitamui.commons.api.dtos.JsonPatchDto;
 import fr.gouv.vitamui.commons.api.dtos.MultiJsonPatchDto;
-import fr.gouv.vitamui.commons.api.logger.VitamUILogger;
-import fr.gouv.vitamui.commons.api.logger.VitamUILoggerFactory;
 import fr.gouv.vitamui.commons.rest.client.AbstractHttpContext;
 import fr.gouv.vitamui.commons.rest.client.BaseRestClient;
 import fr.gouv.vitamui.commons.rest.client.ExternalHttpContext;
 import org.apache.http.client.utils.URIBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.RestTemplate;
@@ -53,7 +53,7 @@
 public class ArchiveUnitClientImpl extends BaseRestClient<ExternalHttpContext> implements ArchiveUnitClient {
 
     private static final String ARCHIVE_UNITS = "archive-units";
-    private static final VitamUILogger log = VitamUILoggerFactory.getInstance(ArchiveUnitClientImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(ArchiveUnitClientImpl.class);
 
     public ArchiveUnitClientImpl(RestTemplate restTemplate, String baseUrl) {
         super(restTemplate, baseUrl);

diff --git a/...gouv/vitamui/archives/search/external/client/SearchCriteriaHistoryExternalRestClient.java b/...gouv/vitamui/archives/search/external/client/SearchCriteriaHistoryExternalRestClient.java
@@ -39,10 +39,10 @@
 import fr.gouv.vitamui.archives.search.common.rest.RestApi;
 import fr.gouv.vitamui.commons.api.domain.PaginatedValuesDto;
 import fr.gouv.vitamui.commons.api.dtos.SearchCriteriaHistoryDto;
-import fr.gouv.vitamui.commons.api.logger.VitamUILogger;
-import fr.gouv.vitamui.commons.api.logger.VitamUILoggerFactory;
 import fr.gouv.vitamui.commons.rest.client.BasePaginatingAndSortingRestClient;
 import fr.gouv.vitamui.commons.rest.client.ExternalHttpContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
@@ -60,9 +60,7 @@
 public class SearchCriteriaHistoryExternalRestClient
     extends BasePaginatingAndSortingRestClient<SearchCriteriaHistoryDto, ExternalHttpContext> {
 
-    private static final VitamUILogger LOGGER = VitamUILoggerFactory.getInstance(
-        SearchCriteriaHistoryExternalRestClient.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(SearchCriteriaHistoryExternalRestClient.class);
 
     public SearchCriteriaHistoryExternalRestClient(final RestTemplate restTemplate, final String baseUrl) {
         super(restTemplate, baseUrl);

diff --git a/.../fr/gouv/vitamui/archives/search/external/client/ArchiveSearchExternalRestClientTest.java b/.../fr/gouv/vitamui/archives/search/external/client/ArchiveSearchExternalRestClientTest.java
@@ -30,8 +30,6 @@
 import fr.gouv.vitamui.archives.search.common.dto.VitamUIArchiveUnitResponseDto;
 import fr.gouv.vitamui.archives.search.common.rest.RestApi;
 import fr.gouv.vitamui.commons.api.dtos.SearchCriteriaDto;
-import fr.gouv.vitamui.commons.api.logger.VitamUILogger;
-import fr.gouv.vitamui.commons.api.logger.VitamUILoggerFactory;
 import fr.gouv.vitamui.commons.rest.client.ExternalHttpContext;
 import fr.gouv.vitamui.commons.test.extension.ServerIdentityExtension;
 import fr.gouv.vitamui.commons.vitam.api.dto.PersistentIdentifierResponseDto;
@@ -42,6 +40,8 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.Resource;
 import org.springframework.http.HttpEntity;
@@ -67,9 +67,7 @@ public class ArchiveSearchExternalRestClientTest extends ServerIdentityExtension
 
     ExternalHttpContext defaultContext = new ExternalHttpContext(9, "", "", "");
 
-    private static final VitamUILogger LOGGER = VitamUILoggerFactory.getInstance(
-        ArchiveSearchExternalRestClientTest.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ArchiveSearchExternalRestClientTest.class);
 
     public final String ARCHIVE_UNITS_RESULTS_CSV = "data/vitam_archive_units_response.csv";
 

diff --git a/...v/vitamui/archives/search/external/server/ApiArchivesSearchExternalServerApplication.java b/...v/vitamui/archives/search/external/server/ApiArchivesSearchExternalServerApplication.java
@@ -26,8 +26,8 @@
 
 package fr.gouv.vitamui.archives.search.external.server;
 
-import fr.gouv.vitamui.commons.api.logger.VitamUILogger;
-import fr.gouv.vitamui.commons.api.logger.VitamUILoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
@@ -43,9 +43,7 @@ public class ApiArchivesSearchExternalServerApplication implements CommandLineRu
     @Autowired
     private Environment env;
 
-    private static final VitamUILogger LOGGER = VitamUILoggerFactory.getInstance(
-        ApiArchivesSearchExternalServerApplication.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ApiArchivesSearchExternalServerApplication.class);
 
     public static void main(final String[] args) {
         final SpringApplication app = new SpringApplicationBuilder(

diff --git a/...r/gouv/vitamui/archives/search/external/server/rest/ArchivesSearchExternalController.java b/...r/gouv/vitamui/archives/search/external/server/rest/ArchivesSearchExternalController.java
@@ -43,13 +43,13 @@
 import fr.gouv.vitamui.commons.api.dtos.SearchCriteriaDto;
 import fr.gouv.vitamui.commons.api.dtos.VitamUiOntologyDto;
 import fr.gouv.vitamui.commons.api.exception.PreconditionFailedException;
-import fr.gouv.vitamui.commons.api.logger.VitamUILogger;
-import fr.gouv.vitamui.commons.api.logger.VitamUILoggerFactory;
 import fr.gouv.vitamui.commons.vitam.api.dto.PersistentIdentifierResponseDto;
 import fr.gouv.vitamui.commons.vitam.api.dto.ResultsDto;
 import fr.gouv.vitamui.commons.vitam.api.dto.VitamUISearchResponseDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;
 import org.springframework.http.MediaType;
@@ -78,9 +78,7 @@
 @ResponseBody
 public class ArchivesSearchExternalController {
 
-    private static final VitamUILogger LOGGER = VitamUILoggerFactory.getInstance(
-        ArchivesSearchExternalController.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ArchivesSearchExternalController.class);
 
     private static final String MANDATORY_QUERY = "The query is a mandatory parameter: ";
     private static final String MANDATORY_IDENTIFIER = "The Identifier is a mandatory parameter: ";

diff --git a/...vitamui/archives/search/external/server/rest/SearchCriteriaHistoryExternalController.java b/...vitamui/archives/search/external/server/rest/SearchCriteriaHistoryExternalController.java
@@ -45,12 +45,12 @@
 import fr.gouv.vitamui.commons.api.domain.ServicesData;
 import fr.gouv.vitamui.commons.api.dtos.SearchCriteriaHistoryDto;
 import fr.gouv.vitamui.commons.api.exception.PreconditionFailedException;
-import fr.gouv.vitamui.commons.api.logger.VitamUILogger;
-import fr.gouv.vitamui.commons.api.logger.VitamUILoggerFactory;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.Getter;
 import lombok.Setter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -76,9 +76,7 @@
 @Api(tags = "searchCriteriaHistory", value = "Search Criteria History")
 public class SearchCriteriaHistoryExternalController {
 
-    private static final VitamUILogger LOGGER = VitamUILoggerFactory.getInstance(
-        SearchCriteriaHistoryExternalController.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(SearchCriteriaHistoryExternalController.class);
 
     private SearchCriteriaHistoryExternalService searchCriteriaHistoryExternalService;
 

diff --git a/...r/gouv/vitamui/archives/search/external/server/service/ArchiveSearchThresholdService.java b/...r/gouv/vitamui/archives/search/external/server/service/ArchiveSearchThresholdService.java
@@ -33,11 +33,11 @@
 import fr.gouv.vitamui.archives.search.common.dto.ArchiveUnitsDto;
 import fr.gouv.vitamui.commons.api.domain.ExternalParametersDto;
 import fr.gouv.vitamui.commons.api.domain.ParameterDto;
-import fr.gouv.vitamui.commons.api.logger.VitamUILogger;
-import fr.gouv.vitamui.commons.api.logger.VitamUILoggerFactory;
 import fr.gouv.vitamui.iam.internal.client.ExternalParametersInternalRestClient;
 import fr.gouv.vitamui.iam.security.client.AbstractResourceClientService;
 import fr.gouv.vitamui.iam.security.service.ExternalSecurityService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -50,7 +50,7 @@
 @Service
 public class ArchiveSearchThresholdService extends AbstractResourceClientService<ArchiveUnitsDto, ArchiveUnitsDto> {
 
-    private static final VitamUILogger LOGGER = VitamUILoggerFactory.getInstance(ArchiveSearchThresholdService.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ArchiveSearchThresholdService.class);
     public static final String PARAM_BULK_OPERATIONS_THRESHOLD_NAME = "PARAM_BULK_OPERATIONS_THRESHOLD";
 
     @Autowired