From c50e28e709f4c2ea47e6e8e3de84d926df63a9a2 Mon Sep 17 00:00:00 2001 From: Daniel Widdis Date: Mon, 21 Aug 2023 09:49:10 -0700 Subject: [PATCH] Update imports to match OpenSearch refactoring (#928) Signed-off-by: Daniel Widdis --- src/main/java/org/opensearch/sdk/SDKClient.java | 4 ++-- src/main/java/org/opensearch/sdk/SDKTransportService.java | 2 +- .../opensearch/sdk/action/RemoteExtensionActionRequest.java | 2 +- .../opensearch/sdk/action/RemoteExtensionTransportAction.java | 2 +- src/main/java/org/opensearch/sdk/api/ActionExtension.java | 2 +- .../sdk/handlers/ExtensionActionRequestHandler.java | 4 ++-- .../org/opensearch/sdk/handlers/OpensearchRequestHandler.java | 2 +- .../opensearch/sdk/sample/helloworld/HelloWorldExtension.java | 2 +- .../sdk/sample/helloworld/rest/RestRemoteHelloAction.java | 2 +- .../sdk/sample/helloworld/transport/SampleResponse.java | 2 +- .../sample/helloworld/transport/SampleTransportAction.java | 2 +- src/test/java/org/opensearch/sdk/TestExtensionsRunner.java | 2 +- src/test/java/org/opensearch/sdk/TestSDKClient.java | 2 +- src/test/java/org/opensearch/sdk/TestSDKTransportService.java | 2 +- .../org/opensearch/sdk/action/TestProxyActionRequest.java | 2 +- .../java/org/opensearch/sdk/action/TestSDKActionModule.java | 2 +- .../sdk/sample/helloworld/TestHelloWorldExtension.java | 4 ++-- .../sdk/sample/helloworld/transport/TestSampleAction.java | 2 +- 18 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/opensearch/sdk/SDKClient.java b/src/main/java/org/opensearch/sdk/SDKClient.java index cde35678..1b1fb3b4 100644 --- a/src/main/java/org/opensearch/sdk/SDKClient.java +++ b/src/main/java/org/opensearch/sdk/SDKClient.java @@ -31,9 +31,9 @@ import org.apache.hc.core5.http.nio.ssl.TlsStrategy; import org.apache.hc.core5.reactor.ssl.TlsDetails; import org.apache.hc.core5.ssl.SSLContextBuilder; -import org.opensearch.action.ActionListener; +import org.opensearch.core.action.ActionListener; import org.opensearch.action.ActionRequest; -import org.opensearch.action.ActionResponse; +import org.opensearch.core.action.ActionResponse; import org.opensearch.action.ActionType; import org.opensearch.action.admin.cluster.health.ClusterHealthRequest; import org.opensearch.action.admin.cluster.health.ClusterHealthResponse; diff --git a/src/main/java/org/opensearch/sdk/SDKTransportService.java b/src/main/java/org/opensearch/sdk/SDKTransportService.java index ac873c73..a2650b2b 100644 --- a/src/main/java/org/opensearch/sdk/SDKTransportService.java +++ b/src/main/java/org/opensearch/sdk/SDKTransportService.java @@ -47,7 +47,7 @@ import org.opensearch.sdk.handlers.ExtensionDependencyResponseHandler; import org.opensearch.sdk.handlers.UpdateSettingsRequestHandler; import org.opensearch.sdk.rest.ExtensionRestPathRegistry; -import org.opensearch.transport.TransportResponse; +import org.opensearch.core.transport.TransportResponse; import org.opensearch.transport.TransportResponseHandler; import org.opensearch.transport.TransportService; diff --git a/src/main/java/org/opensearch/sdk/action/RemoteExtensionActionRequest.java b/src/main/java/org/opensearch/sdk/action/RemoteExtensionActionRequest.java index 85c7108f..abf53a23 100644 --- a/src/main/java/org/opensearch/sdk/action/RemoteExtensionActionRequest.java +++ b/src/main/java/org/opensearch/sdk/action/RemoteExtensionActionRequest.java @@ -14,7 +14,7 @@ import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionRequestValidationException; -import org.opensearch.action.ActionResponse; +import org.opensearch.core.action.ActionResponse; import org.opensearch.action.ActionType; import org.opensearch.core.common.bytes.BytesReference; import org.opensearch.common.io.stream.BytesStreamOutput; diff --git a/src/main/java/org/opensearch/sdk/action/RemoteExtensionTransportAction.java b/src/main/java/org/opensearch/sdk/action/RemoteExtensionTransportAction.java index fa9ce8ed..d6948dbf 100644 --- a/src/main/java/org/opensearch/sdk/action/RemoteExtensionTransportAction.java +++ b/src/main/java/org/opensearch/sdk/action/RemoteExtensionTransportAction.java @@ -9,7 +9,7 @@ package org.opensearch.sdk.action; -import org.opensearch.action.ActionListener; +import org.opensearch.core.action.ActionListener; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.TransportAction; import org.opensearch.extensions.action.RemoteExtensionActionResponse; diff --git a/src/main/java/org/opensearch/sdk/api/ActionExtension.java b/src/main/java/org/opensearch/sdk/api/ActionExtension.java index 0c807f01..cd6cb915 100644 --- a/src/main/java/org/opensearch/sdk/api/ActionExtension.java +++ b/src/main/java/org/opensearch/sdk/api/ActionExtension.java @@ -11,7 +11,7 @@ import org.opensearch.action.ActionType; import org.opensearch.action.ActionRequest; -import org.opensearch.action.ActionResponse; +import org.opensearch.core.action.ActionResponse; import org.opensearch.action.RequestValidators; import org.opensearch.action.admin.indices.alias.IndicesAliasesRequest; import org.opensearch.action.admin.indices.mapping.put.PutMappingRequest; diff --git a/src/main/java/org/opensearch/sdk/handlers/ExtensionActionRequestHandler.java b/src/main/java/org/opensearch/sdk/handlers/ExtensionActionRequestHandler.java index 54e53b2e..b3b1734d 100644 --- a/src/main/java/org/opensearch/sdk/handlers/ExtensionActionRequestHandler.java +++ b/src/main/java/org/opensearch/sdk/handlers/ExtensionActionRequestHandler.java @@ -18,9 +18,9 @@ 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.action.ActionRequest; -import org.opensearch.action.ActionResponse; +import org.opensearch.core.action.ActionResponse; import org.opensearch.action.ActionType; import org.opensearch.core.common.bytes.BytesReference; import org.opensearch.common.io.stream.BytesStreamOutput; diff --git a/src/main/java/org/opensearch/sdk/handlers/OpensearchRequestHandler.java b/src/main/java/org/opensearch/sdk/handlers/OpensearchRequestHandler.java index 53da0420..d8e6a578 100644 --- a/src/main/java/org/opensearch/sdk/handlers/OpensearchRequestHandler.java +++ b/src/main/java/org/opensearch/sdk/handlers/OpensearchRequestHandler.java @@ -11,7 +11,7 @@ import org.opensearch.extensions.OpenSearchRequest; import org.opensearch.sdk.ExtensionsRunner; -import org.opensearch.transport.TransportResponse; +import org.opensearch.core.transport.TransportResponse; /** * This class handles the request from OpenSearch to a {@link ExtensionsRunner#startTransportService(TransportService transportService)} call. diff --git a/src/main/java/org/opensearch/sdk/sample/helloworld/HelloWorldExtension.java b/src/main/java/org/opensearch/sdk/sample/helloworld/HelloWorldExtension.java index f4b8566d..5a2f04e5 100644 --- a/src/main/java/org/opensearch/sdk/sample/helloworld/HelloWorldExtension.java +++ b/src/main/java/org/opensearch/sdk/sample/helloworld/HelloWorldExtension.java @@ -14,7 +14,7 @@ import java.util.List; import org.opensearch.action.ActionRequest; -import org.opensearch.action.ActionResponse; +import org.opensearch.core.action.ActionResponse; import org.opensearch.common.settings.Setting; import org.opensearch.sdk.BaseExtension; import org.opensearch.sdk.Extension; diff --git a/src/main/java/org/opensearch/sdk/sample/helloworld/rest/RestRemoteHelloAction.java b/src/main/java/org/opensearch/sdk/sample/helloworld/rest/RestRemoteHelloAction.java index 7bda7ff1..43aee0a6 100644 --- a/src/main/java/org/opensearch/sdk/sample/helloworld/rest/RestRemoteHelloAction.java +++ b/src/main/java/org/opensearch/sdk/sample/helloworld/rest/RestRemoteHelloAction.java @@ -9,7 +9,7 @@ package org.opensearch.sdk.sample.helloworld.rest; -import org.opensearch.action.ActionListener; +import org.opensearch.core.action.ActionListener; import org.opensearch.core.common.io.stream.StreamInput; import org.opensearch.extensions.ExtensionsManager; import org.opensearch.extensions.action.RemoteExtensionActionResponse; diff --git a/src/main/java/org/opensearch/sdk/sample/helloworld/transport/SampleResponse.java b/src/main/java/org/opensearch/sdk/sample/helloworld/transport/SampleResponse.java index 8d3f9b1e..f6be89f1 100644 --- a/src/main/java/org/opensearch/sdk/sample/helloworld/transport/SampleResponse.java +++ b/src/main/java/org/opensearch/sdk/sample/helloworld/transport/SampleResponse.java @@ -11,7 +11,7 @@ import java.io.IOException; -import org.opensearch.action.ActionResponse; +import org.opensearch.core.action.ActionResponse; import org.opensearch.core.common.io.stream.StreamInput; import org.opensearch.core.common.io.stream.StreamOutput; diff --git a/src/main/java/org/opensearch/sdk/sample/helloworld/transport/SampleTransportAction.java b/src/main/java/org/opensearch/sdk/sample/helloworld/transport/SampleTransportAction.java index 2c80f1cf..894dd3c6 100644 --- a/src/main/java/org/opensearch/sdk/sample/helloworld/transport/SampleTransportAction.java +++ b/src/main/java/org/opensearch/sdk/sample/helloworld/transport/SampleTransportAction.java @@ -9,7 +9,7 @@ package org.opensearch.sdk.sample.helloworld.transport; -import org.opensearch.action.ActionListener; +import org.opensearch.core.action.ActionListener; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.TransportAction; import org.opensearch.tasks.Task; diff --git a/src/test/java/org/opensearch/sdk/TestExtensionsRunner.java b/src/test/java/org/opensearch/sdk/TestExtensionsRunner.java index 335b9044..04a7582c 100644 --- a/src/test/java/org/opensearch/sdk/TestExtensionsRunner.java +++ b/src/test/java/org/opensearch/sdk/TestExtensionsRunner.java @@ -37,7 +37,7 @@ import org.opensearch.core.common.bytes.BytesArray; import org.opensearch.common.settings.Settings; import org.opensearch.common.settings.Setting.Property; -import org.opensearch.common.transport.TransportAddress; +import org.opensearch.core.common.transport.TransportAddress; import org.opensearch.discovery.InitializeExtensionRequest; import org.opensearch.discovery.InitializeExtensionResponse; import org.opensearch.extensions.DiscoveryExtensionNode; diff --git a/src/test/java/org/opensearch/sdk/TestSDKClient.java b/src/test/java/org/opensearch/sdk/TestSDKClient.java index 0be408f6..778a9b40 100644 --- a/src/test/java/org/opensearch/sdk/TestSDKClient.java +++ b/src/test/java/org/opensearch/sdk/TestSDKClient.java @@ -10,7 +10,7 @@ package org.opensearch.sdk; import org.junit.jupiter.api.Test; -import org.opensearch.action.ActionListener; +import org.opensearch.core.action.ActionListener; import org.opensearch.action.admin.cluster.health.ClusterHealthRequest; import org.opensearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest; import org.opensearch.action.admin.indices.alias.get.GetAliasesRequest; diff --git a/src/test/java/org/opensearch/sdk/TestSDKTransportService.java b/src/test/java/org/opensearch/sdk/TestSDKTransportService.java index 60a1bc2a..bb2bea42 100644 --- a/src/test/java/org/opensearch/sdk/TestSDKTransportService.java +++ b/src/test/java/org/opensearch/sdk/TestSDKTransportService.java @@ -15,7 +15,7 @@ import org.opensearch.Version; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.settings.Settings; -import org.opensearch.common.transport.TransportAddress; +import org.opensearch.core.common.transport.TransportAddress; import org.opensearch.extensions.ExtensionsManager; import org.opensearch.extensions.action.RegisterTransportActionsRequest; import org.opensearch.sdk.action.RemoteExtensionAction; diff --git a/src/test/java/org/opensearch/sdk/action/TestProxyActionRequest.java b/src/test/java/org/opensearch/sdk/action/TestProxyActionRequest.java index d57ebd51..83595530 100644 --- a/src/test/java/org/opensearch/sdk/action/TestProxyActionRequest.java +++ b/src/test/java/org/opensearch/sdk/action/TestProxyActionRequest.java @@ -19,7 +19,7 @@ import org.junit.jupiter.api.Test; import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionRequestValidationException; -import org.opensearch.action.ActionResponse; +import org.opensearch.core.action.ActionResponse; import org.opensearch.action.ActionType; import org.opensearch.core.common.bytes.BytesReference; import org.opensearch.core.common.io.stream.BytesStreamInput; diff --git a/src/test/java/org/opensearch/sdk/action/TestSDKActionModule.java b/src/test/java/org/opensearch/sdk/action/TestSDKActionModule.java index 714db721..0acf0f08 100644 --- a/src/test/java/org/opensearch/sdk/action/TestSDKActionModule.java +++ b/src/test/java/org/opensearch/sdk/action/TestSDKActionModule.java @@ -12,7 +12,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.opensearch.action.ActionRequest; -import org.opensearch.action.ActionResponse; +import org.opensearch.core.action.ActionResponse; import org.opensearch.action.ActionType; import org.opensearch.sdk.api.ActionExtension; import org.opensearch.sdk.BaseExtension; diff --git a/src/test/java/org/opensearch/sdk/sample/helloworld/TestHelloWorldExtension.java b/src/test/java/org/opensearch/sdk/sample/helloworld/TestHelloWorldExtension.java index 451de7be..2bcf0d2a 100644 --- a/src/test/java/org/opensearch/sdk/sample/helloworld/TestHelloWorldExtension.java +++ b/src/test/java/org/opensearch/sdk/sample/helloworld/TestHelloWorldExtension.java @@ -20,9 +20,9 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opensearch.action.ActionListener; +import org.opensearch.core.action.ActionListener; import org.opensearch.action.ActionRequest; -import org.opensearch.action.ActionResponse; +import org.opensearch.core.action.ActionResponse; import org.opensearch.action.ActionType; import org.opensearch.action.support.TransportAction; import org.opensearch.client.Node; diff --git a/src/test/java/org/opensearch/sdk/sample/helloworld/transport/TestSampleAction.java b/src/test/java/org/opensearch/sdk/sample/helloworld/transport/TestSampleAction.java index b756d79e..3b322fbb 100644 --- a/src/test/java/org/opensearch/sdk/sample/helloworld/transport/TestSampleAction.java +++ b/src/test/java/org/opensearch/sdk/sample/helloworld/transport/TestSampleAction.java @@ -19,7 +19,7 @@ import org.opensearch.core.common.bytes.BytesReference; import org.opensearch.core.common.io.stream.BytesStreamInput; import org.opensearch.common.io.stream.BytesStreamOutput; -import org.opensearch.action.ActionListener; +import org.opensearch.core.action.ActionListener; import org.opensearch.action.support.ActionFilters; import org.opensearch.test.OpenSearchTestCase;