Spring Boot 3 Upgrade

src/aat/java/uk/gov/hmcts/ccd/datastore/tests/v2/internal/GetUIStartTriggerTest.java

@@ -12,7 +12,7 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
 import static uk.gov.hmcts.ccd.datastore.tests.fixture.AATCaseType.CASE_TYPE;
@@ -46,7 +46,7 @@ void shouldRetrieveWhenExists() {
 
                 // Metadata
                 .body("id", equalTo(CREATE))
-                .body("event_token", is(not(isEmptyString())))
+                .body("event_token", is(not(emptyString())))
                 .body("name", is(CREATE_NAME))
                 .body("description", is(nullValue()))
                 .body("case_id", is(nullValue()))

src/aat/resources/features/F-1003 - Case Creation With Documents/S-1032.1.td.json

@@ -13,7 +13,7 @@
   "expectedResponse": {
     "_extends_": "Common_400_Response",
     "body": {
-      "exception": "javax.validation.ConstraintViolationException",
+      "exception": "jakarta.validation.ConstraintViolationException",
       "message": "createCase.caseTypeId: Case Type Id is invalid",
       "path" : "/case-types/BEFTA_%2526%255E%2524%25C2%25A3CASETYPE_2_1/cases",
       "details": null,

src/aat/resources/features/common/health/Health__Base.td.json

@@ -41,6 +41,7 @@
             "total": "[[ANYTHING_PRESENT]]",
             "free": "[[ANYTHING_PRESENT]]",
             "threshold": "[[ANYTHING_PRESENT]]",
+            "path": "[[ANYTHING_PRESENT]]",
             "exists": true
           }
         },

src/contractTest/java/uk/gov/hmcts/ccd/WireMockBaseTest.java → src/contractTest/java/uk/gov/hmcts/ccd/WireMockBaseContractTest.java

@@ -18,13 +18,13 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.io.IOException;
 
 @AutoConfigureWireMock(port = 0)
-public abstract class WireMockBaseTest {
+public abstract class WireMockBaseContractTest {
 
-    private static final Logger LOG = LoggerFactory.getLogger(WireMockBaseTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(WireMockBaseContractTest.class);
 
     @Value("${wiremock.server.port}")
     protected Integer wiremockPort;

src/contractTest/java/uk/gov/hmcts/ccd/v2/external/controller/CasesControllerProviderTest.java

@@ -15,11 +15,11 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
-import uk.gov.hmcts.ccd.WireMockBaseTest;
+import uk.gov.hmcts.ccd.WireMockBaseContractTest;
 import uk.gov.hmcts.ccd.auditlog.AuditService;
 import uk.gov.hmcts.ccd.data.casedetails.query.UserAuthorisationSecurity;
 import uk.gov.hmcts.ccd.domain.model.definition.CaseDetails;
@@ -55,7 +55,7 @@
 @TestPropertySource(locations = "/application.properties")
 @ActiveProfiles("SECURITY_MOCK")
 @IgnoreNoPactsToVerify
-public class CasesControllerProviderTest extends WireMockBaseTest {
+public class CasesControllerProviderTest extends WireMockBaseContractTest {
 
     private static final String CASEWORKER_USERNAME = "caseworkerUsername";
     private static final String CASEWORKER_PASSWORD = "caseworkerPassword";
@@ -66,58 +66,41 @@ public class CasesControllerProviderTest extends WireMockBaseTest {
 
     @Autowired
     ContractTestSecurityUtils securityUtils;
-
-    @MockBean
+    @MockitoBean
     UserAuthorisationSecurity userAuthorisationSecurity;
-
     @Autowired
     ContractTestCreateCaseOperation contractTestCreateCaseOperation;
-
     @Autowired
     ContractTestGetCaseOperation getCaseOperation;
-
     @Autowired
     ContractTestStartEventOperation startEventOperation;
-
     @Autowired
     ObjectMapper objectMapper;
-
-    @MockBean
+    @MockitoBean
     EventTokenService eventTokenServiceMock;
-
-    @MockBean
+    @MockitoBean
     DocumentSanitiser documentSanitiser;
-
     @Autowired
     ContractTestCaseDefinitionRepository contractTestCaseDefinitionRepository;
-
-    @MockBean
+    @MockitoBean
     AuthorisedCaseSearchOperation elasticsearchCaseSearchOperationMock;
-
-    @MockBean
+    @MockitoBean
     AuthorisedSearchOperation authorisedSearchOperation;
-
-    @MockBean
+    @MockitoBean
     UserAuthorisation userAuthorisation;
-
-    @MockBean
+    @MockitoBean
     AuditService auditService;
-
-    @MockBean
+    @MockitoBean
     CaseAccessService caseAccessService;
-    @MockBean
+    @MockitoBean
     AccessControlService accessControlService;
-
-    @MockBean
+    @MockitoBean
     TelemetryClient telemetryClient;
-
     @Autowired
     ContractTestCreateEventOperation createEventOperation;
-
-    @MockBean
+    @MockitoBean
     CaseDataService caseDataService;
-
-    @MockBean
+    @MockitoBean
     MessageService messageService;
 
     @TestTemplate

src/contractTest/java/uk/gov/hmcts/ccd/v2/external/controller/ContractTestSubmitCaseTransaction.java

@@ -1,6 +1,6 @@
 package uk.gov.hmcts.ccd.v2.external.controller;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import org.springframework.context.annotation.Primary;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;

src/contractTest/java/uk/gov/hmcts/ccd/v2/external/controller/SecurityMockConfiguration.java

@@ -1,14 +1,15 @@
 package uk.gov.hmcts.ccd.v2.external.controller;
 
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
-import org.springframework.core.annotation.Order;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.builders.WebSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
 import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationConverter;
+import org.springframework.security.web.SecurityFilterChain;
+
 import uk.gov.hmcts.ccd.data.SecurityUtils;
 import uk.gov.hmcts.ccd.security.JwtGrantedAuthoritiesConverter;
 import uk.gov.hmcts.ccd.security.filters.SecurityLoggingFilter;
@@ -18,15 +19,14 @@
 import java.util.Collection;
 import java.util.Optional;
 import java.util.function.Function;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
 
 
 @Profile("SECURITY_MOCK")
 @Configuration
 @EnableWebSecurity
-@Order(1)
-public class SecurityMockConfiguration extends WebSecurityConfigurerAdapter {
+public class SecurityMockConfiguration {
 
 
     private final ServiceAuthFilter serviceAuthFilter;
@@ -49,10 +49,9 @@ public SecurityMockConfiguration(final JwtGrantedAuthoritiesConverter jwtGranted
         jwtAuthenticationConverter.setJwtGrantedAuthoritiesConverter(jwtGrantedAuthoritiesConverter);
     }
 
-
-    @Override
-    public void configure(WebSecurity web) {
-        web.ignoring().antMatchers(
+    @Bean
+    public WebSecurityCustomizer webSecurityCustomizer() {
+        return (web) -> web.ignoring().requestMatchers(
             "/case-types/**",
             "/caseworkers/**",
             "/citizens/**",
@@ -61,14 +60,15 @@ public void configure(WebSecurity web) {
             "/");
     }
 
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http.authorizeRequests().antMatchers(
+    @Bean
+    public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+        http.authorizeHttpRequests(ahr ->  ahr.requestMatchers(
             "/case-types/**",
             "/caseworkers/**",
             "/citizens/**",
             "/searchCases/**",
             "/cases/**"
-        ).permitAll();
+        ).permitAll());
+        return http.build();
     }
 }

src/contractTest/java/uk/gov/hmcts/ccd/v2/external/controller/TestIdamConfiguration.java

@@ -22,7 +22,7 @@ public ClientRegistrationRepository clientRegistrationRepository() {
 
     private ClientRegistration clientRegistration() {
         return ClientRegistration.withRegistrationId("oidc")
-            .redirectUriTemplate("{baseUrl}/{action}/oauth2/code/{registrationId}")
+            .redirectUri("{baseUrl}/{action}/oauth2/code/{registrationId}")
             .authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE)
             .scope("read:user")
             .authorizationUri("http://idam/o/authorize")

src/contractTest/java/uk/gov/hmcts/ccd/v2/external/controller/caseassigned/CaseAssignedUserRolesProviderTest.java

@@ -18,7 +18,7 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import uk.gov.hmcts.ccd.ApplicationParams;
-import uk.gov.hmcts.ccd.WireMockBaseTest;
+import uk.gov.hmcts.ccd.WireMockBaseContractTest;
 import uk.gov.hmcts.ccd.data.SecurityUtils;
 import uk.gov.hmcts.ccd.domain.model.std.CaseAssignedUserRole;
 import uk.gov.hmcts.ccd.domain.service.caseaccess.CaseAccessOperation;
@@ -41,7 +41,7 @@
 @ContextConfiguration(classes = {CaseAssignedUserRolesProviderTestContext.class, TestIdamConfiguration.class})
 @IgnoreNoPactsToVerify
 @ActiveProfiles("CASE_ASSIGNED")
-public class CaseAssignedUserRolesProviderTest extends WireMockBaseTest {
+public class CaseAssignedUserRolesProviderTest extends WireMockBaseContractTest {
 
     @Autowired
     ApplicationParams applicationParams;

src/contractTest/java/uk/gov/hmcts/ccd/v2/external/controller/caseassigned/CaseAssignedUserRolesProviderTestContext.java

@@ -1,10 +1,11 @@
 package uk.gov.hmcts.ccd.v2.external.controller.caseassigned;
 
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 import org.springframework.context.annotation.Profile;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+
 import uk.gov.hmcts.ccd.ApplicationParams;
 import uk.gov.hmcts.ccd.data.SecurityUtils;
 import uk.gov.hmcts.ccd.domain.service.caseaccess.CaseAccessOperation;
@@ -16,13 +17,13 @@
 @Profile("CASE_ASSIGNED")
 public class CaseAssignedUserRolesProviderTestContext {
 
-    @MockBean
+    @MockitoBean
     ApplicationParams applicationParams;
 
-    @MockBean
+    @MockitoBean
     SecurityUtils securityUtils;
 
-    @MockBean
+    @MockitoBean
     CaseAccessOperation caseAccessOperation;
 
     @Primary

src/contractTest/java/uk/gov/hmcts/reform/ccd/pactprovider/cases/CasesProviderTest.java

@@ -38,7 +38,8 @@
 
 @Provider("ccd_data_store_api_cases")
 @PactBroker(
-    url = "${PACT_BROKER_FULL_URL:http://localhost:9292}",
+    host = "${PACT_BROKER_URL:localhost}",
+    port = "${PACT_BROKER_PORT:9292}",
     consumerVersionSelectors = {@VersionSelector(tag = "master")})
 @IgnoreNoPactsToVerify
 @ExtendWith(SpringExtension.class)

src/contractTest/java/uk/gov/hmcts/reform/ccd/pactprovider/cases/controller/CasesRestController.java

@@ -1,7 +1,7 @@
 package uk.gov.hmcts.reform.ccd.pactprovider.cases.controller;
 
-import io.swagger.annotations.ApiParam;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
@@ -80,17 +80,17 @@ public ResponseEntity<CaseResource> getCase(@PathVariable("caseId") final String
         path = "/citizens/{uid}/jurisdictions/{jid}/case-types/{ctid}/cases/{cid}/event-triggers/{etid}/token",
         produces = APPLICATION_JSON_VALUE)
     public ResponseEntity<StartEventResult> startEventForCitizen(
-        @ApiParam(value = "Idam user ID", required = true)
+        @Parameter(name = "Idam user ID", required = true)
         @PathVariable("uid") final String uid,
-        @ApiParam(value = "Jurisdiction ID", required = true)
+        @Parameter(name = "Jurisdiction ID", required = true)
         @PathVariable("jid") final String jurisdictionId,
-        @ApiParam(value = "Case type ID", required = true)
+        @Parameter(name = "Case type ID", required = true)
         @PathVariable("ctid") final String caseTypeId,
-        @ApiParam(value = "Case ID", required = true)
+        @Parameter(name = "Case ID", required = true)
         @PathVariable("cid") final String caseId,
-        @ApiParam(value = "Event ID", required = true)
+        @Parameter(name = "Event ID", required = true)
         @PathVariable("etid") final String eventId,
-        @ApiParam(value = "Should `AboutToStart` callback warnings be ignored")
+        @Parameter(name = "Should `AboutToStart` callback warnings be ignored")
         @RequestParam(value = "ignore-warning", required = false, defaultValue = "false") final Boolean ignoreWarning) {
 
         StartEventResult startEventResult = startEventOperation.triggerStartForCase(caseId, eventId, ignoreWarning);
@@ -112,15 +112,15 @@ public ResponseEntity<StartEventResult> startEventForCitizen(
     @GetMapping(path = "/citizens/{uid}/jurisdictions/{jid}/case-types/{ctid}/event-triggers/{etid}/token",
         produces = APPLICATION_JSON_VALUE)
     public ResponseEntity<StartEventResult> startCaseForCitizen(
-        @ApiParam(value = "Idam user ID", required = true)
+        @Parameter(name = "Idam user ID", required = true)
         @PathVariable("uid") final String uid,
-        @ApiParam(value = "Jurisdiction ID", required = true)
+        @Parameter(name = "Jurisdiction ID", required = true)
         @PathVariable("jid") final String jurisdictionId,
-        @ApiParam(value = "Case type ID", required = true)
+        @Parameter(name = "Case type ID", required = true)
         @PathVariable("ctid") final String caseTypeId,
-        @ApiParam(value = "Event ID", required = true)
+        @Parameter(name = "Event ID", required = true)
         @PathVariable("etid") final String eventId,
-        @ApiParam(value = "Should `AboutToStart` callback warnings be ignored")
+        @Parameter(name = "Should `AboutToStart` callback warnings be ignored")
         @RequestParam(value = "ignore-warning", required = false, defaultValue = "false") final Boolean ignoreWarning) {
 
         StartEventResult startEventResult = startEventOperation.triggerStartForCaseType(caseTypeId, eventId,
@@ -143,13 +143,13 @@ public ResponseEntity<StartEventResult> startCaseForCitizen(
     @PostMapping(path = "/citizens/{uid}/jurisdictions/{jid}/case-types/{ctid}/cases/{cid}/events",
         produces = APPLICATION_JSON_VALUE)
     public ResponseEntity<CaseDetails> createCaseEventForCitizen(
-        @ApiParam(value = "Idam user ID", required = true)
+        @Parameter(name = "Idam user ID", required = true)
         @PathVariable("uid") final String uid,
-        @ApiParam(value = "Jurisdiction ID", required = true)
+        @Parameter(name = "Jurisdiction ID", required = true)
         @PathVariable("jid") final String jurisdictionId,
-        @ApiParam(value = "Case type ID", required = true)
+        @Parameter(name = "Case type ID", required = true)
         @PathVariable("ctid") final String caseTypeId,
-        @ApiParam(value = "Case ID", required = true)
+        @Parameter(name = "Case ID", required = true)
         @PathVariable("cid") final String caseId,
         @RequestBody(required = false) final CaseDataContent content) {
 
@@ -172,13 +172,13 @@ public ResponseEntity<CaseDetails> createCaseEventForCitizen(
     @PostMapping(path = "/citizens/{uid}/jurisdictions/{jid}/case-types/{ctid}/cases",
         produces = APPLICATION_JSON_VALUE)
     public ResponseEntity<CaseDetails> saveCaseDetailsForCitizen(
-        @ApiParam(value = "Idam user ID", required = true)
+        @Parameter(name = "Idam user ID", required = true)
         @PathVariable("uid") final String uid,
-        @ApiParam(value = "Jurisdiction ID", required = true)
+        @Parameter(name = "Jurisdiction ID", required = true)
         @PathVariable("jid") final String jurisdictionId,
-        @ApiParam(value = "Case type ID", required = true)
+        @Parameter(name = "Case type ID", required = true)
         @PathVariable("ctid") final String caseTypeId,
-        @ApiParam(value = "Should `AboutToSubmit` callback warnings be ignored")
+        @Parameter(name = "Should `AboutToSubmit` callback warnings be ignored")
         @RequestParam(value = "ignore-warning", required = false, defaultValue = "false") final Boolean ignoreWarning,
         @RequestBody(required = false) final CaseDataContent content) {