Remove explicit SearchResponse references from `org.elasticsearch.sim…

…ilarity` and `org.elasticsearch.versioning` (#102542)
elastic · Nov 24, 2023 · 7def2e0 · 7def2e0
1 parent b12b38c
commit 7def2e0
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 19 deletions.
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/similarity/SimilarityIT.java b/server/src/internalClusterTest/java/org/elasticsearch/similarity/SimilarityIT.java
@@ -8,11 +8,11 @@
 
 package org.elasticsearch.similarity;
 
-import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.test.ESIntegTestCase;
 
 import static org.elasticsearch.action.support.WriteRequest.RefreshPolicy.IMMEDIATE;
 import static org.elasticsearch.index.query.QueryBuilders.matchQuery;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertResponse;
 import static org.elasticsearch.xcontent.XContentFactory.jsonBuilder;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.not;
@@ -52,14 +52,14 @@ public void testCustomBM25Similarity() throws Exception {
             .setRefreshPolicy(IMMEDIATE)
             .get();
 
-        SearchResponse bm25SearchResponse = prepareSearch().setQuery(matchQuery("field1", "quick brown fox")).get();
-        assertThat(bm25SearchResponse.getHits().getTotalHits().value, equalTo(1L));
-        float bm25Score = bm25SearchResponse.getHits().getHits()[0].getScore();
-
-        SearchResponse booleanSearchResponse = prepareSearch().setQuery(matchQuery("field2", "quick brown fox")).get();
-        assertThat(booleanSearchResponse.getHits().getTotalHits().value, equalTo(1L));
-        float defaultScore = booleanSearchResponse.getHits().getHits()[0].getScore();
-
-        assertThat(bm25Score, not(equalTo(defaultScore)));
+        assertResponse(prepareSearch().setQuery(matchQuery("field1", "quick brown fox")), bm25SearchResponse -> {
+            assertThat(bm25SearchResponse.getHits().getTotalHits().value, equalTo(1L));
+            float bm25Score = bm25SearchResponse.getHits().getHits()[0].getScore();
+            assertResponse(prepareSearch().setQuery(matchQuery("field2", "quick brown fox")), booleanSearchResponse -> {
+                assertThat(booleanSearchResponse.getHits().getTotalHits().value, equalTo(1L));
+                float defaultScore = booleanSearchResponse.getHits().getHits()[0].getScore();
+                assertThat(bm25Score, not(equalTo(defaultScore)));
+            });
+        });
     }
 }
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/versioning/SimpleVersioningIT.java b/server/src/internalClusterTest/java/org/elasticsearch/versioning/SimpleVersioningIT.java
@@ -15,7 +15,6 @@
 import org.elasticsearch.action.delete.DeleteResponse;
 import org.elasticsearch.action.get.GetResponse;
 import org.elasticsearch.action.index.IndexResponse;
-import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.common.lucene.uid.Versions;
 import org.elasticsearch.common.settings.Settings;
@@ -36,6 +35,7 @@
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertFutureThrows;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertRequestBuilderThrows;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertResponse;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.lessThanOrEqualTo;
 
@@ -283,14 +283,18 @@ public void testCompareAndSet() {
         // search with versioning
         for (int i = 0; i < 10; i++) {
             // TODO: ADD SEQ NO!
-            SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery()).setVersion(true).get();
-            assertThat(searchResponse.getHits().getAt(0).getVersion(), equalTo(2L));
+            assertResponse(
+                prepareSearch().setQuery(matchAllQuery()).setVersion(true),
+                response -> assertThat(response.getHits().getAt(0).getVersion(), equalTo(2L))
+            );
         }
 
         // search without versioning
         for (int i = 0; i < 10; i++) {
-            SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery()).get();
-            assertThat(searchResponse.getHits().getAt(0).getVersion(), equalTo(Versions.NOT_FOUND));
+            assertResponse(
+                prepareSearch().setQuery(matchAllQuery()),
+                response -> assertThat(response.getHits().getAt(0).getVersion(), equalTo(Versions.NOT_FOUND))
+            );
         }
 
         DeleteResponse deleteResponse = client().prepareDelete("test", "1").setIfSeqNo(1).setIfPrimaryTerm(1).get();
@@ -352,10 +356,11 @@ public void testSimpleVersioningWithFlush() throws Exception {
         client().admin().indices().prepareRefresh().get();
 
         for (int i = 0; i < 10; i++) {
-            SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery()).setVersion(true).seqNoAndPrimaryTerm(true).get();
-            assertHitCount(searchResponse, 1);
-            assertThat(searchResponse.getHits().getAt(0).getVersion(), equalTo(2L));
-            assertThat(searchResponse.getHits().getAt(0).getSeqNo(), equalTo(1L));
+            assertResponse(prepareSearch().setQuery(matchAllQuery()).setVersion(true).seqNoAndPrimaryTerm(true), response -> {
+                assertHitCount(response, 1);
+                assertThat(response.getHits().getAt(0).getVersion(), equalTo(2L));
+                assertThat(response.getHits().getAt(0).getSeqNo(), equalTo(1L));
+            });
         }
     }