Rebase to main and update after conficts

Signed-off-by: Daniel Widdis <[email protected]>
opensearch-project · Sep 30, 2022 · 89eee75 · 89eee75
1 parent f29c893
commit 89eee75
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 127 deletions.
diff --git a/src/main/java/org/opensearch/sdk/ExtensionRestRequest.java b/src/main/java/org/opensearch/sdk/ExtensionRestRequest.java
diff --git a/src/main/java/org/opensearch/sdk/ExtensionsRunner.java b/src/main/java/org/opensearch/sdk/ExtensionsRunner.java
@@ -226,9 +226,6 @@ DiscoveryNode getOpensearchNode() {
     }
 
     /**
-<<<<<<< HEAD
-     * Initializes a Netty4Transport object. This object will be wrapped in a {@link TransportService} object.
-=======
      * Handles a extension request from OpenSearch. This is the first request for
      * the transport communication and will initialize the extension and will be a
      * part of OpenSearch bootstrap.
@@ -342,7 +339,7 @@ RestExecuteOnExtensionResponse handleRestExecuteOnExtensionRequest(ExtensionRest
     /**
      * Initializes a Netty4Transport object. This object will be wrapped in a
      * {@link TransportService} object.
->>>>>>> 60694f1 (Rename/merge duplicate ExtensionRestRequest implementations)
+    >>>>>>> 60694f1 (Rename/merge duplicate ExtensionRestRequest implementations)
      *
      * @param settings
      *            The transport settings to configure.

diff --git a/src/main/java/org/opensearch/sdk/handlers/ExtensionsRestRequestHandler.java b/src/main/java/org/opensearch/sdk/handlers/ExtensionsRestRequestHandler.java
@@ -10,12 +10,12 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.common.bytes.BytesReference;
+import org.opensearch.extensions.rest.ExtensionRestRequest;
 import org.opensearch.extensions.rest.RestExecuteOnExtensionResponse;
 import org.opensearch.rest.RestStatus;
 import org.opensearch.sdk.ExtensionRestHandler;
 import org.opensearch.sdk.ExtensionsRunner;
 import org.opensearch.sdk.ExtensionRestPathRegistry;
-import org.opensearch.sdk.ExtensionRestRequest;
 import org.opensearch.sdk.ExtensionRestResponse;
 
 /**

diff --git a/src/test/java/org/opensearch/sdk/TestExtensionsRunner.java b/src/test/java/org/opensearch/sdk/TestExtensionsRunner.java
@@ -59,7 +59,6 @@
 import org.opensearch.sdk.handlers.ClusterStateResponseHandler;
 import org.opensearch.sdk.handlers.EnvironmentSettingsResponseHandler;
 import org.opensearch.sdk.handlers.ExtensionsInitRequestHandler;
-import org.opensearch.sdk.handlers.ExtensionsRestRequestHandler;
 import org.opensearch.sdk.handlers.LocalNodeResponseHandler;
 import org.opensearch.sdk.handlers.ExtensionStringResponseHandler;
 import org.opensearch.sdk.handlers.OpensearchRequestHandler;