Fix 2.6.0 build (opensearch-project#233)

* Release notes for 2.5 Signed-off-by: Bharathwaj G <[email protected]> * fix 2.6.0 build Signed-off-by: Bharathwaj G <[email protected]> --------- Signed-off-by: Bharathwaj G <[email protected]>
Arpit-Bandejiya · Feb 9, 2023 · a9f65ed · a9f65ed
1 parent 3c4d437
commit a9f65ed
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/...va/org/opensearch/search/asynchronous/context/active/AsynchronousSearchActiveContext.java b/...va/org/opensearch/search/asynchronous/context/active/AsynchronousSearchActiveContext.java
@@ -13,7 +13,7 @@
 import org.opensearch.search.asynchronous.id.AsynchronousSearchId;
 import org.opensearch.search.asynchronous.id.AsynchronousSearchIdConverter;
 import org.opensearch.search.asynchronous.listener.AsynchronousSearchProgressListener;
-import org.apache.lucene.util.SetOnce;
+import org.opensearch.common.SetOnce;
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.search.SearchProgressActionListener;
 import org.opensearch.action.search.SearchResponse;

diff --git a/.../java/org/opensearch/search/asynchronous/listener/AsynchronousSearchProgressListener.java b/.../java/org/opensearch/search/asynchronous/listener/AsynchronousSearchProgressListener.java
@@ -7,7 +7,7 @@
 
 import org.opensearch.search.asynchronous.response.AsynchronousSearchResponse;
 import org.apache.lucene.search.TotalHits;
-import org.apache.lucene.util.SetOnce;
+import org.opensearch.common.SetOnce;
 import org.opensearch.action.search.SearchProgressActionListener;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.search.SearchShard;

diff --git a/...g/opensearch/search/asynchronous/context/active/AsynchronousSearchActiveContextTests.java b/...g/opensearch/search/asynchronous/context/active/AsynchronousSearchActiveContextTests.java
@@ -15,7 +15,7 @@
 import org.opensearch.search.asynchronous.task.AsynchronousSearchTask;
 import org.opensearch.search.asynchronous.utils.TestClientUtils;
 import org.apache.lucene.search.TotalHits;
-import org.apache.lucene.util.SetOnce;
+import org.opensearch.common.SetOnce;
 import org.opensearch.action.search.SearchAction;
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.search.SearchResponse;

diff --git a/...a/org/opensearch/search/asynchronous/integTests/DeleteAsynchronousSearchSingleNodeIT.java b/...a/org/opensearch/search/asynchronous/integTests/DeleteAsynchronousSearchSingleNodeIT.java
@@ -194,7 +194,7 @@ public void onFailure(Exception e) {
             operationThreads.forEach(runnable -> finalTestThreadPool.executor("generic").execute(runnable));
             countDownLatch.await();
             disableBlocks(plugins);
-            assertionConsumer.apply(numDeleteAcknowledged, numDeleteUnAcknowledged, numResourceNotFound);
+            assertionConsumer.accept(numDeleteAcknowledged, numDeleteUnAcknowledged, numResourceNotFound);
         } finally {
             ThreadPool.terminate(testThreadPool, 500, TimeUnit.MILLISECONDS);
         }
@@ -239,7 +239,7 @@ public void onFailure(Exception e) {
             TestThreadPool finalTestThreadPool = testThreadPool;
             operationThreads.forEach(runnable -> finalTestThreadPool.executor("generic").execute(runnable));
             countDownLatch.await();
-            assertionConsumer.apply(numDeleteAcknowledged, numDeleteUnAcknowledged, numResourceNotFound);
+            assertionConsumer.accept(numDeleteAcknowledged, numDeleteUnAcknowledged, numResourceNotFound);
         } finally {
             ThreadPool.terminate(testThreadPool, 500, TimeUnit.MILLISECONDS);
         }

diff --git a/...java/org/opensearch/search/asynchronous/integTests/GetAsynchronousSearchSingleNodeIT.java b/...java/org/opensearch/search/asynchronous/integTests/GetAsynchronousSearchSingleNodeIT.java
@@ -253,7 +253,7 @@ public void onFailure(Exception e) {
             ActionListener.wrap(() -> deleteLatch.countDown()));
             deleteLatch.await();
             disableBlocks(plugins);
-            assertionConsumer.apply(numGetSuccess, numGetFailures, numVersionConflictFailures);
+            assertionConsumer.accept(numGetSuccess, numGetFailures, numVersionConflictFailures);
         } finally {
             ThreadPool.terminate(testThreadPool, 500, TimeUnit.MILLISECONDS);
         }

diff --git a/...a/org/opensearch/search/asynchronous/integTests/SubmitAsynchronousSearchSingleNodeIT.java b/...a/org/opensearch/search/asynchronous/integTests/SubmitAsynchronousSearchSingleNodeIT.java
@@ -152,7 +152,7 @@ public void onFailure(Exception e) {
             operationThreads.forEach(runnable -> finalTestThreadPool.executor("generic").execute(runnable));
             countDownLatch.await();
             disableBlocks(plugins);
-            assertionConsumer.apply(numStartedAsynchronousSearch, numFailedAsynchronousSearch, numRejectedAsynchronousSearch);
+            assertionConsumer.accept(numStartedAsynchronousSearch, numFailedAsynchronousSearch, numRejectedAsynchronousSearch);
         } finally {
             ThreadPool.terminate(testThreadPool, 500, TimeUnit.MILLISECONDS);
         }
@@ -230,7 +230,7 @@ public void onFailure(Exception e) {
             TestThreadPool finalTestThreadPool = testThreadPool;
             operationThreads.forEach(runnable -> finalTestThreadPool.executor("generic").execute(runnable));
             countDownLatch.await();
-            assertionConsumer.apply(numStartedAsynchronousSearch, numFailedAsynchronousSearch, numErrorResponseAsynchronousSearch);
+            assertionConsumer.accept(numStartedAsynchronousSearch, numFailedAsynchronousSearch, numErrorResponseAsynchronousSearch);
         } finally {
             ThreadPool.terminate(testThreadPool, 500, TimeUnit.MILLISECONDS);
         }