diff --git a/aat/build.gradle b/aat/build.gradle index ed304fe57d..658bc0cb64 100644 --- a/aat/build.gradle +++ b/aat/build.gradle @@ -5,13 +5,6 @@ dependencyCheck { suppressionFile = "${rootDir}/dependency-check-suppressions.xml" } -dependencies { - implementation (group: 'com.github.hmcts', name: 'service-auth-provider-java-client', version: '4.0.3') { - exclude group: 'com.google.guava', module: 'guava' - } - implementation group: 'org.awaitility', name: 'awaitility', version: '3.1.6' -} - sourceSets { aat { java { @@ -29,6 +22,11 @@ sourceSets { } } +dependencies { + implementation group: 'com.github.hmcts', name: 'service-auth-provider-java-client', version: '5.2.0' + implementation group: 'org.awaitility', name: 'awaitility', version: '3.1.6' +} + tasks.named("processAatResources") { duplicatesStrategy = 'include' } diff --git a/app-insights/build.gradle b/app-insights/build.gradle index 4fed85ab1a..eea3bd8bd9 100644 --- a/app-insights/build.gradle +++ b/app-insights/build.gradle @@ -2,10 +2,6 @@ plugins { id 'info.solidsoft.pitest' } -dependencies { - // compile "org.springframework:spring-context:5.0.7.RELEASE" -} - dependencyCheck { suppressionFile = "${rootDir}/dependency-check-suppressions.xml" } diff --git a/app-insights/src/test/java/uk/gov/hmcts/ccd/definition/store/AppInsightsTest.java b/app-insights/src/test/java/uk/gov/hmcts/ccd/definition/store/AppInsightsTest.java index 4b4b68469c..1474ae0c8b 100644 --- a/app-insights/src/test/java/uk/gov/hmcts/ccd/definition/store/AppInsightsTest.java +++ b/app-insights/src/test/java/uk/gov/hmcts/ccd/definition/store/AppInsightsTest.java @@ -22,7 +22,7 @@ class AppInsightsTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); TelemetryContext telemetryContext = new TelemetryContext(); telemetryContext.setInstrumentationKey("some-key"); doReturn(telemetryContext).when(telemetryClient).getContext(); diff --git a/application/build.gradle b/application/build.gradle index dd22b75034..21865a3d89 100644 --- a/application/build.gradle +++ b/application/build.gradle @@ -25,13 +25,11 @@ dependencies { implementation project(':elastic-search-support') implementation project(':repository') implementation project(':domain') - implementation "org.springframework.boot:spring-boot-starter-web" - implementation "org.springframework.boot:spring-boot-starter-actuator" - implementation ("io.springfox:springfox-boot-starter:${springfoxSwaggerVersion}") { - exclude group: 'com.google.guava', module: 'guava' - } - implementation "org.flywaydb:flyway-core:6.5.7" - runtimeOnly group: 'org.postgresql', name: 'postgresql', version: '42.7.3' + implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web' + implementation group: 'org.springframework.boot', name: 'spring-boot-starter-actuator' + implementation group: 'org.springdoc', name: 'springdoc-openapi-starter-webmvc-ui', version: springDocVersion + implementation group: 'org.flywaydb', name: 'flyway-core', version: flywayVersion + runtimeOnly group: 'org.postgresql', name: 'postgresql', version: '42.7.4' testImplementation project(":app-insights").sourceSets.main.output testImplementation project(":commons").sourceSets.main.output diff --git a/application/src/main/java/uk/gov/hmcts/ccd/definition/store/SecurityConfiguration.java b/application/src/main/java/uk/gov/hmcts/ccd/definition/store/SecurityConfiguration.java index df78865c29..4f180ab280 100644 --- a/application/src/main/java/uk/gov/hmcts/ccd/definition/store/SecurityConfiguration.java +++ b/application/src/main/java/uk/gov/hmcts/ccd/definition/store/SecurityConfiguration.java @@ -4,33 +4,33 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; 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.core.DelegatingOAuth2TokenValidator; import org.springframework.security.oauth2.core.OAuth2TokenValidator; import org.springframework.security.oauth2.jwt.Jwt; import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.security.oauth2.jwt.JwtDecoders; -import org.springframework.security.oauth2.jwt.JwtIssuerValidator; +// import org.springframework.security.oauth2.jwt.JwtIssuerValidator; import org.springframework.security.oauth2.jwt.JwtTimestampValidator; import org.springframework.security.oauth2.jwt.NimbusJwtDecoder; import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationConverter; -import org.springframework.security.oauth2.server.resource.web.BearerTokenAuthenticationFilter; +import org.springframework.security.oauth2.server.resource.web.authentication.BearerTokenAuthenticationFilter; +import org.springframework.security.web.SecurityFilterChain; + import uk.gov.hmcts.ccd.definition.store.elastic.endpoint.ElasticsearchIndexController; import uk.gov.hmcts.ccd.definition.store.excel.endpoint.ImportController; import uk.gov.hmcts.ccd.definition.store.security.JwtGrantedAuthoritiesConverter; import uk.gov.hmcts.ccd.definition.store.security.filters.ExceptionHandlingFilter; import uk.gov.hmcts.reform.authorisation.filters.ServiceAuthFilter; -import javax.inject.Inject; +import jakarta.inject.Inject; import static org.springframework.security.config.http.SessionCreationPolicy.STATELESS; @Configuration @EnableWebSecurity -public class SecurityConfiguration - extends WebSecurityConfigurerAdapter { +public class SecurityConfiguration { @Value("${spring.security.oauth2.client.provider.oidc.issuer-uri}") private String issuerUri; @@ -51,11 +51,12 @@ public SecurityConfiguration(final ServiceAuthFilter serviceAuthFilter, jwtAuthenticationConverter.setJwtGrantedAuthoritiesConverter(jwtGrantedAuthoritiesConverter); } - @Override - public void configure(WebSecurity web) throws Exception { - web.ignoring().antMatchers("/swagger-resources/**", + @Bean + public WebSecurityCustomizer wewWebSecurityCustomizer() { + return web -> web.ignoring().requestMatchers("/swagger-resources/**", "/swagger-ui/**", "/webjars/**", + "/v3/api-docs", "/v2/**", "/health", "/health/liveness", @@ -65,27 +66,24 @@ public void configure(WebSecurity web) throws Exception { "/api/testing-support/**"); } - @Override - protected void configure(HttpSecurity http) throws Exception { + @Bean + public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { http .addFilterBefore(exceptionHandlingFilter, BearerTokenAuthenticationFilter.class) .addFilterBefore(serviceAuthFilter, BearerTokenAuthenticationFilter.class) .sessionManagement().sessionCreationPolicy(STATELESS).and() - .csrf().disable() - .formLogin().disable() - .logout().disable() - .authorizeRequests() - .antMatchers(ImportController.URI_IMPORT, ElasticsearchIndexController.ELASTIC_INDEX_URI) - .hasAuthority("ccd-import") - .anyRequest() - .authenticated() - .and() - .oauth2ResourceServer() - .jwt() - .jwtAuthenticationConverter(jwtAuthenticationConverter) - .and() - .and() + .csrf(csrf -> csrf.disable()) // NOSONAR - CSRF is disabled as per security requirements + .formLogin(fl -> fl.disable()) + .logout(lg -> lg.disable()) + .authorizeHttpRequests(ar -> + ar.requestMatchers(ImportController.URI_IMPORT, ElasticsearchIndexController.ELASTIC_INDEX_URI) + .hasAuthority("ccd-import") + .anyRequest() + .authenticated() + ) + .oauth2ResourceServer(oauth2 -> oauth2.jwt().jwtAuthenticationConverter(jwtAuthenticationConverter)) .oauth2Client(); + return http.build(); } @Bean @@ -94,7 +92,7 @@ JwtDecoder jwtDecoder() { // We are using issuerOverride instead of issuerUri as SIDAM has the wrong issuer at the moment OAuth2TokenValidator withTimestamp = new JwtTimestampValidator(); - OAuth2TokenValidator withIssuer = new JwtIssuerValidator(issuerOverride); + // OAuth2TokenValidator withIssuer = new JwtIssuerValidator(issuerOverride); // FIXME : enable `withIssuer` once idam migration is done RDM-8094 // OAuth2TokenValidator validator = new DelegatingOAuth2TokenValidator<>(withTimestamp, withIssuer); OAuth2TokenValidator validator = new DelegatingOAuth2TokenValidator<>(withTimestamp); diff --git a/application/src/main/java/uk/gov/hmcts/ccd/definition/store/SwaggerConfiguration.java b/application/src/main/java/uk/gov/hmcts/ccd/definition/store/SwaggerConfiguration.java index 979ad05f82..bd906a1535 100644 --- a/application/src/main/java/uk/gov/hmcts/ccd/definition/store/SwaggerConfiguration.java +++ b/application/src/main/java/uk/gov/hmcts/ccd/definition/store/SwaggerConfiguration.java @@ -1,67 +1,18 @@ package uk.gov.hmcts.ccd.definition.store; -import org.springframework.boot.actuate.autoconfigure.endpoint.web.CorsEndpointProperties; -import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties; -import org.springframework.boot.actuate.autoconfigure.web.server.ManagementPortType; -import org.springframework.boot.actuate.endpoint.ExposableEndpoint; -import org.springframework.boot.actuate.endpoint.web.EndpointMediaTypes; -import org.springframework.boot.actuate.endpoint.web.ExposableWebEndpoint; -import org.springframework.boot.actuate.endpoint.web.WebEndpointsSupplier; -import org.springframework.boot.actuate.endpoint.web.EndpointMapping; -import org.springframework.boot.actuate.endpoint.web.EndpointLinksResolver; -import org.springframework.boot.actuate.endpoint.web.annotation.ControllerEndpointsSupplier; -import org.springframework.boot.actuate.endpoint.web.annotation.ServletEndpointsSupplier; -import org.springframework.boot.actuate.endpoint.web.servlet.WebMvcEndpointHandlerMapping; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.core.env.Environment; -import org.springframework.util.StringUtils; -import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spring.web.plugins.Docket; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; @Configuration public class SwaggerConfiguration { @Bean - public Docket api() { - return new Docket(DocumentationType.SWAGGER_2) - .select() - .apis(RequestHandlerSelectors.basePackage(CaseDataAPIApplication.class.getPackage().getName())) - .build(); - } - - //CCD-3509 CVE-2021-22044 required to fix null pointers in integration tests, - //conflict in Springfox after Springboot 2.6.10 - @Bean - public WebMvcEndpointHandlerMapping webEndpointServletHandlerMapping(WebEndpointsSupplier webEndpointsSupplier, - ServletEndpointsSupplier servletEndpointsSupplier, ControllerEndpointsSupplier controllerEndpointsSupplier, - EndpointMediaTypes endpointMediaTypes, CorsEndpointProperties corsProperties, - WebEndpointProperties webEndpointProperties, Environment environment) { - - List> allEndpoints = new ArrayList<>(); - Collection webEndpoints = webEndpointsSupplier.getEndpoints(); - allEndpoints.addAll(webEndpoints); - allEndpoints.addAll(servletEndpointsSupplier.getEndpoints()); - allEndpoints.addAll(controllerEndpointsSupplier.getEndpoints()); - String basePath = webEndpointProperties.getBasePath(); - EndpointMapping endpointMapping = new EndpointMapping(basePath); - boolean shouldRegisterLinksMapping = this.shouldRegisterLinksMapping(webEndpointProperties, environment, - basePath); - return new WebMvcEndpointHandlerMapping(endpointMapping, webEndpoints, endpointMediaTypes, - corsProperties.toCorsConfiguration(), - new EndpointLinksResolver(allEndpoints, basePath), - shouldRegisterLinksMapping, null); - } - - private boolean shouldRegisterLinksMapping(WebEndpointProperties webEndpointProperties, Environment environment, - String basePath) { - return webEndpointProperties.getDiscovery().isEnabled() && (StringUtils.hasText(basePath) - || ManagementPortType.get(environment).equals(ManagementPortType.DIFFERENT)); + public OpenAPI springShopOpenAPI() { + return new OpenAPI() + .info(new Info().title("CaseDataAPI Application") + .description("CaseDataAPIApplication")); } } diff --git a/application/src/main/java/uk/gov/hmcts/ccd/definition/store/TransactionConfiguration.java b/application/src/main/java/uk/gov/hmcts/ccd/definition/store/TransactionConfiguration.java index 4c183611c0..cdaaa1bef8 100644 --- a/application/src/main/java/uk/gov/hmcts/ccd/definition/store/TransactionConfiguration.java +++ b/application/src/main/java/uk/gov/hmcts/ccd/definition/store/TransactionConfiguration.java @@ -7,7 +7,7 @@ import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.annotation.EnableTransactionManagement; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; @Configuration @EnableTransactionManagement diff --git a/application/src/main/java/uk/gov/hmcts/ccd/definition/store/hikari/HikariConfigurationPropertiesReportEndpoint.java b/application/src/main/java/uk/gov/hmcts/ccd/definition/store/hikari/HikariConfigurationPropertiesReportEndpoint.java index 42f2625da9..e21b12ba60 100644 --- a/application/src/main/java/uk/gov/hmcts/ccd/definition/store/hikari/HikariConfigurationPropertiesReportEndpoint.java +++ b/application/src/main/java/uk/gov/hmcts/ccd/definition/store/hikari/HikariConfigurationPropertiesReportEndpoint.java @@ -1,8 +1,13 @@ package uk.gov.hmcts.ccd.definition.store.hikari; -import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.json.JsonMapper; import com.zaxxer.hikari.HikariDataSource; + +import java.util.ArrayList; + import org.springframework.boot.actuate.context.properties.ConfigurationPropertiesReportEndpoint; +import org.springframework.boot.actuate.endpoint.SanitizingFunction; +import org.springframework.boot.actuate.endpoint.Show; import org.springframework.stereotype.Component; // needed to fix "error" : "Cannot serialize 'spring.datasource.hikari'" in actuator /configprops endpoint @@ -10,9 +15,13 @@ @Component public class HikariConfigurationPropertiesReportEndpoint extends ConfigurationPropertiesReportEndpoint { + public HikariConfigurationPropertiesReportEndpoint() { + super(new ArrayList(), Show.ALWAYS); + } + @Override - protected void configureObjectMapper(ObjectMapper mapper) { - super.configureObjectMapper(mapper); - mapper.addMixIn(HikariDataSource.class, HikariDataSourceMixIn.class); + protected void configureJsonMapper(JsonMapper.Builder builder) { + super.configureJsonMapper(builder); + builder.addMixIn(HikariDataSource.class, HikariDataSourceMixIn.class); } } diff --git a/application/src/main/java/uk/gov/hmcts/ccd/definition/store/security/JwtGrantedAuthoritiesConverter.java b/application/src/main/java/uk/gov/hmcts/ccd/definition/store/security/JwtGrantedAuthoritiesConverter.java index fde413f0a7..1ed0b8a857 100644 --- a/application/src/main/java/uk/gov/hmcts/ccd/definition/store/security/JwtGrantedAuthoritiesConverter.java +++ b/application/src/main/java/uk/gov/hmcts/ccd/definition/store/security/JwtGrantedAuthoritiesConverter.java @@ -31,7 +31,7 @@ public JwtGrantedAuthoritiesConverter(IdamRepository idamRepository) { @Override public Collection convert(Jwt jwt) { List authorities = new ArrayList<>(); - if (jwt.containsClaim(TOKEN_NAME) && jwt.getClaim(TOKEN_NAME).equals(ACCESS_TOKEN)) { + if (jwt.hasClaim(TOKEN_NAME) && jwt.getClaim(TOKEN_NAME).equals(ACCESS_TOKEN)) { UserInfo userInfo = idamRepository.getUserInfo(jwt.getTokenValue()); authorities = extractAuthorityFromClaims(userInfo.getRoles()); } diff --git a/application/src/main/java/uk/gov/hmcts/ccd/definition/store/security/filters/ExceptionHandlingFilter.java b/application/src/main/java/uk/gov/hmcts/ccd/definition/store/security/filters/ExceptionHandlingFilter.java index dd25220cea..ea46398cd8 100644 --- a/application/src/main/java/uk/gov/hmcts/ccd/definition/store/security/filters/ExceptionHandlingFilter.java +++ b/application/src/main/java/uk/gov/hmcts/ccd/definition/store/security/filters/ExceptionHandlingFilter.java @@ -5,9 +5,9 @@ import org.springframework.http.HttpStatus; import org.springframework.web.filter.OncePerRequestFilter; -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; /** * Used to catch the exceptions thrown in the Spring Security filter chain, except the following ServiceAuthFilter diff --git a/application/src/main/resources/application.properties b/application/src/main/resources/application.properties index dbe7623080..322ff5c944 100644 --- a/application/src/main/resources/application.properties +++ b/application/src/main/resources/application.properties @@ -25,8 +25,7 @@ spring.datasource.hikari.connection-timeout=${DEFINITION_STORE_DB_CONNECTION_TIM spring.main.allow-bean-definition-overriding=true # Jackson ObjectMapper configuration spring.jackson.serialization.write-dates-as-timestamps=false - -spring.jpa.properties.hibernate.ejb.interceptor=uk.gov.hmcts.ccd.definition.store.repository.interceptor.CaseRoleInterceptor +hibernate.session_factory.interceptor=uk.gov.hmcts.ccd.definition.store.repository.interceptor.CaseRoleInterceptor # Disable feature detection to avoid the java.sql.SQLFeatureNotSupportedException # Method org.postgresql.jdbc.PgConnection.createClob() is not yet implemented. spring.jpa.properties.hibernate.temp.use_jdbc_metadata_defaults = false @@ -42,6 +41,8 @@ spring.security.oauth2.client.registration.oidc.client-secret = internal #required to fix null pointers in integration tests, conflict in Springfox after Springboot 2.6.10 upgrade spring.mvc.pathmatch.matching-strategy=ant_path_matcher +springdoc.packagesToScan=uk.gov.hmcts.ccd.definition.store + oidc.issuer = ${OIDC_ISSUER:http://fr-am:8080/openam/oauth2/hmcts} idam.s2s-auth.url=${IDAM_S2S_URL:http://localhost:4502} diff --git a/application/src/test/java/uk/gov/hmcts/ccd/definition/store/SwaggerConfigurationTest.java b/application/src/test/java/uk/gov/hmcts/ccd/definition/store/SwaggerConfigurationTest.java deleted file mode 100644 index 70fa444c54..0000000000 --- a/application/src/test/java/uk/gov/hmcts/ccd/definition/store/SwaggerConfigurationTest.java +++ /dev/null @@ -1,67 +0,0 @@ -package uk.gov.hmcts.ccd.definition.store; - -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.actuate.autoconfigure.endpoint.web.CorsEndpointProperties; -import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties; -import org.springframework.boot.actuate.endpoint.web.EndpointMediaTypes; -import org.springframework.boot.actuate.endpoint.web.WebEndpointsSupplier; -import org.springframework.boot.actuate.endpoint.web.annotation.ControllerEndpointsSupplier; -import org.springframework.boot.actuate.endpoint.web.annotation.ServletEndpointsSupplier; -import org.springframework.boot.actuate.endpoint.web.servlet.WebMvcEndpointHandlerMapping; -import org.springframework.core.env.Environment; -import uk.gov.hmcts.net.ccd.definition.store.BaseTest; - - -class SwaggerConfigurationTest extends BaseTest { - - private static final int EXPECTED_TOTAL_ENDPOINTS = 16; - private static final String EXPECTED_APPLICATION_CONTEXT_NAME = "application-1"; - - @Autowired - private WebEndpointsSupplier webEndpointsSupplier; - - @Autowired - private ServletEndpointsSupplier servletEndpointsSupplier; - - @Autowired - private ControllerEndpointsSupplier controllerEndpointsSupplier; - - @Autowired - private EndpointMediaTypes endpointMediaTypes; - - @Autowired - private CorsEndpointProperties corsProperties; - - @Autowired - private WebEndpointProperties webEndpointProperties; - - @Autowired - private Environment environment; - - @Autowired - private SwaggerConfiguration swaggerConfiguration; - - @Test - public void successfullyLoadWebEndpointServletHandlerMappingTest() { - assertNotNull(webEndpointsSupplier); - assertNotNull(servletEndpointsSupplier); - assertNotNull(controllerEndpointsSupplier); - assertNotNull(endpointMediaTypes); - assertNotNull(corsProperties); - assertNotNull(webEndpointProperties); - assertNotNull(environment); - assertNotNull(swaggerConfiguration); - - WebMvcEndpointHandlerMapping webMvcEndpointHandlerMapping = - swaggerConfiguration.webEndpointServletHandlerMapping(webEndpointsSupplier, servletEndpointsSupplier, - controllerEndpointsSupplier, endpointMediaTypes,corsProperties, webEndpointProperties, environment); - - assertEquals(EXPECTED_TOTAL_ENDPOINTS, webMvcEndpointHandlerMapping.getEndpoints().size()); - assertEquals(EXPECTED_APPLICATION_CONTEXT_NAME, webMvcEndpointHandlerMapping.getApplicationContext().getId()); - } - -} diff --git a/application/src/test/java/uk/gov/hmcts/ccd/definition/store/security/JwtGrantedAuthoritiesConverterTest.java b/application/src/test/java/uk/gov/hmcts/ccd/definition/store/security/JwtGrantedAuthoritiesConverterTest.java index bf0ce1a8ee..a011f9922d 100644 --- a/application/src/test/java/uk/gov/hmcts/ccd/definition/store/security/JwtGrantedAuthoritiesConverterTest.java +++ b/application/src/test/java/uk/gov/hmcts/ccd/definition/store/security/JwtGrantedAuthoritiesConverterTest.java @@ -32,7 +32,7 @@ class JwtGrantedAuthoritiesConverterTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); } @Test @@ -48,7 +48,7 @@ void shouldReturnEmptyAuthorities() { @DisplayName("No Claims should return empty authorities") void shouldReturnEmptyAuthoritiesWhenClaimNotAvailable() { Jwt jwt = Mockito.mock(Jwt.class); - when(jwt.containsClaim(anyString())).thenReturn(false); + when(jwt.hasClaim(anyString())).thenReturn(false); Collection authorities = converter.convert(jwt); assertNotNull(authorities); assertEquals(0, authorities.size()); @@ -58,7 +58,7 @@ void shouldReturnEmptyAuthoritiesWhenClaimNotAvailable() { @DisplayName("Should return empty authorities when token value is not matching with expected") void shouldReturnEmptyAuthoritiesWhenClaimValueNotEquals() { Jwt jwt = Mockito.mock(Jwt.class); - when(jwt.containsClaim(anyString())).thenReturn(true); + when(jwt.hasClaim(anyString())).thenReturn(true); when(jwt.getClaim(anyString())).thenReturn("Test"); Collection authorities = converter.convert(jwt); assertNotNull(authorities); @@ -69,11 +69,11 @@ void shouldReturnEmptyAuthoritiesWhenClaimValueNotEquals() { @DisplayName("Should return empty authorities when token value is not matching with expected") void shouldReturnEmptyAuthoritiesWhenIdamReturnsNoUsers() { Jwt jwt = Mockito.mock(Jwt.class); - when(jwt.containsClaim(anyString())).thenReturn(true); + when(jwt.hasClaim(anyString())).thenReturn(true); when(jwt.getClaim(anyString())).thenReturn("access_token"); when(jwt.getTokenValue()).thenReturn("access_token"); UserInfo userInfo = mock(UserInfo.class); - List roles = new ArrayList(); + List roles = new ArrayList<>(); when(userInfo.getRoles()).thenReturn(roles); when(idamRepository.getUserInfo(anyString())).thenReturn(userInfo); Collection authorities = converter.convert(jwt); @@ -85,11 +85,11 @@ void shouldReturnEmptyAuthoritiesWhenIdamReturnsNoUsers() { @DisplayName("Should return empty authorities when token value is not matching with expected") void shouldReturnAuthoritiesWhenIdamReturnsUserRoles() { Jwt jwt = Mockito.mock(Jwt.class); - when(jwt.containsClaim(anyString())).thenReturn(true); + when(jwt.hasClaim(anyString())).thenReturn(true); when(jwt.getClaim(anyString())).thenReturn("access_token"); when(jwt.getTokenValue()).thenReturn("access_token"); UserInfo userInfo = mock(UserInfo.class); - List roles = new ArrayList(); + List roles = new ArrayList<>(); roles.add("citizen"); when(userInfo.getRoles()).thenReturn(roles); when(idamRepository.getUserInfo(anyString())).thenReturn(userInfo); diff --git a/application/src/test/java/uk/gov/hmcts/ccd/definition/store/security/filters/ExceptionHandlingFilterTest.java b/application/src/test/java/uk/gov/hmcts/ccd/definition/store/security/filters/ExceptionHandlingFilterTest.java index 977d5921f9..2b871e3c32 100644 --- a/application/src/test/java/uk/gov/hmcts/ccd/definition/store/security/filters/ExceptionHandlingFilterTest.java +++ b/application/src/test/java/uk/gov/hmcts/ccd/definition/store/security/filters/ExceptionHandlingFilterTest.java @@ -16,9 +16,9 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; diff --git a/application/src/test/java/uk/gov/hmcts/net/ccd/definition/store/BaseTest.java b/application/src/test/java/uk/gov/hmcts/net/ccd/definition/store/BaseTest.java index fa30fcab93..7855fddacf 100644 --- a/application/src/test/java/uk/gov/hmcts/net/ccd/definition/store/BaseTest.java +++ b/application/src/test/java/uk/gov/hmcts/net/ccd/definition/store/BaseTest.java @@ -39,7 +39,7 @@ import uk.gov.hmcts.net.ccd.definition.store.excel.UserRoleSetup; import uk.gov.hmcts.net.ccd.definition.store.wiremock.config.WireMockTestConfiguration; -import javax.inject.Inject; +import jakarta.inject.Inject; import javax.sql.DataSource; import java.io.IOException; import java.io.UnsupportedEncodingException; diff --git a/application/src/test/java/uk/gov/hmcts/net/ccd/definition/store/SwaggerGeneratorTest.java b/application/src/test/java/uk/gov/hmcts/net/ccd/definition/store/SwaggerGeneratorTest.java index 1ed0dd82df..d64235dc29 100644 --- a/application/src/test/java/uk/gov/hmcts/net/ccd/definition/store/SwaggerGeneratorTest.java +++ b/application/src/test/java/uk/gov/hmcts/net/ccd/definition/store/SwaggerGeneratorTest.java @@ -16,7 +16,7 @@ public class SwaggerGeneratorTest extends BaseTest { @DisplayName("Generate swagger documentation for all APIs") @Test public void generateDocs() throws Exception { - ResultActions perform = mockMvc.perform(get("/v2/api-docs")); + ResultActions perform = mockMvc.perform(get("/v3/api-docs")); byte[] specs = perform .andExpect(status().isOk()) .andReturn() diff --git a/application/src/test/java/uk/gov/hmcts/net/ccd/definition/store/TestIdamConfiguration.java b/application/src/test/java/uk/gov/hmcts/net/ccd/definition/store/TestIdamConfiguration.java index cf39b89892..126eeb0869 100644 --- a/application/src/test/java/uk/gov/hmcts/net/ccd/definition/store/TestIdamConfiguration.java +++ b/application/src/test/java/uk/gov/hmcts/net/ccd/definition/store/TestIdamConfiguration.java @@ -24,7 +24,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") diff --git a/application/src/test/java/uk/gov/hmcts/net/ccd/definition/store/e2e/UserRoleIT.java b/application/src/test/java/uk/gov/hmcts/net/ccd/definition/store/e2e/UserRoleIT.java index 52c80d01a0..585636f5c0 100644 --- a/application/src/test/java/uk/gov/hmcts/net/ccd/definition/store/e2e/UserRoleIT.java +++ b/application/src/test/java/uk/gov/hmcts/net/ccd/definition/store/e2e/UserRoleIT.java @@ -27,7 +27,7 @@ //import static org.hamcrest.CoreMatchers.notNullValue; //import static org.hamcrest.CoreMatchers.nullValue; //import static org.hamcrest.core.Is.is; -//import static org.junit.Assert.assertThat; +//import static org.hamcrest.MatcherAssert.assertThat; //import static org.springframework.http.HttpHeaders.AUTHORIZATION; //import static org.springframework.test.context.jdbc.Sql.ExecutionPhase.BEFORE_TEST_METHOD; //import static uk.gov.hmcts.ccd.definition.store.repository.SecurityClassification.PUBLIC; diff --git a/application/src/test/java/uk/gov/hmcts/net/ccd/definition/store/excel/SpreadSheetImportTest.java b/application/src/test/java/uk/gov/hmcts/net/ccd/definition/store/excel/SpreadSheetImportTest.java index 9dc2ce9bc5..f9bc6931ef 100644 --- a/application/src/test/java/uk/gov/hmcts/net/ccd/definition/store/excel/SpreadSheetImportTest.java +++ b/application/src/test/java/uk/gov/hmcts/net/ccd/definition/store/excel/SpreadSheetImportTest.java @@ -25,6 +25,7 @@ import java.io.IOException; import java.io.InputStream; import java.net.URISyntaxException; +import java.nio.charset.Charset; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.HashMap; @@ -46,7 +47,7 @@ import static org.hamcrest.collection.IsCollectionWithSize.hasSize; import static org.hamcrest.collection.IsMapContaining.hasEntry; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.springframework.http.HttpHeaders.AUTHORIZATION; import static uk.gov.hmcts.net.ccd.definition.store.util.WiremockFixtures.stubForPutDictionaryReturns200; import static uk.gov.hmcts.net.ccd.definition.store.util.WiremockFixtures.stubForPutDictionaryReturns4XX; @@ -98,9 +99,9 @@ public void importValidDefinitionFile() throws Exception { stubForPutDictionaryReturns200(getDictionaryRequest()); - MvcResult mvcResult = mockMvc.perform(MockMvcRequestBuilders.fileUpload(IMPORT_URL) + MvcResult mvcResult = mockMvc.perform(MockMvcRequestBuilders.multipart(IMPORT_URL) .file(file) - .header(AUTHORIZATION, "Bearer testUser")) // + .header(AUTHORIZATION, "Bearer testUser")) .andReturn(); assertResponseCode(mvcResult, HttpStatus.SC_CREATED); @@ -129,7 +130,8 @@ public void importValidDefinitionFile_TranslationService_return4XX() throws Exce stubForPutDictionaryReturns4XX(getDictionaryRequest()); - MvcResult mvcResult = mockMvc.perform(MockMvcRequestBuilders.fileUpload(IMPORT_URL) + MvcResult mvcResult = mockMvc.perform(MockMvcRequestBuilders.multipart(IMPORT_URL) + .file(file) .header(AUTHORIZATION, "Bearer testUser")) .andReturn(); @@ -162,7 +164,7 @@ public void importValidDefinitionFileUsingLegacyAccessProfileColumnAlias() throw new ClassPathResource(EXCEL_FILE_WITH_ACCESS_PROFILE_ALIAS, getClass()).getInputStream()) { MockMultipartFile file = new MockMultipartFile("file", inputStream); stubForPutDictionaryReturns200(getDictionaryRequest()); - MvcResult mvcResult = mockMvc.perform(MockMvcRequestBuilders.fileUpload(IMPORT_URL) + MvcResult mvcResult = mockMvc.perform(MockMvcRequestBuilders.multipart(IMPORT_URL) .file(file) .header(AUTHORIZATION, "Bearer testUser")) // .andReturn(); @@ -203,7 +205,7 @@ public void importValidDefinitionFileUserProfileHas403Response() throws Exceptio .willReturn(WireMock.aResponse().withStatus(403))); // when I import a definition file - MvcResult result = mockMvc.perform(MockMvcRequestBuilders.fileUpload(IMPORT_URL) + MvcResult result = mockMvc.perform(MockMvcRequestBuilders.multipart(IMPORT_URL) .file(file) .header(AUTHORIZATION, "Bearer testUser")).andReturn(); @@ -317,7 +319,7 @@ public void importInvalidEventPostStateConditionWithDuplicatePriorities() throws private MvcResult performAndGetMvcResult(InputStream inputStream) throws Exception { MockMultipartFile file = new MockMultipartFile("file", inputStream); - return mockMvc.perform(MockMvcRequestBuilders.fileUpload(IMPORT_URL) + return mockMvc.perform(MockMvcRequestBuilders.multipart(IMPORT_URL) .file(file) .header(AUTHORIZATION, "Bearer testUser")) .andExpect(MockMvcResultMatchers.status().isBadRequest()) @@ -326,7 +328,7 @@ private MvcResult performAndGetMvcResult(InputStream inputStream) throws Excepti private MvcResult performAndGetMvcResult(InputStream inputStream, ResultMatcher resultMatcher) throws Exception { MockMultipartFile file = new MockMultipartFile("file", inputStream); - return mockMvc.perform(MockMvcRequestBuilders.fileUpload(IMPORT_URL) + return mockMvc.perform(MockMvcRequestBuilders.multipart(IMPORT_URL) .file(file) .header(AUTHORIZATION, "Bearer testUser")) .andExpect(resultMatcher) @@ -354,7 +356,7 @@ private void assertBody(String contentAsString, String fileName) String expected = readFileToString(new File(getClass().getClassLoader() .getResource(fileName) - .toURI())); + .toURI()), Charset.defaultCharset()); expected = expected.replaceAll("#date", LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); diff --git a/application/src/test/java/uk/gov/hmcts/net/ccd/definition/store/rest/MultipleControllersEndpointIT.java b/application/src/test/java/uk/gov/hmcts/net/ccd/definition/store/rest/MultipleControllersEndpointIT.java index bcb2750c8b..0da61779a8 100644 --- a/application/src/test/java/uk/gov/hmcts/net/ccd/definition/store/rest/MultipleControllersEndpointIT.java +++ b/application/src/test/java/uk/gov/hmcts/net/ccd/definition/store/rest/MultipleControllersEndpointIT.java @@ -30,7 +30,7 @@ import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; import static org.springframework.http.HttpHeaders.AUTHORIZATION; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; @@ -54,7 +54,7 @@ public void shouldReturnCaseType() throws Exception { try (final InputStream inputStream = new ClassPathResource(EXCEL_FILE_CCD_DEFINITION, getClass()).getInputStream()) { MockMultipartFile file = new MockMultipartFile("file", inputStream); - MvcResult mvcResult = mockMvc.perform(MockMvcRequestBuilders.fileUpload(IMPORT_URL) + MvcResult mvcResult = mockMvc.perform(MockMvcRequestBuilders.multipart(IMPORT_URL) .file(file) .header(AUTHORIZATION, "Bearer testUser")) .andReturn(); @@ -97,7 +97,7 @@ public void shouldReturnCaseType() throws Exception { public void shouldReturnThreeWorkbasketInputFieldsForTestAddressBookCase() throws Exception { InputStream inputStream = new ClassPathResource(EXCEL_FILE_CCD_DEFINITION, getClass()).getInputStream(); MockMultipartFile file = new MockMultipartFile("file", inputStream); - MvcResult mvcResult = mockMvc.perform(MockMvcRequestBuilders.fileUpload(IMPORT_URL) + MvcResult mvcResult = mockMvc.perform(MockMvcRequestBuilders.multipart(IMPORT_URL) .file(file) .header(AUTHORIZATION, "Bearer testUser")) .andReturn(); @@ -127,7 +127,7 @@ public void shouldReturnThreeWorkbasketInputFieldsForTestAddressBookCase() throw public void shouldReturnTabsForTestAddressBookCase() throws Exception { InputStream inputStream = new ClassPathResource(EXCEL_FILE_CCD_DEFINITION, getClass()).getInputStream(); MockMultipartFile file = new MockMultipartFile("file", inputStream); - MvcResult mvcResult = mockMvc.perform(MockMvcRequestBuilders.fileUpload(IMPORT_URL) + MvcResult mvcResult = mockMvc.perform(MockMvcRequestBuilders.multipart(IMPORT_URL) .file(file) .header(AUTHORIZATION, "Bearer testUser")) .andReturn(); @@ -163,7 +163,7 @@ public void shouldReturnTabsForTestAddressBookCase() throws Exception { public void shouldReturnThreeWizardPagesForTestAddressBookCase() throws Exception { InputStream inputStream = new ClassPathResource(EXCEL_FILE_CCD_DEFINITION, getClass()).getInputStream(); MockMultipartFile file = new MockMultipartFile("file", inputStream); - MvcResult mvcResult = mockMvc.perform(MockMvcRequestBuilders.fileUpload(IMPORT_URL) + MvcResult mvcResult = mockMvc.perform(MockMvcRequestBuilders.multipart(IMPORT_URL) .file(file) .header(AUTHORIZATION, "Bearer testUser")) .andReturn(); @@ -195,7 +195,7 @@ public void shouldReturnThreeWizardPagesForTestAddressBookCase() throws Exceptio public void shouldReturnSingleWizardPageForTestComplexAddressBookCase() throws Exception { InputStream inputStream = new ClassPathResource(EXCEL_FILE_CCD_DEFINITION, getClass()).getInputStream(); MockMultipartFile file = new MockMultipartFile("file", inputStream); - MvcResult mvcResult = mockMvc.perform(MockMvcRequestBuilders.fileUpload(IMPORT_URL) + MvcResult mvcResult = mockMvc.perform(MockMvcRequestBuilders.multipart(IMPORT_URL) .file(file) .header(AUTHORIZATION, "Bearer testUser")) .andReturn(); @@ -290,7 +290,7 @@ private void shouldReturnJurisdictions(String id) throws Exception { InputStream inputStream = new ClassPathResource(EXCEL_FILE_CCD_DEFINITION, getClass()).getInputStream(); MockMultipartFile file = new MockMultipartFile("file", inputStream); - MvcResult mvcResult = mockMvc.perform(MockMvcRequestBuilders.fileUpload(IMPORT_URL) + MvcResult mvcResult = mockMvc.perform(MockMvcRequestBuilders.multipart(IMPORT_URL) .file(file) .header(AUTHORIZATION, "Bearer testUser")) .andReturn(); diff --git a/application/src/test/java/uk/gov/hmcts/net/ccd/definition/store/rest/TestingSupportControllerIT.java b/application/src/test/java/uk/gov/hmcts/net/ccd/definition/store/rest/TestingSupportControllerIT.java index 70705484cc..2442f37f88 100644 --- a/application/src/test/java/uk/gov/hmcts/net/ccd/definition/store/rest/TestingSupportControllerIT.java +++ b/application/src/test/java/uk/gov/hmcts/net/ccd/definition/store/rest/TestingSupportControllerIT.java @@ -29,7 +29,7 @@ public void shouldReturnCaseType() throws Exception { try (final InputStream inputStream = new ClassPathResource("/CCD_TestDefinition_TestingSupportData.xlsx", getClass()).getInputStream()) { MockMultipartFile file = new MockMultipartFile("file", inputStream); - MvcResult mvcResult = mockMvc.perform(MockMvcRequestBuilders.fileUpload(IMPORT_URL) + MvcResult mvcResult = mockMvc.perform(MockMvcRequestBuilders.multipart(IMPORT_URL) .file(file) .header(AUTHORIZATION, "Bearer testUser")) .andReturn(); diff --git a/application/src/test/resources/test.properties b/application/src/test/resources/test.properties index 5ccdd266a2..24cec6e16d 100644 --- a/application/src/test/resources/test.properties +++ b/application/src/test/resources/test.properties @@ -4,6 +4,6 @@ idam.api.url=http://localhost:${wiremock.server.port:5000} idam.s2s-auth.url=http://localhost:${wiremock.server.port:4502}/s2s spring.datasource.driver-class-name=org.testcontainers.jdbc.ContainerDatabaseDriver -spring.datasource.url=jdbc:tc:postgresql:9.6:///ccd_definition +spring.datasource.url=jdbc:tc:postgresql:11:///ccd_definition testing-support-endpoints.enabled=true diff --git a/build.gradle b/build.gradle index 38eb1c270e..bfae5130bd 100644 --- a/build.gradle +++ b/build.gradle @@ -1,27 +1,19 @@ -buildscript { - ext { - springBootVersion = '2.7.18' - } - dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") - } -} - plugins { id 'application' - id "org.springframework.boot" version '2.7.18' + id 'jacoco' + id 'idea' + id 'eclipse' + id 'org.springframework.boot' version '3.0.13' id 'io.spring.dependency-management' version '1.1.5' id 'se.patrikerdes.use-latest-versions' version '0.2.7' id 'com.github.ben-manes.versions' version '0.51.0' id 'org.sonarqube' version '5.0.0.4638' - id 'jacoco' - id 'idea' - id 'eclipse' id 'com.github.kt3k.coveralls' version "2.8.2" id 'com.github.spacialcircumstances.gradle-cucumber-reporting' version '0.1.25' id 'info.solidsoft.pitest' version '1.15.0' apply(false) id 'org.jetbrains.gradle.plugin.idea-ext' version "0.7" id 'uk.gov.hmcts.java' version '0.12.57' + id 'org.owasp.dependencycheck' version '10.0.4' } application { @@ -33,36 +25,33 @@ dependencyCheck { suppressionFile = 'dependency-check-suppressions.xml' } -//spring boot dependency override -//overriding some default spring boot deps because too old. Not generally recommended but needed to prevent runtime errors with version 6.4.2 of Elastic -ext['elasticsearch.version'] = '7.17.1' -ext['javax-validation.version'] = '2.0.1.Final' -ext['hibernate-validator.version'] = '6.0.20.Final' -ext['spring-security.version'] = '5.8.10' -ext['springCloudVersion'] = '2021.0.8' -ext['jackson.version'] = '2.16.0' -ext['snakeyaml.version'] = '2.0' -ext['postgresql.version'] = '42.7.3' -//overriding log4j2 default version 2.7 because of vulnerability issues -ext['log4j2.version'] = '2.17.1' -ext['beftaFwVersion'] = '9.2.0' -ext['ccdTestDefinitionVersion'] = '7.24.2' - -// end - ext { - junitJupiterVersion = '5.7.0' - junitVintageVersion = '5.7.0' - springCloudVersion = '2021.0.3' - springfoxSwaggerVersion = '3.0.0' + set('elasticsearch.version', '7.17.1') + set('spring-framework.version', '6.0.21') + set('spring-security.version', '6.0.8') + set('springCloudVersion', '2022.0.5') + set('jackson.version', '2.16.0') + set('snakeyaml.version', '2.2') + set('postgresql.version', '42.7.3') + //overriding log4j2 default version 2.7 because of vulnerability issues + set('log4j2.version', '2.17.1') + + springBootVersion = '3.0.13' + junitJupiterVersion = '5.9.3' + junitVintageVersion = '5.9.3' + springDocVersion = '2.6.0' hamcrestVersion = '1.3' + flywayVersion = '8.5.13' powermockVersion = '2.0.9' - reformLogging= '6.0.1' + reformLogging= '6.1.6' + apachePoiVersion = '5.3.0' appInsightsVersion = '2.4.1' - restAssuredVersion = '4.3.0!!' - groovyVersion = '3.0.19!!' - tomcatVersion = '9.0.91' - feignJackson = '11.6' + restAssuredVersion = '5.5.0' + groovyVersion = '4.0.23' + tomcatVersion = '10.1.31' + lombokVersion = '1.18.34' + feignJackson = '13.5' + beftaFwVersion = '9.0.2' limits = [ 'instruction': 99, 'branch' : 99, @@ -99,88 +88,44 @@ allprojects { elasticSearchVersion = '7.17.1' } - dependencies { - testImplementation ("org.springframework.boot:spring-boot-starter-test:${springBootVersion}"){ - exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' - } - implementation 'net.minidev:json-smart:2.4.9' - } - // Global constraints dependencies { + // Spring implementation 'org.springframework.cloud:spring-cloud-starter-openfeign' - constraints { - implementation('org.springframework.cloud:spring-cloud-starter-openfeign') { - version{ - strictly '4.0.3' - } - } - implementation('org.springframework.cloud:spring-cloud-starter') { - version{ - strictly '3.1.8' - } - } - } + implementation 'org.springframework.cloud:spring-cloud-starter' + implementation 'org.springframework.security:spring-security-rsa' + + implementation group: 'org.postgresql', name: 'postgresql', version: '42.7.4' + implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: tomcatVersion + implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-el', version: tomcatVersion + implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-websocket', version: tomcatVersion + implementation group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '5.2.3' + implementation group: 'commons-fileupload', name: 'commons-fileupload', version: '1.5' - implementation('org.springframework.security:spring-security-rsa'){ - version { - strictly '1.0.12.RELEASE' - } - } + implementation group: 'net.minidev', name: 'json-smart', version: '2.4.9' - implementation('org.bouncycastle:bcprov-jdk18on') { - version { - strictly '1.77' - } + // CVE-2021-42550 + implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.5.8' + implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.5.8' + + testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', { + exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' } - implementation group: 'org.postgresql', name: 'postgresql', version: '42.5.5' - implementation "org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}" - implementation "org.apache.tomcat.embed:tomcat-embed-el:${tomcatVersion}" - implementation "org.apache.tomcat.embed:tomcat-embed-websocket:${tomcatVersion}" - implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13' - implementation group: 'commons-fileupload', name: 'commons-fileupload', version: '1.5' - // Overriding transitive dependency commons-compress due to CVE failures - implementation "org.apache.commons:commons-compress:1.26.0" - // CVE-2021-28170 - implementation "org.glassfish:jakarta.el:4.0.1" + testImplementation group: 'io.rest-assured', name: 'xml-path', version: restAssuredVersion + testImplementation group: 'io.rest-assured', name: 'json-path', version: restAssuredVersion + testImplementation group: 'org.apache.groovy', name: 'groovy', version: groovyVersion + testImplementation group: 'org.apache.groovy', name: 'groovy-xml', version: groovyVersion + testImplementation group: 'org.apache.groovy', name: 'groovy-json', version: groovyVersion + testImplementation group: 'com.github.hmcts', name: 'fortify-client', version: '1.4.3' - // CVE-2021-42550 - implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.13' - implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.2.13' - - testImplementation "io.rest-assured:xml-path:${restAssuredVersion}" - testImplementation "io.rest-assured:json-path:${restAssuredVersion}" - testImplementation "org.codehaus.groovy:groovy:${groovyVersion}" - testImplementation "org.codehaus.groovy:groovy-xml:${groovyVersion}" - testImplementation "org.codehaus.groovy:groovy-json:${groovyVersion}" - testImplementation 'com.github.hmcts:fortify-client:1.4.3:all' } configurations.all { collect { configuration -> configuration.exclude group: 'org.apache.logging.log4j', module: 'log4j-to-slf4j' } - resolutionStrategy { - eachDependency { details -> - if (details.requested.group == 'com.github.ben-manes.caffeine' && details.requested.name == 'caffeine') { - details.useVersion '2.8.5' - } - - if (details.requested.group == 'com.google.code.gson' && details.requested.name == 'gson') { - details.useVersion '2.9.0' - } - - if (details.requested.group == 'com.nimbusds' && details.requested.name == 'nimbus-jose-jwt') { - details.useVersion '9.37.2' - } - if (details.requested.group == 'com.google.guava' && details.requested.name == 'guava') { - details.useVersion '32.1.3-jre' - } - } - - } } } @@ -210,7 +155,7 @@ subprojects { subproject -> configurations { providedRuntime - aatCompile.extendsFrom(testImplementation) + aatImplementation.extendsFrom(testImplementation) aatRuntime.extendsFrom(testRuntimeOnly) cucumberRuntime.extendsFrom(functionalRuntime) } @@ -246,80 +191,79 @@ subprojects { subproject -> dependencies { - implementation group: 'org.apache.poi', name: 'poi', version: '5.2.5' - implementation group: 'org.apache.poi', name: 'poi-ooxml', version: '5.2.5' - implementation group: 'org.apache.poi', name: 'poi-scratchpad', version: '5.2.5' + implementation group: 'org.apache.poi', name: 'poi', version: apachePoiVersion + implementation group: 'org.apache.poi', name: 'poi-ooxml', version: apachePoiVersion + implementation group: 'org.apache.poi', name: 'poi-scratchpad', version: apachePoiVersion implementation group: 'org.apache.commons', name: 'commons-collections4', version: '4.4' + implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.17.0' implementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '9.37.2' - implementation group: 'com.google.code.gson', name: 'gson', version: '2.9.0' + implementation group: 'com.google.code.gson', name: 'gson', version: '2.11.0' implementation group: 'com.github.hmcts.java-logging', name: 'logging', version: reformLogging implementation group: 'com.microsoft.azure', name: 'applicationinsights-logging-logback', version: appInsightsVersion implementation group: 'com.microsoft.azure', name: 'applicationinsights-spring-boot-starter', version: appInsightsVersion implementation group: 'io.jsonwebtoken', name: 'jjwt', version:'0.9.1' - implementation (group: 'com.github.hmcts', name: 'service-auth-provider-java-client', version: '4.0.3') { - exclude group: 'com.google.guava', module: 'guava' - } - implementation (group: 'com.github.hmcts', name: 'idam-java-client', version: '2.0.1') { - exclude group: 'com.google.guava', module: 'guava' - } + implementation group: 'com.github.hmcts', name: 'service-auth-provider-java-client', version: '5.2.0' + implementation group: 'com.github.hmcts', name: 'idam-java-client', version: '3.0.3' + + + implementation group: 'com.google.guava', name: 'guava', version: '33.1.0-jre' + implementation group: 'jakarta.validation', name: 'jakarta.validation-api', version: '3.1.0' + implementation group: 'io.swagger', name: 'swagger-annotations', version: '1.6.6' + implementation group: 'com.vladmihalcea', name: 'hibernate-types-60', version: '2.21.1' + implementation group: 'commons-collections', name: 'commons-collections', version: '3.2.2' - compileOnly 'org.projectlombok:lombok:1.18.34' - annotationProcessor 'org.projectlombok:lombok:1.18.34' + compileOnly group: 'org.projectlombok', name: 'lombok', version: lombokVersion + annotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombokVersion - testCompileOnly 'org.projectlombok:lombok:1.18.34' - testAnnotationProcessor 'org.projectlombok:lombok:1.18.34' + testCompileOnly group: 'org.projectlombok', name: 'lombok', version: lombokVersion + testAnnotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombokVersion - implementation "org.springframework.security:spring-security-web" - implementation "org.springframework.security:spring-security-config" - implementation "org.springframework.boot:spring-boot-starter-oauth2-client" - implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server" + implementation group: 'org.springframework.boot', name: 'spring-boot-starter-cache' + implementation group: 'org.springframework.boot', name: 'spring-boot-starter-data-jpa' + implementation group: 'org.springframework.boot', name: 'spring-boot-starter-oauth2-client' + implementation group: 'org.springframework.boot', name: 'spring-boot-starter-oauth2-resource-server' + implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web' + implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-openfeign' + implementation group: 'org.springframework.security', name: 'spring-security-web' + implementation group: 'org.springframework.security', name: 'spring-security-config' - implementation "io.github.openfeign:feign-httpclient:${feignJackson}" + implementation group: 'io.github.openfeign', name: 'feign-httpclient', version: feignJackson - implementation('org.springframework.boot:spring-boot-starter-web') - implementation('org.springframework.boot:spring-boot-starter-data-jpa') implementation group: 'com.zaxxer', name: 'HikariCP', version: '4.0.2' implementation group: 'org.jooq', name: 'jool-java-8', version: '0.9.14' - implementation "org.elasticsearch:elasticsearch:${elasticSearchVersion}" - implementation "org.elasticsearch.client:elasticsearch-rest-high-level-client:${elasticSearchVersion}" + implementation group: 'org.elasticsearch', name: 'elasticsearch', version: elasticSearchVersion + implementation group: 'org.elasticsearch.client', name: 'elasticsearch-rest-high-level-client', version: elasticSearchVersion implementation group: 'com.github.ben-manes.caffeine', name: 'caffeine', version: '2.7.0' - implementation('org.springframework.boot:spring-boot-starter-cache') - implementation 'org.flywaydb:flyway-core:6.5.7' + implementation group: 'org.flywaydb', name: 'flyway-core', version: flywayVersion - implementation group: 'javax.inject', name: 'javax.inject', version: '1' + implementation group: 'jakarta.inject', name: 'jakarta.inject-api', version: '2.0.1' - implementation (group: 'com.microsoft.azure', name: 'azure-storage', version: '8.0.0') { - exclude group: 'com.google.guava', module: 'guava' - } + + implementation group: 'com.microsoft.azure', name: 'azure-storage', version: '8.0.0' implementation group: 'org.bouncycastle', name: 'bcpkix-jdk15to18', version: '1.77' testImplementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-bootstrap' implementation group: 'commons-io', name: 'commons-io', version: '2.16.1' - implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-openfeign' + implementation group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4' // To avoid compiler warnings about @API annotations in JUnit5 code. - testImplementation 'org.apiguardian:apiguardian-api:1.0.0' - testImplementation "org.postgresql:postgresql:42.7.3" - testImplementation "org.testcontainers:postgresql:1.20.2" - testImplementation "org.hamcrest:hamcrest-core:${hamcrestVersion}" - testImplementation "org.hamcrest:hamcrest-library:${hamcrestVersion}" - testImplementation "org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}" - testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${junitVintageVersion}" - testImplementation "org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}" - testImplementation('org.springframework.boot:spring-boot-starter-test') - testImplementation('org.springframework.cloud:spring-cloud-starter-contract-stub-runner:2.1.0.RELEASE') { - exclude group: 'com.github.tomakehurst', module: 'wiremock-standalone' - exclude group: 'commons-beanutils', module: 'commons-beanutils' - } - testImplementation ('com.github.tomakehurst:wiremock-jre8:2.25.1') - testImplementation ('org.springframework.cloud:spring-cloud-contract-wiremock:2.2.1.RELEASE') { - exclude group: 'commons-beanutils', module: 'commons-beanutils' - } + testImplementation group: 'org.apiguardian', name: 'apiguardian-api', version: '1.0.0' + testImplementation group: 'org.postgresql', name: 'postgresql', version: '42.7.4' + testImplementation group: 'org.testcontainers', name: 'postgresql', version: '1.20.2' + testImplementation group: 'org.hamcrest', name: 'hamcrest-core', version: hamcrestVersion + testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: hamcrestVersion + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: junitJupiterVersion + testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: junitJupiterVersion + testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVintageVersion + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: junitJupiterVersion + testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test' + testImplementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-contract-stub-runner' + + testImplementation group: 'org.springframework.cloud', name: 'spring-cloud-contract-wiremock', version: '4.1.4' testImplementation ("org.mockito:mockito-core:3.6.0") { exclude group: 'org.hamcrest' } @@ -345,12 +289,6 @@ subprojects { subproject -> implementation group: 'junit', name: 'junit', version: '4.13.1' testImplementation group: 'junit', name: 'junit', version: '4.13.1' testImplementation 'info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.4.0' - implementation group: 'com.google.guava', name: 'guava', version: '32.1.3-jre' - implementation 'javax.validation:validation-api:2.0.1.Final' - implementation 'io.swagger:swagger-annotations:1.6.6' - implementation 'com.vladmihalcea:hibernate-types-52:2.16.3' - implementation group: 'commons-collections', name: 'commons-collections', version: '3.2.2' - } // from https://github.com/junit-team/junit5/issues/1024' @@ -366,7 +304,7 @@ subprojects { subproject -> xml.outputLocation = file("${buildDir}/reports/jacoco/jacocoTestReport.xml") } - +74 classDirectories.setFrom((classDirectories.files.collect { fileTree(dir: it, exclude: ['uk/gov/hmcts/ccd/definition/store/hikari/**','**/AppInsightsConfiguration**']) })) @@ -416,7 +354,7 @@ subprojects { subproject -> } test { - environment("AZURE_APPLICATIONINSIGHTS_INSTRUMENTATIONKEY", "some-key") + environment("AZURE_APPLICATIONINSIGHTS_INSTRUMENTATIONKEY", "some-key") generateCucumberReports.enabled = false useJUnitPlatform() @@ -493,11 +431,6 @@ bootJar { archiveFileName = 'case-definition-store-api.jar' } -// Although there are no sources to compile, Jenkins pipeline needs the jar file to be here -dependencies { - implementation project(':application') -} - task smoke(type: Test, dependsOn: ":aat:smoke") task functional(type: Test, dependsOn: ":aat:functional") @@ -532,6 +465,7 @@ task dependencyCheck(dependsOn: dependencyCheckAnalyze) configurations { codacy } dependencies { + implementation project(':application') codacy 'com.github.codacy:codacy-coverage-reporter:-SNAPSHOT' } task sendCoverageToCodacy(type: JavaExec, dependsOn: jacocoTestReport) { diff --git a/domain/build.gradle b/domain/build.gradle index dc827cf82b..384a37c159 100644 --- a/domain/build.gradle +++ b/domain/build.gradle @@ -42,10 +42,8 @@ dependencies { implementation (project(':repository')) { exclude group: 'org.mapstruct', module: 'mapstruct' } - implementation "org.apache.commons:commons-lang3:3.11" - implementation (group: 'commons-validator', name: 'commons-validator', version: '1.6') { - exclude group: 'commons-beanutils', module: 'commons-beanutils' - } + + implementation group: 'commons-validator', name: 'commons-validator', version: '1.9.0' implementation "org.mapstruct:mapstruct-jdk8:${orgMapstructVersion}" implementation "org.mapstruct:mapstruct-processor:${orgMapstructVersion}" testImplementation project(":app-insights").sourceSets.main.output diff --git a/domain/src/main/java/uk/gov/hmcts/ccd/definition/store/domain/AppConfigBasedAmPersistenceSwitch.java b/domain/src/main/java/uk/gov/hmcts/ccd/definition/store/domain/AppConfigBasedAmPersistenceSwitch.java index 33a999216d..fba3a50893 100644 --- a/domain/src/main/java/uk/gov/hmcts/ccd/definition/store/domain/AppConfigBasedAmPersistenceSwitch.java +++ b/domain/src/main/java/uk/gov/hmcts/ccd/definition/store/domain/AppConfigBasedAmPersistenceSwitch.java @@ -3,8 +3,8 @@ import com.google.common.collect.Maps; import org.apache.commons.lang3.StringUtils; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import java.util.List; import java.util.Map; diff --git a/domain/src/main/java/uk/gov/hmcts/ccd/definition/store/domain/ApplicationParams.java b/domain/src/main/java/uk/gov/hmcts/ccd/definition/store/domain/ApplicationParams.java index 2dcb616229..e945162f0f 100644 --- a/domain/src/main/java/uk/gov/hmcts/ccd/definition/store/domain/ApplicationParams.java +++ b/domain/src/main/java/uk/gov/hmcts/ccd/definition/store/domain/ApplicationParams.java @@ -2,9 +2,9 @@ import org.springframework.beans.factory.annotation.Value; -import javax.annotation.PostConstruct; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import java.util.List; @Named diff --git a/domain/src/main/java/uk/gov/hmcts/ccd/definition/store/domain/service/workbasket/WorkBasketUserDefaultService.java b/domain/src/main/java/uk/gov/hmcts/ccd/definition/store/domain/service/workbasket/WorkBasketUserDefaultService.java index bc36f39093..e12d4b6f27 100644 --- a/domain/src/main/java/uk/gov/hmcts/ccd/definition/store/domain/service/workbasket/WorkBasketUserDefaultService.java +++ b/domain/src/main/java/uk/gov/hmcts/ccd/definition/store/domain/service/workbasket/WorkBasketUserDefaultService.java @@ -16,7 +16,7 @@ import uk.gov.hmcts.ccd.definition.store.repository.entity.JurisdictionEntity; import uk.gov.hmcts.ccd.definition.store.repository.model.WorkBasketUserDefault; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; @Service diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/AmSwitchValidatorTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/AmSwitchValidatorTest.java index 3bd04f21ed..7eb32f921b 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/AmSwitchValidatorTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/AmSwitchValidatorTest.java @@ -47,7 +47,7 @@ public class AmSwitchValidatorTest { @BeforeEach public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); doReturn(ccdOnlyWriteCaseTypes).when(goodApplicationParams).getCaseTypesWithAmWrittenOnlyToCcd(); doReturn(amOnlyWriteCaseTypes).when(goodApplicationParams).getCaseTypesWithAmWrittenOnlyToAm(); doReturn(bothWriteCaseTypes).when(goodApplicationParams).getCaseTypesWithAmWrittenToBoth(); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/AppConfigBasedAmPersistenceSwitchTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/AppConfigBasedAmPersistenceSwitchTest.java index 73d8618f4a..9b7773f233 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/AppConfigBasedAmPersistenceSwitchTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/AppConfigBasedAmPersistenceSwitchTest.java @@ -50,7 +50,7 @@ public class AppConfigBasedAmPersistenceSwitchTest { @BeforeEach public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); doReturn(ccdOnlyWriteCaseTypes).when(goodApplicationParams).getCaseTypesWithAmWrittenOnlyToCcd(); doReturn(amOnlyWriteCaseTypes).when(goodApplicationParams).getCaseTypesWithAmWrittenOnlyToAm(); doReturn(bothWriteCaseTypes).when(goodApplicationParams).getCaseTypesWithAmWrittenToBoth(); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/displaycontextparameter/DisplayContextParameterTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/displaycontextparameter/DisplayContextParameterTest.java index 730a784e7d..eb3fef441f 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/displaycontextparameter/DisplayContextParameterTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/displaycontextparameter/DisplayContextParameterTest.java @@ -5,7 +5,7 @@ import java.util.List; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; public class DisplayContextParameterTest { diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/displaycontextparameter/DisplayContextParameterTypeTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/displaycontextparameter/DisplayContextParameterTypeTest.java index dd3d973d16..c1ba90914b 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/displaycontextparameter/DisplayContextParameterTypeTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/displaycontextparameter/DisplayContextParameterTypeTest.java @@ -5,7 +5,7 @@ import java.util.Optional; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; public class DisplayContextParameterTypeTest { diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/AccessProfileServiceImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/AccessProfileServiceImplTest.java index d611f0617f..d67f7c3f6c 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/AccessProfileServiceImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/AccessProfileServiceImplTest.java @@ -19,7 +19,7 @@ import java.util.Optional; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/CaseRoleServiceImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/CaseRoleServiceImplTest.java index d55ae3e72f..f62e444500 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/CaseRoleServiceImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/CaseRoleServiceImplTest.java @@ -16,7 +16,7 @@ import java.util.Optional; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.doReturn; @@ -41,7 +41,7 @@ class CaseRoleServiceImplTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); classUnderTest = new CaseRoleServiceImpl(caseRoleRepository, caseTypeRepository, dtoMapper); caseRoleEntity1.setReference("ref1"); caseRole1.setId(caseRoleEntity1.getReference()); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/CategoryTabServiceImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/CategoryTabServiceImplTest.java index da81fcc72a..ad6440ecaa 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/CategoryTabServiceImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/CategoryTabServiceImplTest.java @@ -24,7 +24,7 @@ public class CategoryTabServiceImplTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); this.categoryTabServiceImpl = new CategoryTabServiceImpl(categoryTabRepository); } diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/ChallengeQuestionTabServiceImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/ChallengeQuestionTabServiceImplTest.java index 9114186804..7264237ac6 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/ChallengeQuestionTabServiceImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/ChallengeQuestionTabServiceImplTest.java @@ -34,7 +34,7 @@ public class ChallengeQuestionTabServiceImplTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); this.challengeQuestionTabServiceImpl = new ChallengeQuestionTabServiceImpl( challengeQuestionTabRepository, dtoMapper); } diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/DefinitionServiceImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/DefinitionServiceImplTest.java index 23edd238db..8467337693 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/DefinitionServiceImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/DefinitionServiceImplTest.java @@ -80,7 +80,7 @@ class DefinitionServiceImplTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); classUnderTest = new DefinitionServiceImpl(jurisdictionRepository, decoratedRepository, mapper); setupMockJurisdictionEntity(); setupMockDefinition(definition, "Mock definition", null); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/EntityToResponseDTOMapperTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/EntityToResponseDTOMapperTest.java index 2c6adc1999..e9991302bb 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/EntityToResponseDTOMapperTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/EntityToResponseDTOMapperTest.java @@ -104,7 +104,7 @@ import static org.hamcrest.Matchers.sameInstance; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/JurisdictionUiConfigServiceImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/JurisdictionUiConfigServiceImplTest.java index 7b065f8bf1..d860f1750b 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/JurisdictionUiConfigServiceImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/JurisdictionUiConfigServiceImplTest.java @@ -18,7 +18,7 @@ import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.jupiter.api.Assertions.assertAll; import static org.mockito.ArgumentMatchers.any; @@ -48,7 +48,7 @@ class JurisdictionUiConfigServiceImplTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); classUnderTest = new JurisdictionUiConfigServiceImpl(jurisdictionUiConfigRepository, dtoMapper); jurisdictionUiConfig1.setId(reference); jurisdictionUiConfigEntity1.setShuttered(false); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/LayoutServiceImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/LayoutServiceImplTest.java index bcc8f506ba..3d4da785cc 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/LayoutServiceImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/LayoutServiceImplTest.java @@ -29,7 +29,7 @@ import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.hasItem; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; public class LayoutServiceImplTest { @@ -50,7 +50,7 @@ public class LayoutServiceImplTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); classUnderTest = new LayoutServiceImpl( genericRepository, asList(new GenericLayoutEntityValidatorImpl()), diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/accessprofiles/RoleToAccessProfilesServiceImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/accessprofiles/RoleToAccessProfilesServiceImplTest.java index 265e36af53..733de76e07 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/accessprofiles/RoleToAccessProfilesServiceImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/accessprofiles/RoleToAccessProfilesServiceImplTest.java @@ -42,7 +42,7 @@ class RoleToAccessProfilesServiceImplTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); classUnderTest = new RoleToAccessProfilesServiceImpl(repository, dtoMapper, caseTypeRepository); } diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/accesstyperoles/AccessTypeRolesServiceImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/accesstyperoles/AccessTypeRolesServiceImplTest.java index 5b5a98ace1..cb5b2df825 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/accesstyperoles/AccessTypeRolesServiceImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/accesstyperoles/AccessTypeRolesServiceImplTest.java @@ -25,7 +25,7 @@ public class AccessTypeRolesServiceImplTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); classUnderTest = new AccessTypeRolesServiceImpl(repository); } diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/accesstypes/AccessTypesServiceImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/accesstypes/AccessTypesServiceImplTest.java index 83cbb44747..1295b1aa85 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/accesstypes/AccessTypesServiceImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/accesstypes/AccessTypesServiceImplTest.java @@ -25,7 +25,7 @@ public class AccessTypesServiceImplTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); classUnderTest = new AccessTypesServiceImpl(repository); } diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/banner/BannerServiceImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/banner/BannerServiceImplTest.java index 698bdc49f2..04af8eecc3 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/banner/BannerServiceImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/banner/BannerServiceImplTest.java @@ -36,7 +36,7 @@ class BannerServiceImplTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); classUnderTest = new BannerServiceImpl(bannerRepository, dtoMapper); } diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/casetype/CaseTypeServiceImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/casetype/CaseTypeServiceImplTest.java index cc27933c58..a7731772e5 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/casetype/CaseTypeServiceImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/casetype/CaseTypeServiceImplTest.java @@ -47,7 +47,7 @@ import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Matchers.any; @@ -105,7 +105,7 @@ class CaseTypeServiceImplTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); caseTypeEntity1.setReference(CASE_TYPE_REFERENCE_1); caseTypeEntity2.setReference(CASE_TYPE_REFERENCE_2); caseTypeEntity3.setReference(CASE_TYPE_REFERENCE_3); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/casetype/CaseTypeVersionInformationTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/casetype/CaseTypeVersionInformationTest.java index 48a39098d2..05504caa68 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/casetype/CaseTypeVersionInformationTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/casetype/CaseTypeVersionInformationTest.java @@ -6,7 +6,7 @@ import static org.hamcrest.core.Is.is; import static org.hamcrest.text.MatchesPattern.matchesPattern; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class CaseTypeVersionInformationTest { diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/casetype/mapper/FieldTypeListItemMapperTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/casetype/mapper/FieldTypeListItemMapperTest.java index 850dfdf710..0a79144d09 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/casetype/mapper/FieldTypeListItemMapperTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/casetype/mapper/FieldTypeListItemMapperTest.java @@ -12,7 +12,7 @@ import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.Matchers.hasProperty; import static org.hamcrest.collection.IsIterableContainingInOrder.contains; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; import static uk.gov.hmcts.ccd.definition.store.utils.FieldTypeListItemBuilder.newFieldTypeListItem; diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/display/DisplayGroupAdapterServiceTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/display/DisplayGroupAdapterServiceTest.java index 13ce091031..fe1d741697 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/display/DisplayGroupAdapterServiceTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/display/DisplayGroupAdapterServiceTest.java @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.BDDMockito.given; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; @@ -58,7 +58,7 @@ class DisplayGroupAdapterServiceTest { @BeforeEach public void setUpMocks() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); classUnderTest = new DisplayGroupAdapterService(displayGroupRepository, caseTypeLiteRepository, eventRepository, diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/display/DisplayServiceTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/display/DisplayServiceTest.java index 15bc6c5932..21dd2aeeed 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/display/DisplayServiceTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/display/DisplayServiceTest.java @@ -59,7 +59,7 @@ public class DisplayServiceTest { @BeforeEach public void setUpMocks() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); } @Nested diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/metadata/MetadataFieldServiceImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/metadata/MetadataFieldServiceImplTest.java index b541c37637..2e227a4c60 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/metadata/MetadataFieldServiceImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/metadata/MetadataFieldServiceImplTest.java @@ -17,7 +17,7 @@ import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; @@ -36,7 +36,7 @@ class MetadataFieldServiceImplTest { @BeforeEach void setup() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); metadataFieldService = new MetadataFieldServiceImpl(caseFieldRepository, dtoMapper); } diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/metadata/MetadataFieldTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/metadata/MetadataFieldTest.java index b490e2ee37..98caf2c32d 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/metadata/MetadataFieldTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/metadata/MetadataFieldTest.java @@ -8,7 +8,7 @@ import static org.hamcrest.CoreMatchers.hasItem; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; class MetadataFieldTest { diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/searchcriteria/SearchCriteriaServiceImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/searchcriteria/SearchCriteriaServiceImplTest.java index 1d7118c4af..3dd8c854c1 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/searchcriteria/SearchCriteriaServiceImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/service/searchcriteria/SearchCriteriaServiceImplTest.java @@ -36,7 +36,7 @@ class SearchCriteriaServiceImplTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); sut = new SearchCriteriaServiceImpl(repository, dtoMapper, caseTypeRepository); } diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/showcondition/ShowConditionParserTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/showcondition/ShowConditionParserTest.java index eff53c405a..a2e99fac1a 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/showcondition/ShowConditionParserTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/showcondition/ShowConditionParserTest.java @@ -5,7 +5,7 @@ import static org.hamcrest.CoreMatchers.hasItems; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/ValidationResultTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/ValidationResultTest.java index 6ee966f78e..c4c0d2c27e 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/ValidationResultTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/ValidationResultTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; class ValidationResultTest { diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/authorization/CrudValidatorTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/authorization/CrudValidatorTest.java index de2c7d8cd2..d2a0bc3654 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/authorization/CrudValidatorTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/authorization/CrudValidatorTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class CrudValidatorTest { diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityACLValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityACLValidatorImplTest.java index ba615aa447..eed11cf8f0 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityACLValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityACLValidatorImplTest.java @@ -14,7 +14,7 @@ import static org.hamcrest.collection.IsEmptyCollection.empty; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsInstanceOf.instanceOf; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.BDDMockito.given; public class CaseFieldEntityACLValidatorImplTest { diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityComplexFieldACLValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityComplexFieldACLValidatorImplTest.java index 8b64dbc3a3..7ceb02e199 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityComplexFieldACLValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityComplexFieldACLValidatorImplTest.java @@ -19,7 +19,7 @@ import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsInstanceOf.instanceOf; import static org.hamcrest.core.IsNot.not; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; import static org.mockito.BDDMockito.given; import static uk.gov.hmcts.ccd.definition.store.repository.FieldTypeUtils.PREDEFINED_COMPLEX_ADDRESS_GLOBAL; @@ -57,7 +57,7 @@ public class CaseFieldEntityComplexFieldACLValidatorImplTest { @BeforeEach public void setup() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); accessProfile = new AccessProfileEntity(); accessProfile.setReference(ACCESS_PROFILE_1); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityComplexFieldCrudValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityComplexFieldCrudValidatorImplTest.java index 76dd9b74a1..c3c6e34529 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityComplexFieldCrudValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityComplexFieldCrudValidatorImplTest.java @@ -9,7 +9,7 @@ import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsInstanceOf.instanceOf; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; class CaseFieldEntityComplexFieldCrudValidatorImplTest { diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityComplexFieldsValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityComplexFieldsValidatorImplTest.java index fb7fe6e539..40a721c186 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityComplexFieldsValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityComplexFieldsValidatorImplTest.java @@ -23,7 +23,7 @@ import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.hasItem; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; @@ -68,7 +68,7 @@ public class CaseFieldEntityComplexFieldsValidatorImplTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); when(complexFieldEntityValidator1.validate(any(), any())).thenReturn(new ValidationResult()); when(complexFieldEntityValidator2.validate(any(), any())).thenReturn(new ValidationResult()); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityCrudValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityCrudValidatorImplTest.java index c40e44a2f6..4acae31ec8 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityCrudValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityCrudValidatorImplTest.java @@ -9,7 +9,7 @@ import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsInstanceOf.instanceOf; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class CaseFieldEntityCrudValidatorImplTest { diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityHasLessRestrictiveSecurityClassificationThanParentValidationErrorTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityHasLessRestrictiveSecurityClassificationThanParentValidationErrorTest.java index 349cd1b871..a519494be9 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityHasLessRestrictiveSecurityClassificationThanParentValidationErrorTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityHasLessRestrictiveSecurityClassificationThanParentValidationErrorTest.java @@ -25,7 +25,7 @@ public class CaseFieldEntityHasLessRestrictiveSecurityClassificationThanParentVa @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); when(mockValidationErrorMessageCreator.createErrorMessage( any(CaseFieldEntityHasLessRestrictiveSecurityClassificationThanParentValidationError.class))) .thenReturn(OVERRIDDEN_ERROR_MESSAGE); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityIdValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityIdValidatorImplTest.java index 63a57a774d..5e83fc84d3 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityIdValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityIdValidatorImplTest.java @@ -12,7 +12,7 @@ import static org.hamcrest.collection.IsEmptyCollection.empty; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsInstanceOf.instanceOf; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.BDDMockito.given; public class CaseFieldEntityIdValidatorImplTest { diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityMissingSecurityClassificationValidationErrorTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityMissingSecurityClassificationValidationErrorTest.java index 445475182f..8175d89206 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityMissingSecurityClassificationValidationErrorTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casefield/CaseFieldEntityMissingSecurityClassificationValidationErrorTest.java @@ -23,7 +23,7 @@ public class CaseFieldEntityMissingSecurityClassificationValidationErrorTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); when(mockValidationErrorMessageCreator.createErrorMessage( any(CaseFieldEntityMissingSecurityClassificationValidationError.class))) .thenReturn(OVERRIDDEN_ERROR_MESSAGE); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/caserole/CaseRoleEntityFieldValueValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/caserole/CaseRoleEntityFieldValueValidatorImplTest.java index 93c9ed5a7f..e0cbfcf3bc 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/caserole/CaseRoleEntityFieldValueValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/caserole/CaseRoleEntityFieldValueValidatorImplTest.java @@ -10,7 +10,7 @@ import static org.hamcrest.core.Is.is; import static org.hamcrest.core.StringContains.containsString; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; @DisplayName("CaseRoleEntity Field Value Validator Tests") diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/caserole/CaseRoleEntityMandatoryFieldsValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/caserole/CaseRoleEntityMandatoryFieldsValidatorImplTest.java index 65f3d905cc..6065f6a930 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/caserole/CaseRoleEntityMandatoryFieldsValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/caserole/CaseRoleEntityMandatoryFieldsValidatorImplTest.java @@ -9,7 +9,7 @@ import uk.gov.hmcts.ccd.definition.store.repository.entity.CaseTypeEntity; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; @DisplayName("CaseRoleEntity Mandatory Field Validator Tests") diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/caserole/CaseRoleEntityUniquenessValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/caserole/CaseRoleEntityUniquenessValidatorImplTest.java index 008d2643e4..15b52c01f9 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/caserole/CaseRoleEntityUniquenessValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/caserole/CaseRoleEntityUniquenessValidatorImplTest.java @@ -9,7 +9,7 @@ import uk.gov.hmcts.ccd.definition.store.repository.entity.CaseTypeEntity; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; class CaseRoleEntityUniquenessValidatorImplTest { diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityACLValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityACLValidatorImplTest.java index db9b29735c..6d83f69c96 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityACLValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityACLValidatorImplTest.java @@ -14,7 +14,7 @@ import static org.hamcrest.collection.IsEmptyCollection.empty; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsInstanceOf.instanceOf; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class CaseTypeEntityACLValidatorImplTest { diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityCaseFieldsValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityCaseFieldsValidatorImplTest.java index 013a206d9d..36a2ebf44b 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityCaseFieldsValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityCaseFieldsValidatorImplTest.java @@ -25,7 +25,7 @@ import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.hasItem; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; @@ -61,7 +61,7 @@ public class CaseTypeEntityCaseFieldsValidatorImplTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); when(caseFieldEntityValidator1.validate(any(), any())).thenReturn(new ValidationResult()); when(caseFieldEntityValidator2.validate(any(), any())).thenReturn(new ValidationResult()); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityCaseRoleValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityCaseRoleValidatorImplTest.java index 6f54524e85..e587425d19 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityCaseRoleValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityCaseRoleValidatorImplTest.java @@ -15,7 +15,7 @@ import java.util.Arrays; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; import static org.mockito.Matchers.any; import static org.mockito.Mockito.when; @@ -36,7 +36,7 @@ class CaseTypeEntityCaseRoleValidatorImplTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); classUnderTest = new CaseTypeEntityCaseRoleValidatorImpl(Arrays.asList(mandatoryValidator, fieldValueValidator, uniquenessValidator)); caseType = new CaseTypeEntity(); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityCrudValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityCrudValidatorImplTest.java index 728b59b5a7..d25c0500e7 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityCrudValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityCrudValidatorImplTest.java @@ -8,7 +8,7 @@ import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsInstanceOf.instanceOf; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class CaseTypeEntityCrudValidatorImplTest { diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityEventValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityEventValidatorImplTest.java index 3b9d36d12e..2c24e78945 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityEventValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityEventValidatorImplTest.java @@ -26,7 +26,7 @@ import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.hasItem; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; @@ -62,7 +62,7 @@ public class CaseTypeEntityEventValidatorImplTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); when(eventEntityValidator1.validate(any(), any())).thenReturn(new ValidationResult()); when(eventEntityValidator2.validate(any(), any())).thenReturn(new ValidationResult()); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityFieldLabelValidatorTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityFieldLabelValidatorTest.java index 4404ae48c2..c90141b0c5 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityFieldLabelValidatorTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityFieldLabelValidatorTest.java @@ -13,7 +13,7 @@ import static org.hamcrest.Matchers.hasProperty; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsCollectionContaining.hasItems; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertFalse; import static uk.gov.hmcts.ccd.definition.store.utils.CaseFieldBuilder.newField; import static uk.gov.hmcts.ccd.definition.store.utils.FieldTypeBuilder.labelFieldType; diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityInvalidAccessProfileValidationErrorTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityInvalidAccessProfileValidationErrorTest.java index b92f0479ab..d1eb42ab6b 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityInvalidAccessProfileValidationErrorTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityInvalidAccessProfileValidationErrorTest.java @@ -24,7 +24,7 @@ public class CaseTypeEntityInvalidAccessProfileValidationErrorTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); final CaseTypeACLEntity entity = buildCaseTypeUserRoleEntity("1yLLoMwpA7"); classUnderTest = new CaseTypeEntityInvalidAccessProfileValidationError(entity, new AuthorisationValidationContext(entity.getCaseType())); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityInvalidCrudValidationErrorTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityInvalidCrudValidationErrorTest.java index 141ce2f66e..eb4715a0b3 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityInvalidCrudValidationErrorTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityInvalidCrudValidationErrorTest.java @@ -24,7 +24,7 @@ public class CaseTypeEntityInvalidCrudValidationErrorTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); final CaseTypeACLEntity caseTypeACLEntity = buildCaseTypeUserRoleEntity("NGITB"); classUnderTest = new CaseTypeEntityInvalidCrudValidationError(caseTypeACLEntity, new AuthorisationValidationContext(caseTypeACLEntity.getCaseType())); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityMissingSecurityClassificationValidationErrorTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityMissingSecurityClassificationValidationErrorTest.java index 0e935f3881..ce9b74d2d4 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityMissingSecurityClassificationValidationErrorTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityMissingSecurityClassificationValidationErrorTest.java @@ -23,7 +23,7 @@ public class CaseTypeEntityMissingSecurityClassificationValidationErrorTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); when(mockValidationErrorMessageCreator.createErrorMessage( any(CaseTypeEntityMissingSecurityClassificationValidationError.class))) .thenReturn(OVERRIDDEN_ERROR_MESSAGE); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityNonUniqueReferenceValidationErrorTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityNonUniqueReferenceValidationErrorTest.java index 84545c6052..dca0e2cf05 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityNonUniqueReferenceValidationErrorTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityNonUniqueReferenceValidationErrorTest.java @@ -23,7 +23,7 @@ public class CaseTypeEntityNonUniqueReferenceValidationErrorTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); when(mockValidationErrorMessageCreator.createErrorMessage( any(CaseTypeEntityNonUniqueReferenceValidationError.class))) .thenReturn(OVERRIDDEN_ERROR_MESSAGE); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityReferenceSpellingValidationErrorTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityReferenceSpellingValidationErrorTest.java index fd2bbbcdf2..5dfca2010d 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityReferenceSpellingValidationErrorTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityReferenceSpellingValidationErrorTest.java @@ -23,7 +23,7 @@ public class CaseTypeEntityReferenceSpellingValidationErrorTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); when(mockValidationErrorMessageCreator.createErrorMessage(any( CaseTypeEntityReferenceSpellingValidationError.class))) .thenReturn(OVERRIDDEN_ERROR_MESSAGE); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntitySearchAliasFieldsValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntitySearchAliasFieldsValidatorImplTest.java index 1016bc7626..fd21c3a016 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntitySearchAliasFieldsValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntitySearchAliasFieldsValidatorImplTest.java @@ -28,7 +28,7 @@ class CaseTypeEntitySearchAliasFieldsValidatorImplTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); caseTypeEntitySearchAliasFieldsValidator = new CaseTypeEntitySearchAliasFieldsValidatorImpl( Collections.singletonList(searchAliasFieldValidator)); } diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityStateValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityStateValidatorImplTest.java index 288c459994..459300c3e1 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityStateValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/casetype/CaseTypeEntityStateValidatorImplTest.java @@ -16,7 +16,7 @@ import java.util.Arrays; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; import static org.mockito.Matchers.any; import static org.mockito.Mockito.when; @@ -36,7 +36,7 @@ public class CaseTypeEntityStateValidatorImplTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); classUnderTest = new CaseTypeEntityStateValidatorImpl(Arrays.asList(crudValidatorImpl, userRoleValidatorImpl)); caseType = new CaseTypeEntity(); caseType.setReference("Case Type I"); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/complexfield/ComplexFieldEntityDisplayContextParameterTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/complexfield/ComplexFieldEntityDisplayContextParameterTest.java index 5f86032316..7ed14bbedf 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/complexfield/ComplexFieldEntityDisplayContextParameterTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/complexfield/ComplexFieldEntityDisplayContextParameterTest.java @@ -14,7 +14,7 @@ import uk.gov.hmcts.ccd.definition.store.repository.entity.FieldTypeEntity; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.when; @@ -34,7 +34,7 @@ public class ComplexFieldEntityDisplayContextParameterTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); validator = new ComplexFieldEntityDisplayContextParameterValidatorImpl(displayContextParameterValidatorFactory); when(displayContextParameterValidatorFactory.getValidator(Mockito.any())) .thenReturn(displayContextParameterValidator); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/complexfield/ComplexFieldEntityDocumentTypeRegularExpressionValidatorTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/complexfield/ComplexFieldEntityDocumentTypeRegularExpressionValidatorTest.java index 6074cfcea6..66b5ac7893 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/complexfield/ComplexFieldEntityDocumentTypeRegularExpressionValidatorTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/complexfield/ComplexFieldEntityDocumentTypeRegularExpressionValidatorTest.java @@ -13,7 +13,7 @@ import static org.hamcrest.collection.IsCollectionWithSize.hasSize; import static org.hamcrest.core.IsInstanceOf.instanceOf; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static uk.gov.hmcts.ccd.definition.store.repository.FieldTypeUtils.BASE_DOCUMENT; class ComplexFieldEntityDocumentTypeRegularExpressionValidatorTest { @@ -29,7 +29,7 @@ class ComplexFieldEntityDocumentTypeRegularExpressionValidatorTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); fieldType.setReference(BASE_DOCUMENT); complexField.setFieldType(fieldType); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/complexfield/ComplexFieldEntityHasLessRestrictiveSecurityClassificationThanParentValidationErrorTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/complexfield/ComplexFieldEntityHasLessRestrictiveSecurityClassificationThanParentValidationErrorTest.java index f06eff4f6f..c10d8a33e7 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/complexfield/ComplexFieldEntityHasLessRestrictiveSecurityClassificationThanParentValidationErrorTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/complexfield/ComplexFieldEntityHasLessRestrictiveSecurityClassificationThanParentValidationErrorTest.java @@ -27,7 +27,7 @@ public class ComplexFieldEntityHasLessRestrictiveSecurityClassificationThanParen @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); when(mockValidationErrorMessageCreator.createErrorMessage( any(ComplexFieldEntityHasLessRestrictiveSecurityClassificationThanParentValidationError.class))) .thenReturn(OVERRIDDEN_ERROR_MESSAGE); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/complexfield/ComplexFieldEntityMissingSecurityClassificationValidationErrorTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/complexfield/ComplexFieldEntityMissingSecurityClassificationValidationErrorTest.java index d3354dd18b..a803ab3607 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/complexfield/ComplexFieldEntityMissingSecurityClassificationValidationErrorTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/complexfield/ComplexFieldEntityMissingSecurityClassificationValidationErrorTest.java @@ -23,7 +23,7 @@ public class ComplexFieldEntityMissingSecurityClassificationValidationErrorTest @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); when(mockValidationErrorMessageCreator.createErrorMessage( any(ComplexFieldEntityMissingSecurityClassificationValidationError.class))) .thenReturn(OVERRIDDEN_ERROR_MESSAGE); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/complexfield/ComplexFieldEntityShowConditionValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/complexfield/ComplexFieldEntityShowConditionValidatorImplTest.java index d10138d034..3b24368e87 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/complexfield/ComplexFieldEntityShowConditionValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/complexfield/ComplexFieldEntityShowConditionValidatorImplTest.java @@ -15,7 +15,7 @@ import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.hasSize; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -35,7 +35,7 @@ public class ComplexFieldEntityShowConditionValidatorImplTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); testObj = new ComplexFieldEntityShowConditionValidatorImpl(mockShowConditionParser); complexField = new ComplexFieldEntity(); } diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaycontextparameter/ArgumentValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaycontextparameter/ArgumentValidatorImplTest.java index 1c00a962c4..ae68579d8d 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaycontextparameter/ArgumentValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaycontextparameter/ArgumentValidatorImplTest.java @@ -6,7 +6,7 @@ import uk.gov.hmcts.ccd.definition.store.domain.displaycontextparameter.DisplayContextParameterType; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static uk.gov.hmcts.ccd.definition.store.repository.FieldTypeUtils.BASE_TEXT; @@ -16,7 +16,7 @@ public class ArgumentValidatorImplTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); validator = new ArgumentValidatorImpl(); } diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaycontextparameter/DateTimeDisplayValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaycontextparameter/DateTimeDisplayValidatorImplTest.java index 8f9e9d957e..c8d357bce6 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaycontextparameter/DateTimeDisplayValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaycontextparameter/DateTimeDisplayValidatorImplTest.java @@ -9,7 +9,7 @@ import uk.gov.hmcts.ccd.definition.store.domain.displaycontextparameter.DisplayContextParameterType; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doThrow; @@ -25,7 +25,7 @@ public class DateTimeDisplayValidatorImplTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); validator = new DateTimeDisplayValidatorImpl(dateTimeFormatParser); } diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaycontextparameter/DateTimeEntryValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaycontextparameter/DateTimeEntryValidatorImplTest.java index 81161b73e5..b85b4993d2 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaycontextparameter/DateTimeEntryValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaycontextparameter/DateTimeEntryValidatorImplTest.java @@ -9,7 +9,7 @@ import uk.gov.hmcts.ccd.definition.store.domain.displaycontextparameter.DisplayContextParameterType; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doThrow; @@ -25,7 +25,7 @@ public class DateTimeEntryValidatorImplTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); validator = new DateTimeEntryValidatorImpl(dateTimeFormatParser); } diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaycontextparameter/DisplayContextParameterValidatorFactoryTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaycontextparameter/DisplayContextParameterValidatorFactoryTest.java index da55682b2d..6ffe32b3dd 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaycontextparameter/DisplayContextParameterValidatorFactoryTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaycontextparameter/DisplayContextParameterValidatorFactoryTest.java @@ -12,7 +12,7 @@ import java.util.NoSuchElementException; import static org.hamcrest.CoreMatchers.instanceOf; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -25,7 +25,7 @@ public class DisplayContextParameterValidatorFactoryTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); } @Test diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaygroup/DisplayGroupCaseFieldsValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaygroup/DisplayGroupCaseFieldsValidatorImplTest.java index ff01f27be4..22a3796c70 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaygroup/DisplayGroupCaseFieldsValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaygroup/DisplayGroupCaseFieldsValidatorImplTest.java @@ -17,7 +17,7 @@ import static org.hamcrest.CoreMatchers.hasItems; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Matchers.anyObject; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -44,7 +44,7 @@ public class DisplayGroupCaseFieldsValidatorImplTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); testObj = new DisplayGroupCaseFieldsValidatorImpl(Lists.newArrayList(validator1, validator2)); displayGroup = new DisplayGroupEntity(); } diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaygroup/DisplayGroupColumnNumberValidatorTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaygroup/DisplayGroupColumnNumberValidatorTest.java index 5abbfea8a3..1f7dad8717 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaygroup/DisplayGroupColumnNumberValidatorTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaygroup/DisplayGroupColumnNumberValidatorTest.java @@ -11,7 +11,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.hasSize; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class DisplayGroupColumnNumberValidatorTest { @@ -20,7 +20,7 @@ public class DisplayGroupColumnNumberValidatorTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); testObj = new DisplayGroupColumnNumberValidator(); entity = new DisplayGroupCaseFieldEntity(); } diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaygroup/DisplayGroupDateTimeDisplayContextParameterValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaygroup/DisplayGroupDateTimeDisplayContextParameterValidatorImplTest.java index f36d77b567..fab3daf7c0 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaygroup/DisplayGroupDateTimeDisplayContextParameterValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaygroup/DisplayGroupDateTimeDisplayContextParameterValidatorImplTest.java @@ -15,7 +15,7 @@ import uk.gov.hmcts.ccd.definition.store.repository.entity.FieldTypeEntity; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.when; @@ -32,7 +32,7 @@ public class DisplayGroupDateTimeDisplayContextParameterValidatorImplTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); validator = new DisplayGroupDateTimeDisplayContextParameterValidatorImpl( displayContextParameterValidatorFactory); when(displayContextParameterValidatorFactory.getValidator(Mockito.any())) diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaygroup/PageShowConditionValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaygroup/PageShowConditionValidatorImplTest.java index d12761dce5..3b7f9df1a2 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaygroup/PageShowConditionValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaygroup/PageShowConditionValidatorImplTest.java @@ -20,7 +20,7 @@ import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.hasSize; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -40,7 +40,7 @@ public class PageShowConditionValidatorImplTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); testObj = new PageShowConditionValidatorImpl(mockShowConditionParser, new CaseFieldEntityUtil()); displayGroup = new DisplayGroupEntity(); } diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaygroup/TabShowConditionValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaygroup/TabShowConditionValidatorImplTest.java index d371755728..891ed290c8 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaygroup/TabShowConditionValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/displaygroup/TabShowConditionValidatorImplTest.java @@ -29,7 +29,7 @@ import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.hasSize; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -52,7 +52,7 @@ public class TabShowConditionValidatorImplTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); testObj = new TabShowConditionValidatorImpl(mockShowConditionParser, new CaseFieldEntityUtil()); displayGroup = new DisplayGroupEntity(); allTabDisplayGroups = Lists.newArrayList(); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/CreateEventDoesNotHavePostStateValidationErrorTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/CreateEventDoesNotHavePostStateValidationErrorTest.java index f90d42328c..dbb5d64aa9 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/CreateEventDoesNotHavePostStateValidationErrorTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/CreateEventDoesNotHavePostStateValidationErrorTest.java @@ -23,7 +23,7 @@ public class CreateEventDoesNotHavePostStateValidationErrorTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); when(mockValidationErrorMessageCreator.createErrorMessage( any(CreateEventDoesNotHavePostStateValidationError.class))) .thenReturn(OVERRIDDEN_ERROR_MESSAGE); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityCanSaveDraftValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityCanSaveDraftValidatorImplTest.java index 2795349782..a326081616 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityCanSaveDraftValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityCanSaveDraftValidatorImplTest.java @@ -9,7 +9,7 @@ import uk.gov.hmcts.ccd.definition.store.repository.entity.StateEntity; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; class EventEntityCanSaveDraftValidatorImplTest { diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityCrudValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityCrudValidatorImplTest.java index 411bf0ff0b..c558b6ac4e 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityCrudValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityCrudValidatorImplTest.java @@ -9,7 +9,7 @@ import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsInstanceOf.instanceOf; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class EventEntityCrudValidatorImplTest { diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityEnableConditionReferencesInvalidCaseFieldErrorTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityEnableConditionReferencesInvalidCaseFieldErrorTest.java index 9d76cd4ae8..fec36fc3d4 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityEnableConditionReferencesInvalidCaseFieldErrorTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityEnableConditionReferencesInvalidCaseFieldErrorTest.java @@ -23,7 +23,7 @@ public class EventEntityEnableConditionReferencesInvalidCaseFieldErrorTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); when(mockValidationErrorMessageCreator.createErrorMessage( any(EventEntityEnableConditionReferencesInvalidCaseFieldError.class))) .thenReturn(OVERRIDDEN_ERROR_MESSAGE); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityEnablingConditionValidatorTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityEnablingConditionValidatorTest.java index 6cf56b57ea..e1eec6761a 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityEnablingConditionValidatorTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityEnablingConditionValidatorTest.java @@ -41,7 +41,7 @@ public class EventEntityEnablingConditionValidatorTest { @Before public void setUp() throws InvalidShowConditionException { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); classUnderTest = new EventEntityEnablingConditionValidator(showConditionExtractor, caseTypeEntityUtil); caseTypeEntity = new CaseTypeEntity(); caseTypeEntity.setReference("TestCaseType"); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityEventCaseFieldsValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityEventCaseFieldsValidatorImplTest.java index c9e4c040a4..1f5d9d2139 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityEventCaseFieldsValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityEventCaseFieldsValidatorImplTest.java @@ -27,7 +27,7 @@ import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.hasItem; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; @@ -59,7 +59,7 @@ public class EventEntityEventCaseFieldsValidatorImplTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); when(eventCaseFieldValidator1.validate(any(), any())).thenReturn(new ValidationResult()); when(eventCaseFieldValidator2.validate(any(), any())).thenReturn(new ValidationResult()); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityHasLessRestrictiveSecurityClassificationThanParentValidationErrorTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityHasLessRestrictiveSecurityClassificationThanParentValidationErrorTest.java index 4a1cf682c2..dfafe88837 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityHasLessRestrictiveSecurityClassificationThanParentValidationErrorTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityHasLessRestrictiveSecurityClassificationThanParentValidationErrorTest.java @@ -25,7 +25,7 @@ public class EventEntityHasLessRestrictiveSecurityClassificationThanParentValida @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); when(mockValidationErrorMessageCreator.createErrorMessage( any(EventEntityHasLessRestrictiveSecurityClassificationThanParentValidationError.class))) .thenReturn(OVERRIDDEN_ERROR_MESSAGE); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityInvalidDefaultPostStateErrorTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityInvalidDefaultPostStateErrorTest.java index c71ec690a6..a3e705943d 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityInvalidDefaultPostStateErrorTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityInvalidDefaultPostStateErrorTest.java @@ -22,7 +22,7 @@ public class EventEntityInvalidDefaultPostStateErrorTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); when(mockValidationErrorMessageCreator.createErrorMessage(any(EventEntityInvalidDefaultPostStateError.class))) .thenReturn("Invalid Default Post State"); CaseTypeEntity caseType = new CaseTypeEntity(); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityInvalidPostStatePriorityErrorTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityInvalidPostStatePriorityErrorTest.java index 7d7469de67..2c31f03b89 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityInvalidPostStatePriorityErrorTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityInvalidPostStatePriorityErrorTest.java @@ -22,7 +22,7 @@ public class EventEntityInvalidPostStatePriorityErrorTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); when(mockValidationErrorMessageCreator.createErrorMessage(any(EventEntityInvalidPostStatePriorityError.class))) .thenReturn("Duplicate Post state"); CaseTypeEntity caseType = new CaseTypeEntity(); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityMissingSecurityClassificationValidationErrorTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityMissingSecurityClassificationValidationErrorTest.java index 81fe84d59b..0cac178554 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityMissingSecurityClassificationValidationErrorTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityMissingSecurityClassificationValidationErrorTest.java @@ -23,7 +23,7 @@ public class EventEntityMissingSecurityClassificationValidationErrorTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); when(mockValidationErrorMessageCreator.createErrorMessage( any(EventEntityMissingSecurityClassificationValidationError.class))) .thenReturn(OVERRIDDEN_ERROR_MESSAGE); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityPostStateValidatorTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityPostStateValidatorTest.java index 0b63f2c33e..94c6ba1ccc 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityPostStateValidatorTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/event/EventEntityPostStateValidatorTest.java @@ -53,7 +53,7 @@ public class EventEntityPostStateValidatorTest { @Before public void setUp() throws InvalidShowConditionException { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); classUnderTest = new EventEntityPostStateValidator(showConditionExtractor, caseTypeEntityUtil); caseTypeEntity = new CaseTypeEntity(); caseTypeEntity.setReference("TestCaseType"); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/eventcasefield/EventCaseFieldArgumentDisplayContextParameterValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/eventcasefield/EventCaseFieldArgumentDisplayContextParameterValidatorImplTest.java index 7d39a4c1a0..67e49a48f1 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/eventcasefield/EventCaseFieldArgumentDisplayContextParameterValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/eventcasefield/EventCaseFieldArgumentDisplayContextParameterValidatorImplTest.java @@ -15,7 +15,7 @@ import uk.gov.hmcts.ccd.definition.store.repository.entity.FieldTypeEntity; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; import static org.mockito.Mockito.when; @@ -34,7 +34,7 @@ public class EventCaseFieldArgumentDisplayContextParameterValidatorImplTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); validator = new EventCaseFieldArgumentDisplayContextParameterValidatorImpl( displayContextParameterValidatorFactory); when(displayContextParameterValidatorFactory.getValidator(Mockito.any())) diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/eventcasefield/EventCaseFieldDateTimeDisplayContextParameterValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/eventcasefield/EventCaseFieldDateTimeDisplayContextParameterValidatorImplTest.java index 32c90b2222..9c7ea0667d 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/eventcasefield/EventCaseFieldDateTimeDisplayContextParameterValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/eventcasefield/EventCaseFieldDateTimeDisplayContextParameterValidatorImplTest.java @@ -16,7 +16,7 @@ import uk.gov.hmcts.ccd.definition.store.repository.entity.FieldTypeEntity; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.when; @@ -36,7 +36,7 @@ public class EventCaseFieldDateTimeDisplayContextParameterValidatorImplTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); validator = new EventCaseFieldDateTimeDisplayContextParameterValidatorImpl( displayContextParameterValidatorFactory); when(displayContextParameterValidatorFactory.getValidator(Mockito.any())) diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/eventcasefield/EventCaseFieldEntityInvalidShowConditionErrorTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/eventcasefield/EventCaseFieldEntityInvalidShowConditionErrorTest.java index 4886b82804..b5ff59d3a9 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/eventcasefield/EventCaseFieldEntityInvalidShowConditionErrorTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/eventcasefield/EventCaseFieldEntityInvalidShowConditionErrorTest.java @@ -24,7 +24,7 @@ public class EventCaseFieldEntityInvalidShowConditionErrorTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); when(mockValidationErrorMessageCreator.createErrorMessage( any(EventCaseFieldEntityInvalidShowConditionError.class))) .thenReturn(OVERRIDDEN_ERROR_MESSAGE); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/eventcasefield/EventCaseFieldEntityWithShowConditionReferencesInvalidCaseFieldErrorTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/eventcasefield/EventCaseFieldEntityWithShowConditionReferencesInvalidCaseFieldErrorTest.java index 598d4f8a0e..a9e5d2d1b3 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/eventcasefield/EventCaseFieldEntityWithShowConditionReferencesInvalidCaseFieldErrorTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/eventcasefield/EventCaseFieldEntityWithShowConditionReferencesInvalidCaseFieldErrorTest.java @@ -24,7 +24,7 @@ public class EventCaseFieldEntityWithShowConditionReferencesInvalidCaseFieldErro @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); when(mockValidationErrorMessageCreator.createErrorMessage( any(EventCaseFieldEntityWithShowConditionReferencesInvalidCaseFieldError.class))) .thenReturn(OVERRIDDEN_ERROR_MESSAGE); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/eventcasefield/EventCaseFieldShowConditionValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/eventcasefield/EventCaseFieldShowConditionValidatorImplTest.java index e3c4f42126..912b19bd40 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/eventcasefield/EventCaseFieldShowConditionValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/eventcasefield/EventCaseFieldShowConditionValidatorImplTest.java @@ -28,7 +28,7 @@ import static org.hamcrest.Matchers.hasSize; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; @@ -48,7 +48,7 @@ public class EventCaseFieldShowConditionValidatorImplTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); classUnderTest = new EventCaseFieldShowConditionValidatorImpl( showConditionExtractor, new CaseFieldEntityUtil()); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/eventcasefieldcomplextype/EventComplexTypeShowConditionValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/eventcasefieldcomplextype/EventComplexTypeShowConditionValidatorImplTest.java index 92cb29a46f..245735f318 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/eventcasefieldcomplextype/EventComplexTypeShowConditionValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/eventcasefieldcomplextype/EventComplexTypeShowConditionValidatorImplTest.java @@ -45,7 +45,7 @@ public class EventComplexTypeShowConditionValidatorImplTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); classUnderTest = new EventComplexTypeShowConditionValidatorImpl( showConditionExtractor, new CaseFieldEntityUtil()); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/fieldtype/DocumentTypeRegularExpressionValidatorTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/fieldtype/DocumentTypeRegularExpressionValidatorTest.java index 18a91942a3..a3be49ccd0 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/fieldtype/DocumentTypeRegularExpressionValidatorTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/fieldtype/DocumentTypeRegularExpressionValidatorTest.java @@ -12,7 +12,7 @@ import static org.hamcrest.collection.IsCollectionWithSize.hasSize; import static org.hamcrest.core.IsInstanceOf.instanceOf; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static uk.gov.hmcts.ccd.definition.store.repository.FieldTypeUtils.BASE_DOCUMENT; class DocumentTypeRegularExpressionValidatorTest { @@ -26,7 +26,7 @@ class DocumentTypeRegularExpressionValidatorTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); fieldType.setReference(BASE_DOCUMENT); } diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/fieldtype/FieldTypeComplexFieldsValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/fieldtype/FieldTypeComplexFieldsValidatorImplTest.java index 64752d6b53..540b3d8561 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/fieldtype/FieldTypeComplexFieldsValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/fieldtype/FieldTypeComplexFieldsValidatorImplTest.java @@ -21,7 +21,7 @@ import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.hasItem; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; @@ -49,7 +49,7 @@ public class FieldTypeComplexFieldsValidatorImplTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); when(complexFieldEntityValidator1.validate(any(), any())).thenReturn(new ValidationResult()); when(complexFieldEntityValidator2.validate(any(), any())).thenReturn(new ValidationResult()); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/fieldtype/FieldTypeValidationContextFactoryTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/fieldtype/FieldTypeValidationContextFactoryTest.java index 879f554270..4ea115f21c 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/fieldtype/FieldTypeValidationContextFactoryTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/fieldtype/FieldTypeValidationContextFactoryTest.java @@ -9,7 +9,7 @@ import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.hasSize; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/genericlayout/GenericLayoutEntityDisplayContextParameterValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/genericlayout/GenericLayoutEntityDisplayContextParameterValidatorImplTest.java index 2b5fc00b48..3ef2bb84c4 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/genericlayout/GenericLayoutEntityDisplayContextParameterValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/genericlayout/GenericLayoutEntityDisplayContextParameterValidatorImplTest.java @@ -27,7 +27,7 @@ import java.util.stream.Stream; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.when; @@ -45,7 +45,7 @@ public class GenericLayoutEntityDisplayContextParameterValidatorImplTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); validator = new GenericLayoutEntityDisplayContextParameterValidatorImpl( displayContextParameterValidatorFactory); when(displayContextParameterValidatorFactory.getValidator(Mockito.any())) diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/genericlayout/GenericLayoutEntityElementPathValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/genericlayout/GenericLayoutEntityElementPathValidatorImplTest.java index 9ccbf90f1a..ac86b26450 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/genericlayout/GenericLayoutEntityElementPathValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/genericlayout/GenericLayoutEntityElementPathValidatorImplTest.java @@ -28,7 +28,7 @@ import static java.util.Arrays.asList; import static java.util.Collections.emptyList; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; import static uk.gov.hmcts.ccd.definition.store.repository.FieldTypeUtils.PREDEFINED_COMPLEX_ADDRESS_UK; diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/genericlayout/GenericLayoutEntityOrderValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/genericlayout/GenericLayoutEntityOrderValidatorImplTest.java index 85a8f85ff4..e5ec6ac2a5 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/genericlayout/GenericLayoutEntityOrderValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/genericlayout/GenericLayoutEntityOrderValidatorImplTest.java @@ -23,7 +23,7 @@ import static java.util.Collections.emptyList; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; @DisplayName("Generic Layout Entity Order Validator Implementation Tests") diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/genericlayout/GenericLayoutEntityValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/genericlayout/GenericLayoutEntityValidatorImplTest.java index 33c9d246fe..eefe0bfb46 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/genericlayout/GenericLayoutEntityValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/genericlayout/GenericLayoutEntityValidatorImplTest.java @@ -23,7 +23,7 @@ import static java.util.Collections.emptyList; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; @DisplayName("Generic Layout Entity Validator Implementation Tests") diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/genericlayout/GenericLayoutSearchableValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/genericlayout/GenericLayoutSearchableValidatorImplTest.java index 539033e3f1..8130048744 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/genericlayout/GenericLayoutSearchableValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/genericlayout/GenericLayoutSearchableValidatorImplTest.java @@ -24,7 +24,7 @@ class GenericLayoutSearchableValidatorImplTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); validator = new GenericLayoutSearchableValidatorImpl(); } diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/genericlayout/GenericLayoutShowConditionValidatorTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/genericlayout/GenericLayoutShowConditionValidatorTest.java index 5807e97361..274d92abc3 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/genericlayout/GenericLayoutShowConditionValidatorTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/genericlayout/GenericLayoutShowConditionValidatorTest.java @@ -23,7 +23,7 @@ import static java.util.Arrays.asList; import static java.util.Collections.emptyList; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.any; import static org.mockito.Mockito.never; @@ -48,7 +48,7 @@ public class GenericLayoutShowConditionValidatorTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); underTest = new GenericLayoutShowConditionValidatorImpl( showConditionExtractor, new CaseFieldEntityUtil()); diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/searchaliasfield/SearchAliasFieldTypeValidatorTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/searchaliasfield/SearchAliasFieldTypeValidatorTest.java index dd1dec9f54..bc283231ea 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/searchaliasfield/SearchAliasFieldTypeValidatorTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/searchaliasfield/SearchAliasFieldTypeValidatorTest.java @@ -36,7 +36,7 @@ class SearchAliasFieldTypeValidatorTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); validator = new SearchAliasFieldTypeValidator(repository); } diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/state/StateEntityACLValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/state/StateEntityACLValidatorImplTest.java index f53e360d50..90bf352f00 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/state/StateEntityACLValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/state/StateEntityACLValidatorImplTest.java @@ -11,7 +11,7 @@ import static org.hamcrest.collection.IsEmptyCollection.empty; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsInstanceOf.instanceOf; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class StateEntityACLValidatorImplTest { private StateEntity stateEntity; diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/state/StateEntityCrudValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/state/StateEntityCrudValidatorImplTest.java index 9a07843c78..e3718c91f1 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/state/StateEntityCrudValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/state/StateEntityCrudValidatorImplTest.java @@ -9,7 +9,7 @@ import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsInstanceOf.instanceOf; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class StateEntityCrudValidatorImplTest { private StateEntity stateEntity; diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/userprofile/UserProfileValidatorImplJunit4Test.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/userprofile/UserProfileValidatorImplJunit4Test.java index 7ea40560a4..ca05214b97 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/userprofile/UserProfileValidatorImplJunit4Test.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/userprofile/UserProfileValidatorImplJunit4Test.java @@ -14,7 +14,7 @@ import static org.hamcrest.collection.IsCollectionWithSize.hasSize; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsEqual.equalTo; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/userprofile/UserProfileValidatorImplTest.java b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/userprofile/UserProfileValidatorImplTest.java index ba7dec84d0..5f3714caf4 100644 --- a/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/userprofile/UserProfileValidatorImplTest.java +++ b/domain/src/test/java/uk/gov/hmcts/ccd/definition/store/domain/validation/userprofile/UserProfileValidatorImplTest.java @@ -18,7 +18,7 @@ import static org.hamcrest.collection.IsCollectionWithSize.hasSize; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsEqual.equalTo; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/elastic-search-support/src/main/java/uk/gov/hmcts/ccd/definition/store/elastic/mapping/support/injection/TypeMappersManager.java b/elastic-search-support/src/main/java/uk/gov/hmcts/ccd/definition/store/elastic/mapping/support/injection/TypeMappersManager.java index 86951e7ec2..0476b154a3 100644 --- a/elastic-search-support/src/main/java/uk/gov/hmcts/ccd/definition/store/elastic/mapping/support/injection/TypeMappersManager.java +++ b/elastic-search-support/src/main/java/uk/gov/hmcts/ccd/definition/store/elastic/mapping/support/injection/TypeMappersManager.java @@ -4,7 +4,7 @@ import org.springframework.stereotype.Component; import uk.gov.hmcts.ccd.definition.store.elastic.mapping.type.TypeMappingGenerator; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.util.List; import java.util.Map; import java.util.Set; diff --git a/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/ElasticsearchBaseTest.java b/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/ElasticsearchBaseTest.java index d32b7b430e..99e1071b8c 100644 --- a/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/ElasticsearchBaseTest.java +++ b/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/ElasticsearchBaseTest.java @@ -94,7 +94,7 @@ public WebMvcEndpointHandlerMapping webEndpointServletHandlerMapping(WebEndpoint return new WebMvcEndpointHandlerMapping(endpointMapping, webEndpoints, endpointMediaTypes, corsProperties.toCorsConfiguration(), new EndpointLinksResolver(allEndpoints, basePath), - shouldRegisterLinksMapping, null); + shouldRegisterLinksMapping); } private boolean shouldRegisterLinksMapping(WebEndpointProperties webEndpointProperties, Environment environment, diff --git a/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/endpoint/ElasticsearchIndexControllerTest.java b/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/endpoint/ElasticsearchIndexControllerTest.java index de5c800291..13979f3f49 100644 --- a/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/endpoint/ElasticsearchIndexControllerTest.java +++ b/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/endpoint/ElasticsearchIndexControllerTest.java @@ -54,7 +54,7 @@ class ElasticsearchIndexControllerTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); caseTypes = new ArrayList<>(); caseTypes.add(createCaseType(CASE_TYPE_1, JURISDICTION_1)); caseTypes.add(createCaseType(CASE_TYPE_2, JURISDICTION_1)); diff --git a/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/exception/ElasticsearchErrorTest.java b/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/exception/ElasticsearchErrorTest.java index dcced367a7..69eb388090 100644 --- a/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/exception/ElasticsearchErrorTest.java +++ b/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/exception/ElasticsearchErrorTest.java @@ -8,7 +8,7 @@ import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; class ElasticsearchErrorTest { diff --git a/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/exception/handler/ElasticsearchErrorHandlerTest.java b/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/exception/handler/ElasticsearchErrorHandlerTest.java index 7bd5929a6e..f9a518b447 100644 --- a/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/exception/handler/ElasticsearchErrorHandlerTest.java +++ b/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/exception/handler/ElasticsearchErrorHandlerTest.java @@ -13,7 +13,7 @@ import java.util.List; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; class ElasticsearchErrorHandlerTest { @@ -29,7 +29,7 @@ class ElasticsearchErrorHandlerTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); messageBuilderA = new TestElasticsearchErrorMessageBuilder(".*PATTERN ONE.*", "ERROR MESSAGE ONE"); messageBuilderB = new TestElasticsearchErrorMessageBuilder("PATTERN TWO .+", "ERROR MESSAGE TWO"); errorMessageBuilders = Arrays.asList(messageBuilderA, messageBuilderB); diff --git a/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/exception/handler/ElasticsearchErrorMessageBuilderTest.java b/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/exception/handler/ElasticsearchErrorMessageBuilderTest.java index ec76d4eddd..69d2c5424c 100644 --- a/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/exception/handler/ElasticsearchErrorMessageBuilderTest.java +++ b/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/exception/handler/ElasticsearchErrorMessageBuilderTest.java @@ -8,7 +8,7 @@ import uk.gov.hmcts.ccd.definition.store.repository.entity.CaseTypeEntity; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/exception/handler/FieldTypeMappingErrorMessageBuilderTest.java b/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/exception/handler/FieldTypeMappingErrorMessageBuilderTest.java index 0aaffd9bf8..1c999ec3d1 100644 --- a/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/exception/handler/FieldTypeMappingErrorMessageBuilderTest.java +++ b/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/exception/handler/FieldTypeMappingErrorMessageBuilderTest.java @@ -9,7 +9,7 @@ import uk.gov.hmcts.ccd.definition.store.utils.CaseTypeBuilder; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; class FieldTypeMappingErrorMessageBuilderTest { diff --git a/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/exception/handler/MaxFieldLimitErrorMessageBuilderTest.java b/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/exception/handler/MaxFieldLimitErrorMessageBuilderTest.java index 44ba81d723..dd081e8cae 100644 --- a/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/exception/handler/MaxFieldLimitErrorMessageBuilderTest.java +++ b/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/exception/handler/MaxFieldLimitErrorMessageBuilderTest.java @@ -9,7 +9,7 @@ import uk.gov.hmcts.ccd.definition.store.utils.CaseTypeBuilder; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; class MaxFieldLimitErrorMessageBuilderTest { diff --git a/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/model/IndicesCreationResultTest.java b/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/model/IndicesCreationResultTest.java index 2b8f5eb2dc..77ef17ec75 100644 --- a/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/model/IndicesCreationResultTest.java +++ b/elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/model/IndicesCreationResultTest.java @@ -9,7 +9,7 @@ import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; import static uk.gov.hmcts.ccd.definition.store.repository.SecurityClassification.PUBLIC; diff --git a/excel-importer/build.gradle b/excel-importer/build.gradle index 47277f42e0..7bc8d4bb22 100644 --- a/excel-importer/build.gradle +++ b/excel-importer/build.gradle @@ -24,9 +24,7 @@ dependencies { testImplementation project(":repository").sourceSets.main.output testImplementation project(":repository").sourceSets.test.output - implementation "org.springframework.boot:spring-boot-starter-web" - implementation "org.apache.commons:commons-collections4:4.1" - implementation "org.apache.commons:commons-lang3:3.11" + implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web' implementation group: 'org.apache.poi', name: 'poi-ooxml', version: '5.2.5' } diff --git a/excel-importer/src/main/java/uk/gov/hmcts/ccd/definition/store/excel/azurestorage/service/AzureBlobStorageClient.java b/excel-importer/src/main/java/uk/gov/hmcts/ccd/definition/store/excel/azurestorage/service/AzureBlobStorageClient.java index 4f90c65b28..d5ec626f78 100644 --- a/excel-importer/src/main/java/uk/gov/hmcts/ccd/definition/store/excel/azurestorage/service/AzureBlobStorageClient.java +++ b/excel-importer/src/main/java/uk/gov/hmcts/ccd/definition/store/excel/azurestorage/service/AzureBlobStorageClient.java @@ -11,7 +11,7 @@ import uk.gov.hmcts.ccd.definition.store.excel.domain.definition.model.DefinitionFileUploadMetadata; import uk.gov.hmcts.ccd.definition.store.excel.util.DateTimeStringGenerator; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.io.IOException; import java.io.InputStream; import java.net.URISyntaxException; diff --git a/excel-importer/src/main/java/uk/gov/hmcts/ccd/definition/store/excel/endpoint/exception/RestResponseEntityExceptionHandler.java b/excel-importer/src/main/java/uk/gov/hmcts/ccd/definition/store/excel/endpoint/exception/RestResponseEntityExceptionHandler.java index e168f92b19..8df79d3447 100644 --- a/excel-importer/src/main/java/uk/gov/hmcts/ccd/definition/store/excel/endpoint/exception/RestResponseEntityExceptionHandler.java +++ b/excel-importer/src/main/java/uk/gov/hmcts/ccd/definition/store/excel/endpoint/exception/RestResponseEntityExceptionHandler.java @@ -21,7 +21,7 @@ import uk.gov.hmcts.ccd.definition.store.domain.validation.ValidationException; import uk.gov.hmcts.ccd.definition.store.excel.azurestorage.exception.FileStorageException; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; import java.util.Set; diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/azurestorage/service/AzureBlobStorageClientTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/azurestorage/service/AzureBlobStorageClientTest.java index 7ca2eccbb6..eac9f70280 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/azurestorage/service/AzureBlobStorageClientTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/azurestorage/service/AzureBlobStorageClientTest.java @@ -49,7 +49,7 @@ public class AzureBlobStorageClientTest { public void setUp() { cloudBlobContainer = PowerMockito.mock(CloudBlobContainer.class); cloudBlockBlob = PowerMockito.mock(CloudBlockBlob.class); - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); clientUnderTest = new AzureBlobStorageClient(cloudBlobContainer, dateTimeStringGenerator); } diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/azurestorage/service/FileStorageServiceTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/azurestorage/service/FileStorageServiceTest.java index fdf477d514..3d935adfd3 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/azurestorage/service/FileStorageServiceTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/azurestorage/service/FileStorageServiceTest.java @@ -23,7 +23,7 @@ class FileStorageServiceTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); } @Test diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/client/translation/ServiceAuthHeadersInterceptorTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/client/translation/ServiceAuthHeadersInterceptorTest.java index 0453f26d8d..0b81425d94 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/client/translation/ServiceAuthHeadersInterceptorTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/client/translation/ServiceAuthHeadersInterceptorTest.java @@ -24,7 +24,7 @@ class ServiceAuthHeadersInterceptorTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); template = new RequestTemplate(); } diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/endpoint/ImportControllerTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/endpoint/ImportControllerTest.java index 4cada1b0f2..51eb8d22bf 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/endpoint/ImportControllerTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/endpoint/ImportControllerTest.java @@ -42,7 +42,7 @@ class ImportControllerTest { @BeforeEach void setup() throws IOException { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); mockMvc = MockMvcBuilders.standaloneSetup(controller).build(); file = new MockMultipartFile("file", diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/endpoint/exception/RestResponseEntityExceptionHandlerTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/endpoint/exception/RestResponseEntityExceptionHandlerTest.java index 90cf960852..989e2cbe29 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/endpoint/exception/RestResponseEntityExceptionHandlerTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/endpoint/exception/RestResponseEntityExceptionHandlerTest.java @@ -26,7 +26,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/endpoint/exception/SpreadsheetValidationErrorMessageCreatorTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/endpoint/exception/SpreadsheetValidationErrorMessageCreatorTest.java index b92bc5b104..79e3fc4feb 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/endpoint/exception/SpreadsheetValidationErrorMessageCreatorTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/endpoint/exception/SpreadsheetValidationErrorMessageCreatorTest.java @@ -106,7 +106,7 @@ public class SpreadsheetValidationErrorMessageCreatorTest { @Before public void setUp() throws Exception { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); when(entityToDefinitionDataItemRegistry.getForEntity(anyObject())).thenReturn(Optional.empty()); } diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/AccessTypeRolesParserTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/AccessTypeRolesParserTest.java index 4551bcc6c6..fb4fe858eb 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/AccessTypeRolesParserTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/AccessTypeRolesParserTest.java @@ -67,7 +67,7 @@ class AccessTypeRolesParserTest extends ParserTestBase { @BeforeEach public void setup() { parseContext = new ParseContext(); - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); //setup case type when(caseTypeEntity.getReference()).thenReturn(CASE_TYPE_ID_1); diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/AccessTypesParserTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/AccessTypesParserTest.java index c9cf23dc1f..fe85b17523 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/AccessTypesParserTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/AccessTypesParserTest.java @@ -63,7 +63,7 @@ public class AccessTypesParserTest extends ParserTestBase { @BeforeEach public void setup() { parseContext = new ParseContext(); - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); //setup case types when(caseTypeEntity.getReference()).thenReturn(CASE_TYPE_ID_1); diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/AuthorisationCaseEventParserTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/AuthorisationCaseEventParserTest.java index 215ea2a98c..00f8acaaa4 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/AuthorisationCaseEventParserTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/AuthorisationCaseEventParserTest.java @@ -64,7 +64,7 @@ class AuthorisationCaseEventParserTest { @BeforeEach public void setup() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); final ParseContext context = new ParseContext(); given(mockAccessProfileEntity.getReference()).willReturn(TEST_ACCESS_PROFILE_FOUND); diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/AuthorisationCaseFieldParserTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/AuthorisationCaseFieldParserTest.java index e3bb1e51ad..2a22c1dfe9 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/AuthorisationCaseFieldParserTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/AuthorisationCaseFieldParserTest.java @@ -67,7 +67,7 @@ public class AuthorisationCaseFieldParserTest { @BeforeEach public void setup() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); final ParseContext context = new ParseContext(); given(mockAccessProfileEntity.getReference()).willReturn(TEST_ACCESS_PROFILE_FOUND); context.registerAccessProfiles(Collections.singletonList(mockAccessProfileEntity)); diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/AuthorisationCaseStateParserTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/AuthorisationCaseStateParserTest.java index 6c52eaa76c..544df712ff 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/AuthorisationCaseStateParserTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/AuthorisationCaseStateParserTest.java @@ -52,7 +52,7 @@ public class AuthorisationCaseStateParserTest { @BeforeEach public void setup() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); final ParseContext context = new ParseContext(); given(mockAccessProfileEntity.getReference()).willReturn(TEST_ACCESS_PROFILE_FOUND); context.registerAccessProfiles(Arrays.asList(mockAccessProfileEntity)); diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/AuthorisationCaseTypeParserTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/AuthorisationCaseTypeParserTest.java index 6adc724827..614f56765e 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/AuthorisationCaseTypeParserTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/AuthorisationCaseTypeParserTest.java @@ -50,7 +50,7 @@ public class AuthorisationCaseTypeParserTest { @BeforeEach public void setup() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); final ParseContext context = new ParseContext(); given(mockAccessProfileEntity.getReference()).willReturn(TEST_ACCESS_PROFILE_FOUND); context.registerAccessProfiles(Arrays.asList(mockAccessProfileEntity)); diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/AuthorisationComplexTypeParserTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/AuthorisationComplexTypeParserTest.java index 37772018ca..ec7f55d2b0 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/AuthorisationComplexTypeParserTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/AuthorisationComplexTypeParserTest.java @@ -79,7 +79,7 @@ public class AuthorisationComplexTypeParserTest { @BeforeEach public void setup() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); final ParseContext context = new ParseContext(); given(mockAccessProfileEntity.getReference()).willReturn(TEST_ACCESS_PROFILE_FOUND); context.registerAccessProfiles(Arrays.asList(mockAccessProfileEntity)); diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/BannerParserTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/BannerParserTest.java index e4d07b4e49..d32525951b 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/BannerParserTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/BannerParserTest.java @@ -15,7 +15,7 @@ import java.util.Optional; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/CaseFieldParserTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/CaseFieldParserTest.java index 839310b3f6..3d61a4842d 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/CaseFieldParserTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/CaseFieldParserTest.java @@ -17,7 +17,7 @@ import java.util.Optional; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/CaseRoleParserTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/CaseRoleParserTest.java index deead97618..fb82fda029 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/CaseRoleParserTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/CaseRoleParserTest.java @@ -17,7 +17,7 @@ import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNull.nullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; import static uk.gov.hmcts.ccd.definition.store.excel.util.mapper.SheetName.CASE_ROLE; diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/CaseTypeParserTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/CaseTypeParserTest.java index 171d602ad9..562e59a14c 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/CaseTypeParserTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/CaseTypeParserTest.java @@ -16,7 +16,7 @@ import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNull.nullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.inOrder; diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/CategoryParserTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/CategoryParserTest.java index e5385499fa..e51e6dd7d7 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/CategoryParserTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/CategoryParserTest.java @@ -44,7 +44,7 @@ public class CategoryParserTest extends BaseChallengeQuestionTest { @Before public void setup() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); parseContext = buildParseContext(); this.categoryParser = new CategoryParser(categoryValidator); } diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/ChallengeQuestionParserTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/ChallengeQuestionParserTest.java index 835b2c85ab..a26bd84074 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/ChallengeQuestionParserTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/ChallengeQuestionParserTest.java @@ -18,7 +18,7 @@ import uk.gov.hmcts.ccd.definition.store.repository.entity.ChallengeQuestionTabEntity; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doThrow; @@ -32,7 +32,7 @@ public class ChallengeQuestionParserTest extends BaseChallengeQuestionTest { @Before public void setup() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); parseContext = buildParseContext(); this.challengeQuestionParser = new ChallengeQuestionParser(challengeQuestionValidator); } diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/DisplayGroupParserTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/DisplayGroupParserTest.java index c9493e6dc2..5330ed5f19 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/DisplayGroupParserTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/DisplayGroupParserTest.java @@ -29,7 +29,7 @@ import static org.hamcrest.collection.IsCollectionWithSize.hasSize; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNull.nullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/EventCaseFieldComplexTypeParserTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/EventCaseFieldComplexTypeParserTest.java index 2aaaf697ed..3abb1f36cd 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/EventCaseFieldComplexTypeParserTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/EventCaseFieldComplexTypeParserTest.java @@ -48,7 +48,7 @@ public class EventCaseFieldComplexTypeParserTest { @Before public void setUp() throws InvalidShowConditionException { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); when(showConditionParser.parseShowCondition(any())).thenReturn( new ShowCondition.Builder().showConditionExpression(PARSED_SHOW_CONDITION).build()); } diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/EventCaseFieldParserTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/EventCaseFieldParserTest.java index 90d218461e..1bf7eed9a4 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/EventCaseFieldParserTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/EventCaseFieldParserTest.java @@ -51,7 +51,7 @@ public class EventCaseFieldParserTest { @Before public void setUp() throws InvalidShowConditionException { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); when(parseContext.getCaseFieldForCaseType(any(), any())).thenReturn(CASE_FIELD); when(showConditionParser.parseShowCondition(any())).thenReturn( new ShowCondition.Builder().showConditionExpression(PARSED_SHOW_CONDITION).build() diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/EventPostStateParserTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/EventPostStateParserTest.java index dd13cc9d85..d2279d61c4 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/EventPostStateParserTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/EventPostStateParserTest.java @@ -14,7 +14,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/FieldTypeParserTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/FieldTypeParserTest.java index 7ff3febf60..e8903290b0 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/FieldTypeParserTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/FieldTypeParserTest.java @@ -30,7 +30,7 @@ public class FieldTypeParserTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); } @SuppressWarnings("checkstyle:LineLength") diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/FieldsTypeParserTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/FieldsTypeParserTest.java index 6e490e89ff..5bc15e3845 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/FieldsTypeParserTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/FieldsTypeParserTest.java @@ -8,7 +8,7 @@ import uk.gov.hmcts.ccd.definition.store.repository.entity.FieldTypeEntity; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/GenericLayoutParserTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/GenericLayoutParserTest.java index 62bdc9f00d..7a56d4be53 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/GenericLayoutParserTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/GenericLayoutParserTest.java @@ -58,7 +58,7 @@ public class GenericLayoutParserTest { @BeforeEach public void setup() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); CaseTypeEntity caseTypeEntity = new CaseTypeEntity(); caseTypeEntity.setReference(CASE_TYPE_ID); CaseTypeEntity caseTypeEntity2 = new CaseTypeEntity(); diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/LayoutParserTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/LayoutParserTest.java index 4bd01befce..6d080ae4c2 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/LayoutParserTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/LayoutParserTest.java @@ -1,7 +1,7 @@ package uk.gov.hmcts.ccd.definition.store.excel.parser; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; import static org.mockito.Mockito.verify; import static uk.gov.hmcts.ccd.definition.store.excel.util.mapper.SheetName.CASE_EVENT_TO_FIELDS; @@ -58,7 +58,7 @@ class LayoutParserTest { @BeforeEach void init() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); caseTypeEntity = buildCaseTypeEntity(); caseFieldEntity = buildCaseFieldEntity(); diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/MetadataCaseFieldParserTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/MetadataCaseFieldParserTest.java index 4fd621f618..d02debd57f 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/MetadataCaseFieldParserTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/MetadataCaseFieldParserTest.java @@ -19,7 +19,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.mockito.MockitoAnnotations.initMocks; +import static org.mockito.MockitoAnnotations.openMocks; class MetadataCaseFieldParserTest { @@ -33,7 +33,7 @@ class MetadataCaseFieldParserTest { @BeforeEach void setUp() { - initMocks(this); + openMocks(this); metadataCaseFieldParser = new MetadataCaseFieldParser(parseContext, registry); } diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/SearchAliasFieldParserTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/SearchAliasFieldParserTest.java index 6709873780..848040f5a5 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/SearchAliasFieldParserTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/SearchAliasFieldParserTest.java @@ -58,7 +58,7 @@ class SearchAliasFieldParserTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); parser = new SearchAliasFieldParser(parseContext); } diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/SearchCasesResultLayoutParserTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/SearchCasesResultLayoutParserTest.java index b4518f455b..4db4d245ce 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/SearchCasesResultLayoutParserTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/SearchCasesResultLayoutParserTest.java @@ -35,7 +35,7 @@ class SearchCasesResultLayoutParserTest { @BeforeEach public void setup() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); definitionSheets = new HashMap<>(); classUnderTest = new SearchCasesResultLayoutParser( diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/SearchInputLayoutParserTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/SearchInputLayoutParserTest.java index af9782c63d..b061e43a73 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/SearchInputLayoutParserTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/SearchInputLayoutParserTest.java @@ -35,7 +35,7 @@ public class SearchInputLayoutParserTest { @BeforeEach public void setup() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); CaseTypeEntity caseTypeEntity = new CaseTypeEntity(); caseTypeEntity.setReference(CASE_TYPE_ID); diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/SearchResultLayoutParserTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/SearchResultLayoutParserTest.java index ba53265b5d..3f2aede08a 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/SearchResultLayoutParserTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/SearchResultLayoutParserTest.java @@ -34,7 +34,7 @@ public class SearchResultLayoutParserTest { @BeforeEach public void setup() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); definitionSheets = new HashMap<>(); classUnderTest = new SearchResultLayoutParser( diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/SpreadsheetParserTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/SpreadsheetParserTest.java index f04bc6cb73..18ea428034 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/SpreadsheetParserTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/SpreadsheetParserTest.java @@ -15,7 +15,7 @@ import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; @RunWith(MockitoJUnitRunner.class) public class SpreadsheetParserTest { diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/StateMetadataCaseFieldEntityFactoryTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/StateMetadataCaseFieldEntityFactoryTest.java index b9910551e3..9f744a1ec9 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/StateMetadataCaseFieldEntityFactoryTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/StateMetadataCaseFieldEntityFactoryTest.java @@ -25,7 +25,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.mockito.MockitoAnnotations.initMocks; +import static org.mockito.MockitoAnnotations.openMocks; import static org.mockito.internal.util.reflection.Whitebox.setInternalState; import static uk.gov.hmcts.ccd.definition.store.domain.service.metadata.MetadataField.STATE; import static uk.gov.hmcts.ccd.definition.store.repository.FieldTypeUtils.BASE_FIXED_LIST; @@ -42,7 +42,7 @@ class StateMetadataCaseFieldEntityFactoryTest { @BeforeEach void setUp() { - initMocks(this); + openMocks(this); factory = new StateMetadataCaseFieldEntityFactory(mock(FieldTypeRepository.class)); setInternalState(factory, "versionedRepository", repository); } diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/StateParserTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/StateParserTest.java index 30c9a347f6..b63ebe5b78 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/StateParserTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/StateParserTest.java @@ -17,7 +17,7 @@ import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNull.nullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; import static uk.gov.hmcts.ccd.definition.store.excel.util.mapper.SheetName.STATE; diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/WorkbasketInputLayoutParserTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/WorkbasketInputLayoutParserTest.java index 29e104112b..2bf5de351c 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/WorkbasketInputLayoutParserTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/WorkbasketInputLayoutParserTest.java @@ -36,7 +36,7 @@ public class WorkbasketInputLayoutParserTest { @BeforeEach public void setup() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); definitionSheets = new HashMap<>(); classUnderTest = new WorkbasketInputLayoutParser( diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/WorkbasketLayoutParserTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/WorkbasketLayoutParserTest.java index c8bea58d1e..00723f8d1c 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/WorkbasketLayoutParserTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/WorkbasketLayoutParserTest.java @@ -35,7 +35,7 @@ public class WorkbasketLayoutParserTest { @BeforeEach public void setup() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); definitionSheets = new HashMap<>(); classUnderTest = new WorkbasketLayoutParser( diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/model/DefinitionDataItemTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/model/DefinitionDataItemTest.java index fded5e66d5..b025508c41 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/model/DefinitionDataItemTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/parser/model/DefinitionDataItemTest.java @@ -20,7 +20,7 @@ import static org.hamcrest.core.IsNull.nullValue; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class DefinitionDataItemTest { diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/service/ProcessUploadServiceTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/service/ProcessUploadServiceTest.java index c56c530991..aa2cf208e0 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/service/ProcessUploadServiceTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/service/ProcessUploadServiceTest.java @@ -21,7 +21,7 @@ import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.willThrow; @@ -50,7 +50,7 @@ class ProcessUploadServiceTest { @BeforeEach void setup() throws IOException { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); file = new MockMultipartFile("file", diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/service/TranslationServiceTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/service/TranslationServiceTest.java index 4f8657e798..506dfeb2e7 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/service/TranslationServiceTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/service/TranslationServiceTest.java @@ -58,7 +58,7 @@ class TranslationServiceTest { @BeforeEach public void setup() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); Logger filterLogger = (Logger) LoggerFactory.getLogger(TranslationServiceImpl.class); filterLogger.setLevel(Level.DEBUG); diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/util/mapper/MapperUtilTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/util/mapper/MapperUtilTest.java index d236f83ea2..0696abed15 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/util/mapper/MapperUtilTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/util/mapper/MapperUtilTest.java @@ -16,7 +16,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; public class MapperUtilTest { diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/util/mapper/SheetNameTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/util/mapper/SheetNameTest.java index 1a3327bace..4d2d67edc1 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/util/mapper/SheetNameTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/util/mapper/SheetNameTest.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertNull; class SheetNameTest { diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/validation/CategoryValidatorTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/validation/CategoryValidatorTest.java index d29d14377d..9bfe15bd86 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/validation/CategoryValidatorTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/validation/CategoryValidatorTest.java @@ -13,7 +13,7 @@ import uk.gov.hmcts.ccd.definition.store.repository.entity.CaseTypeEntity; import static org.hamcrest.Matchers.containsString; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; public class CategoryValidatorTest { @@ -38,7 +38,7 @@ public class CategoryValidatorTest { @Before public void setup() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); parseContext = buildParseContext(); categoryValidator = new CategoryValidator(); definitionDataItem = buildDefinitionDataItem(LIVE_FROM, LIVE_TO, CASE_TYPE, CATEGORY_ID, diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/validation/ChallengeQuestionValidatorTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/validation/ChallengeQuestionValidatorTest.java index 9bb800af7f..945fc24182 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/validation/ChallengeQuestionValidatorTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/validation/ChallengeQuestionValidatorTest.java @@ -13,7 +13,7 @@ import uk.gov.hmcts.ccd.definition.store.repository.entity.ChallengeQuestionTabEntity; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; @@ -28,7 +28,7 @@ public class ChallengeQuestionValidatorTest extends BaseChallengeQuestionTest { @Before public void setup() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); parseContext = new ParseContext(); ChallengeQuestionTabEntity entity = new ChallengeQuestionTabEntity(); entity.setQuestionId("questionId"); diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/validation/DisplayContextParameterValidatorTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/validation/DisplayContextParameterValidatorTest.java index f3c3a2610a..9189495011 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/validation/DisplayContextParameterValidatorTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/validation/DisplayContextParameterValidatorTest.java @@ -12,7 +12,7 @@ import java.util.Map; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class DisplayContextParameterValidatorTest { diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/validation/HiddenFieldsValidatorTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/validation/HiddenFieldsValidatorTest.java index 7f80a864ff..d127934cc8 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/validation/HiddenFieldsValidatorTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/validation/HiddenFieldsValidatorTest.java @@ -13,7 +13,7 @@ import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/validation/SpreadsheetValidatorTest.java b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/validation/SpreadsheetValidatorTest.java index 789a94b466..2cc8bf5bc4 100644 --- a/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/validation/SpreadsheetValidatorTest.java +++ b/excel-importer/src/test/java/uk/gov/hmcts/ccd/definition/store/excel/validation/SpreadsheetValidatorTest.java @@ -15,7 +15,7 @@ import java.util.Map; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class SpreadsheetValidatorTest { diff --git a/integration-tests/build.gradle b/integration-tests/build.gradle index 517cf965d0..d487df33b2 100644 --- a/integration-tests/build.gradle +++ b/integration-tests/build.gradle @@ -18,12 +18,10 @@ dependencies { implementation project(':application') implementation project(':excel-importer') implementation project(':rest-api') - testImplementation "org.springframework.boot:spring-boot-starter-web" - testImplementation "org.springframework.boot:spring-boot-starter-actuator" - testImplementation ("io.springfox:springfox-boot-starter:${springfoxSwaggerVersion}") { - exclude group: 'com.google.guava', module: 'guava' - } - testImplementation group: 'org.postgresql', name: 'postgresql', version: '42.4.1' + testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-web' + testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-actuator' + testImplementation group: 'org.springdoc', name: 'springdoc-openapi-starter-webmvc-ui', version: springDocVersion + testImplementation group: 'org.postgresql', name: 'postgresql', version: '42.7.4' } // To help obscure gradle problem diff --git a/integration-tests/src/test/java/uk/gov/hmcts/integration/ServiceToServiceIT.java b/integration-tests/src/test/java/uk/gov/hmcts/integration/ServiceToServiceIT.java index 4897ff3771..d593b93097 100644 --- a/integration-tests/src/test/java/uk/gov/hmcts/integration/ServiceToServiceIT.java +++ b/integration-tests/src/test/java/uk/gov/hmcts/integration/ServiceToServiceIT.java @@ -18,7 +18,7 @@ import static org.apache.http.HttpStatus.SC_FORBIDDEN; import static org.apache.http.HttpStatus.SC_UNAUTHORIZED; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.springframework.http.HttpMethod.GET; import static uk.gov.hmcts.ccd.definition.store.excel.endpoint.ImportController.URI_IMPORT; diff --git a/integration-tests/src/test/resources/integration_tests.properties b/integration-tests/src/test/resources/integration_tests.properties index 4033116e8f..d5226a550a 100644 --- a/integration-tests/src/test/resources/integration_tests.properties +++ b/integration-tests/src/test/resources/integration_tests.properties @@ -5,4 +5,4 @@ idam.api.url=http://localhost:${wiremock.server.port}/idam idam.s2s-auth.url=http://localhost:${wiremock.server.port}/s2s spring.datasource.driver-class-name=org.testcontainers.jdbc.ContainerDatabaseDriver -spring.datasource.url=jdbc:tc:postgresql:9.6:///ccd_definition +spring.datasource.url=jdbc:tc:postgresql:11:///ccd_definition diff --git a/repository/build.gradle b/repository/build.gradle index eda237c9fa..5cad3a7f37 100644 --- a/repository/build.gradle +++ b/repository/build.gradle @@ -28,22 +28,17 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-data-jpa") { exclude group: 'org.apache.tomcat', module: 'tomcat-jdbc' } - implementation (group: 'com.github.hmcts', name: 'service-auth-provider-java-client', version: '4.0.3') { - exclude group: 'com.google.guava', module: 'guava' - } - implementation "commons-beanutils:commons-beanutils:1.9.4" - implementation "org.apache.commons:commons-lang3:3.11" - implementation ("io.springfox:springfox-boot-starter:${springfoxSwaggerVersion}") { - exclude group: 'com.google.guava', module: 'guava' - } - implementation "com.google.guava:guava:32.1.3-jre" - implementation "javax.validation:validation-api:2.0.1.Final" - implementation "org.hibernate.validator:hibernate-validator:6.0.20.Final" - implementation "org.glassfish:javax.el:3.0.0" - implementation "org.flywaydb:flyway-core:6.5.7" - testImplementation "org.assertj:assertj-core" + implementation group: 'com.github.hmcts', name: 'service-auth-provider-java-client', version: '5.2.0' + implementation group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4' + implementation group: 'org.springdoc', name: 'springdoc-openapi-starter-webmvc-ui', version: springDocVersion + implementation group: 'com.google.guava', name: 'guava', version: '33.1.0-jre' + implementation group: 'jakarta.validation', name: 'jakarta.validation-api', version: '3.1.0' + implementation group: 'org.hibernate.validator', name: 'hibernate-validator', version: '6.0.20.Final' + implementation group: 'jakarta.el', name: 'jakarta.el-api', version: '6.0.1' + implementation group: 'org.flywaydb', name: 'flyway-core', version: flywayVersion + testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.19.0' testImplementation project(":commons").sourceSets.main.output - implementation group: 'com.vladmihalcea', name: 'hibernate-types-52', version: '2.9.13' + implementation group: 'com.vladmihalcea', name: 'hibernate-types-60', version: '2.21.1' testImplementation group: 'com.vladmihalcea', name: 'db-util', version: '1.0.5' } diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/ClassUserType.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/ClassUserType.java index 1b0f0b21f6..0ecf0cfad4 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/ClassUserType.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/ClassUserType.java @@ -21,8 +21,8 @@ public ClassUserType() { } @Override - public int[] sqlTypes() { - return new int[] {Types.JAVA_OBJECT}; + public int getSqlType() { + return Types.JAVA_OBJECT; } @Override @@ -42,10 +42,10 @@ public int hashCode(Object object) { @Override public Object nullSafeGet(ResultSet resultSet, - String[] names, + int pos, SharedSessionContractImplementor sharedSessionContractImplementor, Object o) throws HibernateException, SQLException { - final String className = resultSet.getString(names[0]); + final String className = resultSet.getString(pos); return getClass(className); } diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/GeneralImmutableJsonType.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/GeneralImmutableJsonType.java index c5619b48eb..c9bf8f1ea6 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/GeneralImmutableJsonType.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/GeneralImmutableJsonType.java @@ -23,8 +23,8 @@ public GeneralImmutableJsonType(Class type) { } @Override - public int[] sqlTypes() { - return new int[] {Types.JAVA_OBJECT}; + public int getSqlType() { + return Types.JAVA_OBJECT; } @Override @@ -44,10 +44,10 @@ public int hashCode(Object object) { @Override public Object nullSafeGet(ResultSet resultSet, - String[] names, + int pos, SharedSessionContractImplementor sharedSessionContractImplementor, Object o) throws HibernateException, SQLException { - final String cellContent = resultSet.getString(names[0]); + final String cellContent = resultSet.getString(pos); return JsonUtils.fromString(cellContent, dataType); } diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/ModelObject.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/ModelObject.java index f6736e1a91..84915165f6 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/ModelObject.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/ModelObject.java @@ -3,13 +3,13 @@ import lombok.Getter; import lombok.Setter; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Version; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.Version; import java.util.Date; @MappedSuperclass diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/NewPostgreSQL94Dialect.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/NewPostgreSQL94Dialect.java deleted file mode 100644 index 3c850d00a7..0000000000 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/NewPostgreSQL94Dialect.java +++ /dev/null @@ -1,14 +0,0 @@ -package uk.gov.hmcts.ccd.definition.store.repository; - -import org.hibernate.dialect.PostgreSQL94Dialect; - -import java.sql.Types; - -public class NewPostgreSQL94Dialect extends PostgreSQL94Dialect { - - public NewPostgreSQL94Dialect() { - registerColumnType(Types.JAVA_OBJECT, "jsonb"); - registerColumnType(Types.NULL, "null"); // need for gradle task `liquibaseDiffChangelog` - } - -} diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/PostgreSQLEnumType.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/PostgreSQLEnumType.java deleted file mode 100644 index f3ea828397..0000000000 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/PostgreSQLEnumType.java +++ /dev/null @@ -1,61 +0,0 @@ -package uk.gov.hmcts.ccd.definition.store.repository; - -import org.hibernate.HibernateException; -import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.type.EnumType; - -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Types; -import java.util.Properties; - -public class PostgreSQLEnumType> extends EnumType { - - private Class clazz; - - @Override - public void setParameterValues(Properties parameters) { - String className = (String) parameters.get("type"); - - if (className == null) { - throw new HibernateException("Parameter 'type' must be set to determine the Enum class"); - } - - try { - this.clazz = (Class) Class.forName(className); - } catch (ClassNotFoundException e) { - throw new HibernateException("Couldn't get the class for name [" + className + "].", e); - } - } - - @Override - public Object nullSafeGet(ResultSet rs, String[] names, SharedSessionContractImplementor session, Object owner) - throws SQLException { - return EnumUtil.getEnumFromString(clazz, rs.getString(names[0])); - } - - @Override - public void nullSafeSet( - PreparedStatement st, - Object value, - int index, - SharedSessionContractImplementor session) throws SQLException { - - if (value == null) { - st.setNull(index, Types.OTHER); - } else { - st.setObject( - index, - value.toString(), - Types.OTHER - ); - } - } - - @Override - public int[] sqlTypes() { - return new int[] {Types.OTHER}; - } - -} diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/SecurityUtils.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/SecurityUtils.java index 76e376b399..f9aa3bee84 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/SecurityUtils.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/SecurityUtils.java @@ -8,7 +8,7 @@ import uk.gov.hmcts.reform.authorisation.generators.AuthTokenGenerator; import uk.gov.hmcts.reform.idam.client.models.UserInfo; -import javax.inject.Named; +import jakarta.inject.Named; @Named public class SecurityUtils { diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/AccessProfileEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/AccessProfileEntity.java index ac6ed1a6c9..4fe30a8b71 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/AccessProfileEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/AccessProfileEntity.java @@ -1,37 +1,30 @@ package uk.gov.hmcts.ccd.definition.store.repository.entity; import org.hibernate.annotations.CreationTimestamp; -import org.hibernate.annotations.Parameter; import org.hibernate.annotations.Type; -import org.hibernate.annotations.TypeDef; -import uk.gov.hmcts.ccd.definition.store.repository.PostgreSQLEnumType; + +import com.vladmihalcea.hibernate.type.basic.PostgreSQLEnumType; import uk.gov.hmcts.ccd.definition.store.repository.SecurityClassification; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; import java.io.Serializable; import java.time.LocalDateTime; -import static javax.persistence.GenerationType.SEQUENCE; +import static jakarta.persistence.GenerationType.SEQUENCE; @Table(name = "role") @Entity -@TypeDef( - name = "pgsql_securityclassification_enum", - typeClass = PostgreSQLEnumType.class, - parameters = @Parameter(name = "type", - value = "uk.gov.hmcts.ccd.definition.store.repository.SecurityClassification") -) @Inheritance(strategy = InheritanceType.SINGLE_TABLE) @DiscriminatorColumn(name = "dtype", discriminatorType = DiscriminatorType.STRING) @DiscriminatorValue("USERROLE") @@ -56,7 +49,7 @@ public class AccessProfileEntity implements Serializable { @Column(name = "security_classification") @Enumerated(EnumType.STRING) - @Type(type = "pgsql_securityclassification_enum") + @Type(PostgreSQLEnumType.class) private SecurityClassification securityClassification; public Integer getId() { diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/AccessTypeEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/AccessTypeEntity.java index c6d96f590e..fb06621325 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/AccessTypeEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/AccessTypeEntity.java @@ -3,19 +3,19 @@ import lombok.Getter; import lombok.Setter; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.io.Serial; import java.time.LocalDate; -import static javax.persistence.FetchType.LAZY; -import static javax.persistence.GenerationType.IDENTITY; +import static jakarta.persistence.FetchType.LAZY; +import static jakarta.persistence.GenerationType.IDENTITY; @Table(name = "access_type") @Entity diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/AccessTypeRoleEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/AccessTypeRoleEntity.java index 8202e185ef..08f0610296 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/AccessTypeRoleEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/AccessTypeRoleEntity.java @@ -3,20 +3,20 @@ import lombok.Getter; import lombok.Setter; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.io.Serial; import java.io.Serializable; import java.time.LocalDate; -import static javax.persistence.FetchType.LAZY; -import static javax.persistence.GenerationType.IDENTITY; +import static jakarta.persistence.FetchType.LAZY; +import static jakarta.persistence.GenerationType.IDENTITY; @Table(name = "access_type_role") @Entity diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/Authorisation.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/Authorisation.java index c5c2ab60fc..9983750467 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/Authorisation.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/Authorisation.java @@ -2,22 +2,22 @@ import org.hibernate.annotations.CreationTimestamp; -import javax.persistence.Column; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.Transient; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Column; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Transient; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; import java.time.LocalDate; import java.time.LocalDateTime; import static java.util.Objects.isNull; import static java.util.Objects.nonNull; -import static javax.persistence.GenerationType.SEQUENCE; +import static jakarta.persistence.GenerationType.SEQUENCE; @MappedSuperclass public abstract class Authorisation implements Serializable { diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/BannerEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/BannerEntity.java index 0e1e111fae..3d43e6aecd 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/BannerEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/BannerEntity.java @@ -2,18 +2,18 @@ import org.hibernate.annotations.CreationTimestamp; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.io.Serializable; import java.time.LocalDateTime; -import static javax.persistence.FetchType.EAGER; -import static javax.persistence.GenerationType.IDENTITY; +import static jakarta.persistence.FetchType.EAGER; +import static jakarta.persistence.GenerationType.IDENTITY; @Table(name = "banner") @Entity diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseFieldACLEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseFieldACLEntity.java index 26bcce66ff..cf2497b5a6 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseFieldACLEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseFieldACLEntity.java @@ -1,10 +1,10 @@ package uk.gov.hmcts.ccd.definition.store.repository.entity; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.io.Serializable; @Table(name = "case_field_acl") diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseFieldEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseFieldEntity.java index 494d18c923..cb3c116051 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseFieldEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseFieldEntity.java @@ -2,22 +2,23 @@ import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import org.hibernate.annotations.Parameter; import org.hibernate.annotations.Type; -import org.hibernate.annotations.TypeDef; -import org.hibernate.annotations.TypeDefs; -import uk.gov.hmcts.ccd.definition.store.repository.PostgreSQLEnumType; + + +import com.vladmihalcea.hibernate.type.basic.PostgreSQLEnumType; import uk.gov.hmcts.ccd.definition.store.repository.SecurityClassification; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import java.io.Serializable; import java.time.LocalDate; import java.util.ArrayList; @@ -26,26 +27,13 @@ import java.util.Objects; import java.util.Optional; -import static javax.persistence.CascadeType.ALL; -import static javax.persistence.FetchType.EAGER; -import static javax.persistence.FetchType.LAZY; -import static javax.persistence.GenerationType.SEQUENCE; +import static jakarta.persistence.CascadeType.ALL; +import static jakarta.persistence.FetchType.EAGER; +import static jakarta.persistence.FetchType.LAZY; +import static jakarta.persistence.GenerationType.SEQUENCE; @Table(name = "case_field") @Entity -@TypeDefs({ - @TypeDef( - name = "pgsql_securityclassification_enum", - typeClass = PostgreSQLEnumType.class, - parameters = @Parameter(name = "type", - value = "uk.gov.hmcts.ccd.definition.store.repository.SecurityClassification") - ), - @TypeDef( - name = "pgsql_datafieldtype_enum", - typeClass = PostgreSQLEnumType.class, - parameters = @Parameter(name = "type", - value = "uk.gov.hmcts.ccd.definition.store.repository.entity.DataFieldType") - )}) public class CaseFieldEntity implements FieldEntity, Serializable { @Id @@ -75,7 +63,8 @@ public class CaseFieldEntity implements FieldEntity, Serializable { private boolean searchable = true; @Column(name = "security_classification") - @Type(type = "pgsql_securityclassification_enum") + @Enumerated(EnumType.STRING) + @Type(PostgreSQLEnumType.class) private SecurityClassification securityClassification; @ManyToOne(fetch = EAGER) @@ -96,7 +85,8 @@ public class CaseFieldEntity implements FieldEntity, Serializable { private final List complexFieldACLEntities = new ArrayList<>(); @Column(name = "data_field_type") - @Type(type = "pgsql_datafieldtype_enum") + @Enumerated(EnumType.STRING) + @Type(PostgreSQLEnumType.class) private DataFieldType dataFieldType; @Column(name = "category_id") diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseRoleEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseRoleEntity.java index f8157ad3b7..61dd7a71b6 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseRoleEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseRoleEntity.java @@ -1,13 +1,13 @@ package uk.gov.hmcts.ccd.definition.store.repository.entity; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.io.Serializable; -import static javax.persistence.FetchType.LAZY; +import static jakarta.persistence.FetchType.LAZY; @Table(name = "role") @Entity diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseTypeACLEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseTypeACLEntity.java index cfa3f6817d..4c943fbfdc 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseTypeACLEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseTypeACLEntity.java @@ -1,11 +1,11 @@ package uk.gov.hmcts.ccd.definition.store.repository.entity; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; @Table(name = "case_type_acl") diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseTypeEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseTypeEntity.java index 25d60f28fb..42ec5425e6 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseTypeEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseTypeEntity.java @@ -9,38 +9,33 @@ import java.util.List; import java.util.Optional; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import org.hibernate.annotations.Parameter; import org.hibernate.annotations.Type; -import org.hibernate.annotations.TypeDef; -import uk.gov.hmcts.ccd.definition.store.repository.PostgreSQLEnumType; + +import com.vladmihalcea.hibernate.type.basic.PostgreSQLEnumType; import uk.gov.hmcts.ccd.definition.store.repository.SecurityClassification; -import static javax.persistence.CascadeType.ALL; -import static javax.persistence.FetchType.EAGER; -import static javax.persistence.FetchType.LAZY; -import static javax.persistence.GenerationType.SEQUENCE; +import static jakarta.persistence.CascadeType.ALL; +import static jakarta.persistence.FetchType.EAGER; +import static jakarta.persistence.FetchType.LAZY; +import static jakarta.persistence.GenerationType.SEQUENCE; @Table(name = "case_type") @Entity -@TypeDef( - name = "pgsql_securityclassification_enum", - typeClass = PostgreSQLEnumType.class, - parameters = @Parameter(name = "type", - value = "uk.gov.hmcts.ccd.definition.store.repository.SecurityClassification") -) public class CaseTypeEntity implements Serializable, Versionable { @Id @@ -71,7 +66,8 @@ public class CaseTypeEntity implements Serializable, Versionable { private String description; @Column(name = "security_classification") - @Type(type = "pgsql_securityclassification_enum") + @Enumerated(EnumType.STRING) + @Type(PostgreSQLEnumType.class) private SecurityClassification securityClassification; @ManyToOne(fetch = LAZY, cascade = ALL) diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseTypeLiteACLEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseTypeLiteACLEntity.java index b0d3b4fb13..a8a9be4e88 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseTypeLiteACLEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseTypeLiteACLEntity.java @@ -1,7 +1,7 @@ package uk.gov.hmcts.ccd.definition.store.repository.entity; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import java.io.Serializable; @Table(name = "case_type_acl") diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseTypeLiteEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseTypeLiteEntity.java index 08e4f6fc03..06f51364b2 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseTypeLiteEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseTypeLiteEntity.java @@ -2,23 +2,23 @@ import org.hibernate.annotations.Fetch; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import static javax.persistence.CascadeType.ALL; -import static javax.persistence.FetchType.LAZY; -import static javax.persistence.GenerationType.IDENTITY; +import static jakarta.persistence.CascadeType.ALL; +import static jakarta.persistence.FetchType.LAZY; +import static jakarta.persistence.GenerationType.IDENTITY; import static org.hibernate.annotations.FetchMode.SUBSELECT; /** diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CategoryEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CategoryEntity.java index faa032ab62..38f1537675 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CategoryEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CategoryEntity.java @@ -1,17 +1,17 @@ package uk.gov.hmcts.ccd.definition.store.repository.entity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.io.Serializable; import java.time.LocalDate; -import static javax.persistence.FetchType.LAZY; +import static jakarta.persistence.FetchType.LAZY; @Table(name = "category") @Entity diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/ChallengeQuestionTabEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/ChallengeQuestionTabEntity.java index 5e0d29dd2a..d554c31032 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/ChallengeQuestionTabEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/ChallengeQuestionTabEntity.java @@ -2,17 +2,17 @@ import java.io.Serializable; -import static javax.persistence.FetchType.LAZY; - -import javax.persistence.Table; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.ManyToOne; -import javax.persistence.JoinColumn; -import javax.persistence.FetchType; +import static jakarta.persistence.FetchType.LAZY; + +import jakarta.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.FetchType; @Table(name = "challenge_question") @Entity diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/ComplexFieldACLEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/ComplexFieldACLEntity.java index 2ff387b620..f307fe889a 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/ComplexFieldACLEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/ComplexFieldACLEntity.java @@ -1,10 +1,10 @@ package uk.gov.hmcts.ccd.definition.store.repository.entity; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.io.Serializable; @Table(name = "complex_field_acl") diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/ComplexFieldEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/ComplexFieldEntity.java index 985f532c19..f5466bf25d 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/ComplexFieldEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/ComplexFieldEntity.java @@ -3,33 +3,28 @@ import java.io.Serializable; import java.util.Objects; -import static javax.persistence.GenerationType.SEQUENCE; +import static jakarta.persistence.GenerationType.SEQUENCE; -import org.hibernate.annotations.Parameter; import org.hibernate.annotations.Type; -import org.hibernate.annotations.TypeDef; -import uk.gov.hmcts.ccd.definition.store.repository.PostgreSQLEnumType; + +import com.vladmihalcea.hibernate.type.basic.PostgreSQLEnumType; import uk.gov.hmcts.ccd.definition.store.repository.SecurityClassification; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.GeneratedValue; -import javax.persistence.ManyToOne; -import javax.persistence.FetchType; -import javax.persistence.CascadeType; -import javax.persistence.JoinColumn; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.FetchType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Transient; @Table(name = "complex_field") @Entity -@TypeDef( - name = "pgsql_securityclassification_enum", - typeClass = PostgreSQLEnumType.class, - parameters = @Parameter(name = "type", - value = "uk.gov.hmcts.ccd.definition.store.repository.SecurityClassification") -) public class ComplexFieldEntity implements FieldEntity, Serializable { @Id @@ -53,7 +48,8 @@ public class ComplexFieldEntity implements FieldEntity, Serializable { private boolean searchable = true; @Column(name = "security_classification") - @Type(type = "pgsql_securityclassification_enum") + @Enumerated(EnumType.STRING) + @Type(PostgreSQLEnumType.class) private SecurityClassification securityClassification; @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/DefinitionEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/DefinitionEntity.java index 346d15ab3c..36a85e754c 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/DefinitionEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/DefinitionEntity.java @@ -3,41 +3,30 @@ import com.fasterxml.jackson.databind.JsonNode; import com.vladmihalcea.hibernate.type.json.JsonNodeBinaryType; import org.hibernate.annotations.CreationTimestamp; -import org.hibernate.annotations.Parameter; import org.hibernate.annotations.Type; -import org.hibernate.annotations.TypeDef; -import org.hibernate.annotations.TypeDefs; + + import org.hibernate.annotations.UpdateTimestamp; -import uk.gov.hmcts.ccd.definition.store.repository.PostgreSQLEnumType; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import com.vladmihalcea.hibernate.type.basic.PostgreSQLEnumType; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import java.io.Serializable; import java.time.LocalDateTime; -import static javax.persistence.FetchType.LAZY; -import static javax.persistence.GenerationType.IDENTITY; +import static jakarta.persistence.FetchType.LAZY; +import static jakarta.persistence.GenerationType.IDENTITY; @Table(name = "definition_designer") @Entity -@TypeDefs({ - @TypeDef( - name = "jsonb-node", - typeClass = JsonNodeBinaryType.class - ), - @TypeDef( - name = "pgsql_definitionstatus_enum", - typeClass = PostgreSQLEnumType.class, - parameters = @Parameter(name = "type", - value = "uk.gov.hmcts.ccd.definition.store.repository.entity.DefinitionStatus") - ) -}) public class DefinitionEntity implements Serializable, Versionable { @Id @@ -59,11 +48,12 @@ public class DefinitionEntity implements Serializable, Versionable { private Integer version; @Column(name = "status", nullable = false) - @Type(type = "pgsql_definitionstatus_enum") + @Enumerated(EnumType.STRING) + @Type(PostgreSQLEnumType.class) private DefinitionStatus status; @Column(name = "data", nullable = false, columnDefinition = "jsonb") - @Type(type = "jsonb-node") + @Type(JsonNodeBinaryType.class) private JsonNode data; @Column(name = "author", nullable = false) diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/DisplayGroupCaseFieldEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/DisplayGroupCaseFieldEntity.java index 90a65eb180..1869e92458 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/DisplayGroupCaseFieldEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/DisplayGroupCaseFieldEntity.java @@ -2,16 +2,16 @@ import org.apache.commons.lang3.StringUtils; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; import java.time.LocalDate; import java.util.Objects; diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/DisplayGroupEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/DisplayGroupEntity.java index 5932edc133..a1541e2f89 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/DisplayGroupEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/DisplayGroupEntity.java @@ -4,27 +4,27 @@ import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import static javax.persistence.CascadeType.ALL; -import static javax.persistence.FetchType.EAGER; -import static javax.persistence.FetchType.LAZY; +import static jakarta.persistence.CascadeType.ALL; +import static jakarta.persistence.FetchType.EAGER; +import static jakarta.persistence.FetchType.LAZY; @Table(name = "display_group") @Entity diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventACLEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventACLEntity.java index 754b8917fc..329e70f0b0 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventACLEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventACLEntity.java @@ -1,10 +1,10 @@ package uk.gov.hmcts.ccd.definition.store.repository.entity; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.io.Serializable; @Table(name = "event_acl") diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventCaseFieldEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventCaseFieldEntity.java index cbc0710d45..5a3cda1317 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventCaseFieldEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventCaseFieldEntity.java @@ -3,35 +3,31 @@ import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.Type; -import org.hibernate.annotations.TypeDef; + import uk.gov.hmcts.ccd.definition.store.repository.DisplayContext; -import uk.gov.hmcts.ccd.definition.store.repository.PostgreSQLEnumType; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import com.vladmihalcea.hibernate.type.basic.PostgreSQLEnumType; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import static javax.persistence.CascadeType.ALL; -import static javax.persistence.FetchType.LAZY; +import static jakarta.persistence.CascadeType.ALL; +import static jakarta.persistence.FetchType.LAZY; @Table(name = "event_case_field") @Entity -@TypeDef( - name = "pgsql_displaycontext_enum", - typeClass = PostgreSQLEnumType.class, - parameters = @org.hibernate.annotations.Parameter(name = "type", - value = "uk.gov.hmcts.ccd.definition.store.repository.DisplayContext") -) public class EventCaseFieldEntity implements Serializable { @Id @Column(name = "id") @@ -52,7 +48,8 @@ public class EventCaseFieldEntity implements Serializable { private final List eventComplexTypes = new ArrayList<>(); @Column(name = "display_context", nullable = false) - @Type(type = "pgsql_displaycontext_enum") + @Enumerated(EnumType.STRING) + @Type(PostgreSQLEnumType.class) private DisplayContext displayContext; @Column(name = "display_context_parameter") diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventComplexTypeEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventComplexTypeEntity.java index ea4f32df6b..5c3a3c63f5 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventComplexTypeEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventComplexTypeEntity.java @@ -1,31 +1,28 @@ package uk.gov.hmcts.ccd.definition.store.repository.entity; import org.hibernate.annotations.Type; -import org.hibernate.annotations.TypeDef; + +import com.vladmihalcea.hibernate.type.basic.PostgreSQLEnumType; + import uk.gov.hmcts.ccd.definition.store.repository.DisplayContext; -import uk.gov.hmcts.ccd.definition.store.repository.PostgreSQLEnumType; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.io.Serializable; import java.time.LocalDate; -import static javax.persistence.FetchType.LAZY; +import static jakarta.persistence.FetchType.LAZY; @Table(name = "event_case_field_complex_type") @Entity -@TypeDef( - name = "pgsql_displaycontext_enum", - typeClass = PostgreSQLEnumType.class, - parameters = @org.hibernate.annotations.Parameter(name = "type", - value = "uk.gov.hmcts.ccd.definition.store.repository.DisplayContext") -) public class EventComplexTypeEntity implements Serializable { @Id @Column(name = "id") @@ -54,7 +51,8 @@ public class EventComplexTypeEntity implements Serializable { private Integer order; @Column(name = "display_context", nullable = false) - @Type(type = "pgsql_displaycontext_enum") + @Enumerated(EnumType.STRING) + @Type(PostgreSQLEnumType.class) private DisplayContext displayContext; @Column(name = "show_condition") diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventEntity.java index a86846a8b9..d80f161700 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventEntity.java @@ -7,42 +7,36 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.MapKey; -import javax.persistence.MapKeyEnumerated; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKey; +import jakarta.persistence.MapKeyEnumerated; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import org.hibernate.annotations.Parameter; import org.hibernate.annotations.Type; -import org.hibernate.annotations.TypeDef; -import uk.gov.hmcts.ccd.definition.store.repository.PostgreSQLEnumType; + +import com.vladmihalcea.hibernate.type.basic.PostgreSQLEnumType; import uk.gov.hmcts.ccd.definition.store.repository.SecurityClassification; import uk.gov.hmcts.ccd.definition.store.repository.model.WebhookType; -import static javax.persistence.CascadeType.ALL; -import static javax.persistence.FetchType.LAZY; +import static jakarta.persistence.CascadeType.ALL; +import static jakarta.persistence.FetchType.LAZY; import static org.hibernate.annotations.FetchMode.SUBSELECT; @Table(name = "event") @Entity -@TypeDef( - name = "pgsql_securityclassification_enum", - typeClass = PostgreSQLEnumType.class, - parameters = @Parameter(name = "type", - value = "uk.gov.hmcts.ccd.definition.store.repository.SecurityClassification") -) public class EventEntity implements Serializable { @Id @@ -72,7 +66,8 @@ public class EventEntity implements Serializable { private Integer order; @Column(name = "security_classification") - @Type(type = "pgsql_securityclassification_enum") + @Enumerated(EnumType.STRING) + @Type(PostgreSQLEnumType.class) private SecurityClassification securityClassification; @Column(name = "show_summary") diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventLiteACLEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventLiteACLEntity.java index 39b5fdb693..f2a602294a 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventLiteACLEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventLiteACLEntity.java @@ -1,7 +1,7 @@ package uk.gov.hmcts.ccd.definition.store.repository.entity; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import java.io.Serializable; @Table(name = "event_acl") diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventLiteEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventLiteEntity.java index aa198c11fb..e4ceaf170f 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventLiteEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventLiteEntity.java @@ -2,23 +2,23 @@ import org.hibernate.annotations.Fetch; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import static javax.persistence.CascadeType.ALL; -import static javax.persistence.FetchType.EAGER; -import static javax.persistence.GenerationType.IDENTITY; +import static jakarta.persistence.CascadeType.ALL; +import static jakarta.persistence.FetchType.EAGER; +import static jakarta.persistence.GenerationType.IDENTITY; import static org.hibernate.annotations.FetchMode.SUBSELECT; /** diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventPostStateEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventPostStateEntity.java index 0d0ae061a7..3743008926 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventPostStateEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventPostStateEntity.java @@ -1,16 +1,16 @@ package uk.gov.hmcts.ccd.definition.store.repository.entity; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; - -import static javax.persistence.FetchType.LAZY; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; + +import static jakarta.persistence.FetchType.LAZY; @Table(name = "event_post_state") @Entity diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventWebhookEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventWebhookEntity.java index 6055a595c2..b2ad80f3a0 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventWebhookEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/EventWebhookEntity.java @@ -1,21 +1,22 @@ package uk.gov.hmcts.ccd.definition.store.repository.entity; -import org.hibernate.annotations.Parameter; import org.hibernate.annotations.Type; -import org.hibernate.annotations.TypeDef; -import uk.gov.hmcts.ccd.definition.store.repository.PostgreSQLEnumType; + +import com.vladmihalcea.hibernate.type.basic.PostgreSQLEnumType; import uk.gov.hmcts.ccd.definition.store.repository.model.WebhookType; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; /** * This is a joining type for modelling Event Webhooks. @@ -23,11 +24,6 @@ * event (Start, PreSubmit and PostSubmit at time of writing). * See {@link EventEntity#webhooks} */ -@TypeDef( - name = "webhook_type_enum", - typeClass = PostgreSQLEnumType.class, - parameters = @Parameter(name = "type", value = "uk.gov.hmcts.ccd.definition.store.repository.model.WebhookType") -) @Entity(name = "EventWebhookEntity") @Table(name = "event_webhook") public class EventWebhookEntity { @@ -46,12 +42,10 @@ public class EventWebhookEntity { private EventEntity event; @Column(name = "webhook_type") - @Type(type = "webhook_type_enum") + @Enumerated(EnumType.STRING) + @Type(PostgreSQLEnumType.class) private WebhookType type; - private EventWebhookEntity() { - } - public EventWebhookEntity(EventEntity event, WebhookEntity webhook, WebhookType type) { this.event = event; this.webhook = webhook; diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/FieldEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/FieldEntity.java index 3021a90496..084bea416c 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/FieldEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/FieldEntity.java @@ -3,7 +3,7 @@ import com.google.common.base.Strings; import org.apache.commons.lang3.StringUtils; -import javax.persistence.Transient; +import jakarta.persistence.Transient; import java.io.Serializable; import java.util.Arrays; import java.util.List; diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/FieldTypeEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/FieldTypeEntity.java index a337f7e22d..98dfe194b8 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/FieldTypeEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/FieldTypeEntity.java @@ -5,18 +5,18 @@ import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import java.io.Serializable; import java.time.LocalDateTime; import java.util.ArrayList; @@ -28,7 +28,7 @@ import java.util.UUID; import static java.util.Collections.emptySet; -import static javax.persistence.GenerationType.SEQUENCE; +import static jakarta.persistence.GenerationType.SEQUENCE; import static uk.gov.hmcts.ccd.definition.store.repository.FieldTypeUtils.BASE_COLLECTION; import static uk.gov.hmcts.ccd.definition.store.repository.FieldTypeUtils.BASE_COMPLEX; import static uk.gov.hmcts.ccd.definition.store.repository.FieldTypeUtils.BASE_DOCUMENT; diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/FieldTypeListItemEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/FieldTypeListItemEntity.java index 903170d6fd..93283f4b4c 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/FieldTypeListItemEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/FieldTypeListItemEntity.java @@ -1,16 +1,16 @@ package uk.gov.hmcts.ccd.definition.store.repository.entity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.io.Serializable; -import static javax.persistence.GenerationType.SEQUENCE; +import static jakarta.persistence.GenerationType.SEQUENCE; @Table(name = "field_type_list_item") @Entity diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/GenericLayoutEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/GenericLayoutEntity.java index 617b824bf2..f2bb0ee847 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/GenericLayoutEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/GenericLayoutEntity.java @@ -3,21 +3,21 @@ import org.apache.commons.lang3.StringUtils; import uk.gov.hmcts.ccd.definition.store.repository.LayoutSheetType; -import javax.persistence.Column; -import javax.persistence.MappedSuperclass; -import javax.persistence.Id; -import javax.persistence.GeneratedValue; -import javax.persistence.ManyToOne; -import javax.persistence.JoinColumn; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Transient; import java.io.Serializable; import java.time.LocalDate; import java.util.Optional; -import static javax.persistence.CascadeType.ALL; -import static javax.persistence.FetchType.LAZY; -import static javax.persistence.GenerationType.IDENTITY; +import static jakarta.persistence.CascadeType.ALL; +import static jakarta.persistence.FetchType.LAZY; +import static jakarta.persistence.GenerationType.IDENTITY; @MappedSuperclass public abstract class GenericLayoutEntity implements Serializable { diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/InputCaseFieldEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/InputCaseFieldEntity.java index c48758c621..d7bde61865 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/InputCaseFieldEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/InputCaseFieldEntity.java @@ -2,8 +2,8 @@ import uk.gov.hmcts.ccd.definition.store.repository.LayoutSheetType; -import javax.persistence.Column; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.MappedSuperclass; import java.util.Optional; @MappedSuperclass diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/JurisdictionEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/JurisdictionEntity.java index e5908c5224..b13c3df7ce 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/JurisdictionEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/JurisdictionEntity.java @@ -2,16 +2,16 @@ import org.hibernate.annotations.CreationTimestamp; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.io.Serializable; import java.time.LocalDateTime; import java.util.Date; -import static javax.persistence.GenerationType.IDENTITY; +import static jakarta.persistence.GenerationType.IDENTITY; @Table(name = "jurisdiction") @Entity diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/JurisdictionUiConfigEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/JurisdictionUiConfigEntity.java index 59b1338362..53690842d2 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/JurisdictionUiConfigEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/JurisdictionUiConfigEntity.java @@ -1,16 +1,16 @@ package uk.gov.hmcts.ccd.definition.store.repository.entity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.io.Serializable; -import static javax.persistence.FetchType.EAGER; -import static javax.persistence.GenerationType.IDENTITY; +import static jakarta.persistence.FetchType.EAGER; +import static jakarta.persistence.GenerationType.IDENTITY; @Table(name = "jurisdiction_ui_config") @Entity diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/RoleToAccessProfilesEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/RoleToAccessProfilesEntity.java index fa423b3dfa..28e9f506a4 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/RoleToAccessProfilesEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/RoleToAccessProfilesEntity.java @@ -1,17 +1,17 @@ package uk.gov.hmcts.ccd.definition.store.repository.entity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.io.Serializable; import java.util.Date; -import static javax.persistence.FetchType.LAZY; +import static jakarta.persistence.FetchType.LAZY; @Table(name = "role_to_access_profiles") @Entity diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/SearchAliasFieldEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/SearchAliasFieldEntity.java index 1bea0da3c0..91ee9b9085 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/SearchAliasFieldEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/SearchAliasFieldEntity.java @@ -1,16 +1,16 @@ package uk.gov.hmcts.ccd.definition.store.repository.entity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.io.Serializable; -import static javax.persistence.FetchType.LAZY; -import static javax.persistence.GenerationType.IDENTITY; +import static jakarta.persistence.FetchType.LAZY; +import static jakarta.persistence.GenerationType.IDENTITY; @Table(name = "search_alias_field") @Entity diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/SearchCasesResultFieldEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/SearchCasesResultFieldEntity.java index 8c6be4f555..d890a2314f 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/SearchCasesResultFieldEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/SearchCasesResultFieldEntity.java @@ -2,10 +2,10 @@ import uk.gov.hmcts.ccd.definition.store.repository.LayoutSheetType; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Table(name = "search_cases_result_fields") diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/SearchCriteriaEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/SearchCriteriaEntity.java index b83231fea9..fa969f70d8 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/SearchCriteriaEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/SearchCriteriaEntity.java @@ -1,17 +1,17 @@ package uk.gov.hmcts.ccd.definition.store.repository.entity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.io.Serializable; import java.util.Date; -import static javax.persistence.FetchType.LAZY; +import static jakarta.persistence.FetchType.LAZY; @Table(name = "search_criteria") @Entity diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/SearchInputCaseFieldEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/SearchInputCaseFieldEntity.java index fefa5f2a02..6906e6b978 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/SearchInputCaseFieldEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/SearchInputCaseFieldEntity.java @@ -1,7 +1,7 @@ package uk.gov.hmcts.ccd.definition.store.repository.entity; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Table(name = "search_input_case_field") @Entity diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/SearchPartyEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/SearchPartyEntity.java index f6209cd870..1004f5967f 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/SearchPartyEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/SearchPartyEntity.java @@ -2,16 +2,16 @@ import java.io.Serializable; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; - -import static javax.persistence.FetchType.LAZY; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; + +import static jakarta.persistence.FetchType.LAZY; @Table(name = "search_party") @Entity diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/SearchResultCaseFieldEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/SearchResultCaseFieldEntity.java index a075ff511b..87e29a400a 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/SearchResultCaseFieldEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/SearchResultCaseFieldEntity.java @@ -2,9 +2,9 @@ import uk.gov.hmcts.ccd.definition.store.repository.LayoutSheetType; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Table(name = "search_result_case_field") diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/SortOrder.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/SortOrder.java index 9516685406..6f33903c8d 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/SortOrder.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/SortOrder.java @@ -1,7 +1,7 @@ package uk.gov.hmcts.ccd.definition.store.repository.entity; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable public class SortOrder { diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/StateACLEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/StateACLEntity.java index 6bf10c1c61..57c4b7e24c 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/StateACLEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/StateACLEntity.java @@ -1,11 +1,11 @@ package uk.gov.hmcts.ccd.definition.store.repository.entity; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import java.io.Serializable; import java.util.Objects; diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/StateEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/StateEntity.java index fba670f90e..ef1a9294d7 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/StateEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/StateEntity.java @@ -3,25 +3,25 @@ import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; import java.io.Serializable; import java.time.LocalDate; import java.util.Collection; import java.util.LinkedHashSet; import java.util.Set; -import static javax.persistence.CascadeType.ALL; -import static javax.persistence.FetchType.EAGER; +import static jakarta.persistence.CascadeType.ALL; +import static jakarta.persistence.FetchType.EAGER; @Table(name = "state") @Entity diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/WebhookEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/WebhookEntity.java index 11096c77a2..96f15a3463 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/WebhookEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/WebhookEntity.java @@ -3,27 +3,21 @@ import com.google.common.collect.Lists; import com.vladmihalcea.hibernate.type.array.IntArrayType; import org.hibernate.annotations.Type; -import org.hibernate.annotations.TypeDef; -import org.hibernate.annotations.TypeDefs; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; + + + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; import java.util.List; @Table(name = "webhook") @Entity -@TypeDefs({ - @TypeDef( - name = "int-array", - typeClass = IntArrayType.class - ) -}) public class WebhookEntity implements Serializable { @Id @@ -34,7 +28,7 @@ public class WebhookEntity implements Serializable { @Column(name = "url") private String url; - @Type(type = "int-array") + @Type(IntArrayType.class) @Column( name = "timeouts", columnDefinition = "integer[]" diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/WorkBasketCaseFieldEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/WorkBasketCaseFieldEntity.java index bf3c725767..525ff6b67f 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/WorkBasketCaseFieldEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/WorkBasketCaseFieldEntity.java @@ -2,9 +2,9 @@ import uk.gov.hmcts.ccd.definition.store.repository.LayoutSheetType; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Table(name = "workbasket_case_field") @Entity diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/WorkBasketInputCaseFieldEntity.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/WorkBasketInputCaseFieldEntity.java index 07d2bfd488..9829d58769 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/WorkBasketInputCaseFieldEntity.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/WorkBasketInputCaseFieldEntity.java @@ -1,7 +1,7 @@ package uk.gov.hmcts.ccd.definition.store.repository.entity; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Table(name = "workbasket_input_case_field") @Entity diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/interceptor/CaseRoleInterceptor.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/interceptor/CaseRoleInterceptor.java index 70ff605884..432c0b6035 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/interceptor/CaseRoleInterceptor.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/interceptor/CaseRoleInterceptor.java @@ -1,6 +1,6 @@ package uk.gov.hmcts.ccd.definition.store.repository.interceptor; -import org.hibernate.EmptyInterceptor; +import org.hibernate.Interceptor; import org.hibernate.type.Type; import org.springframework.stereotype.Component; import uk.gov.hmcts.ccd.definition.store.repository.entity.CaseRoleEntity; @@ -8,13 +8,14 @@ import java.io.Serializable; @Component -public class CaseRoleInterceptor extends EmptyInterceptor { +public class CaseRoleInterceptor implements Interceptor, Serializable { @Override public boolean onSave(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) { if (entity instanceof CaseRoleEntity) { CaseRoleEntity caseRoleEntity = (CaseRoleEntity) entity; caseRoleEntity.setReference(caseRoleEntity.getReference().toUpperCase()); + return true; } - return super.onSave(entity, id, state, propertyNames, types); + return false; } } diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/model/DefinitionModelMapper.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/model/DefinitionModelMapper.java index ba7f590b3a..deb551a5d9 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/model/DefinitionModelMapper.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/model/DefinitionModelMapper.java @@ -6,7 +6,7 @@ import uk.gov.hmcts.ccd.definition.store.repository.entity.DefinitionEntity; import uk.gov.hmcts.ccd.definition.store.repository.entity.JurisdictionEntity; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; @Component public class DefinitionModelMapper { diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/model/UserRole.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/model/UserRole.java index 1688709d46..6a3c631938 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/model/UserRole.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/model/UserRole.java @@ -5,8 +5,8 @@ import io.swagger.annotations.ApiModelProperty; import uk.gov.hmcts.ccd.definition.store.repository.SecurityClassification; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; @ApiModel public class UserRole { diff --git a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/model/UserRoleModelMapper.java b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/model/UserRoleModelMapper.java index 34ea3dad41..bb98c00e5a 100644 --- a/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/model/UserRoleModelMapper.java +++ b/repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/model/UserRoleModelMapper.java @@ -2,7 +2,7 @@ import uk.gov.hmcts.ccd.definition.store.repository.entity.AccessProfileEntity; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; public class UserRoleModelMapper { diff --git a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/AccessProfileRepositoryTest.java b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/AccessProfileRepositoryTest.java index 6b03ab3b16..2f5d2f3ff5 100644 --- a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/AccessProfileRepositoryTest.java +++ b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/AccessProfileRepositoryTest.java @@ -14,7 +14,7 @@ import uk.gov.hmcts.ccd.definition.store.repository.entity.CaseTypeEntity; import uk.gov.hmcts.ccd.definition.store.repository.entity.JurisdictionEntity; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.util.Arrays; import java.util.List; import java.util.Optional; @@ -22,7 +22,7 @@ import static com.github.npathai.hamcrestopt.OptionalMatchers.isEmpty; import static org.hamcrest.Matchers.is; import static org.hamcrest.core.IsNull.notNullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static uk.gov.hmcts.ccd.definition.store.repository.SecurityClassification.PUBLIC; import static uk.gov.hmcts.ccd.definition.store.repository.SecurityClassification.RESTRICTED; diff --git a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/AccessTypeRolesRepositoryTest.java b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/AccessTypeRolesRepositoryTest.java index c9ba4ca148..e36a8f58b4 100644 --- a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/AccessTypeRolesRepositoryTest.java +++ b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/AccessTypeRolesRepositoryTest.java @@ -13,7 +13,7 @@ import uk.gov.hmcts.ccd.definition.store.repository.entity.CaseTypeEntity; import uk.gov.hmcts.ccd.definition.store.repository.entity.JurisdictionEntity; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.time.LocalDate; import java.time.Month; import java.util.List; diff --git a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/AccessTypesRepositoryTest.java b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/AccessTypesRepositoryTest.java index fc17071f2d..b2c84503b1 100644 --- a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/AccessTypesRepositoryTest.java +++ b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/AccessTypesRepositoryTest.java @@ -13,7 +13,7 @@ import uk.gov.hmcts.ccd.definition.store.repository.entity.CaseTypeEntity; import uk.gov.hmcts.ccd.definition.store.repository.entity.JurisdictionEntity; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.time.LocalDate; import java.time.Month; import java.util.List; diff --git a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/BannerRepositoryTest.java b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/BannerRepositoryTest.java index f549ae860b..9ce598fca3 100644 --- a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/BannerRepositoryTest.java +++ b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/BannerRepositoryTest.java @@ -11,12 +11,12 @@ import uk.gov.hmcts.ccd.definition.store.repository.entity.BannerEntity; import uk.gov.hmcts.ccd.definition.store.repository.entity.JurisdictionEntity; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.util.List; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; @RunWith(SpringRunner.class) diff --git a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/CaseFieldEntityUtilTest.java b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/CaseFieldEntityUtilTest.java index 93ecefdb72..762bcde534 100644 --- a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/CaseFieldEntityUtilTest.java +++ b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/CaseFieldEntityUtilTest.java @@ -17,7 +17,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.collection.IsEmptyCollection.empty; import static org.hamcrest.core.IsNot.not; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; import static uk.gov.hmcts.ccd.definition.store.repository.CaseFieldEntityUtil.parseParentCodes; diff --git a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/CaseTypeLiteRepositoryTest.java b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/CaseTypeLiteRepositoryTest.java index 41c6da7c74..6bd400ced6 100644 --- a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/CaseTypeLiteRepositoryTest.java +++ b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/CaseTypeLiteRepositoryTest.java @@ -14,7 +14,7 @@ import uk.gov.hmcts.ccd.definition.store.repository.entity.JurisdictionEntity; import uk.gov.hmcts.ccd.definition.store.repository.entity.StateEntity; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.util.List; import static org.junit.Assert.assertEquals; diff --git a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/CaseTypeObjectGraphTest.java b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/CaseTypeObjectGraphTest.java index dbff3d68c5..fa41a18385 100644 --- a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/CaseTypeObjectGraphTest.java +++ b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/CaseTypeObjectGraphTest.java @@ -5,7 +5,7 @@ import java.util.Iterator; import java.util.List; import java.util.Optional; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.commons.lang3.StringUtils; import org.assertj.core.util.Lists; import org.junit.Before; @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; import static uk.gov.hmcts.ccd.definition.store.CustomHamcrestMatchers.hasItemWithProperty; diff --git a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/CaseTypeRepositoryTest.java b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/CaseTypeRepositoryTest.java index 1bfcecf4c6..3ae3711de3 100644 --- a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/CaseTypeRepositoryTest.java +++ b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/CaseTypeRepositoryTest.java @@ -13,7 +13,7 @@ import uk.gov.hmcts.ccd.definition.store.repository.entity.CaseTypeEntity; import uk.gov.hmcts.ccd.definition.store.repository.entity.JurisdictionEntity; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.util.Arrays; import java.util.Collections; @@ -28,7 +28,7 @@ import static org.hamcrest.core.IsNot.not; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.jupiter.api.Assertions.assertAll; import static uk.gov.hmcts.ccd.definition.store.repository.SecurityClassification.PUBLIC; diff --git a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/DisplayGroupRepositoryTest.java b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/DisplayGroupRepositoryTest.java index a716c39dc5..0b9044cc2b 100644 --- a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/DisplayGroupRepositoryTest.java +++ b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/DisplayGroupRepositoryTest.java @@ -27,7 +27,7 @@ import static org.hamcrest.core.AllOf.allOf; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsEqual.equalTo; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static uk.gov.hmcts.ccd.definition.store.repository.entity.DisplayGroupPurpose.EDIT; import static uk.gov.hmcts.ccd.definition.store.repository.entity.DisplayGroupPurpose.VIEW; import static uk.gov.hmcts.ccd.definition.store.repository.entity.DisplayGroupType.PAGE; diff --git a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/DraftDefinitionRepositoryTest.java b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/DraftDefinitionRepositoryTest.java index cf8febde78..aed73314b7 100644 --- a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/DraftDefinitionRepositoryTest.java +++ b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/DraftDefinitionRepositoryTest.java @@ -12,7 +12,7 @@ import uk.gov.hmcts.ccd.definition.store.repository.entity.DefinitionStatus; import uk.gov.hmcts.ccd.definition.store.repository.entity.JurisdictionEntity; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.io.IOException; import static org.hamcrest.CoreMatchers.is; diff --git a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/FieldTypeRepositoryTest.java b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/FieldTypeRepositoryTest.java index 2d92a32ee4..6c518b0691 100644 --- a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/FieldTypeRepositoryTest.java +++ b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/FieldTypeRepositoryTest.java @@ -29,7 +29,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static uk.gov.hmcts.ccd.definition.store.repository.FieldTypeUtils.PREDEFINED_COMPLEX_ADDRESS_GLOBAL; import static uk.gov.hmcts.ccd.definition.store.repository.FieldTypeUtils.PREDEFINED_COMPLEX_ADDRESS_GLOBAL_UK; import static uk.gov.hmcts.ccd.definition.store.repository.FieldTypeUtils.PREDEFINED_COMPLEX_ADDRESS_UK; diff --git a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/FieldTypeUtilsTest.java b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/FieldTypeUtilsTest.java index 2849110d3d..8d9ff55e5f 100644 --- a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/FieldTypeUtilsTest.java +++ b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/FieldTypeUtilsTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class FieldTypeUtilsTest { diff --git a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/GenericLayoutRepositoryTest.java b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/GenericLayoutRepositoryTest.java index 5d081679b2..41522a1755 100644 --- a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/GenericLayoutRepositoryTest.java +++ b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/GenericLayoutRepositoryTest.java @@ -25,7 +25,7 @@ import static org.hamcrest.core.AllOf.allOf; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsEqual.equalTo; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; @RunWith(SpringRunner.class) @SpringBootTest(classes = { diff --git a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/JsonUtilsTest.java b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/JsonUtilsTest.java index 8ced071fa2..cc17d04fee 100644 --- a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/JsonUtilsTest.java +++ b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/JsonUtilsTest.java @@ -10,7 +10,7 @@ import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsInstanceOf.instanceOf; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class JsonUtilsTest { diff --git a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/JurisdictionRepositoryTest.java b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/JurisdictionRepositoryTest.java index 0efae43c40..75e24642f3 100644 --- a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/JurisdictionRepositoryTest.java +++ b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/JurisdictionRepositoryTest.java @@ -17,7 +17,7 @@ import static org.hamcrest.Matchers.hasProperty; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; @RunWith(SpringRunner.class) diff --git a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/JurisdictionUiConfigRepositoryTest.java b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/JurisdictionUiConfigRepositoryTest.java index c835745f5d..a14f6585d8 100644 --- a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/JurisdictionUiConfigRepositoryTest.java +++ b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/JurisdictionUiConfigRepositoryTest.java @@ -19,7 +19,7 @@ import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; @RunWith(SpringRunner.class) diff --git a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/SanityCheckApplication.java b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/SanityCheckApplication.java index 8afd2996a1..dd8f7c518d 100644 --- a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/SanityCheckApplication.java +++ b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/SanityCheckApplication.java @@ -4,7 +4,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.ComponentScan; -import javax.inject.Inject; +import jakarta.inject.Inject; import javax.sql.DataSource; @SpringBootApplication diff --git a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/SearchResultObjectGraphTest.java b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/SearchResultObjectGraphTest.java index 1eafaa4b2a..d5b773f3d2 100644 --- a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/SearchResultObjectGraphTest.java +++ b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/SearchResultObjectGraphTest.java @@ -22,7 +22,7 @@ import static org.hamcrest.core.AllOf.allOf; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsEqual.equalTo; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; @RunWith(SpringRunner.class) @SpringBootTest(classes = { diff --git a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/SecurityUtilsTest.java b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/SecurityUtilsTest.java index bf6606bca2..8762379c25 100644 --- a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/SecurityUtilsTest.java +++ b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/SecurityUtilsTest.java @@ -55,7 +55,7 @@ class SecurityUtilsTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); final GrantedAuthority[] authorities = new GrantedAuthority[]{newAuthority("role1"), newAuthority("role2")}; diff --git a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/TestConfiguration.java b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/TestConfiguration.java index 6c80ce6caf..66c8fac714 100644 --- a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/TestConfiguration.java +++ b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/TestConfiguration.java @@ -74,7 +74,7 @@ public WebMvcEndpointHandlerMapping webEndpointServletHandlerMapping(WebEndpoint return new WebMvcEndpointHandlerMapping(endpointMapping, webEndpoints, endpointMediaTypes, corsProperties.toCorsConfiguration(), new EndpointLinksResolver(allEndpoints, basePath), - shouldRegisterLinksMapping, null); + shouldRegisterLinksMapping); } private boolean shouldRegisterLinksMapping(WebEndpointProperties webEndpointProperties, Environment environment, diff --git a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/VersionedDefinitionRepositoryDecoratorTest.java b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/VersionedDefinitionRepositoryDecoratorTest.java index 191043849c..8a218e38ad 100644 --- a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/VersionedDefinitionRepositoryDecoratorTest.java +++ b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/VersionedDefinitionRepositoryDecoratorTest.java @@ -24,7 +24,7 @@ import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertEquals; diff --git a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseFieldEntityTest.java b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseFieldEntityTest.java index e8ba161163..51e549fa09 100644 --- a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseFieldEntityTest.java +++ b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/entity/CaseFieldEntityTest.java @@ -14,7 +14,7 @@ import static java.util.Collections.singletonList; import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/entity/FieldEntityTest.java b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/entity/FieldEntityTest.java index a3e20dcbd4..78c4eda744 100644 --- a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/entity/FieldEntityTest.java +++ b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/entity/FieldEntityTest.java @@ -6,7 +6,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static uk.gov.hmcts.ccd.definition.store.repository.FieldTypeUtils.PREDEFINED_COMPLEX_ADDRESS_GLOBAL; import static uk.gov.hmcts.ccd.definition.store.utils.CaseFieldBuilder.newField; import static uk.gov.hmcts.ccd.definition.store.utils.CaseFieldBuilder.newTextField; diff --git a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/entity/FieldTypeEntityTest.java b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/entity/FieldTypeEntityTest.java index 5540a76b9f..ce0eeb01a4 100644 --- a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/entity/FieldTypeEntityTest.java +++ b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/entity/FieldTypeEntityTest.java @@ -8,7 +8,7 @@ import static java.util.Collections.emptySet; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.jupiter.api.Assertions.assertAll; import static uk.gov.hmcts.ccd.definition.store.repository.FieldTypeUtils.BASE_DOCUMENT; diff --git a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/model/DefinitionModelMapperTest.java b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/model/DefinitionModelMapperTest.java index d53991c81f..b697d4de6e 100644 --- a/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/model/DefinitionModelMapperTest.java +++ b/repository/src/test/java/uk/gov/hmcts/ccd/definition/store/repository/model/DefinitionModelMapperTest.java @@ -46,7 +46,7 @@ class DefinitionModelMapperTest { @BeforeEach void setUp() throws IOException { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); setupMockJurisdictionEntity(); setupMockDefinitionEntity(); definition = createDefinition(); diff --git a/repository/src/test/resources/test.properties b/repository/src/test/resources/test.properties index 0ffb466d6c..3d40f9f7d1 100644 --- a/repository/src/test/resources/test.properties +++ b/repository/src/test/resources/test.properties @@ -6,11 +6,11 @@ idam.s2s-auth.totp_secret=some.auth.provider.service.client.key idam.api.url=http://localhost:${wiremock.server.port:5000} spring.application.name=ccd-definition-store -spring.jpa.properties.hibernate.ejb.interceptor=uk.gov.hmcts.ccd.definition.store.repository.interceptor.CaseRoleInterceptor +hibernate.session_factory.interceptor=uk.gov.hmcts.ccd.definition.store.repository.interceptor.CaseRoleInterceptor spring.cloud.discovery.client.composite-indicator.enabled=false spring.datasource.driver-class-name=org.testcontainers.jdbc.ContainerDatabaseDriver -spring.datasource.url=jdbc:tc:postgresql:9.6:///ccd_definition +spring.datasource.url=jdbc:tc:postgresql:11:///ccd_definition spring.main.allow-bean-definition-overriding=true #CCD-3509 CVE-2021-22044 diff --git a/rest-api/src/main/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/AccessTypesController.java b/rest-api/src/main/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/AccessTypesController.java index 72ec77b058..db0afdfd0b 100644 --- a/rest-api/src/main/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/AccessTypesController.java +++ b/rest-api/src/main/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/AccessTypesController.java @@ -15,7 +15,7 @@ import uk.gov.hmcts.ccd.definition.store.repository.model.AccessTypeJurisdictionResults; import uk.gov.hmcts.ccd.definition.store.rest.service.AccessTypesService; -import javax.validation.Valid; +import jakarta.validation.Valid; @RestController public class AccessTypesController { diff --git a/rest-api/src/main/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/ControllerExceptionHandler.java b/rest-api/src/main/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/ControllerExceptionHandler.java index a3fb6e3591..c8c8abf04a 100644 --- a/rest-api/src/main/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/ControllerExceptionHandler.java +++ b/rest-api/src/main/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/ControllerExceptionHandler.java @@ -20,8 +20,8 @@ import uk.gov.hmcts.ccd.definition.store.rest.endpoint.exceptions.DuplicateFoundException; import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; -import javax.persistence.OptimisticLockException; -import javax.persistence.PersistenceException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; import java.io.IOException; import java.util.Map; import java.util.Set; diff --git a/rest-api/src/main/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/DraftDefinitionController.java b/rest-api/src/main/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/DraftDefinitionController.java index 6540de9586..a4605479c9 100644 --- a/rest-api/src/main/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/DraftDefinitionController.java +++ b/rest-api/src/main/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/DraftDefinitionController.java @@ -19,7 +19,7 @@ import uk.gov.hmcts.ccd.definition.store.domain.service.response.ServiceResponse; import uk.gov.hmcts.ccd.definition.store.repository.model.Definition; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.List; import static org.springframework.http.HttpStatus.CREATED; diff --git a/rest-api/src/main/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/TestingSupportController.java b/rest-api/src/main/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/TestingSupportController.java index d18804bcb1..1718230eec 100644 --- a/rest-api/src/main/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/TestingSupportController.java +++ b/rest-api/src/main/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/TestingSupportController.java @@ -8,8 +8,6 @@ import lombok.extern.slf4j.Slf4j; import org.hibernate.Session; import org.hibernate.SessionFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.web.bind.annotation.DeleteMapping; @@ -38,8 +36,6 @@ public TestingSupportController(SessionFactory sessionFactory) { this.sessionFactory = sessionFactory; } - private static final Logger LOG = LoggerFactory.getLogger(TestingSupportController.class); - @DeleteMapping(value = "/cleanup-case-type/{changeId}") @ApiOperation(value = "Delete a list of Case Type Schemas", notes = "Blank body response.\n") @ApiResponses(value = { @@ -75,7 +71,9 @@ public void dataCaseTypeIdDelete( } private List getCaseTypeIdsByReferences(Session session, List caseTypesWithChangeIds) { - var ids = session.createNativeQuery("SELECT id FROM case_type WHERE reference IN ( :caseTypesWithChangeIds );") + var ids = session.createNativeQuery( + "SELECT id FROM case_type WHERE reference IN ( :caseTypesWithChangeIds );", + Integer.class) .setParameterList("caseTypesWithChangeIds", caseTypesWithChangeIds) .list(); session.getTransaction().commit(); @@ -231,8 +229,8 @@ WHERE id IN ( :caseTypeIds ) private void executeSql(Session session, String sql, List ids) { session.beginTransaction(); - session.createNativeQuery(sql) - .setParameterList("caseTypeIds", ids, org.hibernate.type.IntegerType.INSTANCE) + session.createNativeMutationQuery(sql) + .setParameterList("caseTypeIds", ids) .executeUpdate(); session.getTransaction().commit(); } diff --git a/rest-api/src/main/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/UserRoleController.java b/rest-api/src/main/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/UserRoleController.java index 91003e887c..b5b9ccf797 100644 --- a/rest-api/src/main/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/UserRoleController.java +++ b/rest-api/src/main/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/UserRoleController.java @@ -22,7 +22,7 @@ import uk.gov.hmcts.ccd.definition.store.domain.service.response.ServiceResponse; import uk.gov.hmcts.ccd.definition.store.repository.model.UserRole; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.Base64; import java.util.List; diff --git a/rest-api/src/main/java/uk/gov/hmcts/ccd/definition/store/rest/model/ImportAudit.java b/rest-api/src/main/java/uk/gov/hmcts/ccd/definition/store/rest/model/ImportAudit.java index 2ba693e1a9..6d2c8ffa26 100644 --- a/rest-api/src/main/java/uk/gov/hmcts/ccd/definition/store/rest/model/ImportAudit.java +++ b/rest-api/src/main/java/uk/gov/hmcts/ccd/definition/store/rest/model/ImportAudit.java @@ -11,7 +11,6 @@ public class ImportAudit { @Getter - @Setter @JsonProperty("date_imported") private String dateImported; diff --git a/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/AdminWebAuthorizationControllerTest.java b/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/AdminWebAuthorizationControllerTest.java index 2f373c67b3..980d4f521e 100644 --- a/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/AdminWebAuthorizationControllerTest.java +++ b/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/AdminWebAuthorizationControllerTest.java @@ -17,7 +17,7 @@ import static org.codehaus.groovy.runtime.InvokerHelper.asList; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/CaseDefinitionControllerTest.java b/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/CaseDefinitionControllerTest.java index cf64682bac..e198ea97b1 100644 --- a/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/CaseDefinitionControllerTest.java +++ b/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/CaseDefinitionControllerTest.java @@ -26,7 +26,7 @@ import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsCollectionContaining.hasItems; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.Mockito.any; diff --git a/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/ControllerExceptionHandlerTest.java b/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/ControllerExceptionHandlerTest.java index db2171f824..ec0600b612 100644 --- a/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/ControllerExceptionHandlerTest.java +++ b/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/ControllerExceptionHandlerTest.java @@ -16,7 +16,7 @@ import uk.gov.hmcts.ccd.definition.store.elastic.exception.ElasticSearchInitialisationException; import uk.gov.hmcts.ccd.definition.store.rest.endpoint.exceptions.DuplicateFoundException; -import javax.persistence.OptimisticLockException; +import jakarta.persistence.OptimisticLockException; import java.io.IOException; import java.util.Map; diff --git a/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/DraftDefinitionControllerTest.java b/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/DraftDefinitionControllerTest.java index b77542a5c3..3566056aeb 100644 --- a/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/DraftDefinitionControllerTest.java +++ b/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/DraftDefinitionControllerTest.java @@ -27,7 +27,7 @@ import static java.util.Arrays.asList; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNot.not; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -69,7 +69,7 @@ class DraftDefinitionControllerTest { @BeforeEach void setUp() throws IOException { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); final DraftDefinitionController controller = new DraftDefinitionController(definitionService); mockMvc = MockMvcBuilders.standaloneSetup(controller) .setControllerAdvice(new ControllerExceptionHandler()) diff --git a/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/IdamProfileControllerTest.java b/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/IdamProfileControllerTest.java index a12b2dc40c..52602747d9 100644 --- a/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/IdamProfileControllerTest.java +++ b/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/IdamProfileControllerTest.java @@ -19,7 +19,7 @@ import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.BDDMockito.given; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; diff --git a/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/ImportAuditControllerTest.java b/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/ImportAuditControllerTest.java index 5dd9da9d00..9e8ffa1927 100644 --- a/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/ImportAuditControllerTest.java +++ b/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/ImportAuditControllerTest.java @@ -18,11 +18,11 @@ import static java.util.Collections.emptyList; import static org.codehaus.groovy.runtime.InvokerHelper.asList; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; -import static org.mockito.MockitoAnnotations.initMocks; +import static org.mockito.MockitoAnnotations.openMocks; import static org.springframework.http.MediaType.APPLICATION_JSON; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; @@ -42,7 +42,7 @@ class ImportAuditControllerTest { @BeforeEach void createSubject() throws Exception { - initMocks(this); + openMocks(this); subject = new ImportAuditController(azureImportAuditsClient); mockMvc = standaloneSetup(subject) .setControllerAdvice(new ControllerExceptionHandler()) diff --git a/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/TestingSupportControllerTest.java b/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/TestingSupportControllerTest.java index c69c26fb09..4f6b72a93b 100644 --- a/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/TestingSupportControllerTest.java +++ b/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/TestingSupportControllerTest.java @@ -4,7 +4,6 @@ import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.ArgumentMatchers.isA; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -18,8 +17,8 @@ import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.Transaction; +import org.hibernate.query.MutationQuery; import org.hibernate.query.NativeQuery; -import org.hibernate.type.IntegerType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -36,7 +35,9 @@ class TestingSupportControllerTest { @Mock private Session session; @Mock - private NativeQuery nativeQuery; + private NativeQuery nativeQuery; + @Mock + private MutationQuery mutationQuery; @Mock private Transaction transaction; @@ -56,14 +57,16 @@ void setUp() { @Test @DisplayName("Should execute delete queries") void shouldDeleteRecords() throws Exception { - when(session.createNativeQuery(anyString())) + when(session.createNativeQuery(anyString(), eq(Integer.class))) .thenReturn(nativeQuery); when(nativeQuery.setParameterList(eq("caseTypesWithChangeIds"), anyList())) .thenReturn(nativeQuery); - when(nativeQuery.setParameterList(eq("caseTypeIds"), anyList(), isA(IntegerType.class))) - .thenReturn(nativeQuery); when(nativeQuery.list()) - .thenReturn(List.of("1","2")); + .thenReturn(List.of(Integer.parseInt("1"),Integer.parseInt("2"))); + when(session.createNativeMutationQuery(anyString())) + .thenReturn(mutationQuery); + when(mutationQuery.setParameterList(eq("caseTypeIds"), anyList())) + .thenReturn(mutationQuery); when(session.getTransaction()) .thenReturn(transaction); mockMvc.perform(delete("/api/testing-support/cleanup-case-type/1") @@ -71,14 +74,17 @@ void shouldDeleteRecords() throws Exception { .andDo(print()) .andExpect(status().isOk()); - verify(session, times(29)) - .createNativeQuery(anyString()); + verify(session, times(1)) + .createNativeQuery(anyString(), eq(Integer.class)); + + verify(session, times(28)) + .createNativeMutationQuery(anyString()); } @Test @DisplayName("Should return case type not found") void shouldReturnNotFound() throws Exception { - when(session.createNativeQuery(anyString())) + when(session.createNativeQuery(anyString(), eq(Integer.class))) .thenReturn(nativeQuery); when(nativeQuery.setParameterList(eq("caseTypesWithChangeIds"), anyList())) .thenReturn(nativeQuery); @@ -93,6 +99,9 @@ void shouldReturnNotFound() throws Exception { .andExpect(content().json("{\"message\":\"Object Not Found for:Unable to find case type\"}")); verify(session, times(1)) - .createNativeQuery(anyString()); + .createNativeQuery(anyString(), eq(Integer.class)); + + verify(session, times(0)) + .createNativeMutationQuery(anyString()); } } diff --git a/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/UserRoleControllerTest.java b/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/UserRoleControllerTest.java index bfb77227ca..e956ceff45 100644 --- a/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/UserRoleControllerTest.java +++ b/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/endpoint/UserRoleControllerTest.java @@ -23,8 +23,8 @@ import uk.gov.hmcts.ccd.definition.store.repository.SecurityClassification; import uk.gov.hmcts.ccd.definition.store.repository.model.UserRole; -import javax.persistence.OptimisticLockException; -import javax.persistence.PersistenceException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; import java.nio.charset.Charset; import java.util.Arrays; import java.util.Base64; @@ -72,7 +72,7 @@ class UserRoleControllerTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); mockMvc = MockMvcBuilders.standaloneSetup(controller) .setControllerAdvice(new ControllerExceptionHandler()) .build(); diff --git a/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/service/AzureImportAuditsClientTest.java b/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/service/AzureImportAuditsClientTest.java index c5ebcff781..ae88078059 100644 --- a/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/service/AzureImportAuditsClientTest.java +++ b/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/service/AzureImportAuditsClientTest.java @@ -28,7 +28,7 @@ import static com.google.common.collect.Lists.newArrayList; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; @@ -96,7 +96,7 @@ public void setUp() throws StorageException, NoSuchAlgorithmException { blobsPage2 = mock(ResultSegment.class); blobsPage3 = mock(ResultSegment.class); - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); // create the mock to return by getInstance() SSLContext context = PowerMockito.mock(SSLContext.class); diff --git a/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/service/IdamProfileClientTest.java b/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/service/IdamProfileClientTest.java index a5bece933d..3087a71cd6 100644 --- a/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/service/IdamProfileClientTest.java +++ b/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/service/IdamProfileClientTest.java @@ -23,7 +23,7 @@ class IdamProfileClientTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); } @Test diff --git a/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/service/ProxyServiceTest.java b/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/service/ProxyServiceTest.java index 2105b03c94..c11c0400a8 100644 --- a/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/service/ProxyServiceTest.java +++ b/rest-api/src/test/java/uk/gov/hmcts/ccd/definition/store/rest/service/ProxyServiceTest.java @@ -9,7 +9,7 @@ import java.io.IOException; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; class ProxyServiceTest { @@ -19,7 +19,7 @@ class ProxyServiceTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); } @Test