Cleanup

elastic-search-support/build.gradle

@@ -22,13 +22,11 @@ dependencies {
     testImplementation project(path: ':domain', configuration: 'testOutput')
     testImplementation project(":domain").sourceSets.main.output
     testImplementation project(":repository").sourceSets.test.output
-
     testImplementation group: 'org.skyscreamer', name: 'jsonassert', version: '1.5.3'
     testImplementation group: 'org.testcontainers', name: 'elasticsearch', version: testcontainersVersion
     testImplementation group: 'org.testcontainers', name: 'junit-jupiter', version: testcontainersVersion
     testImplementation 'net.ttddyy:datasource-proxy:1.8'
     testImplementation(project(":application"))
-
 }
 
 pitest {

elastic-search-support/src/main/java/uk/gov/hmcts/ccd/definition/store/elastic/ElasticDefinitionImportListener.java

@@ -83,16 +83,17 @@ public void initialiseElasticSearch(DefinitionImportedEvent event) {
 
                 //prepare for db
                 metadata = new ReindexEntity();
+                metadata.setIndexName(caseTypeName);
                 metadata.setReindex(reindex);
                 metadata.setDeleteOldIndex(deleteOldIndex);
                 metadata.setCaseType(currentCaseType.getReference());
                 metadata.setJurisdiction(caseType.getJurisdiction().getReference());
-                metadata.setIndexName(caseTypeName);
                 metadata.setStartTime(LocalDateTime.now());
                 metadata.setStatus("STARTED");
                 metadata = reindexRepository.save(metadata);
                 if (metadata == null) {
-                    throw new ElasticSearchInitialisationException(new IllegalStateException("Failed to persist reindex metadata"));
+                    throw new ElasticSearchInitialisationException(
+                        new IllegalStateException("Failed to persist reindex metadata"));
                 }
 
                 if (reindex) {
@@ -150,7 +151,7 @@ public void onResponse(BulkByScrollResponse bulkByScrollResponse) {
                         asyncElasticClient.removeIndex(oldIndex);
                     }
 
-                    //for db
+                    //set success status and end time for db
                     metadata.setStatus("SUCCESS");
                     metadata.setEndTime(LocalDateTime.now());
                     reindexRepository.save(metadata);
@@ -165,7 +166,7 @@ public void onResponse(BulkByScrollResponse bulkByScrollResponse) {
             @Override
             public void onFailure(Exception ex) {
                 try (elasticClient; HighLevelCCDElasticClient asyncElasticClient = clientFactory.getObject()) {
-                    //for db
+                    //set failure status and end time for db
                     reindexFailedPersist(metadata, ex);
 
                     //if failed delete new index, set old index writable

elastic-search-support/src/main/java/uk/gov/hmcts/ccd/definition/store/elastic/client/HighLevelCCDElasticClient.java

@@ -14,6 +14,8 @@
 import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.client.indices.CreateIndexRequest;
 import org.elasticsearch.client.indices.CreateIndexResponse;
+import org.elasticsearch.client.indices.GetMappingsRequest;
+import org.elasticsearch.client.indices.GetMappingsResponse;
 import org.elasticsearch.client.indices.PutMappingRequest;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.reindex.BulkByScrollResponse;
@@ -94,6 +96,11 @@ public GetAliasesResponse getAlias(String alias) throws IOException {
         return elasticClient.indices().getAlias(request, RequestOptions.DEFAULT);
     }
 
+    public GetMappingsResponse getMapping(String indexName) throws IOException {
+        GetMappingsRequest request = new GetMappingsRequest().indices(indexName);
+        return elasticClient.indices().getMapping(request, RequestOptions.DEFAULT);
+    }
+
     private Settings.Builder casesIndexSettings(String file) throws IOException {
         try (InputStream inputStream = getClass().getResourceAsStream(file)) {
             Settings.Builder settings = Settings.builder().loadFromStream(file,

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

@@ -1,24 +1,31 @@
 package uk.gov.hmcts.ccd.definition.store.elastic;
 
+import org.elasticsearch.client.GetAliasesResponse;
+import org.elasticsearch.cluster.metadata.AliasMetadata;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.beans.factory.ObjectFactory;
 import uk.gov.hmcts.ccd.definition.store.elastic.client.HighLevelCCDElasticClient;
 import uk.gov.hmcts.ccd.definition.store.elastic.config.CcdElasticSearchProperties;
 import uk.gov.hmcts.ccd.definition.store.elastic.mapping.CaseMappingGenerator;
 import uk.gov.hmcts.ccd.definition.store.event.DefinitionImportedEvent;
+import uk.gov.hmcts.ccd.definition.store.repository.ReindexRepository;
 import uk.gov.hmcts.ccd.definition.store.repository.entity.CaseTypeEntity;
 import uk.gov.hmcts.ccd.definition.store.utils.CaseTypeBuilder;
 
 import java.io.IOException;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.beans.factory.ObjectFactory;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
 
 import static com.google.common.collect.Lists.newArrayList;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -40,6 +47,9 @@ class AsynchronousElasticDefinitionImportListenerTest {
     @Mock
     private CaseMappingGenerator caseMappingGenerator;
 
+    @Mock
+    private ReindexRepository reindexRepository;
+
     private CaseTypeEntity caseA = new CaseTypeBuilder().withJurisdiction("jurA").withReference("caseTypeA").build();
     private CaseTypeEntity caseB = new CaseTypeBuilder().withJurisdiction("jurB").withReference("caseTypeB").build();
 
@@ -54,6 +64,13 @@ void createsIndexIfNotExists() throws IOException {
         when(config.getCasesIndexNameFormat()).thenReturn("%s");
         when(ccdElasticClient.aliasExists(anyString())).thenReturn(false);
 
+        GetAliasesResponse aliasResponse = mock(GetAliasesResponse.class);
+        Map<String, Set<AliasMetadata>> aliasMap = Map.of("casetypea-000001",
+            Collections.singleton(AliasMetadata.builder("casetypea").build()));
+        when(aliasResponse.getAliases()).thenReturn(aliasMap);
+        when(ccdElasticClient.getAlias(anyString())).thenReturn(aliasResponse);
+        when(reindexRepository.save(any())).thenAnswer(invocation -> invocation.getArgument(0));
+
         listener.onDefinitionImported(newEvent(caseA, caseB));
 
         verify(ccdElasticClient).createIndex("casetypea-000001", "casetypea");

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

@@ -1,5 +1,19 @@
 package uk.gov.hmcts.ccd.definition.store.elastic;
 
+import org.elasticsearch.ElasticsearchStatusException;
+import org.elasticsearch.action.ActionListener;
+import org.elasticsearch.client.GetAliasesResponse;
+import org.elasticsearch.cluster.metadata.AliasMetadata;
+import org.elasticsearch.index.reindex.BulkByScrollResponse;
+import org.elasticsearch.rest.RestStatus;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.beans.factory.ObjectFactory;
 import uk.gov.hmcts.ccd.definition.store.elastic.client.HighLevelCCDElasticClient;
 import uk.gov.hmcts.ccd.definition.store.elastic.config.CcdElasticSearchProperties;
 import uk.gov.hmcts.ccd.definition.store.elastic.exception.ElasticSearchInitialisationException;
@@ -18,21 +32,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.elasticsearch.ElasticsearchStatusException;
-import org.elasticsearch.action.ActionListener;
-import org.elasticsearch.client.GetAliasesResponse;
-import org.elasticsearch.cluster.metadata.AliasMetadata;
-import org.elasticsearch.index.reindex.BulkByScrollResponse;
-import org.elasticsearch.rest.RestStatus;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.beans.factory.ObjectFactory;
-
 import static com.google.common.collect.Lists.newArrayList;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -260,12 +259,13 @@ void deletesNewIndexWhenReindexingFails() throws IOException {
     void savesMetadataOnSuccessfulReindex() throws IOException {
         mockAliasResponse();
 
-        ArgumentCaptor<ReindexEntity> captor = ArgumentCaptor.forClass(ReindexEntity.class);
         when(reindexRepository.save(any(ReindexEntity.class))).thenAnswer(invocation -> invocation.getArgument(0));
         mockSuccessfulReindex();
 
         listener.onDefinitionImported(newEvent(true, true, caseA));
 
+        ArgumentCaptor<ReindexEntity> captor = ArgumentCaptor.forClass(ReindexEntity.class);
+
         //verify that the reindex metadata was saved twice, once before reindexing and once after
         verify(reindexRepository, atLeast(2)).save(captor.capture());
         List<ReindexEntity> metadata = captor.getAllValues();
@@ -284,7 +284,6 @@ void savesMetadataOnSuccessfulReindex() throws IOException {
     void savesMetadataOnFailedReindex() throws IOException {
         mockAliasResponse();
 
-        ArgumentCaptor<ReindexEntity> captor = ArgumentCaptor.forClass(ReindexEntity.class);
         when(reindexRepository.save(any(ReindexEntity.class))).thenAnswer(invocation -> invocation.getArgument(0));
         mockFailedReindex();
 
@@ -294,6 +293,8 @@ void savesMetadataOnFailedReindex() throws IOException {
             listener.onDefinitionImported(event)
         );
 
+        ArgumentCaptor<ReindexEntity> captor = ArgumentCaptor.forClass(ReindexEntity.class);
+
         //verify that the reindex metadata was saved twice, once before reindexing and once after
         verify(reindexRepository, atLeast(2)).save(captor.capture());
         List<ReindexEntity> metadata = captor.getAllValues();

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

@@ -35,7 +35,8 @@
 import java.util.stream.Collectors;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
-    classes = { ServletWebServerFactoryAutoConfiguration.class, ElasticsearchConfigurationIT.class, CaseDataAPIApplication.class })
+    classes = {ServletWebServerFactoryAutoConfiguration.class, ElasticsearchConfigurationIT.class,
+        CaseDataAPIApplication.class})
 @ContextConfiguration(initializers = ElasticsearchContainerInitializer.class)
 public abstract class ElasticsearchBaseTest implements TestUtils {
 

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

@@ -6,7 +6,6 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-
 import uk.gov.hmcts.ccd.definition.store.elastic.exception.ElasticSearchInitialisationException;
 import uk.gov.hmcts.ccd.definition.store.event.DefinitionImportedEvent;
 import uk.gov.hmcts.ccd.definition.store.repository.ReindexRepository;

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

@@ -1,5 +1,10 @@
 package uk.gov.hmcts.ccd.definition.store.elastic.integration;
 
+import org.elasticsearch.client.indices.GetMappingsResponse;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationEventPublisher;
 import uk.gov.hmcts.ccd.definition.store.elastic.ElasticDefinitionImportListener;
 import uk.gov.hmcts.ccd.definition.store.elastic.ElasticsearchBaseTest;
 import uk.gov.hmcts.ccd.definition.store.elastic.client.HighLevelCCDElasticClient;
@@ -16,18 +21,8 @@
 
 import java.io.IOException;
 
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mock;
-import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.context.ApplicationEventPublisher;
-
 import static com.google.common.collect.Lists.newArrayList;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.assertj.core.api.Assertions.assertThat;
 import static uk.gov.hmcts.ccd.definition.store.utils.CaseFieldBuilder.newField;
 import static uk.gov.hmcts.ccd.definition.store.utils.CaseFieldBuilder.newTextField;
 import static uk.gov.hmcts.ccd.definition.store.utils.FieldTypeBuilder.newType;
@@ -47,15 +42,16 @@ class CaseMappingGenerationIT extends ElasticsearchBaseTest {
     @Autowired
     private CaseMappingGenerator mappingGenerator;
 
-    @MockBean
+    @Autowired
     private HighLevelCCDElasticClient client;
 
-    @Mock
-    private ObjectFactory<HighLevelCCDElasticClient> clientObjectFactory;
-
     @BeforeEach
     void setUp() {
-        when(clientObjectFactory.getObject()).thenReturn(client);
+        try {
+            deleteElasticsearchIndices(WILDCARD);
+        } catch (Exception e) {
+            // Ignore any exceptions during index deletion, as it may not exist
+        }
     }
 
     @Test
@@ -64,8 +60,11 @@ void testListeningToDefinitionImportedEvent() throws IOException {
 
         publisher.publishEvent(new DefinitionImportedEvent(newArrayList(caseType)));
 
-        verify(client).createIndex(anyString(), anyString());
-        verify(client).upsertMapping(anyString(), anyString());
+        String indexName = String.format(config.getCasesIndexNameFormat(), caseType.getReference().toLowerCase());
+        assertThat(client.aliasExists(indexName)).isTrue();
+
+        GetMappingsResponse mapping = client.getMapping(indexName);
+        assertThat(mapping).isNotNull();
     }
 
     @Test
@@ -74,8 +73,11 @@ void testListeningToDefinitionImportedEventWithDynamicLists() throws IOException
 
         publisher.publishEvent(new DefinitionImportedEvent(newArrayList(caseType)));
 
-        verify(client).createIndex(anyString(), anyString());
-        verify(client).upsertMapping(anyString(), anyString());
+        String indexName = String.format(config.getCasesIndexNameFormat(), caseType.getReference().toLowerCase());
+        assertThat(client.aliasExists(indexName)).isTrue();
+
+        GetMappingsResponse mapping = client.getMapping(indexName);
+        assertThat(mapping).isNotNull();
     }
 
     private CaseTypeEntity createCaseType() {

repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/entity/ReindexEntity.java

@@ -1,16 +1,16 @@
 package uk.gov.hmcts.ccd.definition.store.repository.entity;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.time.LocalDateTime;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
 
-import static javax.persistence.GenerationType.IDENTITY;
+import static jakarta.persistence.GenerationType.IDENTITY;
 
 @Table(name = "reindex")
 @Entity