Pull request #45: Opensearch new

Merge in RED/search-service from opensearch-new to master

* commit '3a4172648cb7f162c004a9bca1b47ad58bcace60':
  OpenSearch adjustment
  OpenSearch adjustment
  Fixed wrong imports
  Changed to opensearch

search-service-v1/search-service-server-v1/pom.xml

@@ -47,26 +47,9 @@
         <!-- other external -->
 
         <dependency>
-            <groupId>org.elasticsearch</groupId>
-            <artifactId>elasticsearch</artifactId>
-            <version>7.15.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.elasticsearch.client</groupId>
-            <artifactId>elasticsearch-rest-high-level-client</artifactId>
-            <version>7.15.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.elasticsearch.client</groupId>
-                    <artifactId>elasticsearch-rest-client</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.elasticsearch.client</groupId>
-            <artifactId>elasticsearch-rest-client</artifactId>
-            <version>7.15.0</version>
+            <groupId>org.opensearch.client</groupId>
+            <artifactId>opensearch-rest-high-level-client</artifactId>
+            <version>1.2.4</version>
         </dependency>
 
         <!-- spring -->

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;

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}")

search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/client/ElasticsearchClient.java

@@ -1,24 +1,21 @@
 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;
 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;
 import javax.annotation.PreDestroy;
-
 import java.io.IOException;
 import java.util.stream.Collectors;
 

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

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());
     }

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;

search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/DocumentIndexService.java

@@ -1,6 +1,18 @@
 package com.iqser.red.service.search.v1.server.service;
 
-import static com.iqser.red.service.search.v1.server.service.IndexCreatorService.INDEX_NAME;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+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.*;
+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;
@@ -9,26 +21,7 @@ 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.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.settings.ElasticsearchSettings;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import static com.iqser.red.service.search.v1.server.service.IndexCreatorService.INDEX_NAME;
 
 @Slf4j
 @Service

search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/DocumentUpdateService.java

@@ -6,10 +6,10 @@ 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;

search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexCreatorService.java

@@ -5,12 +5,12 @@ 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.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;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;

search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/IndexDeleteService.java

@@ -1,20 +1,18 @@
 package com.iqser.red.service.search.v1.server.service;
 
-import static com.iqser.red.service.search.v1.server.service.IndexCreatorService.INDEX_NAME;
-
-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.springframework.stereotype.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.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;
 
 @Slf4j
 @Service
@@ -35,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");
         }
 
     }
@@ -53,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");
         }
 
     }

search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/SearchService.java

@@ -12,16 +12,16 @@ 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.*;
+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;

search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/settings/ElasticsearchSettings.java

@@ -1,7 +1,7 @@
 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;

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

search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/utils/FailfastElasticSearchHealthIndicator.java

@@ -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);
-        }
-    }
-
-}

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;