From 4fd8bd38b1c803b3b012342408e5d01562842dda Mon Sep 17 00:00:00 2001 From: deiflaender Date: Thu, 24 Feb 2022 10:16:18 +0100 Subject: [PATCH 1/4] Changed to opensearch --- .../search-service-server-v1/pom.xml | 23 ++--------- .../v1/server/client/ElasticsearchClient.java | 6 +-- .../server/service/DocumentDeleteService.java | 4 +- .../server/service/DocumentIndexService.java | 17 ++++++-- .../server/service/DocumentUpdateService.java | 9 +++-- .../server/service/IndexCreatorService.java | 13 ++++--- .../v1/server/service/SearchService.java | 24 +++++++----- .../settings/ElasticsearchSettings.java | 3 +- .../FailfastElasticSearchHealthIndicator.java | 39 ------------------- .../search/v1/server/service/SearchTest.java | 3 ++ 10 files changed, 53 insertions(+), 88 deletions(-) delete mode 100644 search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/utils/FailfastElasticSearchHealthIndicator.java diff --git a/search-service-v1/search-service-server-v1/pom.xml b/search-service-v1/search-service-server-v1/pom.xml index 29dcdcf..54a529e 100644 --- a/search-service-v1/search-service-server-v1/pom.xml +++ b/search-service-v1/search-service-server-v1/pom.xml @@ -47,26 +47,9 @@ - org.elasticsearch - elasticsearch - 7.15.0 - - - - org.elasticsearch.client - elasticsearch-rest-high-level-client - 7.15.0 - - - org.elasticsearch.client - elasticsearch-rest-client - - - - - org.elasticsearch.client - elasticsearch-rest-client - 7.15.0 + org.opensearch.client + opensearch-rest-high-level-client + 1.2.4 diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/client/ElasticsearchClient.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/client/ElasticsearchClient.java index ca179fd..ce796e9 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/client/ElasticsearchClient.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/client/ElasticsearchClient.java @@ -11,9 +11,9 @@ import org.apache.http.auth.AuthScope; import org.apache.http.auth.UsernamePasswordCredentials; import org.apache.http.client.CredentialsProvider; import org.apache.http.impl.client.BasicCredentialsProvider; -import org.elasticsearch.client.RestClient; -import org.elasticsearch.client.RestClientBuilder; -import org.elasticsearch.client.RestHighLevelClient; +import org.opensearch.client.RestClient; +import org.opensearch.client.RestClientBuilder; +import org.opensearch.client.RestHighLevelClient; import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/DocumentDeleteService.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/DocumentDeleteService.java index 4ae2eb0..642ff57 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/DocumentDeleteService.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/DocumentDeleteService.java @@ -4,8 +4,8 @@ import com.iqser.red.service.search.v1.server.client.ElasticsearchClient; import com.iqser.red.service.search.v1.server.exception.IndexException; import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings; import lombok.RequiredArgsConstructor; -import org.elasticsearch.action.delete.DeleteRequest; -import org.elasticsearch.client.RequestOptions; +import org.opensearch.action.delete.DeleteRequest; +import org.opensearch.client.RequestOptions; import org.springframework.stereotype.Service; import java.io.IOException; diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/DocumentIndexService.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/DocumentIndexService.java index 27fa043..f10e5eb 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/DocumentIndexService.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/DocumentIndexService.java @@ -9,13 +9,11 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import org.elasticsearch.action.index.IndexRequest; -import org.elasticsearch.client.RequestOptions; -import org.elasticsearch.common.xcontent.XContentType; import org.springframework.stereotype.Service; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.DossierStatus; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.WorkflowStatus; import com.iqser.red.service.search.v1.server.client.ElasticsearchClient; import com.iqser.red.service.search.v1.server.exception.IndexException; @@ -29,6 +27,19 @@ import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.opensearch.action.index.IndexRequest; +import org.opensearch.client.RequestOptions; +import org.opensearch.common.xcontent.XContentType; +import org.springframework.stereotype.Service; + +import java.io.IOException; +import java.time.OffsetDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import static com.iqser.red.service.search.v1.server.service.IndexCreatorService.INDEX_NAME; @Slf4j @Service diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/DocumentUpdateService.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/DocumentUpdateService.java index 74dd666..221be11 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/DocumentUpdateService.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/DocumentUpdateService.java @@ -6,10 +6,11 @@ import com.iqser.red.service.search.v1.server.model.IndexDocumentUpdate; import com.iqser.red.service.search.v1.server.model.IndexFileAttribute; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; -import org.elasticsearch.action.update.UpdateRequest; -import org.elasticsearch.action.update.UpdateResponse; -import org.elasticsearch.client.RequestOptions; -import org.elasticsearch.common.xcontent.XContentType; + +import org.opensearch.action.update.UpdateRequest; +import org.opensearch.action.update.UpdateResponse; +import org.opensearch.client.RequestOptions; +import org.opensearch.common.xcontent.XContentType; import org.springframework.stereotype.Service; import java.util.ArrayList; diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexCreatorService.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexCreatorService.java index c144151..a2e7286 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexCreatorService.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexCreatorService.java @@ -5,12 +5,13 @@ import com.iqser.red.service.search.v1.server.exception.IndexException; import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings; import com.iqser.red.service.search.v1.server.utils.ResourceLoader; import lombok.extern.slf4j.Slf4j; -import org.elasticsearch.client.RequestOptions; -import org.elasticsearch.client.indices.CreateIndexRequest; -import org.elasticsearch.client.indices.CreateIndexResponse; -import org.elasticsearch.client.indices.GetIndexRequest; -import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.common.xcontent.XContentType; + +import org.opensearch.action.admin.indices.create.CreateIndexRequest; +import org.opensearch.action.admin.indices.create.CreateIndexResponse; +import org.opensearch.client.RequestOptions; +import org.opensearch.client.indices.GetIndexRequest; +import org.opensearch.common.settings.Settings; +import org.opensearch.common.xcontent.XContentType; import org.springframework.stereotype.Service; import java.io.IOException; diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/SearchService.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/SearchService.java index 0f4819e..9b47e45 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/SearchService.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/SearchService.java @@ -12,16 +12,20 @@ import io.micrometer.core.instrument.util.StringUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.lucene.search.join.ScoreMode; -import org.elasticsearch.action.search.SearchRequest; -import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.client.RequestOptions; -import org.elasticsearch.common.text.Text; -import org.elasticsearch.index.query.*; -import org.elasticsearch.search.SearchHit; -import org.elasticsearch.search.SearchHits; -import org.elasticsearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.search.fetch.subphase.FetchSourceContext; -import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder; +import org.opensearch.action.search.SearchRequest; +import org.opensearch.action.search.SearchResponse; +import org.opensearch.client.RequestOptions; +import org.opensearch.common.text.Text; +import org.opensearch.index.query.BoolQueryBuilder; +import org.opensearch.index.query.InnerHitBuilder; +import org.opensearch.index.query.NestedQueryBuilder; +import org.opensearch.index.query.QueryBuilder; +import org.opensearch.index.query.QueryBuilders; +import org.opensearch.search.SearchHit; +import org.opensearch.search.SearchHits; +import org.opensearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.fetch.subphase.FetchSourceContext; +import org.opensearch.search.fetch.subphase.highlight.HighlightBuilder; import org.springframework.stereotype.Service; import java.io.IOException; diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/settings/ElasticsearchSettings.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/settings/ElasticsearchSettings.java index b1c3086..ca8d244 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/settings/ElasticsearchSettings.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/settings/ElasticsearchSettings.java @@ -1,7 +1,8 @@ package com.iqser.red.service.search.v1.server.settings; import lombok.Data; -import org.elasticsearch.action.support.WriteRequest; + +import org.opensearch.action.support.WriteRequest; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/utils/FailfastElasticSearchHealthIndicator.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/utils/FailfastElasticSearchHealthIndicator.java deleted file mode 100644 index 4516242..0000000 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/utils/FailfastElasticSearchHealthIndicator.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.iqser.red.service.search.v1.server.utils; - -import com.iqser.red.service.search.v1.server.client.ElasticsearchClient; -import lombok.extern.slf4j.Slf4j; -import org.elasticsearch.ElasticsearchException; -import org.springframework.boot.actuate.elasticsearch.ElasticsearchRestHealthIndicator; -import org.springframework.boot.actuate.health.Health; -import org.springframework.boot.actuate.health.Status; -import org.springframework.stereotype.Component; - -@Slf4j -@Component -public class FailfastElasticSearchHealthIndicator extends ElasticsearchRestHealthIndicator { - - public FailfastElasticSearchHealthIndicator(ElasticsearchClient elasticsearchClient) { - - super(elasticsearchClient.getLowLevelClient()); - } - - - @Override - protected void doHealthCheck(Health.Builder builder) throws Exception { - - try { - super.doHealthCheck(builder); - Health healthStatus = builder.build(); - if (healthStatus.getStatus().equals(Status.DOWN)) { - log.info("Elasticsearch health check returned {} , shutting down system...", healthStatus.getStatus()); - System.exit(1); - } else { - log.debug("Elasticsearch health status returned {} ", healthStatus.getStatus()); - } - } catch (ElasticsearchException e) { - log.info("Elasticsearch is not available, shutting down system...", e); - System.exit(1); - } - } - -} 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 0b719bc..60b1431 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 @@ -9,6 +9,8 @@ import com.iqser.red.service.search.v1.server.client.FileStatusClient; import com.iqser.red.service.search.v1.server.client.FileStatusProcessingUpdateClient; import com.iqser.red.service.search.v1.server.model.Text; import lombok.SneakyThrows; + +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.amqp.rabbit.core.RabbitTemplate; @@ -26,6 +28,7 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; +@Ignore @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {AbstractElasticsearchIntegrationTest.WAIT_FOR_WRITE_REQUESTS}) public class SearchTest extends AbstractElasticsearchIntegrationTest { From 5760e0f2e502991c1fb43a36e68f63505be3ea78 Mon Sep 17 00:00:00 2001 From: deiflaender Date: Thu, 24 Feb 2022 11:27:30 +0100 Subject: [PATCH 2/4] Fixed wrong imports --- .../service/search/v1/server/service/IndexCreatorService.java | 4 ++-- .../red/service/search/v1/server/service/SearchTest.java | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexCreatorService.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexCreatorService.java index a2e7286..f425133 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexCreatorService.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexCreatorService.java @@ -6,9 +6,9 @@ import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings; import com.iqser.red.service.search.v1.server.utils.ResourceLoader; import lombok.extern.slf4j.Slf4j; -import org.opensearch.action.admin.indices.create.CreateIndexRequest; -import org.opensearch.action.admin.indices.create.CreateIndexResponse; import org.opensearch.client.RequestOptions; +import org.opensearch.client.indices.CreateIndexRequest; +import org.opensearch.client.indices.CreateIndexResponse; import org.opensearch.client.indices.GetIndexRequest; import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.XContentType; 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 60b1431..b4c24eb 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 @@ -28,7 +28,6 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -@Ignore @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {AbstractElasticsearchIntegrationTest.WAIT_FOR_WRITE_REQUESTS}) public class SearchTest extends AbstractElasticsearchIntegrationTest { From ac0d132e48a1eb3072715e0ece9137653f1c37b8 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 21 Mar 2022 15:51:56 +0200 Subject: [PATCH 3/4] OpenSearch adjustment --- .../service/search/v1/server/Application.java | 1 - .../v1/server/client/DossierClient.java | 1 - .../v1/server/client/ElasticsearchClient.java | 3 -- .../v1/server/model/IndexDocumentUpdate.java | 4 +-- .../server/queue/IndexingMessageReceiver.java | 34 +++++++------------ .../server/service/DocumentIndexService.java | 20 +---------- .../server/service/DocumentUpdateService.java | 1 - .../server/service/IndexCreatorService.java | 1 - .../v1/server/service/IndexDeleteService.java | 12 +++---- .../v1/server/service/SearchService.java | 6 +--- .../settings/ElasticsearchSettings.java | 1 - .../settings/SearchServiceSettings.java | 7 +--- 12 files changed, 22 insertions(+), 69 deletions(-) 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 8de6d49..6e81d1a 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 @@ -5,7 +5,6 @@ import com.iqser.red.service.search.v1.server.client.ElasticsearchClient; import com.iqser.red.service.search.v1.server.client.FileStatusClient; import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings; import com.iqser.red.service.search.v1.server.settings.SearchServiceSettings; - import org.springframework.boot.SpringApplication; import org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/client/DossierClient.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/client/DossierClient.java index 2cf757c..acf1be9 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/client/DossierClient.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/client/DossierClient.java @@ -1,7 +1,6 @@ package com.iqser.red.service.search.v1.server.client; import com.iqser.red.service.persistence.service.v1.api.resources.DossierResource; -import com.iqser.red.service.persistence.service.v1.api.resources.StatusResource; import org.springframework.cloud.openfeign.FeignClient; @FeignClient(name = "DossierResource", url = "${persistence-service.url}") diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/client/ElasticsearchClient.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/client/ElasticsearchClient.java index ce796e9..c48221e 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/client/ElasticsearchClient.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/client/ElasticsearchClient.java @@ -1,11 +1,9 @@ package com.iqser.red.service.search.v1.server.client; import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings; - import lombok.RequiredArgsConstructor; import lombok.experimental.Delegate; import lombok.extern.slf4j.Slf4j; - import org.apache.http.HttpHost; import org.apache.http.auth.AuthScope; import org.apache.http.auth.UsernamePasswordCredentials; @@ -18,7 +16,6 @@ import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; - import java.io.IOException; import java.util.stream.Collectors; diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/model/IndexDocumentUpdate.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/model/IndexDocumentUpdate.java index bb7a08a..caccd41 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/model/IndexDocumentUpdate.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/model/IndexDocumentUpdate.java @@ -1,12 +1,12 @@ package com.iqser.red.service.search.v1.server.model; -import java.util.List; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.List; + @Data @Builder @NoArgsConstructor diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/queue/IndexingMessageReceiver.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/queue/IndexingMessageReceiver.java index 6271d9a..16f8479 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/queue/IndexingMessageReceiver.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/queue/IndexingMessageReceiver.java @@ -1,17 +1,5 @@ package com.iqser.red.service.search.v1.server.queue; -import static com.iqser.red.service.search.v1.server.queue.MessagingConfiguration.DELETE_FROM_INDEX_DLQ; -import static com.iqser.red.service.search.v1.server.queue.MessagingConfiguration.DELETE_FROM_INDEX_QUEUE; -import static com.iqser.red.service.search.v1.server.queue.MessagingConfiguration.INDEXING_DQL; -import static com.iqser.red.service.search.v1.server.queue.MessagingConfiguration.INDEXING_QUEUE; - -import java.util.List; - -import org.springframework.amqp.rabbit.annotation.RabbitHandler; -import org.springframework.amqp.rabbit.annotation.RabbitListener; -import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.springframework.stereotype.Service; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.Dossier; @@ -22,15 +10,17 @@ import com.iqser.red.service.search.v1.server.client.DossierClient; import com.iqser.red.service.search.v1.server.client.FileStatusClient; import com.iqser.red.service.search.v1.server.client.FileStatusProcessingUpdateClient; import com.iqser.red.service.search.v1.server.model.Text; -import com.iqser.red.service.search.v1.server.service.DocumentDeleteService; -import com.iqser.red.service.search.v1.server.service.DocumentIndexService; -import com.iqser.red.service.search.v1.server.service.DocumentUpdateService; -import com.iqser.red.service.search.v1.server.service.IndexCreatorService; -import com.iqser.red.service.search.v1.server.service.IndexDeleteService; -import com.iqser.red.service.search.v1.server.service.TextStorageService; - +import com.iqser.red.service.search.v1.server.service.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.amqp.rabbit.annotation.RabbitHandler; +import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.stereotype.Service; + +import java.util.List; + +import static com.iqser.red.service.search.v1.server.queue.MessagingConfiguration.*; @Slf4j @Service @@ -68,8 +58,8 @@ public class IndexingMessageReceiver { fileStatus = fileStatusClient.getFileStatus(indexRequest.getDossierId(), indexRequest.getFileId()); dossier = dossierClient.getDossierById(indexRequest.getDossierId(), true, true); documentUpdateService.updateDocument(indexRequest.getFileId(), fileStatus.getAssignee(), - dossier.getSoftDeletedTime() !=null, dossier.getArchivedTime() != null, fileStatus.getWorkflowStatus() - .name(), fileStatus.getFileAttributes()); + dossier.getSoftDeletedTime() != null, dossier.getArchivedTime() != null, fileStatus.getWorkflowStatus() + .name(), fileStatus.getFileAttributes()); log.info("Successfully updated {}", indexRequest); break; @@ -124,7 +114,7 @@ public class IndexingMessageReceiver { fileStatusProcessingUpdateClient.indexing(dossier.getId(), file.getId()); Text text = textStorageService.getText(dossier.getId(), file.getId()); documentIndexService.indexDocument(dossier.getDossierTemplateId(), dossier.getId(), file.getId(), file.getFilename(), text, file.getAssignee(), - dossier.getSoftDeletedTime() !=null, dossier.getArchivedTime() != null, file.getWorkflowStatus(), file.getFileAttributes()); + dossier.getSoftDeletedTime() != null, dossier.getArchivedTime() != null, file.getWorkflowStatus(), file.getFileAttributes()); fileStatusProcessingUpdateClient.indexingSuccessful(dossier.getId(), file.getId()); log.info("Successfully indexed dossier {} file {}", dossier.getId(), file.getId()); } diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/DocumentIndexService.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/DocumentIndexService.java index f10e5eb..a7fc45d 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/DocumentIndexService.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/DocumentIndexService.java @@ -1,30 +1,12 @@ package com.iqser.red.service.search.v1.server.service; -import static com.iqser.red.service.search.v1.server.service.IndexCreatorService.INDEX_NAME; - -import java.io.IOException; -import java.time.OffsetDateTime; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -import org.springframework.stereotype.Service; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.DossierStatus; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.WorkflowStatus; import com.iqser.red.service.search.v1.server.client.ElasticsearchClient; import com.iqser.red.service.search.v1.server.exception.IndexException; -import com.iqser.red.service.search.v1.server.model.IndexDocument; -import com.iqser.red.service.search.v1.server.model.IndexFileAttribute; -import com.iqser.red.service.search.v1.server.model.IndexSection; -import com.iqser.red.service.search.v1.server.model.SectionArea; -import com.iqser.red.service.search.v1.server.model.SectionText; -import com.iqser.red.service.search.v1.server.model.Text; +import com.iqser.red.service.search.v1.server.model.*; import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings; - import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.opensearch.action.index.IndexRequest; diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/DocumentUpdateService.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/DocumentUpdateService.java index 221be11..65ab087 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/DocumentUpdateService.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/DocumentUpdateService.java @@ -6,7 +6,6 @@ import com.iqser.red.service.search.v1.server.model.IndexDocumentUpdate; import com.iqser.red.service.search.v1.server.model.IndexFileAttribute; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; - import org.opensearch.action.update.UpdateRequest; import org.opensearch.action.update.UpdateResponse; import org.opensearch.client.RequestOptions; diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexCreatorService.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexCreatorService.java index f425133..4d29947 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexCreatorService.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexCreatorService.java @@ -5,7 +5,6 @@ import com.iqser.red.service.search.v1.server.exception.IndexException; import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings; import com.iqser.red.service.search.v1.server.utils.ResourceLoader; import lombok.extern.slf4j.Slf4j; - import org.opensearch.client.RequestOptions; import org.opensearch.client.indices.CreateIndexRequest; import org.opensearch.client.indices.CreateIndexResponse; diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexDeleteService.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexDeleteService.java index 955c6cb..29410c8 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexDeleteService.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexDeleteService.java @@ -1,7 +1,9 @@ package com.iqser.red.service.search.v1.server.service; -import static com.iqser.red.service.search.v1.server.service.IndexCreatorService.INDEX_NAME; - +import com.iqser.red.service.search.v1.server.client.ElasticsearchClient; +import lombok.RequiredArgsConstructor; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest; import org.elasticsearch.action.support.master.AcknowledgedResponse; @@ -10,11 +12,7 @@ import org.elasticsearch.client.indices.CloseIndexRequest; import org.elasticsearch.core.TimeValue; import org.springframework.stereotype.Service; -import com.iqser.red.service.search.v1.server.client.ElasticsearchClient; - -import lombok.RequiredArgsConstructor; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; +import static com.iqser.red.service.search.v1.server.service.IndexCreatorService.INDEX_NAME; @Slf4j @Service diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/SearchService.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/SearchService.java index 9b47e45..d0022f7 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/SearchService.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/SearchService.java @@ -16,11 +16,7 @@ import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; import org.opensearch.client.RequestOptions; import org.opensearch.common.text.Text; -import org.opensearch.index.query.BoolQueryBuilder; -import org.opensearch.index.query.InnerHitBuilder; -import org.opensearch.index.query.NestedQueryBuilder; -import org.opensearch.index.query.QueryBuilder; -import org.opensearch.index.query.QueryBuilders; +import org.opensearch.index.query.*; import org.opensearch.search.SearchHit; import org.opensearch.search.SearchHits; import org.opensearch.search.builder.SearchSourceBuilder; diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/settings/ElasticsearchSettings.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/settings/ElasticsearchSettings.java index ca8d244..5289066 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/settings/ElasticsearchSettings.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/settings/ElasticsearchSettings.java @@ -1,7 +1,6 @@ package com.iqser.red.service.search.v1.server.settings; import lombok.Data; - import org.opensearch.action.support.WriteRequest; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/settings/SearchServiceSettings.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/settings/SearchServiceSettings.java index 5a0863b..da6791e 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/settings/SearchServiceSettings.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/settings/SearchServiceSettings.java @@ -1,15 +1,10 @@ package com.iqser.red.service.search.v1.server.settings; -import java.util.ArrayList; -import java.util.List; - -import org.elasticsearch.action.support.WriteRequest; +import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; -import lombok.Data; - @Data @Primary @Configuration From 3a4172648cb7f162c004a9bca1b47ad58bcace60 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 21 Mar 2022 15:53:28 +0200 Subject: [PATCH 4/4] OpenSearch adjustment --- .../v1/server/service/IndexDeleteService.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexDeleteService.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexDeleteService.java index 29410c8..29df883 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexDeleteService.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexDeleteService.java @@ -1,15 +1,15 @@ package com.iqser.red.service.search.v1.server.service; import com.iqser.red.service.search.v1.server.client.ElasticsearchClient; +import com.iqser.red.service.search.v1.server.exception.IndexException; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest; -import org.elasticsearch.action.support.master.AcknowledgedResponse; -import org.elasticsearch.client.RequestOptions; -import org.elasticsearch.client.indices.CloseIndexRequest; -import org.elasticsearch.core.TimeValue; +import org.opensearch.action.admin.indices.delete.DeleteIndexRequest; +import org.opensearch.action.support.master.AcknowledgedResponse; +import org.opensearch.client.RequestOptions; +import org.opensearch.client.indices.CloseIndexRequest; +import org.opensearch.common.unit.TimeValue; import org.springframework.stereotype.Service; import static com.iqser.red.service.search.v1.server.service.IndexCreatorService.INDEX_NAME; @@ -33,7 +33,7 @@ public class IndexDeleteService { if (closeIndexResponse.isAcknowledged()) { log.info("Index is closed"); } else { - throw new ElasticsearchException("Error while closing index"); + throw new IndexException("Error while closing index"); } } @@ -51,7 +51,7 @@ public class IndexDeleteService { if (deleteIndexResponse.isAcknowledged()) { log.info("Index is dropped"); } else { - throw new ElasticsearchException("Error while dropping index"); + throw new IndexException("Error while dropping index"); } }