diff --git a/bamboo-specs/src/main/java/buildjob/PlanSpec.java b/bamboo-specs/src/main/java/buildjob/PlanSpec.java index e35cb1a..3a1e2a4 100644 --- a/bamboo-specs/src/main/java/buildjob/PlanSpec.java +++ b/bamboo-specs/src/main/java/buildjob/PlanSpec.java @@ -1,6 +1,5 @@ package buildjob; -import java.time.DayOfWeek; import java.time.LocalTime; import com.atlassian.bamboo.specs.api.BambooSpec; @@ -19,11 +18,9 @@ import com.atlassian.bamboo.specs.api.builders.project.Project; import com.atlassian.bamboo.specs.builders.task.CheckoutItem; import com.atlassian.bamboo.specs.api.builders.Variable; import com.atlassian.bamboo.specs.builders.task.InjectVariablesTask; -import com.atlassian.bamboo.specs.builders.task.ScriptTask; import com.atlassian.bamboo.specs.builders.task.VcsCheckoutTask; import com.atlassian.bamboo.specs.builders.task.VcsTagTask; import com.atlassian.bamboo.specs.builders.trigger.BitbucketServerTrigger; -import com.atlassian.bamboo.specs.builders.trigger.RepositoryPollingTrigger; import com.atlassian.bamboo.specs.builders.trigger.ScheduledTrigger; import com.atlassian.bamboo.specs.model.task.InjectVariablesScope; import com.atlassian.bamboo.specs.util.BambooServer; diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/Application.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/Application.java index d53532e..fff4295 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/Application.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/Application.java @@ -1,9 +1,5 @@ package com.iqser.red.service.search.v1.server; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import com.iqser.red.commons.jackson.ObjectMapperFactory; import com.iqser.red.commons.spring.DefaultWebMvcConfiguration; import com.iqser.red.service.search.v1.server.client.ElasticsearchClient; import com.iqser.red.service.search.v1.server.client.FileStatusClient; @@ -18,7 +14,6 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; -import org.springframework.context.annotation.Primary; import io.micrometer.core.aop.TimedAspect; import io.micrometer.core.instrument.MeterRegistry; diff --git a/search-service-v1/search-service-server-v1/src/main/resources/index/mapping.json b/search-service-v1/search-service-server-v1/src/main/resources/index/mapping.json index 02558d8..ff86c6b 100644 --- a/search-service-v1/search-service-server-v1/src/main/resources/index/mapping.json +++ b/search-service-v1/search-service-server-v1/src/main/resources/index/mapping.json @@ -11,7 +11,8 @@ }, "filename": { "type": "text", - "term_vector": "with_positions_offsets" + "term_vector": "with_positions_offsets", + "analyzer": "simple" }, "date": { "type": "date" diff --git a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/AbstractElasticsearchIntegrationTest.java b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/AbstractElasticsearchIntegrationTest.java index cea9a24..160ab8a 100644 --- a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/AbstractElasticsearchIntegrationTest.java +++ b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/AbstractElasticsearchIntegrationTest.java @@ -1,18 +1,16 @@ package com.iqser.red.service.search.v1.server.service; -import com.amazonaws.services.s3.AmazonS3; import com.iqser.red.service.search.v1.server.Application; import com.iqser.red.service.search.v1.server.client.ElasticsearchClient; import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings; import com.iqser.red.storage.commons.StorageAutoConfiguration; import com.iqser.red.storage.commons.service.StorageService; -import org.junit.ClassRule; + import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.ApplicationContextInitializer; diff --git a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/FileSystemBackedStorageService.java b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/FileSystemBackedStorageService.java index 5f10ad5..bada8a5 100644 --- a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/FileSystemBackedStorageService.java +++ b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/FileSystemBackedStorageService.java @@ -1,8 +1,6 @@ package com.iqser.red.service.search.v1.server.service; -import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.iqser.red.commons.jackson.ObjectMapperFactory; import com.iqser.red.storage.commons.exception.StorageObjectDoesNotExist; import com.iqser.red.storage.commons.service.StorageService; diff --git a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/IndexTest.java b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/IndexTest.java index 4e1e171..c7e0334 100644 --- a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/IndexTest.java +++ b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/IndexTest.java @@ -4,11 +4,8 @@ import static org.mockito.Mockito.when; import org.junit.Assert; import org.junit.Test; -import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.test.context.junit4.SpringRunner; import com.iqser.red.service.persistence.service.v1.api.model.index.IndexInformation; import com.iqser.red.service.search.v1.server.client.FileStatusClient; diff --git a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/SearchTest.java b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/SearchTest.java index 0e0ca85..39b1e5e 100644 --- a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/SearchTest.java +++ b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/SearchTest.java @@ -3,18 +3,14 @@ package com.iqser.red.service.search.v1.server.service; import static org.assertj.core.api.Assertions.assertThat; import java.io.IOException; -import java.util.Arrays; import java.util.List; import java.util.Map; import org.junit.Test; -import org.junit.runner.RunWith; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.core.io.ClassPathResource; -import org.springframework.test.context.junit4.SpringRunner; import org.testcontainers.shaded.org.apache.commons.lang.StringUtils; import com.fasterxml.jackson.databind.ObjectMapper; @@ -347,7 +343,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest { documentIndexService.indexDocument("template2", "dossierId2", "fileId2", "S-Metolachlor_RAR_01_Volume_1_2018-09-06.pdf", text2, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value")); // Act & Assert 1 - SearchResult result = searchService.search("S-Metolachlor", null, Arrays.asList("dossierId1", "dossierId2"), null, null, false, false, null, null, 0, 10, false); + SearchResult result = searchService.search("S-Metolachlor", null, List.of("dossierId1", "dossierId2"), null, null, false, false, null, null, 0, 10, false); assertThat(result.getMatchedDocuments().size()).isEqualTo(1); @@ -355,17 +351,17 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest { documentDeleteService.deleteDocument("fileId1"); // Act & Assert 2 - result = searchService.search("hans klaus single", null, Arrays.asList("dossierId1", "dossierId2"), null, null, false, false, null, null, 0, 10, true); + result = searchService.search("hans klaus single", null, List.of("dossierId1", "dossierId2"), null, null, false, false, null, null, 0, 10, true); assertThat(result.getMatchedDocuments().size()).isEqualTo(1); // Act & Assert 3 - result = searchService.search("hans klaus single", null, Arrays.asList("dossierId3", "dossierId4"), null, null, false, false, null, null, 0, 10, true); + result = searchService.search("hans klaus single", null, List.of("dossierId3", "dossierId4"), null, null, false, false, null, null, 0, 10, true); assertThat(result.getMatchedDocuments().size()).isEqualTo(0); // Act & Assert 4 - result = searchService.search("hans klaus single", Arrays.asList("template1", "template2"), null, null, null, false, false, null, null, 0, 10, true); + result = searchService.search("hans klaus single", List.of("template1", "template2"), null, null, null, false, false, null, null, 0, 10, true); assertThat(result.getMatchedDocuments().size()).isEqualTo(1); @@ -385,7 +381,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest { documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value")); // Act - SearchResult result = searchService.search(searchString, null, Arrays.asList("dossierId1"), null, null, false, false, null, null, 1, 10, true); + SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 1, 10, true); // Assert assertThat(result.getMatchedDocuments().size()).isEqualTo(0); @@ -405,7 +401,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest { documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value")); // Act - SearchResult result = searchService.search(searchString, null, Arrays.asList("dossierId1"), null, null, false, false, null, null, 0, 10, true); + SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true); // Assert assertThat(result.getMatchedDocuments().size()).isEqualTo(1); @@ -427,7 +423,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest { documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value")); // Act - SearchResult result = searchService.search(searchString, null, Arrays.asList("dossierId1"), null, null, false, false, null, null, 0, 10, true); + SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true); // Assert assertThat(result.getMatchedDocuments().size()).isEqualTo(1); @@ -437,6 +433,245 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest { } + /* + * Filename contains only one word and searchString contains complete filename without ending + */ + @Test + public void testFilenameWithOneWord() throws IOException { + // Arrange + ClassPathResource textResource = new ClassPathResource("files/Text.json"); + Text text = objectMapper.readValue(textResource.getInputStream(), Text.class); + String fileName = "luke.pdf"; + String searchString = "luke"; + documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value")); + + // Act + SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true); + + // Assert + assertThat(result.getMatchedDocuments().size()).isEqualTo(1); + assertThat(result.getMatchedDocuments().get(0).getMatchedTerms().size()).isGreaterThan(0); + assertThat(result.getMatchedDocuments().get(0).getMatchedTerms().contains(searchString)).isTrue(); + } + + + /* + * Filename contains number, blank, underscore and searchString contains one word + */ + @Test + public void testFilenameWithWhitespaceAndUnderscoreAndSearchOneWord() throws IOException { + // Arrange + ClassPathResource textResource = new ClassPathResource("files/Text.json"); + Text text = objectMapper.readValue(textResource.getInputStream(), Text.class); + String fileName = "1 Abamectin_prr.pdf"; + String searchString = "Abamectin"; + documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value")); + + // Act + SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true); + + // Assert + assertThat(result.getMatchedDocuments().size()).isEqualTo(1); + assertThat(result.getMatchedDocuments().get(0).getMatchedTerms().size()).isGreaterThan(0); + assertThat(result.getMatchedDocuments().get(0).getMatchedTerms().contains(searchString)).isTrue(); + } + + + /* + * Filename contains number, blank, underscore and searchString contains last word + */ + @Test + public void testFilenameWithWhitespaceAndUnderscoreAndSearchLastWord() throws IOException { + // Arrange + ClassPathResource textResource = new ClassPathResource("files/Text.json"); + Text text = objectMapper.readValue(textResource.getInputStream(), Text.class); + String fileName = "1 Abamectin_prr.pdf"; + String searchString = "prr"; + documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value")); + + // Act + SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true); + + // Assert + assertThat(result.getMatchedDocuments().size()).isEqualTo(1); + assertThat(result.getMatchedDocuments().get(0).getMatchedTerms().size()).isGreaterThan(0); + assertThat(result.getMatchedDocuments().get(0).getMatchedTerms().contains(searchString)).isTrue(); + } + + + /* + * Filename contains number, blank, underscore and searchString contains number + */ + @Test + public void testFilenameWithWhitespaceAndUnderscoreAndSearchNumber() throws IOException { + // Arrange + ClassPathResource textResource = new ClassPathResource("files/Text.json"); + Text text = objectMapper.readValue(textResource.getInputStream(), Text.class); + String fileName = "1 Abamectin_prr.pdf"; + String searchString = "1"; + documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value")); + + // Act + SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true); + + // Assert + assertThat(result.getMatchedDocuments().size()).isEqualTo(1); + assertThat(result.getMatchedDocuments().get(0).getMatchedTerms().size()).isGreaterThan(0); + assertThat(result.getMatchedDocuments().get(0).getMatchedTerms().contains(searchString)).isTrue(); + } + + + /* + * Filename contains number, blank, underscore and searchString contains whole fileName + */ + @Test + public void testFilenameWithWhitespaceAndUnderscoreAndSearchCompleteFileName() throws IOException { + // Arrange + ClassPathResource textResource = new ClassPathResource("files/Text.json"); + Text text = objectMapper.readValue(textResource.getInputStream(), Text.class); + String fileName = "1 Abamectin_prr.pdf"; + String searchString = "1 Abamectin_prr.pdf"; + documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value")); + + // Act + SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true); + + // Assert + assertThat(result.getMatchedDocuments().size()).isEqualTo(1); + assertThat(result.getMatchedDocuments().get(0).getMatchedTerms().size()).isGreaterThan(0); + } + + + /* + * Filename contains number, blank, underscore and searchString contains part of fileName + */ + @Test + public void testFilenameWithWhitespaceAndUnderscoreAndSearchPartOfFileNameSearchNumber() throws IOException { + // Arrange + ClassPathResource textResource = new ClassPathResource("files/Text.json"); + Text text = objectMapper.readValue(textResource.getInputStream(), Text.class); + String fileName = "1 Abamectin_prr.pdf"; + String searchString = "1 Abamectin"; + documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value")); + + // Act + SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true); + + // Assert + assertThat(result.getMatchedDocuments().size()).isEqualTo(1); + assertThat(result.getMatchedDocuments().get(0).getMatchedTerms().size()).isGreaterThan(0); + } + + + /* + * Filename contains number, blank, underscore and searchString contains part of fileName + */ + @Test + public void testFilenameWithWhitespaceAndUnderscoreAndSearchLastPartOfFileName() throws IOException { + // Arrange + ClassPathResource textResource = new ClassPathResource("files/Text.json"); + Text text = objectMapper.readValue(textResource.getInputStream(), Text.class); + String fileName = "1 Abamectin_prr.pdf"; + String searchString = "_prr.pdf"; + documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value")); + + // Act + SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true); + + // Assert + assertThat(result.getMatchedDocuments().size()).isEqualTo(1); + assertThat(result.getMatchedDocuments().get(0).getMatchedTerms().size()).isGreaterThan(0); + } + + + /* + * Filename contains only one uppercase word and searchString contains complete filename without ending + */ + @Test + public void testFilenameWithOneWordUppercase() throws IOException { + // Arrange + ClassPathResource textResource = new ClassPathResource("files/Text.json"); + Text text = objectMapper.readValue(textResource.getInputStream(), Text.class); + String fileName = "LUKE.pdf"; + String searchString = "luke"; + documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value")); + + // Act + SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true); + + // Assert + assertThat(result.getMatchedDocuments().size()).isEqualTo(1); + assertThat(result.getMatchedDocuments().get(0).getMatchedTerms().size()).isGreaterThan(0); + assertThat(result.getMatchedDocuments().get(0).getMatchedTerms().contains(searchString)).isTrue(); + } + + + /* + * Filename contains only one word and searchString contains complete filename with ending + */ + @Test + public void testFilenameWithOneWordAndEnding() throws IOException { + // Arrange + ClassPathResource textResource = new ClassPathResource("files/Text.json"); + Text text = objectMapper.readValue(textResource.getInputStream(), Text.class); + String fileName = "luke.pdf"; + String searchString = "luke.pdf"; + documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value")); + + // Act + SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true); + + // Assert + assertThat(result.getMatchedDocuments().size()).isEqualTo(1); + assertThat(result.getMatchedDocuments().get(0).getMatchedTerms().size()).isGreaterThan(0); + assertThat(result.getMatchedDocuments().get(0).getMatchedTerms().contains(searchString)).isTrue(); + } + + + /* + * Filename contains only one word with umlaut and searchString contains complete filename without ending + */ + @Test + public void testFilenameWithOneWordWithUmlaut() throws IOException { + // Arrange + ClassPathResource textResource = new ClassPathResource("files/Text.json"); + Text text = objectMapper.readValue(textResource.getInputStream(), Text.class); + String fileName = "Äpfel.pdf"; + String searchString = "äpfel"; + documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value")); + + // Act + SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true); + + // Assert + assertThat(result.getMatchedDocuments().size()).isEqualTo(1); + assertThat(result.getMatchedDocuments().get(0).getMatchedTerms().size()).isGreaterThan(0); + assertThat(result.getMatchedDocuments().get(0).getMatchedTerms().contains(searchString)).isTrue(); + } + + + /* + * FFilename contains only one word with umlaut and searchString contains complete filename with ending + */ + @Test + public void testFilenameWithOneWordWithUmlautAndEnding() throws IOException { + // Arrange + ClassPathResource textResource = new ClassPathResource("files/Text.json"); + Text text = objectMapper.readValue(textResource.getInputStream(), Text.class); + String fileName = "Äpfel.pdf"; + String searchString = "äpfel.pdf"; + documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value")); + + // Act + SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true); + + // Assert + assertThat(result.getMatchedDocuments().size()).isEqualTo(1); + assertThat(result.getMatchedDocuments().get(0).getMatchedTerms().size()).isGreaterThan(0); + assertThat(result.getMatchedDocuments().get(0).getMatchedTerms().contains(searchString)).isTrue(); + } + + /* * Filename contains hyphen and searchString contains one word from filename */ @@ -450,7 +685,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest { documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value")); // Act - SearchResult result = searchService.search(searchString, null, Arrays.asList("dossierId1"), null, null, false, false, null, null, 0, 10, true); + SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true); // Assert assertThat(result.getMatchedDocuments().size()).isEqualTo(1); @@ -472,7 +707,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest { documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value")); // Act - SearchResult result = searchService.search(searchString, null, Arrays.asList("dossierId1"), null, null, false, false, null, null, 0, 10, true); + SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true); // Assert assertThat(result.getMatchedDocuments().size()).isEqualTo(1); @@ -495,7 +730,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest { documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value")); // Act - SearchResult result = searchService.search(searchString, null, Arrays.asList("dossierId1"), null, null, false, false, null, null, 0, 10, true); + SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true); // Assert assertThat(result.getMatchedDocuments().size()).isEqualTo(1); @@ -518,7 +753,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest { documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value")); // Act - SearchResult result = searchService.search(searchString, null, Arrays.asList("dossierId1"), null, null, false, false, null, null, 0, 10, true); + SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true); // Assert assertThat(result.getMatchedDocuments().size()).isEqualTo(1); @@ -541,7 +776,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest { documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value")); // Act - SearchResult result = searchService.search(searchString, null, Arrays.asList("dossierId1"), null, null, false, false, null, null, 0, 10, true); + SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true); // Assert assertThat(result.getMatchedDocuments().size()).isEqualTo(1); @@ -564,7 +799,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest { documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value")); // Act - SearchResult result = searchService.search(searchString, null, Arrays.asList("dossierId1"), null, null, false, false, null, null, 0, 10, true); + SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true); // Assert assertThat(result.getMatchedDocuments().size()).isEqualTo(1); @@ -586,7 +821,7 @@ public class SearchTest extends AbstractElasticsearchIntegrationTest { documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text, "UserId", false, false, WorkflowStatus.NEW, Map.of("F1Key", "F1Value")); // Act - SearchResult result = searchService.search(searchString, null, Arrays.asList("dossierId1"), null, null, false, false, null, null, 0, 10, true); + SearchResult result = searchService.search(searchString, null, List.of("dossierId1"), null, null, false, false, null, null, 0, 10, true); // Assert assertThat(result.getMatchedDocuments().size()).isEqualTo(1);