Add back ElasticsearchContainerInitializer

build.gradle

@@ -130,7 +130,6 @@ allprojects {
         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.10', classifier: 'all'
-        testImplementation 'com.h2database:h2'
     }
 
 }

elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/ElasticsearchBaseTest.java

@@ -3,29 +3,22 @@
 import org.apache.http.util.EntityUtils;
 import org.elasticsearch.client.Request;
 import org.elasticsearch.client.RestHighLevelClient;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.skyscreamer.jsonassert.Customization;
 import org.skyscreamer.jsonassert.JSONCompareMode;
 import org.skyscreamer.jsonassert.comparator.CustomComparator;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock;
-import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-import org.testcontainers.junit.jupiter.Testcontainers;
 
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.stream.Collectors;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
-    classes = {ServletWebServerFactoryAutoConfiguration.class, ElasticsearchConfigurationIT.class,
-        TestReindexConfig.class, ElasticsearchTestApplication.class})
-@ActiveProfiles("test")
+    classes = {ElasticsearchTestApplication.class})
+@ContextConfiguration(initializers = {ElasticsearchContainerInitializer.class})
 @TestPropertySource(locations = "classpath:application-test.properties")
-@Testcontainers
 public abstract class ElasticsearchBaseTest implements TestUtils {
 
     private static final String GET = "GET";

elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/ElasticsearchTestApplication.java

@@ -1,22 +1,9 @@
 package uk.gov.hmcts.ccd.definition.store.elastic;
 
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
-import org.springframework.boot.autoconfigure.security.oauth2.client.servlet.OAuth2ClientAutoConfiguration;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 
-@SpringBootApplication(
-    scanBasePackages = "uk.gov.hmcts.ccd.definition.store.elastic",
-    exclude = {
-        OAuth2ClientAutoConfiguration.class,
-        ManagementWebSecurityAutoConfiguration.class
-    }
-)
-@EnableConfigurationProperties
+@SpringBootApplication
 public class ElasticsearchTestApplication {
     public static void main(String[] args) {
         SpringApplication.run(ElasticsearchTestApplication.class, args);

elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/TestReindexConfig.java

@@ -1,95 +1,22 @@
 package uk.gov.hmcts.ccd.definition.store.elastic;
 
-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.EndpointLinksResolver;
-import org.springframework.boot.actuate.endpoint.web.EndpointMapping;
-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.annotation.ControllerEndpointsSupplier;
-import org.springframework.boot.actuate.endpoint.web.annotation.ServletEndpointsSupplier;
-import org.springframework.boot.actuate.endpoint.web.servlet.WebMvcEndpointHandlerMapping;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
-import org.springframework.context.annotation.Profile;
-import org.springframework.core.env.Environment;
-import org.springframework.util.StringUtils;
-import uk.gov.hmcts.ccd.definition.store.domain.service.JurisdictionService;
-import uk.gov.hmcts.ccd.definition.store.event.DefinitionImportedEvent;
-import uk.gov.hmcts.ccd.definition.store.repository.BannerRepository;
-import uk.gov.hmcts.ccd.definition.store.repository.CaseFieldRepository;
-import uk.gov.hmcts.ccd.definition.store.repository.DisplayGroupRepository;
-import uk.gov.hmcts.ccd.definition.store.repository.EventRepository;
-import uk.gov.hmcts.ccd.definition.store.repository.FieldTypeRepository;
-import uk.gov.hmcts.ccd.definition.store.repository.GenericLayoutRepository;
-import uk.gov.hmcts.ccd.definition.store.repository.JurisdictionRepository;
-import uk.gov.hmcts.ccd.definition.store.repository.JurisdictionUiConfigRepository;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import uk.gov.hmcts.ccd.definition.store.repository.ReindexRepository;
 import uk.gov.hmcts.ccd.definition.store.repository.entity.ReindexEntity;
 import uk.gov.hmcts.reform.idam.client.IdamApi;
 import uk.gov.hmcts.reform.idam.client.IdamClient;
 
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 @TestConfiguration
-@Profile("test")
+@EnableJpaRepositories(basePackageClasses = ReindexRepository.class)
+@EntityScan(basePackageClasses = ReindexEntity.class)
 public class TestReindexConfig {
 
-    @Bean
-    @Primary
-    public ReindexRepository mockReindexRepository() {
-        ReindexRepository mockRepo = mock(ReindexRepository.class);
-        when(mockRepo.findByIndexName(any())).thenReturn(Optional.empty());
-        when(mockRepo.saveAndFlush(any())).thenReturn(new ReindexEntity());
-        when(mockRepo.save(any())).thenReturn(new ReindexEntity());
-        doNothing().when(mockRepo).deleteAll();
-        when(mockRepo.findAll()).thenReturn(Collections.emptyList());
-        return mockRepo;
-    }
-
-    //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<ExposableEndpoint<?>> allEndpoints = new ArrayList<>();
-        Collection<ExposableWebEndpoint> 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);
-    }
-
-    private boolean shouldRegisterLinksMapping(WebEndpointProperties webEndpointProperties, Environment environment,
-                                               String basePath) {
-        return webEndpointProperties.getDiscovery().isEnabled() && (StringUtils.hasText(basePath)
-                                                                    || ManagementPortType.get(environment).equals(ManagementPortType.DIFFERENT));
-    }
-
     @Bean
     @Primary
     public IdamClient mockIdamClient() {

elastic-search-support/src/test/resources/application-test.properties

@@ -2,23 +2,16 @@
 spring.datasource.driver-class-name=org.testcontainers.jdbc.ContainerDatabaseDriver
 spring.datasource.url=jdbc:tc:postgresql:15:///ccd_definition
 
-# Allow bean overriding for test configurations
-spring.main.allow-bean-definition-overriding=true
-
 # Remove JPA exclusions to allow real database operations
-spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.security.oauth2.client.servlet.OAuth2ClientAutoConfiguration,org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration,org.springdoc.core.configuration.SpringDocConfiguration,org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration,uk.gov.hmcts.reform.idam.client.config.IdamClientAutoConfiguration
+spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.security.oauth2.client.servlet.OAuth2ClientAutoConfiguration,org.springdoc.core.configuration.SpringDocConfiguration,org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration
+
+# JPA Configuration for tests
+spring.jpa.hibernate.ddl-auto=create-drop
+spring.jpa.show-sql=false
+spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
 
-# Disable security and other non-essential components
-spring.security.oauth2.client.registration=
-spring.security.oauth2.client.provider=
-spring.security.oauth2.client.provider.oidc.issuer-uri=
+# Disable flyway
 spring.flyway.enabled=false
-management.health.elasticsearch.enabled=false
-management.endpoints.enabled-by-default=false
-springdoc.api-docs.enabled=false
-springdoc.swagger-ui.enabled=false
-management.endpoint.health.enabled=false
-management.endpoint.info.enabled=false
 
 # Elasticsearch configuration
 elasticsearch.host=localhost
@@ -28,4 +21,4 @@ elasticsearch.enabled=true
 elasticsearch.indexShards=8
 elasticsearch.indexShardsReplicas=3
 elasticsearch.failImportIfError=true
-elasticsearch.dynamic=true
+elasticsearch.dynamic=true