Increment version to 2.10.0 and refactoring (#321)

* Increment version to 2.10.0 Signed-off-by: Bharathwaj G <[email protected]> * updating bwc Signed-off-by: Bharathwaj G <[email protected]> * refactoring changes Signed-off-by: Bharathwaj G <[email protected]> * refactoring Signed-off-by: Bharathwaj G <[email protected]> * painless plugin fix Signed-off-by: Bharathwaj G <[email protected]> * fixing bwc tests Signed-off-by: Bharathwaj G <[email protected]> --------- Signed-off-by: Bharathwaj G <[email protected]>
opensearch-project · Aug 28, 2023 · a656716 · a656716
1 parent 68e7110
commit a656716
Show file tree

Hide file tree

Showing 70 changed files with 174 additions and 172 deletions.
diff --git a/build.gradle b/build.gradle
@@ -10,8 +10,8 @@ buildscript {
         distribution = 'oss-zip'
         opensearch_group = "org.opensearch"
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
-        opensearch_version = System.getProperty("opensearch.version", "2.9.0-SNAPSHOT")
-        opensearch_plugin_version = System.getProperty("bwc.version", "1.1.0.0")
+        opensearch_version = System.getProperty("opensearch.version", "2.10.0-SNAPSHOT")
+        opensearch_plugin_version = System.getProperty("bwc.version", "2.9.0.0")
         buildVersionQualifier = System.getProperty("build.version_qualifier", "")
         // 2.0.0-rc1-SNAPSHOT -> 2.0.0.0-rc1-SNAPSHOT
         version_tokens = opensearch_version.tokenize('-')
@@ -124,9 +124,11 @@ publishing {
 }
 
 dependencies {
+    testImplementation "org.antlr:antlr4-runtime:${versions.antlr4}"
     testImplementation "org.opensearch.plugin:reindex-client:${opensearch_version}"
     testImplementation "org.opensearch.plugin:lang-painless:${opensearch_version}"
     testImplementation "org.opensearch.test:framework:${opensearch_version}"
+    compileOnly "org.opensearch.plugin:opensearch-scripting-painless-spi:${versions.opensearch}"
     compileOnly "org.opensearch.plugin:transport-netty4-client:${opensearch_version}"
     compileOnly "org.opensearch:opensearch:${opensearch_version}"
     implementation "org.opensearch:common-utils:${common_utils_version}"
@@ -256,16 +258,17 @@ ext.getPluginResource = { download_to_folder, download_from_src ->
 }
 
 String baseName = "asynSearchCluster"
-String bwcVersion = "1.1.0.0"
+String bwcVersionShort = "2.9.0"
+String bwcVersion = bwcVersionShort + ".0"
 String bwcFilePath = "src/test/resources/org/opensearch/search/asynchronous/bwc/"
-String bwcRemoteFile = "https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930/linux/x64/builds/opensearch/plugins/opensearch-asynchronous-search-1.1.0.0.zip"
+String bwcRemoteFile = "https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/"+ bwcVersionShort + "/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-asynchronous-search-"+ bwcVersion +".zip"
 getPluginResource(bwcFilePath + bwcVersion, bwcRemoteFile)
 // Creates two test clusters of previous version and loads opensearch plugin of bwcVersion
 2.times { i ->
     testClusters {
         "${baseName}$i" {
             testDistribution = "ARCHIVE"
-            versions = ["1.1.0",opensearch_version]
+            versions = ["2.9.0",opensearch_version]
             numberOfNodes = 3
             plugin(provider(new Callable<RegularFile>() {
                 @Override

diff --git a/src/main/java/org/opensearch/search/asynchronous/action/AsynchronousSearchStatsAction.java b/src/main/java/org/opensearch/search/asynchronous/action/AsynchronousSearchStatsAction.java
@@ -7,7 +7,7 @@
 
 import org.opensearch.search.asynchronous.response.AsynchronousSearchStatsResponse;
 import org.opensearch.action.ActionType;
-import org.opensearch.common.io.stream.Writeable;
+import org.opensearch.core.common.io.stream.Writeable;
 
 public class AsynchronousSearchStatsAction extends ActionType<AsynchronousSearchStatsResponse> {
 

diff --git a/src/main/java/org/opensearch/search/asynchronous/context/AsynchronousSearchContextId.java b/src/main/java/org/opensearch/search/asynchronous/context/AsynchronousSearchContextId.java
@@ -5,9 +5,9 @@
 
 package org.opensearch.search.asynchronous.context;
 
-import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
-import org.opensearch.common.io.stream.Writeable;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
+import org.opensearch.core.common.io.stream.Writeable;
 
 import java.io.IOException;
 import java.util.Objects;

diff --git a/...va/org/opensearch/search/asynchronous/context/active/AsynchronousSearchActiveContext.java b/...va/org/opensearch/search/asynchronous/context/active/AsynchronousSearchActiveContext.java
@@ -14,7 +14,7 @@
 import org.opensearch.search.asynchronous.id.AsynchronousSearchIdConverter;
 import org.opensearch.search.asynchronous.listener.AsynchronousSearchProgressListener;
 import org.opensearch.common.SetOnce;
-import org.opensearch.action.ActionListener;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.action.search.SearchProgressActionListener;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.search.SearchTask;

diff --git a/...java/org/opensearch/search/asynchronous/context/active/AsynchronousSearchActiveStore.java b/...java/org/opensearch/search/asynchronous/context/active/AsynchronousSearchActiveStore.java
@@ -10,7 +10,7 @@
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.common.util.CollectionUtils;
+import org.opensearch.core.common.util.CollectionUtils;
 import org.opensearch.common.util.concurrent.ConcurrentMapLong;
 import org.opensearch.core.concurrency.OpenSearchRejectedExecutionException;
 import org.opensearch.search.asynchronous.context.AsynchronousSearchContextId;

diff --git a/.../org/opensearch/search/asynchronous/context/permits/AsynchronousSearchContextPermits.java b/.../org/opensearch/search/asynchronous/context/permits/AsynchronousSearchContextPermits.java
@@ -12,7 +12,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.opensearch.action.ActionListener;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.common.lease.Releasable;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.concurrent.AbstractRunnable;

diff --git a/.../opensearch/search/asynchronous/context/permits/NoopAsynchronousSearchContextPermits.java b/.../opensearch/search/asynchronous/context/permits/NoopAsynchronousSearchContextPermits.java
@@ -7,7 +7,7 @@
 
 import org.opensearch.search.asynchronous.context.AsynchronousSearchContextId;
 import org.opensearch.search.asynchronous.context.active.AsynchronousSearchContextClosedException;
-import org.opensearch.action.ActionListener;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.common.lease.Releasable;
 import org.opensearch.common.unit.TimeValue;
 

diff --git a/...nsearch/search/asynchronous/context/persistence/AsynchronousSearchPersistenceContext.java b/...nsearch/search/asynchronous/context/persistence/AsynchronousSearchPersistenceContext.java
@@ -13,9 +13,9 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.opensearch.action.search.SearchResponse;
-import org.opensearch.common.bytes.BytesReference;
-import org.opensearch.common.io.stream.NamedWriteableAwareStreamInput;
-import org.opensearch.common.io.stream.NamedWriteableRegistry;
+import org.opensearch.core.common.bytes.BytesReference;
+import org.opensearch.core.common.io.stream.NamedWriteableAwareStreamInput;
+import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

diff --git a/...pensearch/search/asynchronous/context/persistence/AsynchronousSearchPersistenceModel.java b/...pensearch/search/asynchronous/context/persistence/AsynchronousSearchPersistenceModel.java
@@ -9,7 +9,7 @@
 import org.opensearch.OpenSearchException;
 import org.opensearch.Version;
 import org.opensearch.action.search.SearchResponse;
-import org.opensearch.common.bytes.BytesReference;
+import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 
 import java.io.IOException;

diff --git a/src/main/java/org/opensearch/search/asynchronous/context/state/event/SearchStartedEvent.java b/src/main/java/org/opensearch/search/asynchronous/context/state/event/SearchStartedEvent.java
@@ -7,7 +7,7 @@
 
 import org.opensearch.search.asynchronous.context.AsynchronousSearchContext;
 import org.opensearch.search.asynchronous.context.state.AsynchronousSearchContextEvent;
-import org.opensearch.action.ActionListener;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.action.ActionRequest;
 import org.opensearch.action.search.SearchTask;
 

diff --git a/src/main/java/org/opensearch/search/asynchronous/id/AsynchronousSearchIdConverter.java b/src/main/java/org/opensearch/search/asynchronous/id/AsynchronousSearchIdConverter.java
@@ -7,7 +7,7 @@
 
 import org.opensearch.search.asynchronous.context.AsynchronousSearchContextId;
 import org.apache.lucene.store.ByteArrayDataInput;
-import org.opensearch.common.bytes.BytesReference;
+import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 
 import java.io.IOException;

diff --git a/...in/java/org/opensearch/search/asynchronous/listener/AsynchronousSearchTimeoutWrapper.java b/...in/java/org/opensearch/search/asynchronous/listener/AsynchronousSearchTimeoutWrapper.java
@@ -7,7 +7,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.opensearch.action.ActionListener;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.threadpool.Scheduler;
 import org.opensearch.threadpool.ThreadPool;

diff --git a/...va/org/opensearch/search/asynchronous/listener/CompositeSearchProgressActionListener.java b/...va/org/opensearch/search/asynchronous/listener/CompositeSearchProgressActionListener.java
@@ -5,7 +5,7 @@
 
 package org.opensearch.search.asynchronous.listener;
 
-import org.opensearch.action.ActionListener;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.action.search.SearchProgressActionListener;
 
 import java.util.ArrayList;

diff --git a/src/main/java/org/opensearch/search/asynchronous/listener/PrioritizedActionListener.java b/src/main/java/org/opensearch/search/asynchronous/listener/PrioritizedActionListener.java
@@ -6,7 +6,7 @@
 package org.opensearch.search.asynchronous.listener;
 
 
-import org.opensearch.action.ActionListener;
+import org.opensearch.core.action.ActionListener;
 
 public interface PrioritizedActionListener<Response> extends ActionListener<Response> {
 

diff --git a/...va/org/opensearch/search/asynchronous/management/AsynchronousSearchManagementService.java b/...va/org/opensearch/search/asynchronous/management/AsynchronousSearchManagementService.java
@@ -14,7 +14,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.opensearch.action.ActionListener;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.action.ActionRequest;
 import org.opensearch.action.ActionRequestValidationException;
 import org.opensearch.cluster.ClusterChangedEvent;
@@ -23,10 +23,10 @@
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.Randomness;
-import org.opensearch.common.component.AbstractLifecycleComponent;
+import org.opensearch.common.lifecycle.AbstractLifecycleComponent;
 import org.opensearch.common.inject.Inject;
-import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.TimeValue;

diff --git a/src/main/java/org/opensearch/search/asynchronous/plugin/AsynchronousSearchPlugin.java b/src/main/java/org/opensearch/search/asynchronous/plugin/AsynchronousSearchPlugin.java
@@ -24,13 +24,13 @@
 import org.opensearch.search.asynchronous.transport.TransportGetAsynchronousSearchAction;
 import org.opensearch.search.asynchronous.transport.TransportSubmitAsynchronousSearchAction;
 import org.opensearch.action.ActionRequest;
-import org.opensearch.action.ActionResponse;
+import org.opensearch.core.action.ActionResponse;
 import org.opensearch.client.Client;
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
 import org.opensearch.cluster.node.DiscoveryNodes;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.component.LifecycleComponent;
-import org.opensearch.common.io.stream.NamedWriteableRegistry;
+import org.opensearch.common.lifecycle.LifecycleComponent;
+import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.IndexScopedSettings;
 import org.opensearch.common.settings.Setting;

diff --git a/...in/java/org/opensearch/search/asynchronous/processor/AsynchronousSearchPostProcessor.java b/...in/java/org/opensearch/search/asynchronous/processor/AsynchronousSearchPostProcessor.java
@@ -25,7 +25,7 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.opensearch.ExceptionsHelper;
-import org.opensearch.action.ActionListener;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.unit.TimeValue;

diff --git a/...ain/java/org/opensearch/search/asynchronous/request/AsynchronousSearchRoutingRequest.java b/...ain/java/org/opensearch/search/asynchronous/request/AsynchronousSearchRoutingRequest.java
@@ -6,8 +6,8 @@
 package org.opensearch.search.asynchronous.request;
 
 import org.opensearch.action.ActionRequest;
-import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
 
 import java.io.IOException;
 

diff --git a/src/main/java/org/opensearch/search/asynchronous/request/AsynchronousSearchStatsRequest.java b/src/main/java/org/opensearch/search/asynchronous/request/AsynchronousSearchStatsRequest.java
@@ -6,8 +6,8 @@
 package org.opensearch.search.asynchronous.request;
 
 import org.opensearch.action.support.nodes.BaseNodesRequest;
-import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
 
 import java.io.IOException;
 

diff --git a/...main/java/org/opensearch/search/asynchronous/request/DeleteAsynchronousSearchRequest.java b/...main/java/org/opensearch/search/asynchronous/request/DeleteAsynchronousSearchRequest.java
@@ -6,7 +6,7 @@
 package org.opensearch.search.asynchronous.request;
 
 import org.opensearch.action.ActionRequestValidationException;
-import org.opensearch.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamInput;
 
 import java.io.IOException;
 

diff --git a/src/main/java/org/opensearch/search/asynchronous/request/GetAsynchronousSearchRequest.java b/src/main/java/org/opensearch/search/asynchronous/request/GetAsynchronousSearchRequest.java
@@ -7,8 +7,8 @@
 
 import org.opensearch.action.ActionRequestValidationException;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.common.unit.TimeValue;
 
 import java.io.IOException;

diff --git a/...main/java/org/opensearch/search/asynchronous/request/SubmitAsynchronousSearchRequest.java b/...main/java/org/opensearch/search/asynchronous/request/SubmitAsynchronousSearchRequest.java
@@ -11,10 +11,10 @@
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.common.Nullable;
 import org.opensearch.core.common.Strings;
-import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.common.unit.TimeValue;
-import org.opensearch.tasks.TaskId;
+import org.opensearch.core.tasks.TaskId;
 
 import java.io.IOException;
 import java.util.Map;

diff --git a/src/main/java/org/opensearch/search/asynchronous/response/AcknowledgedResponse.java b/src/main/java/org/opensearch/search/asynchronous/response/AcknowledgedResponse.java
@@ -5,22 +5,22 @@
 
 package org.opensearch.search.asynchronous.response;
 
-import org.opensearch.action.ActionResponse;
+import org.opensearch.core.action.ActionResponse;
 import org.opensearch.common.xcontent.StatusToXContentObject;
 import org.opensearch.core.ParseField;
-import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.xcontent.ConstructingObjectParser;
 import org.opensearch.core.xcontent.ObjectParser;
 import org.opensearch.core.xcontent.XContentBuilder;
-import org.opensearch.rest.RestStatus;
+import org.opensearch.core.rest.RestStatus;
 
 import java.io.IOException;
 import java.util.Objects;
 
 import static org.opensearch.core.xcontent.ConstructingObjectParser.constructorArg;
-import static org.opensearch.rest.RestStatus.NOT_FOUND;
-import static org.opensearch.rest.RestStatus.OK;
+import static org.opensearch.core.rest.RestStatus.NOT_FOUND;
+import static org.opensearch.core.rest.RestStatus.OK;
 
 /**
  * A response that indicates that a request has been acknowledged

diff --git a/src/main/java/org/opensearch/search/asynchronous/response/AsynchronousSearchResponse.java b/src/main/java/org/opensearch/search/asynchronous/response/AsynchronousSearchResponse.java
@@ -6,33 +6,32 @@
 package org.opensearch.search.asynchronous.response;
 
 import org.opensearch.common.xcontent.StatusToXContentObject;
-import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentHelper;
 import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.core.ParseField;
 import org.opensearch.search.asynchronous.context.state.AsynchronousSearchState;
 import org.opensearch.OpenSearchException;
 import org.opensearch.ExceptionsHelper;
-import org.opensearch.action.ActionResponse;
+import org.opensearch.core.action.ActionResponse;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.client.Requests;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
-import org.opensearch.common.bytes.BytesReference;
-import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
+import org.opensearch.core.common.bytes.BytesReference;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.MediaTypeRegistry;
 import org.opensearch.core.xcontent.XContentParser;
-import org.opensearch.rest.RestStatus;
+import org.opensearch.core.rest.RestStatus;
 
 import java.io.IOException;
 import java.util.Map;
 import java.util.Objects;
 
 import static java.util.Collections.emptyMap;
 import static org.opensearch.common.xcontent.XContentHelper.convertToMap;
-import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken;
+import static org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken;
 
 public class AsynchronousSearchResponse extends ActionResponse implements StatusToXContentObject {
 
@@ -204,7 +203,7 @@ public boolean equals(Object o) {
     private Map<String, Object> getErrorAsMap(OpenSearchException exception) throws IOException {
         if (exception != null) {
             BytesReference error;
-            try (XContentBuilder builder = XContentFactory.contentBuilder(Requests.INDEX_CONTENT_TYPE)) {
+            try (XContentBuilder builder = MediaTypeRegistry.contentBuilder(Requests.INDEX_CONTENT_TYPE)) {
                 builder.startObject();
                 OpenSearchException.generateThrowableXContent(builder, ToXContent.EMPTY_PARAMS, exception);
                 builder.endObject();
@@ -218,7 +217,8 @@ private Map<String, Object> getErrorAsMap(OpenSearchException exception) throws
 
     private Map<String, Object> getResponseAsMap(SearchResponse searchResponse) throws IOException {
         if (searchResponse != null) {
-            BytesReference response = XContentHelper.toXContent(searchResponse, Requests.INDEX_CONTENT_TYPE, true);
+            BytesReference response = org.opensearch.core.xcontent.XContentHelper.toXContent(
+                    searchResponse, Requests.INDEX_CONTENT_TYPE,true);
             if (response == null) {
                 return emptyMap();
             }

diff --git a/...ain/java/org/opensearch/search/asynchronous/response/AsynchronousSearchStatsResponse.java b/...ain/java/org/opensearch/search/asynchronous/response/AsynchronousSearchStatsResponse.java
@@ -10,9 +10,8 @@
 import org.opensearch.action.FailedNodeException;
 import org.opensearch.action.support.nodes.BaseNodesResponse;
 import org.opensearch.cluster.ClusterName;
-import org.opensearch.common.Strings;
-import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.xcontent.ToXContentObject;
 import org.opensearch.core.xcontent.XContentBuilder;
 
@@ -66,7 +65,7 @@ public String toString() {
             builder.startObject();
             toXContent(builder, EMPTY_PARAMS);
             builder.endObject();
-            return Strings.toString(builder);
+            return builder.toString();
         } catch (IOException e) {
             return "{ \"error\" : \"" + e.getMessage() + "\"}";
         }