From 8f0fa19dea378982ae12260fee4030fd850543ad Mon Sep 17 00:00:00 2001 From: Joshua Palis Date: Wed, 12 Jul 2023 15:42:46 -0700 Subject: [PATCH] Fixing imports (#880) Signed-off-by: Joshua Palis --- src/main/java/org/opensearch/sdk/Extension.java | 2 +- src/main/java/org/opensearch/sdk/ExtensionsRunner.java | 2 +- .../org/opensearch/sdk/SDKNamedWriteableRegistry.java | 4 ++-- .../sdk/action/RemoteExtensionActionRequest.java | 6 +++--- .../java/org/opensearch/sdk/api/SearchExtension.java | 6 +++--- .../sdk/handlers/AcknowledgedResponseHandler.java | 2 +- .../sdk/handlers/ClusterSettingsResponseHandler.java | 2 +- .../sdk/handlers/ClusterStateResponseHandler.java | 2 +- .../handlers/EnvironmentSettingsResponseHandler.java | 2 +- .../sdk/handlers/ExtensionActionRequestHandler.java | 4 ++-- .../sdk/handlers/ExtensionActionResponseHandler.java | 2 +- .../handlers/ExtensionDependencyResponseHandler.java | 2 +- .../sdk/handlers/ExtensionsRestRequestHandler.java | 4 ++-- .../opensearch/sdk/rest/BaseExtensionRestHandler.java | 6 +++--- .../java/org/opensearch/sdk/rest/SDKHttpRequest.java | 4 ++-- .../sdk/sample/helloworld/rest/RestHelloAction.java | 8 ++++---- .../sample/helloworld/rest/RestRemoteHelloAction.java | 4 ++-- .../sdk/sample/helloworld/transport/SampleRequest.java | 4 ++-- .../sample/helloworld/transport/SampleResponse.java | 4 ++-- .../java/org/opensearch/sdk/ssl/SSLNettyTransport.java | 2 +- .../java/org/opensearch/sdk/ssl/SecureSSLSettings.java | 2 +- .../java/org/opensearch/sdk/TestExtensionsRunner.java | 4 ++-- .../opensearch/sdk/TestSDKNamedWriteableRegistry.java | 10 +++++----- .../opensearch/sdk/TestSDKNamedXContentRegistry.java | 4 ++-- .../opensearch/sdk/action/TestProxyActionRequest.java | 8 ++++---- .../sdk/integTest/TransportCommunicationIT.java | 6 +++++- .../sdk/rest/TestBaseExtensionRestHandler.java | 4 ++-- .../org/opensearch/sdk/rest/TestNamedRouteHandler.java | 2 +- .../org/opensearch/sdk/rest/TestSDKRestRequest.java | 4 ++-- .../sample/helloworld/rest/TestRestHelloAction.java | 6 +++--- .../sample/helloworld/transport/TestSampleAction.java | 4 ++-- 31 files changed, 65 insertions(+), 61 deletions(-) diff --git a/src/main/java/org/opensearch/sdk/Extension.java b/src/main/java/org/opensearch/sdk/Extension.java index cd440aed..669930b0 100644 --- a/src/main/java/org/opensearch/sdk/Extension.java +++ b/src/main/java/org/opensearch/sdk/Extension.java @@ -13,7 +13,7 @@ import java.util.Collection; import java.util.List; -import org.opensearch.common.io.stream.NamedWriteableRegistry; +import org.opensearch.core.common.io.stream.NamedWriteableRegistry; import org.opensearch.common.settings.Setting; import org.opensearch.core.xcontent.NamedXContentRegistry; import org.opensearch.threadpool.ExecutorBuilder; diff --git a/src/main/java/org/opensearch/sdk/ExtensionsRunner.java b/src/main/java/org/opensearch/sdk/ExtensionsRunner.java index 4c6f281f..8cdf91b5 100644 --- a/src/main/java/org/opensearch/sdk/ExtensionsRunner.java +++ b/src/main/java/org/opensearch/sdk/ExtensionsRunner.java @@ -18,7 +18,7 @@ import org.opensearch.action.ActionType; import org.opensearch.action.support.TransportAction; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; -import org.opensearch.common.io.stream.NamedWriteableRegistry; +import org.opensearch.core.common.io.stream.NamedWriteableRegistry; import org.opensearch.extensions.rest.ExtensionRestRequest; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; diff --git a/src/main/java/org/opensearch/sdk/SDKNamedWriteableRegistry.java b/src/main/java/org/opensearch/sdk/SDKNamedWriteableRegistry.java index 3529fab8..50d1e4b2 100644 --- a/src/main/java/org/opensearch/sdk/SDKNamedWriteableRegistry.java +++ b/src/main/java/org/opensearch/sdk/SDKNamedWriteableRegistry.java @@ -10,8 +10,8 @@ package org.opensearch.sdk; import org.opensearch.cluster.ClusterModule; -import org.opensearch.common.io.stream.NamedWriteableRegistry; -import org.opensearch.common.io.stream.NamedWriteableRegistry.Entry; +import org.opensearch.core.common.io.stream.NamedWriteableRegistry; +import org.opensearch.core.common.io.stream.NamedWriteableRegistry.Entry; import org.opensearch.common.network.NetworkModule; import org.opensearch.common.settings.Settings; import org.opensearch.indices.IndicesModule; diff --git a/src/main/java/org/opensearch/sdk/action/RemoteExtensionActionRequest.java b/src/main/java/org/opensearch/sdk/action/RemoteExtensionActionRequest.java index b3242b4e..85c7108f 100644 --- a/src/main/java/org/opensearch/sdk/action/RemoteExtensionActionRequest.java +++ b/src/main/java/org/opensearch/sdk/action/RemoteExtensionActionRequest.java @@ -16,10 +16,10 @@ import org.opensearch.action.ActionRequestValidationException; import org.opensearch.action.ActionResponse; import org.opensearch.action.ActionType; -import org.opensearch.common.bytes.BytesReference; +import org.opensearch.core.common.bytes.BytesReference; import org.opensearch.common.io.stream.BytesStreamOutput; -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.extensions.action.ExtensionTransportActionsHandler; /** diff --git a/src/main/java/org/opensearch/sdk/api/SearchExtension.java b/src/main/java/org/opensearch/sdk/api/SearchExtension.java index 6249531c..2cc882ea 100644 --- a/src/main/java/org/opensearch/sdk/api/SearchExtension.java +++ b/src/main/java/org/opensearch/sdk/api/SearchExtension.java @@ -13,9 +13,9 @@ import org.apache.lucene.search.Sort; import org.opensearch.common.CheckedFunction; import org.opensearch.core.ParseField; -import org.opensearch.common.io.stream.NamedWriteable; -import org.opensearch.common.io.stream.StreamInput; -import org.opensearch.common.io.stream.Writeable; +import org.opensearch.core.common.io.stream.NamedWriteable; +import org.opensearch.core.common.io.stream.StreamInput; +import org.opensearch.core.common.io.stream.Writeable; import org.opensearch.common.lucene.search.function.ScoreFunction; import org.opensearch.core.xcontent.ContextParser; import org.opensearch.core.xcontent.XContent; diff --git a/src/main/java/org/opensearch/sdk/handlers/AcknowledgedResponseHandler.java b/src/main/java/org/opensearch/sdk/handlers/AcknowledgedResponseHandler.java index 085e39ca..3cc02c87 100644 --- a/src/main/java/org/opensearch/sdk/handlers/AcknowledgedResponseHandler.java +++ b/src/main/java/org/opensearch/sdk/handlers/AcknowledgedResponseHandler.java @@ -11,7 +11,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.common.io.stream.StreamInput; +import org.opensearch.core.common.io.stream.StreamInput; import org.opensearch.extensions.AcknowledgedResponse; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportException; diff --git a/src/main/java/org/opensearch/sdk/handlers/ClusterSettingsResponseHandler.java b/src/main/java/org/opensearch/sdk/handlers/ClusterSettingsResponseHandler.java index 2377a719..bf390f91 100644 --- a/src/main/java/org/opensearch/sdk/handlers/ClusterSettingsResponseHandler.java +++ b/src/main/java/org/opensearch/sdk/handlers/ClusterSettingsResponseHandler.java @@ -12,7 +12,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.cluster.ClusterSettingsResponse; -import org.opensearch.common.io.stream.StreamInput; +import org.opensearch.core.common.io.stream.StreamInput; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportException; import org.opensearch.transport.TransportResponseHandler; diff --git a/src/main/java/org/opensearch/sdk/handlers/ClusterStateResponseHandler.java b/src/main/java/org/opensearch/sdk/handlers/ClusterStateResponseHandler.java index 442ab81d..237adfc4 100644 --- a/src/main/java/org/opensearch/sdk/handlers/ClusterStateResponseHandler.java +++ b/src/main/java/org/opensearch/sdk/handlers/ClusterStateResponseHandler.java @@ -13,7 +13,7 @@ import org.apache.logging.log4j.Logger; import org.opensearch.action.admin.cluster.state.ClusterStateResponse; import org.opensearch.cluster.ClusterState; -import org.opensearch.common.io.stream.StreamInput; +import org.opensearch.core.common.io.stream.StreamInput; import org.opensearch.extensions.ExtensionsManager; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportException; diff --git a/src/main/java/org/opensearch/sdk/handlers/EnvironmentSettingsResponseHandler.java b/src/main/java/org/opensearch/sdk/handlers/EnvironmentSettingsResponseHandler.java index a70e4c0a..99a7be25 100644 --- a/src/main/java/org/opensearch/sdk/handlers/EnvironmentSettingsResponseHandler.java +++ b/src/main/java/org/opensearch/sdk/handlers/EnvironmentSettingsResponseHandler.java @@ -13,7 +13,7 @@ import org.apache.logging.log4j.Logger; import org.opensearch.env.EnvironmentSettingsResponse; import org.opensearch.extensions.ExtensionsManager; -import org.opensearch.common.io.stream.StreamInput; +import org.opensearch.core.common.io.stream.StreamInput; import org.opensearch.common.settings.Settings; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportException; diff --git a/src/main/java/org/opensearch/sdk/handlers/ExtensionActionRequestHandler.java b/src/main/java/org/opensearch/sdk/handlers/ExtensionActionRequestHandler.java index 4c0f8657..54e53b2e 100644 --- a/src/main/java/org/opensearch/sdk/handlers/ExtensionActionRequestHandler.java +++ b/src/main/java/org/opensearch/sdk/handlers/ExtensionActionRequestHandler.java @@ -22,9 +22,9 @@ import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionResponse; import org.opensearch.action.ActionType; -import org.opensearch.common.bytes.BytesReference; +import org.opensearch.core.common.bytes.BytesReference; import org.opensearch.common.io.stream.BytesStreamOutput; -import org.opensearch.common.io.stream.StreamInput; +import org.opensearch.core.common.io.stream.StreamInput; import org.opensearch.extensions.ExtensionsManager; import org.opensearch.extensions.action.ExtensionActionRequest; import org.opensearch.extensions.action.ExtensionActionResponse; diff --git a/src/main/java/org/opensearch/sdk/handlers/ExtensionActionResponseHandler.java b/src/main/java/org/opensearch/sdk/handlers/ExtensionActionResponseHandler.java index 0932f105..b20a0e36 100644 --- a/src/main/java/org/opensearch/sdk/handlers/ExtensionActionResponseHandler.java +++ b/src/main/java/org/opensearch/sdk/handlers/ExtensionActionResponseHandler.java @@ -14,7 +14,7 @@ import org.opensearch.extensions.ExtensionsManager; import org.opensearch.extensions.action.RemoteExtensionActionResponse; import org.opensearch.sdk.SDKTransportService; -import org.opensearch.common.io.stream.StreamInput; +import org.opensearch.core.common.io.stream.StreamInput; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportException; import org.opensearch.transport.TransportResponseHandler; diff --git a/src/main/java/org/opensearch/sdk/handlers/ExtensionDependencyResponseHandler.java b/src/main/java/org/opensearch/sdk/handlers/ExtensionDependencyResponseHandler.java index 38de3eb6..35d98890 100644 --- a/src/main/java/org/opensearch/sdk/handlers/ExtensionDependencyResponseHandler.java +++ b/src/main/java/org/opensearch/sdk/handlers/ExtensionDependencyResponseHandler.java @@ -16,7 +16,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.common.io.stream.StreamInput; +import org.opensearch.core.common.io.stream.StreamInput; import org.opensearch.extensions.DiscoveryExtensionNode; import org.opensearch.extensions.ExtensionDependencyResponse; import org.opensearch.extensions.ExtensionsManager; diff --git a/src/main/java/org/opensearch/sdk/handlers/ExtensionsRestRequestHandler.java b/src/main/java/org/opensearch/sdk/handlers/ExtensionsRestRequestHandler.java index 30f9acfa..88f60b56 100644 --- a/src/main/java/org/opensearch/sdk/handlers/ExtensionsRestRequestHandler.java +++ b/src/main/java/org/opensearch/sdk/handlers/ExtensionsRestRequestHandler.java @@ -11,7 +11,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.common.bytes.BytesReference; +import org.opensearch.core.common.bytes.BytesReference; import org.opensearch.extensions.rest.ExtensionRestRequest; import org.opensearch.extensions.rest.ExtensionRestResponse; import org.opensearch.extensions.rest.RestExecuteOnExtensionResponse; @@ -26,7 +26,7 @@ import static java.util.Collections.emptyMap; import static java.util.Collections.emptyList; import static org.opensearch.rest.BytesRestResponse.TEXT_CONTENT_TYPE; -import static org.opensearch.rest.RestStatus.NOT_FOUND; +import static org.opensearch.core.rest.RestStatus.NOT_FOUND; /** * This class handles the request from OpenSearch to a {@link ExtensionsRunner#startTransportService(TransportService transportService)} call. diff --git a/src/main/java/org/opensearch/sdk/rest/BaseExtensionRestHandler.java b/src/main/java/org/opensearch/sdk/rest/BaseExtensionRestHandler.java index d4067011..dc39eab2 100644 --- a/src/main/java/org/opensearch/sdk/rest/BaseExtensionRestHandler.java +++ b/src/main/java/org/opensearch/sdk/rest/BaseExtensionRestHandler.java @@ -15,8 +15,8 @@ import java.util.Optional; import java.util.Set; -import static org.opensearch.rest.RestStatus.INTERNAL_SERVER_ERROR; -import static org.opensearch.rest.RestStatus.NOT_FOUND; +import static org.opensearch.core.rest.RestStatus.INTERNAL_SERVER_ERROR; +import static org.opensearch.core.rest.RestStatus.NOT_FOUND; import java.io.IOException; import java.util.Objects; @@ -37,7 +37,7 @@ import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestRequest.Method; import org.opensearch.rest.RestResponse; -import org.opensearch.rest.RestStatus; +import org.opensearch.core.rest.RestStatus; /** * Provides convenience methods to reduce boilerplate code in an {@link ExtensionRestHandler} implementation. diff --git a/src/main/java/org/opensearch/sdk/rest/SDKHttpRequest.java b/src/main/java/org/opensearch/sdk/rest/SDKHttpRequest.java index 46c8973f..3fc3a43d 100644 --- a/src/main/java/org/opensearch/sdk/rest/SDKHttpRequest.java +++ b/src/main/java/org/opensearch/sdk/rest/SDKHttpRequest.java @@ -9,12 +9,12 @@ package org.opensearch.sdk.rest; -import org.opensearch.common.bytes.BytesReference; +import org.opensearch.core.common.bytes.BytesReference; import org.opensearch.extensions.rest.ExtensionRestRequest; import org.opensearch.http.HttpRequest; import org.opensearch.http.HttpResponse; import org.opensearch.rest.RestRequest; -import org.opensearch.rest.RestStatus; +import org.opensearch.core.rest.RestStatus; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/opensearch/sdk/sample/helloworld/rest/RestHelloAction.java b/src/main/java/org/opensearch/sdk/sample/helloworld/rest/RestHelloAction.java index b2d9df0b..46722bc5 100644 --- a/src/main/java/org/opensearch/sdk/sample/helloworld/rest/RestHelloAction.java +++ b/src/main/java/org/opensearch/sdk/sample/helloworld/rest/RestHelloAction.java @@ -10,7 +10,7 @@ package org.opensearch.sdk.sample.helloworld.rest; import org.opensearch.OpenSearchParseException; -import org.opensearch.common.bytes.BytesReference; +import org.opensearch.core.common.bytes.BytesReference; import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; @@ -36,9 +36,9 @@ import static org.opensearch.rest.RestRequest.Method.GET; import static org.opensearch.rest.RestRequest.Method.POST; import static org.opensearch.rest.RestRequest.Method.PUT; -import static org.opensearch.rest.RestStatus.BAD_REQUEST; -import static org.opensearch.rest.RestStatus.NOT_ACCEPTABLE; -import static org.opensearch.rest.RestStatus.OK; +import static org.opensearch.core.rest.RestStatus.BAD_REQUEST; +import static org.opensearch.core.rest.RestStatus.NOT_ACCEPTABLE; +import static org.opensearch.core.rest.RestStatus.OK; /** * Sample REST Handler (REST Action). 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 ac69e08f..7bda7ff1 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 @@ -10,7 +10,7 @@ package org.opensearch.sdk.sample.helloworld.rest; import org.opensearch.action.ActionListener; -import org.opensearch.common.io.stream.StreamInput; +import org.opensearch.core.common.io.stream.StreamInput; import org.opensearch.extensions.ExtensionsManager; import org.opensearch.extensions.action.RemoteExtensionActionResponse; import org.opensearch.extensions.rest.ExtensionRestResponse; @@ -33,7 +33,7 @@ import java.util.function.Function; import static org.opensearch.rest.RestRequest.Method.GET; -import static org.opensearch.rest.RestStatus.OK; +import static org.opensearch.core.rest.RestStatus.OK; /** * Sample REST Handler demonstrating proxy actions to another extension diff --git a/src/main/java/org/opensearch/sdk/sample/helloworld/transport/SampleRequest.java b/src/main/java/org/opensearch/sdk/sample/helloworld/transport/SampleRequest.java index 38f1eade..c476621a 100644 --- a/src/main/java/org/opensearch/sdk/sample/helloworld/transport/SampleRequest.java +++ b/src/main/java/org/opensearch/sdk/sample/helloworld/transport/SampleRequest.java @@ -13,8 +13,8 @@ import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionRequestValidationException; -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; /** * A sample request class to demonstrate extension actions 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 80e60706..8d3f9b1e 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 @@ -12,8 +12,8 @@ import java.io.IOException; import org.opensearch.action.ActionResponse; -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; /** * A sample response class to demonstrate extension actions diff --git a/src/main/java/org/opensearch/sdk/ssl/SSLNettyTransport.java b/src/main/java/org/opensearch/sdk/ssl/SSLNettyTransport.java index 38593d0f..562af772 100644 --- a/src/main/java/org/opensearch/sdk/ssl/SSLNettyTransport.java +++ b/src/main/java/org/opensearch/sdk/ssl/SSLNettyTransport.java @@ -28,7 +28,7 @@ import org.opensearch.ExceptionsHelper; import org.opensearch.Version; import org.opensearch.cluster.node.DiscoveryNode; -import org.opensearch.common.io.stream.NamedWriteableRegistry; +import org.opensearch.core.common.io.stream.NamedWriteableRegistry; import org.opensearch.common.network.NetworkService; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.PageCacheRecycler; diff --git a/src/main/java/org/opensearch/sdk/ssl/SecureSSLSettings.java b/src/main/java/org/opensearch/sdk/ssl/SecureSSLSettings.java index 604a1973..d9763eb1 100644 --- a/src/main/java/org/opensearch/sdk/ssl/SecureSSLSettings.java +++ b/src/main/java/org/opensearch/sdk/ssl/SecureSSLSettings.java @@ -15,7 +15,7 @@ import org.apache.logging.log4j.Logger; import org.opensearch.common.settings.SecureSetting; -import org.opensearch.common.settings.SecureString; +import org.opensearch.core.common.settings.SecureString; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; diff --git a/src/test/java/org/opensearch/sdk/TestExtensionsRunner.java b/src/test/java/org/opensearch/sdk/TestExtensionsRunner.java index 70252559..335b9044 100644 --- a/src/test/java/org/opensearch/sdk/TestExtensionsRunner.java +++ b/src/test/java/org/opensearch/sdk/TestExtensionsRunner.java @@ -34,7 +34,7 @@ import org.junit.jupiter.api.Test; import org.opensearch.Version; import org.opensearch.cluster.node.DiscoveryNode; -import org.opensearch.common.bytes.BytesArray; +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; @@ -48,7 +48,7 @@ import org.opensearch.http.HttpRequest; import org.opensearch.rest.BytesRestResponse; import org.opensearch.rest.RestRequest.Method; -import org.opensearch.rest.RestStatus; +import org.opensearch.core.rest.RestStatus; import org.opensearch.common.settings.Setting; import org.opensearch.extensions.UpdateSettingsRequest; import org.opensearch.sdk.handlers.ClusterSettingsResponseHandler; diff --git a/src/test/java/org/opensearch/sdk/TestSDKNamedWriteableRegistry.java b/src/test/java/org/opensearch/sdk/TestSDKNamedWriteableRegistry.java index 54b25110..5d2aac88 100644 --- a/src/test/java/org/opensearch/sdk/TestSDKNamedWriteableRegistry.java +++ b/src/test/java/org/opensearch/sdk/TestSDKNamedWriteableRegistry.java @@ -11,11 +11,11 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opensearch.common.io.stream.NamedWriteable; -import org.opensearch.common.io.stream.NamedWriteableRegistry; -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.NamedWriteable; +import org.opensearch.core.common.io.stream.NamedWriteableRegistry; +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 org.opensearch.common.settings.Settings; import org.opensearch.test.OpenSearchTestCase; diff --git a/src/test/java/org/opensearch/sdk/TestSDKNamedXContentRegistry.java b/src/test/java/org/opensearch/sdk/TestSDKNamedXContentRegistry.java index 43212bed..c21e6c9d 100644 --- a/src/test/java/org/opensearch/sdk/TestSDKNamedXContentRegistry.java +++ b/src/test/java/org/opensearch/sdk/TestSDKNamedXContentRegistry.java @@ -9,10 +9,10 @@ package org.opensearch.sdk; -import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; +import static org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken; import org.opensearch.core.ParseField; -import org.opensearch.common.bytes.BytesReference; +import org.opensearch.core.common.bytes.BytesReference; import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.LoggingDeprecationHandler; import org.opensearch.core.xcontent.NamedXContentRegistry; diff --git a/src/test/java/org/opensearch/sdk/action/TestProxyActionRequest.java b/src/test/java/org/opensearch/sdk/action/TestProxyActionRequest.java index 6c432c3f..d57ebd51 100644 --- a/src/test/java/org/opensearch/sdk/action/TestProxyActionRequest.java +++ b/src/test/java/org/opensearch/sdk/action/TestProxyActionRequest.java @@ -21,11 +21,11 @@ import org.opensearch.action.ActionRequestValidationException; import org.opensearch.action.ActionResponse; import org.opensearch.action.ActionType; -import org.opensearch.common.bytes.BytesReference; -import org.opensearch.common.io.stream.BytesStreamInput; +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.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.Settings; import org.opensearch.extensions.action.RemoteExtensionActionResponse; import org.opensearch.sdk.ExtensionsRunner; diff --git a/src/test/java/org/opensearch/sdk/integTest/TransportCommunicationIT.java b/src/test/java/org/opensearch/sdk/integTest/TransportCommunicationIT.java index 1cae4d08..5f027099 100644 --- a/src/test/java/org/opensearch/sdk/integTest/TransportCommunicationIT.java +++ b/src/test/java/org/opensearch/sdk/integTest/TransportCommunicationIT.java @@ -7,7 +7,7 @@ * compatible open source license. */ -package org.opensearch.sdk; +package org.opensearch.sdk.integTest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -15,6 +15,10 @@ import org.opensearch.common.network.NetworkAddress; import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; +import org.opensearch.sdk.ExtensionsRunner; +import org.opensearch.sdk.ExtensionsRunnerForTest; +import org.opensearch.sdk.NettyTransport; +import org.opensearch.sdk.TestThreadPool; import org.opensearch.transport.netty4.Netty4Transport; import org.opensearch.test.OpenSearchIntegTestCase; import org.opensearch.threadpool.ThreadPool; diff --git a/src/test/java/org/opensearch/sdk/rest/TestBaseExtensionRestHandler.java b/src/test/java/org/opensearch/sdk/rest/TestBaseExtensionRestHandler.java index 3c375331..cd0e24bf 100644 --- a/src/test/java/org/opensearch/sdk/rest/TestBaseExtensionRestHandler.java +++ b/src/test/java/org/opensearch/sdk/rest/TestBaseExtensionRestHandler.java @@ -15,14 +15,14 @@ import java.util.function.Function; import org.junit.jupiter.api.Test; -import org.opensearch.common.bytes.BytesArray; +import org.opensearch.core.common.bytes.BytesArray; import org.opensearch.extensions.rest.ExtensionRestResponse; import org.opensearch.rest.NamedRoute; import org.opensearch.rest.RestHandler.Route; import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestRequest.Method; import org.opensearch.rest.RestResponse; -import org.opensearch.rest.RestStatus; +import org.opensearch.core.rest.RestStatus; import org.opensearch.test.OpenSearchTestCase; import static org.opensearch.rest.RestRequest.Method.GET; diff --git a/src/test/java/org/opensearch/sdk/rest/TestNamedRouteHandler.java b/src/test/java/org/opensearch/sdk/rest/TestNamedRouteHandler.java index cf557d11..d0b567c2 100644 --- a/src/test/java/org/opensearch/sdk/rest/TestNamedRouteHandler.java +++ b/src/test/java/org/opensearch/sdk/rest/TestNamedRouteHandler.java @@ -11,7 +11,7 @@ import org.opensearch.extensions.rest.ExtensionRestResponse; import org.opensearch.rest.NamedRoute; -import org.opensearch.rest.RestStatus; +import org.opensearch.core.rest.RestStatus; import org.opensearch.test.OpenSearchTestCase; import java.util.Collections; diff --git a/src/test/java/org/opensearch/sdk/rest/TestSDKRestRequest.java b/src/test/java/org/opensearch/sdk/rest/TestSDKRestRequest.java index 48b0b33e..16b33ef2 100644 --- a/src/test/java/org/opensearch/sdk/rest/TestSDKRestRequest.java +++ b/src/test/java/org/opensearch/sdk/rest/TestSDKRestRequest.java @@ -15,8 +15,8 @@ import java.util.Map; import org.junit.jupiter.api.Test; -import org.opensearch.common.bytes.BytesArray; -import org.opensearch.common.bytes.BytesReference; +import org.opensearch.core.common.bytes.BytesArray; +import org.opensearch.core.common.bytes.BytesReference; import org.opensearch.common.xcontent.XContentType; import org.opensearch.extensions.rest.ExtensionRestRequest; import org.opensearch.http.HttpRequest; diff --git a/src/test/java/org/opensearch/sdk/sample/helloworld/rest/TestRestHelloAction.java b/src/test/java/org/opensearch/sdk/sample/helloworld/rest/TestRestHelloAction.java index f45930f8..09c5c96f 100644 --- a/src/test/java/org/opensearch/sdk/sample/helloworld/rest/TestRestHelloAction.java +++ b/src/test/java/org/opensearch/sdk/sample/helloworld/rest/TestRestHelloAction.java @@ -19,12 +19,12 @@ import org.opensearch.rest.NamedRoute; import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestRequest.Method; -import org.opensearch.common.bytes.BytesArray; -import org.opensearch.common.bytes.BytesReference; +import org.opensearch.core.common.bytes.BytesArray; +import org.opensearch.core.common.bytes.BytesReference; import org.opensearch.common.xcontent.XContentType; import org.opensearch.http.HttpRequest.HttpVersion; import org.opensearch.rest.RestResponse; -import org.opensearch.rest.RestStatus; +import org.opensearch.core.rest.RestStatus; import org.opensearch.sdk.rest.ExtensionRestHandler; import org.opensearch.sdk.rest.TestSDKRestRequest; import org.opensearch.test.OpenSearchTestCase; 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 8e2e09e7..b756d79e 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 @@ -16,8 +16,8 @@ import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; -import org.opensearch.common.bytes.BytesReference; -import org.opensearch.common.io.stream.BytesStreamInput; +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.action.support.ActionFilters;