refactoring

Signed-off-by: Bharathwaj G <[email protected]>

src/main/java/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;

src/main/java/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;

src/main/java/org/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;
 

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;
 

src/main/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;

src/main/java/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;

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> {
 

src/main/java/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;

src/main/java/org/opensearch/search/asynchronous/plugin/AsynchronousSearchPlugin.java

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

src/main/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;

src/main/java/org/opensearch/search/asynchronous/request/SubmitAsynchronousSearchRequest.java

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

src/main/java/org/opensearch/search/asynchronous/response/AcknowledgedResponse.java

@@ -5,7 +5,7 @@
 
 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.core.common.io.stream.StreamInput;

src/main/java/org/opensearch/search/asynchronous/response/AsynchronousSearchResponse.java

@@ -6,13 +6,12 @@
 package org.opensearch.search.asynchronous.response;
 
 import org.opensearch.common.xcontent.StatusToXContentObject;
-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;
@@ -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();
  }

src/main/java/org/opensearch/search/asynchronous/service/AsynchronousSearchPersistenceService.java

@@ -16,7 +16,7 @@
 import org.opensearch.ExceptionsHelper;
 import org.opensearch.ResourceAlreadyExistsException;
 import org.opensearch.ResourceNotFoundException;
-import org.opensearch.action.ActionListener;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.action.DocWriteResponse;
 import org.opensearch.action.bulk.BackoffPolicy;
 import org.opensearch.action.delete.DeleteRequest;

src/main/java/org/opensearch/search/asynchronous/service/AsynchronousSearchService.java

@@ -12,7 +12,7 @@
 import org.opensearch.OpenSearchSecurityException;
 import org.opensearch.OpenSearchTimeoutException;
 import org.opensearch.ResourceNotFoundException;
-import org.opensearch.action.ActionListener;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.action.admin.cluster.node.tasks.cancel.CancelTasksRequest;
 import org.opensearch.action.admin.cluster.node.tasks.cancel.CancelTasksResponse;
 import org.opensearch.action.search.SearchAction;
@@ -58,7 +58,7 @@
 import org.opensearch.search.asynchronous.stats.AsynchronousSearchStats;
 import org.opensearch.search.asynchronous.stats.InternalAsynchronousSearchStats;
 import org.opensearch.search.asynchronous.utils.AsynchronousSearchExceptionUtils;
-import org.opensearch.tasks.TaskId;
+import org.opensearch.core.tasks.TaskId;
 import org.opensearch.threadpool.ThreadPool;
 
 import java.util.Collections;
@@ -75,8 +75,8 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import static org.opensearch.action.ActionListener.runAfter;
-import static org.opensearch.action.ActionListener.wrap;
+import static org.opensearch.core.action.ActionListener.runAfter;
+import static org.opensearch.core.action.ActionListener.wrap;
 import static org.opensearch.search.asynchronous.context.state.AsynchronousSearchState.CLOSED;
 import static org.opensearch.search.asynchronous.context.state.AsynchronousSearchState.FAILED;
 import static org.opensearch.search.asynchronous.context.state.AsynchronousSearchState.INIT;

src/main/java/org/opensearch/search/asynchronous/task/AsynchronousSearchTask.java

@@ -12,7 +12,7 @@
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.search.SearchTask;
 import org.opensearch.core.common.Strings;
-import org.opensearch.tasks.TaskId;
+import org.opensearch.core.tasks.TaskId;
 
 import java.util.Map;
 import java.util.Objects;

src/main/java/org/opensearch/search/asynchronous/task/SubmitAsynchronousSearchTask.java

@@ -7,7 +7,7 @@
 
 import org.opensearch.search.asynchronous.request.SubmitAsynchronousSearchRequest;
 import org.opensearch.tasks.CancellableTask;
-import org.opensearch.tasks.TaskId;
+import org.opensearch.core.tasks.TaskId;
 
 import java.util.Map;
 

src/main/java/org/opensearch/search/asynchronous/transport/TransportAsynchronousSearchRoutingAction.java

@@ -15,9 +15,9 @@
 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.ActionListenerResponseHandler;
-import org.opensearch.action.ActionResponse;
+import org.opensearch.core.action.ActionResponse;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
 import org.opensearch.client.Client;

src/main/java/org/opensearch/search/asynchronous/transport/TransportDeleteAsynchronousSearchAction.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.support.ActionFilters;
 import org.opensearch.client.Client;
 import org.opensearch.cluster.service.ClusterService;

src/main/java/org/opensearch/search/asynchronous/transport/TransportGetAsynchronousSearchAction.java

@@ -18,7 +18,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.support.ActionFilters;
 import org.opensearch.client.Client;
 import org.opensearch.cluster.service.ClusterService;

src/main/java/org/opensearch/search/asynchronous/transport/TransportSubmitAsynchronousSearchAction.java

@@ -21,7 +21,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.search.SearchRequest;
 import org.opensearch.action.search.SearchTask;
 import org.opensearch.action.search.TransportSearchAction;
@@ -31,7 +31,7 @@
 import org.opensearch.common.inject.Inject;
 import org.opensearch.search.SearchService;
 import org.opensearch.tasks.Task;
-import org.opensearch.tasks.TaskId;
+import org.opensearch.core.tasks.TaskId;
 import org.opensearch.threadpool.ThreadPool;
 import org.opensearch.transport.TransportService;
 

src/test/java/org/opensearch/search/asynchronous/commons/AsynchronousSearchIntegTestCase.java

@@ -28,7 +28,7 @@
 import org.opensearch.plugins.PluginsService;
 import org.opensearch.script.MockScriptPlugin;
 import org.opensearch.search.lookup.LeafFieldsLookup;
-import org.opensearch.tasks.TaskId;
+import org.opensearch.core.tasks.TaskId;
 import org.opensearch.test.OpenSearchIntegTestCase;
 
 import java.util.ArrayList;

src/test/java/org/opensearch/search/asynchronous/commons/AsynchronousSearchSingleNodeTestCase.java

@@ -22,8 +22,8 @@
 import org.apache.lucene.search.TotalHits;
 import org.junit.After;
 import org.junit.Before;
-import org.opensearch.action.ActionFuture;
-import org.opensearch.action.ActionListener;
+import org.opensearch.common.action.ActionFuture;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.action.get.GetRequest;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.search.ShardSearchFailure;

src/test/java/org/opensearch/search/asynchronous/context/active/AsynchronousSearchActiveContextTests.java

@@ -29,7 +29,7 @@
 import org.opensearch.search.internal.InternalSearchResponse;
 import org.opensearch.search.profile.SearchProfileShardResults;
 import org.opensearch.search.suggest.Suggest;
-import org.opensearch.tasks.TaskId;
+import org.opensearch.core.tasks.TaskId;
 import org.opensearch.threadpool.ScalingExecutorBuilder;
 import org.opensearch.threadpool.TestThreadPool;
 import org.opensearch.threadpool.ThreadPool;

src/test/java/org/opensearch/search/asynchronous/context/permits/AsynchronousSearchContextPermitsTests.java

@@ -7,7 +7,7 @@
 
 import org.opensearch.search.asynchronous.context.AsynchronousSearchContextId;
 import org.opensearch.search.asynchronous.plugin.AsynchronousSearchPlugin;
-import org.opensearch.action.ActionListener;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.action.LatchedActionListener;
 import org.opensearch.action.support.PlainActionFuture;
 import org.opensearch.common.CheckedRunnable;

src/test/java/org/opensearch/search/asynchronous/context/permits/NoopAsynchronousSearchContextPermitsTests.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.action.LatchedActionListener;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.test.OpenSearchTestCase;

src/test/java/org/opensearch/search/asynchronous/integTests/AsynchronousSearchRejectionIT.java

@@ -19,7 +19,7 @@
 import org.opensearch.OpenSearchTimeoutException;
 import org.opensearch.ExceptionsHelper;
 import org.opensearch.ResourceNotFoundException;
-import org.opensearch.action.ActionListener;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.action.LatchedActionListener;
 import org.opensearch.action.search.SearchAction;
 import org.opensearch.action.search.SearchPhaseExecutionException;
@@ -34,7 +34,7 @@
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.search.SearchService;
 import org.opensearch.search.aggregations.InternalAggregation;
-import org.opensearch.tasks.TaskId;
+import org.opensearch.core.tasks.TaskId;
 import org.opensearch.test.OpenSearchIntegTestCase;
 import org.opensearch.test.junit.annotations.TestLogging;
 import org.opensearch.threadpool.TestThreadPool;

src/test/java/org/opensearch/search/asynchronous/integTests/AsynchronousSearchTaskCancellationIT.java

@@ -11,7 +11,7 @@
 import org.opensearch.search.asynchronous.plugin.AsynchronousSearchPlugin;
 import org.opensearch.search.asynchronous.request.SubmitAsynchronousSearchRequest;
 import org.opensearch.search.asynchronous.response.AsynchronousSearchResponse;
-import org.opensearch.action.ActionListener;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.action.admin.cluster.node.tasks.cancel.CancelTasksResponse;
 import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksResponse;
 import org.opensearch.action.bulk.BulkRequestBuilder;

src/test/java/org/opensearch/search/asynchronous/integTests/DeleteAsynchronousSearchSingleNodeIT.java

@@ -11,7 +11,7 @@
 import org.opensearch.search.asynchronous.response.AcknowledgedResponse;
 import org.opensearch.search.asynchronous.response.AsynchronousSearchResponse;
 import org.opensearch.ResourceNotFoundException;
-import org.opensearch.action.ActionListener;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.action.LatchedActionListener;
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.common.TriConsumer;

src/test/java/org/opensearch/search/asynchronous/integTests/GetAsynchronousSearchSingleNodeIT.java

@@ -14,7 +14,7 @@
 import org.opensearch.search.asynchronous.utils.QuadConsumer;
 import org.opensearch.OpenSearchTimeoutException;
 import org.opensearch.ResourceNotFoundException;
-import org.opensearch.action.ActionListener;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.action.LatchedActionListener;
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.common.TriConsumer;

src/test/java/org/opensearch/search/asynchronous/integTests/MixedOperationSingleNodeIT.java

@@ -14,7 +14,7 @@
 import org.opensearch.search.asynchronous.utils.QuadConsumer;
 import org.opensearch.OpenSearchTimeoutException;
 import org.opensearch.ResourceNotFoundException;
-import org.opensearch.action.ActionListener;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.action.LatchedActionListener;
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.common.unit.TimeValue;

src/test/java/org/opensearch/search/asynchronous/integTests/SubmitAsynchronousSearchSingleNodeIT.java

@@ -15,7 +15,7 @@
 import org.opensearch.search.asynchronous.response.AsynchronousSearchResponse;
 import org.opensearch.search.asynchronous.service.AsynchronousSearchService;
 import org.opensearch.search.asynchronous.utils.AsynchronousSearchAssertions;
-import org.opensearch.action.ActionListener;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.action.LatchedActionListener;
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.search.SearchResponse;

src/test/java/org/opensearch/search/asynchronous/listener/AsynchronousSearchCancellationIT.java

@@ -24,7 +24,7 @@
 import org.opensearch.script.ScriptType;
 import org.opensearch.search.SearchService;
 import org.opensearch.search.aggregations.InternalAggregation;
-import org.opensearch.tasks.TaskId;
+import org.opensearch.core.tasks.TaskId;
 import org.opensearch.tasks.TaskInfo;
 import org.opensearch.test.OpenSearchIntegTestCase;
 import org.opensearch.threadpool.TestThreadPool;

src/test/java/org/opensearch/search/asynchronous/listener/AsynchronousSearchPartialResponseIT.java

@@ -21,7 +21,7 @@
 import org.opensearch.search.aggregations.InternalAggregation;
 import org.opensearch.search.aggregations.InternalAggregations;
 import org.opensearch.search.aggregations.bucket.terms.Terms;
-import org.opensearch.tasks.TaskId;
+import org.opensearch.core.tasks.TaskId;
 import org.opensearch.test.OpenSearchIntegTestCase;
 import org.opensearch.threadpool.TestThreadPool;
 import org.opensearch.threadpool.ThreadPool;

src/test/java/org/opensearch/search/asynchronous/listener/AsynchronousSearchProgressListenerIT.java

@@ -23,7 +23,7 @@
 import org.opensearch.search.builder.SearchSourceBuilder;
 import org.opensearch.search.sort.FieldSortBuilder;
 import org.opensearch.search.sort.SortOrder;
-import org.opensearch.tasks.TaskId;
+import org.opensearch.core.tasks.TaskId;
 import org.opensearch.test.OpenSearchSingleNodeTestCase;
 import org.opensearch.threadpool.TestThreadPool;
 import org.opensearch.threadpool.ThreadPool;

src/test/java/org/opensearch/search/asynchronous/listener/AsynchronousSearchTimeoutWrapperTests.java

@@ -6,7 +6,7 @@
 package org.opensearch.search.asynchronous.listener;
 
 import org.opensearch.search.asynchronous.plugin.AsynchronousSearchPlugin;
-import org.opensearch.action.ActionListener;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.cluster.coordination.DeterministicTaskQueue;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.TimeValue;