Addressing comments

Signed-off-by: Bharathwaj G <bharath78910@gmail.com>
bharath-techie · Jul 21, 2022 · 717cd66 · 717cd66
1 parent 25bb645
commit 717cd66
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/server/src/main/java/org/opensearch/action/search/PitService.java b/server/src/main/java/org/opensearch/action/search/PitService.java
@@ -58,11 +58,12 @@ public void deletePitContexts(
             .filter(ctx -> Strings.isEmpty(ctx.getSearchContextIdForNode().getClusterAlias()) == false)
             .map(c -> c.getSearchContextIdForNode().getClusterAlias())
             .collect(Collectors.toSet());
-        StepListener<BiFunction<String, String, DiscoveryNode>> lookupListener = SearchUtils.getConnectionLookupListener(
-            searchTransportService.getRemoteClusterService(),
-            clusterService.state(),
-            clusters
-        );
+        StepListener<BiFunction<String, String, DiscoveryNode>> lookupListener = (StepListener<
+            BiFunction<String, String, DiscoveryNode>>) SearchUtils.getConnectionLookupListener(
+                searchTransportService.getRemoteClusterService(),
+                clusterService.state(),
+                clusters
+            );
         lookupListener.whenComplete(nodeLookup -> {
             final GroupedActionListener<DeletePitResponse> groupedListener = getDeletePitGroupedListener(
                 listener,

diff --git a/server/src/main/java/org/opensearch/action/search/SearchUtils.java b/server/src/main/java/org/opensearch/action/search/SearchUtils.java
@@ -8,6 +8,7 @@
 
 package org.opensearch.action.search;
 
+import org.opensearch.action.ActionListener;
 import org.opensearch.action.StepListener;
 import org.opensearch.cluster.ClusterState;
 import org.opensearch.cluster.node.DiscoveryNode;
@@ -26,7 +27,7 @@ public SearchUtils() {}
     /**
      * Get connection lookup listener for list of clusters passed
      */
-    public static StepListener<BiFunction<String, String, DiscoveryNode>> getConnectionLookupListener(
+    public static ActionListener<BiFunction<String, String, DiscoveryNode>> getConnectionLookupListener(
         RemoteClusterService remoteClusterService,
         ClusterState state,
         Set<String> clusters