[WIP] Spring boot upgrade

.github/workflows/e2e-test.yml

@@ -88,10 +88,10 @@ jobs:
 
       - name: Run e2e-bfd-test
         run: |
-          mvn test -s settings.xml -pl e2e-bfd-test -am -Dtest=EndToEndBfdTests -DfailIfNoTests=false -Dusername=$ARTIFACTORY_USER -Dpassword=$ARTIFACTORY_PASSWORD -Drepository_url=$ARTIFACTORY_URL --no-transfer-progress
+          mvn test -s settings.xml -pl e2e-bfd-test -am -Dtest=EndToEndBfdTests -DfailIfNoTests=false -Dsurefire.failIfNoSpecifiedTests=false -Dusername=$ARTIFACTORY_USER -Dpassword=$ARTIFACTORY_PASSWORD -Drepository_url=$ARTIFACTORY_URL --no-transfer-progress
 
       - name: Run e2e-test
         env:
           E2E_ENVIRONMENT: ${{ inputs.environment == 'dev' && 'DEV' || inputs.environment == 'test' && 'IMPL' || inputs.environment == 'sbx' && 'SANDBOX' }}
         run: |
-          mvn test -s settings.xml -pl e2e-test -am -Dtest=TestRunner -DfailIfNoTests=false -Dusername=$ARTIFACTORY_USER -Dpassword=$ARTIFACTORY_PASSWORD -Drepository_url=$ARTIFACTORY_URL --no-transfer-progress
+          mvn test -s settings.xml -pl e2e-test -am -Dtest=TestRunner -DfailIfNoTests=false -Dsurefire.failIfNoSpecifiedTests=false -Dusername=$ARTIFACTORY_USER -Dpassword=$ARTIFACTORY_PASSWORD -Drepository_url=$ARTIFACTORY_URL --no-transfer-progress

api/pom.xml

@@ -104,18 +104,30 @@
             <type>zip</type>
         </dependency>
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>5.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.core5</groupId>
+            <artifactId>httpcore5</artifactId>
+            <version>5.3</version>
         </dependency>
         <dependency>
             <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-ui</artifactId>
-            <version>1.6.14</version>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+            <version>2.6.0</version>
         </dependency>
         <dependency>
             <groupId>gov.cms.ab2d</groupId>
             <artifactId>ab2d-events-client</artifactId>
             <version>${events-client.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.awspring.cloud</groupId>
+                    <artifactId>spring-cloud-aws-dependencies</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

api/src/main/java/gov/cms/ab2d/api/SpringBootApp.java

@@ -3,10 +3,12 @@
 import gov.cms.ab2d.api.config.MDCFilter;
 import gov.cms.ab2d.common.feign.ContractFeignClient;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.cloud.openfeign.FeignAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
@@ -16,6 +18,7 @@
 @EnableJpaRepositories({"gov.cms.ab2d.common.repository", "gov.cms.ab2d.job.repository"})
 @PropertySource("classpath:application.common.properties")
 @EnableFeignClients(clients = {ContractFeignClient.class})
+@ImportAutoConfiguration({FeignAutoConfiguration.class})
 public class SpringBootApp {
 
     public static void main(String[] args) {

api/src/main/java/gov/cms/ab2d/api/config/MDCFilter.java

@@ -4,10 +4,10 @@
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 @Component

api/src/main/java/gov/cms/ab2d/api/config/OpenAPIConfig.java

@@ -14,8 +14,8 @@
 import io.swagger.v3.oas.models.security.SecurityRequirement;
 import io.swagger.v3.oas.models.security.SecurityScheme;
 import lombok.extern.slf4j.Slf4j;
-import org.springdoc.core.GroupedOpenApi;
-import org.springdoc.core.customizers.OpenApiCustomiser;
+import org.springdoc.core.models.GroupedOpenApi;
+import org.springdoc.core.customizers.OpenApiCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -33,7 +33,7 @@
  *
  * {@link OpenAPI} - the base configuration for all versions of the API
  * {@link GroupedOpenApi} - one of these for each version of FHIR we support (V1 - STU3, V2 - R4)
- * {@link OpenApiCustomiser} - customize a {@link GroupedOpenApi} with default behavior
+ * {@link OpenApiCustomizer} - customize a {@link GroupedOpenApi} with default behavior
  */
 @Slf4j
 @Configuration
@@ -70,7 +70,7 @@ public GroupedOpenApi apiV1() {
                 // Only match /v1/fhir calls
                 .pathsToMatch(API_PREFIX_V1 + FHIR_PREFIX + "/**")
                 // Customize the page with default error responses to authentication and internal errors
-                .addOpenApiCustomiser(defaultResponseMessages())
+                .addOpenApiCustomizer(defaultResponseMessages())
                 .build();
     }
 
@@ -85,11 +85,11 @@ public GroupedOpenApi apiV2() {
                 // Only match /v2/fhir calls
                 .pathsToMatch(API_PREFIX_V2 + FHIR_PREFIX + "/**")
                 // Customize the page with default error responses to authentication and internal errors
-                .addOpenApiCustomiser(defaultResponseMessages())
+                .addOpenApiCustomizer(defaultResponseMessages())
                 .build();
     }
 
-    public OpenApiCustomiser defaultResponseMessages() {
+    public OpenApiCustomizer defaultResponseMessages() {
         return api -> {
 
             // Add JSON templates for expected response bodies

api/src/main/java/gov/cms/ab2d/api/controller/AdminAPI.java

@@ -18,8 +18,8 @@
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.constraints.NotBlank;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.constraints.NotBlank;
 import java.time.OffsetDateTime;
 
 import static gov.cms.ab2d.api.controller.common.ApiText.*;

api/src/main/java/gov/cms/ab2d/api/controller/ErrorHandler.java

@@ -23,7 +23,7 @@
 import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.hl7.fhir.instance.model.api.IBaseResource;

api/src/main/java/gov/cms/ab2d/api/controller/HealthAPI.java

@@ -3,7 +3,7 @@
 import gov.cms.ab2d.api.util.HealthCheck;
 import gov.cms.ab2d.eventclient.clients.SQSEventClient;
 import gov.cms.ab2d.eventclient.events.ApiResponseEvent;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.AllArgsConstructor;
 import org.slf4j.MDC;
 import org.springframework.http.HttpStatus;

api/src/main/java/gov/cms/ab2d/api/controller/common/ApiCommon.java

@@ -15,6 +15,9 @@
 import gov.cms.ab2d.eventclient.events.ApiResponseEvent;
 import gov.cms.ab2d.fhir.FhirVersion;
 import gov.cms.ab2d.job.dto.StartJobDTO;
+import java.time.OffsetDateTime;
+import java.util.Set;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.MDC;
 import org.springframework.http.HttpHeaders;
@@ -23,10 +26,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
-import javax.servlet.http.HttpServletRequest;
-import java.time.OffsetDateTime;
-import java.util.Set;
-
 import static gov.cms.ab2d.common.util.Constants.*;
 import static gov.cms.ab2d.fhir.BundleUtils.EOB;
 import static java.time.format.DateTimeFormatter.ISO_OFFSET_DATE_TIME;

api/src/main/java/gov/cms/ab2d/api/controller/common/Common.java

@@ -2,7 +2,7 @@
 
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 public class Common {
     private static final String HTTPS_STRING = "https";

api/src/main/java/gov/cms/ab2d/api/controller/common/FileDownloadCommon.java

@@ -7,8 +7,8 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;

api/src/main/java/gov/cms/ab2d/api/controller/common/StatusCommon.java

@@ -18,7 +18,7 @@
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Value;

api/src/main/java/gov/cms/ab2d/api/controller/v1/BulkDataAccessAPIV1.java

@@ -19,8 +19,8 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.constraints.NotBlank;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.constraints.NotBlank;
 import java.time.OffsetDateTime;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

api/src/main/java/gov/cms/ab2d/api/controller/v1/CapabilityAPIV1.java

@@ -9,7 +9,7 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.hl7.fhir.dstu3.model.CapabilityStatement;

api/src/main/java/gov/cms/ab2d/api/controller/v1/FileDownloadAPIV1.java

@@ -20,9 +20,9 @@
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.NotBlank;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotBlank;
 import java.io.IOException;
 
 import static org.springframework.http.HttpHeaders.CONTENT_TYPE;

api/src/main/java/gov/cms/ab2d/api/controller/v1/StatusAPIV1.java

@@ -23,8 +23,8 @@
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.constraints.NotBlank;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.constraints.NotBlank;
 
 import static gov.cms.ab2d.api.controller.common.ApiText.FILE_EXPIRES;
 import static gov.cms.ab2d.api.controller.common.ApiText.JOB_CANCELLED_MSG;

api/src/main/java/gov/cms/ab2d/api/controller/v2/BulkDataAccessAPIV2.java

@@ -15,8 +15,8 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import java.time.OffsetDateTime;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.constraints.NotBlank;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.constraints.NotBlank;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.MDC;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;

api/src/main/java/gov/cms/ab2d/api/controller/v2/CapabilityAPIV2.java

@@ -8,7 +8,7 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.hl7.fhir.r4.model.CapabilityStatement;

api/src/main/java/gov/cms/ab2d/api/controller/v2/FileDownloadAPIV2.java

@@ -21,9 +21,9 @@
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.NotBlank;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotBlank;
 import java.io.IOException;
 
 import static gov.cms.ab2d.api.controller.common.ApiText.BULK_DNLD_DSC;

api/src/main/java/gov/cms/ab2d/api/controller/v2/StatusAPIV2.java

@@ -24,8 +24,8 @@
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.constraints.NotBlank;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.constraints.NotBlank;
 
 import static gov.cms.ab2d.api.controller.common.ApiCommon.JOB_CANCELLED_MSG;
 import static gov.cms.ab2d.api.controller.common.ApiText.FILE_EXPIRES;

api/src/main/java/gov/cms/ab2d/api/security/FilterChainExceptionHandler.java

@@ -6,9 +6,9 @@
 import org.springframework.web.filter.OncePerRequestFilter;
 import org.springframework.web.servlet.HandlerExceptionResolver;
 
-import javax.servlet.FilterChain;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * This class is used to handle exceptions that come from filters, such as the JwtTokenAuthenticationFilter, since by

api/src/main/java/gov/cms/ab2d/api/security/JwtTokenAuthenticationFilter.java

@@ -16,11 +16,11 @@
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-import javax.annotation.PostConstruct;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.annotation.PostConstruct;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.MDC;