Getting latest changes from main

Signed-off-by: Vacha Shah <[email protected]>
opensearch-project · Aug 3, 2023 · 46aaea2 · 46aaea2
1 parent 6030039
commit 46aaea2
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/server/src/main/java/org/opensearch/action/ProtobufActionListenerResponseHandler.java b/server/src/main/java/org/opensearch/action/ProtobufActionListenerResponseHandler.java
@@ -13,7 +13,7 @@
 import org.opensearch.threadpool.ThreadPool;
 import org.opensearch.transport.TransportResponseHandler;
 import org.opensearch.transport.TransportException;
-import org.opensearch.transport.TransportResponse;
+import org.opensearch.core.transport.TransportResponse;
 
 import java.io.IOException;
 import java.util.Objects;

diff --git a/server/src/main/java/org/opensearch/action/ProtobufActionResponse.java b/server/src/main/java/org/opensearch/action/ProtobufActionResponse.java
@@ -8,7 +8,7 @@
 
 package org.opensearch.action;
 
-import org.opensearch.transport.TransportResponse;
+import org.opensearch.core.transport.TransportResponse;
 
 import java.io.IOException;
 

diff --git a/server/src/main/java/org/opensearch/action/support/ProtobufChannelActionListener.java b/server/src/main/java/org/opensearch/action/support/ProtobufChannelActionListener.java
@@ -11,7 +11,7 @@
 import org.opensearch.action.ActionListener;
 import org.opensearch.transport.TransportChannel;
 import org.opensearch.transport.TransportRequest;
-import org.opensearch.transport.TransportResponse;
+import org.opensearch.core.transport.TransportResponse;
 
 /**
  * Listener for transport channel actions

diff --git a/server/src/main/java/org/opensearch/action/support/nodes/ProtobufBaseNodeResponse.java b/server/src/main/java/org/opensearch/action/support/nodes/ProtobufBaseNodeResponse.java
@@ -9,7 +9,7 @@
 package org.opensearch.action.support.nodes;
 
 import org.opensearch.cluster.node.DiscoveryNode;
-import org.opensearch.transport.TransportResponse;
+import org.opensearch.core.transport.TransportResponse;
 
 /**
  * A base class for node level operations.

diff --git a/server/src/main/java/org/opensearch/tasks/ProtobufTaskCancellationService.java b/server/src/main/java/org/opensearch/tasks/ProtobufTaskCancellationService.java
@@ -23,7 +23,7 @@
 import org.opensearch.transport.TransportException;
 import org.opensearch.transport.TransportRequest;
 import org.opensearch.transport.ProtobufTransportRequestHandler;
-import org.opensearch.transport.TransportResponse;
+import org.opensearch.core.transport.TransportResponse;
 import org.opensearch.transport.TransportService;
 
 import java.io.IOException;

diff --git a/server/src/main/java/org/opensearch/transport/ProtobufEmptyTransportResponseHandler.java b/server/src/main/java/org/opensearch/transport/ProtobufEmptyTransportResponseHandler.java
@@ -11,8 +11,8 @@
 import java.io.IOException;
 
 import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.transport.TransportResponse;
 import org.opensearch.threadpool.ThreadPool;
-import org.opensearch.transport.TransportResponse.Empty;
 
 /**
  * Handler for empty transport response
@@ -40,7 +40,7 @@ public String executor() {
     }
 
     @Override
-    public Empty read(StreamInput in) throws IOException {
+    public TransportResponse.Empty read(StreamInput in) throws IOException {
         // TODO Auto-generated method stub
         throw new UnsupportedOperationException("Unimplemented method 'read'");
     }

diff --git a/...r/src/test/java/org/opensearch/transport/TransportServiceDeserializationFailureTests.java b/...r/src/test/java/org/opensearch/transport/TransportServiceDeserializationFailureTests.java
@@ -46,7 +46,7 @@
 import org.opensearch.test.OpenSearchTestCase;
 import org.opensearch.test.transport.MockTransport;
 import org.opensearch.threadpool.ThreadPool;
-import org.opensearch.transport.TransportResponse.Empty;
+import org.opensearch.core.transport.TransportResponse.Empty;
 
 import java.io.IOException;
 import java.util.Collections;

diff --git a/test/framework/src/main/java/org/opensearch/transport/AbstractSimpleTransportTestCase.java b/test/framework/src/main/java/org/opensearch/transport/AbstractSimpleTransportTestCase.java
@@ -75,7 +75,7 @@
 import org.opensearch.test.transport.StubbableTransport;
 import org.opensearch.threadpool.TestThreadPool;
 import org.opensearch.threadpool.ThreadPool;
-import org.opensearch.transport.TransportResponse.Empty;
+import org.opensearch.core.transport.TransportResponse.Empty;
 
 import org.junit.After;
 import org.junit.Before;