From 49e264759e6e8bb68ebb8d846af6a749cd6bc455 Mon Sep 17 00:00:00 2001
From: Mingshi Liu <mingshl@amazon.com>
Date: Tue, 11 Jul 2023 18:10:16 -0700
Subject: [PATCH] cherry pick 3704821ce373516f9da18e07deec6e22360918e9

---
 build.gradle                                              | 2 +-
 .../relevance/actionfilter/SearchActionFilterTests.java   | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index de873f7..b418c28 100644
--- a/build.gradle
+++ b/build.gradle
@@ -143,11 +143,11 @@ sourceSets {
 
 
 jacocoTestReport {
+    dependsOn test
     reports {
         xml.required = true
         html.required = true
     }
-    dependsOn test
 }
 
 // TODO: Enable these checks
diff --git a/src/test/java/org/opensearch/search/relevance/actionfilter/SearchActionFilterTests.java b/src/test/java/org/opensearch/search/relevance/actionfilter/SearchActionFilterTests.java
index 1af2da7..0625792 100644
--- a/src/test/java/org/opensearch/search/relevance/actionfilter/SearchActionFilterTests.java
+++ b/src/test/java/org/opensearch/search/relevance/actionfilter/SearchActionFilterTests.java
@@ -26,7 +26,6 @@
 import org.opensearch.action.support.ActionFilterChain;
 import org.opensearch.client.Client;
 import org.opensearch.common.bytes.BytesReference;
-import org.opensearch.common.collect.ImmutableOpenMap;
 import org.opensearch.common.document.DocumentField;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
@@ -123,11 +122,8 @@ private static Client buildMockClient(String indexName, Settings... settings) {
             settingsBuilder.put(settingsEntry);
         }
         Settings settingsObj = settingsBuilder.build();
-        ImmutableOpenMap<String, Settings> indexSettingsMap = ImmutableOpenMap.<String, Settings>builder()
-                .fPut(indexName, settingsObj)
-                .build();
-        ImmutableOpenMap<String, Settings> emptyMap = ImmutableOpenMap.<String, Settings>builder().build();
-        GetSettingsResponse getSettingsResponse = new GetSettingsResponse(indexSettingsMap, emptyMap);
+        Map<String, Settings> indexSettingsMap = Map.of(indexName, settingsObj);
+        GetSettingsResponse getSettingsResponse = new GetSettingsResponse(indexSettingsMap, Collections.emptyMap());
         when(mockGetSettingsFuture.actionGet()).thenReturn(getSettingsResponse);
         when(client.execute(eq(GetSettingsAction.INSTANCE), any(GetSettingsRequest.class)))
                 .thenReturn(mockGetSettingsFuture);