From 7b945c56242a5ad1ab5c33fad2aaf9ea5b82ade0 Mon Sep 17 00:00:00 2001 From: Vacha Shah Date: Tue, 31 Oct 2023 18:13:20 +0000 Subject: [PATCH] spotlessApply Signed-off-by: Vacha Shah --- .../client/opensearch/core/search/Hit.java | 2 +- .../integTest/AbstractSearchRequestIT.java | 30 ++++++++++++------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Hit.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Hit.java index 6fabb4100a..dab34ab94a 100644 --- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Hit.java +++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Hit.java @@ -287,7 +287,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) { if (this.id != null) { generator.writeKey("_id"); generator.write(this.id); - } + } if (this.score != null) { generator.writeKey("_score"); diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractSearchRequestIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractSearchRequestIT.java index 6800d6af0d..19f3af617f 100644 --- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractSearchRequestIT.java +++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractSearchRequestIT.java @@ -11,7 +11,6 @@ import java.io.IOException; import java.util.Arrays; import java.util.stream.Collectors; - import org.junit.Test; import org.opensearch.client.opensearch._types.FieldValue; import org.opensearch.client.opensearch._types.SortOrder; @@ -27,7 +26,8 @@ public abstract class AbstractSearchRequestIT extends OpenSearchJavaClientTestCa @Test public void shouldReturnSearchResults() throws Exception { final String index = "search_request"; - assertTrue(javaClient().indices() + assertTrue( + javaClient().indices() .create( b -> b.index(index) .mappings( @@ -36,7 +36,8 @@ public void shouldReturnSearchResults() throws Exception { ) .settings(settings -> settings.sort(s -> s.field("name").order(SegmentSortOrder.Asc))) ) - .acknowledged()); + .acknowledged() + ); createTestDocuments(index); javaClient().indices().refresh(); @@ -58,14 +59,23 @@ public void shouldReturnSearchResults() throws Exception { final SearchResponse response = javaClient().search(request, ShopItem.class); assertEquals(response.hits().hits().size(), 2); - assertTrue(Arrays.stream(response.hits().hits().get(0).fields().get("name").to(String[].class)).collect(Collectors.toList()).contains("hummer")); - assertTrue(Arrays.stream(response.hits().hits().get(1).fields().get("name").to(String[].class)).collect(Collectors.toList()).contains("jammer")); + assertTrue( + Arrays.stream(response.hits().hits().get(0).fields().get("name").to(String[].class)) + .collect(Collectors.toList()) + .contains("hummer") + ); + assertTrue( + Arrays.stream(response.hits().hits().get(1).fields().get("name").to(String[].class)) + .collect(Collectors.toList()) + .contains("jammer") + ); } @Test public void shouldReturnSearchResultsWithoutStoredFields() throws Exception { final String index = "search_request"; - assertTrue(javaClient().indices() + assertTrue( + javaClient().indices() .create( b -> b.index(index) .mappings( @@ -74,7 +84,8 @@ public void shouldReturnSearchResultsWithoutStoredFields() throws Exception { ) .settings(settings -> settings.sort(s -> s.field("name").order(SegmentSortOrder.Asc))) ) - .acknowledged()); + .acknowledged() + ); createTestDocuments(index); javaClient().indices().refresh(); @@ -86,10 +97,7 @@ public void shouldReturnSearchResultsWithoutStoredFields() throws Exception { ); final SearchRequest request = SearchRequest.of( - r -> r.index(index) - .sort(s -> s.field(f -> f.field("name").order(SortOrder.Asc))) - .query(query) - .storedFields("_none_") + r -> r.index(index).sort(s -> s.field(f -> f.field("name").order(SortOrder.Asc))).query(query).storedFields("_none_") ); final SearchResponse response = javaClient().search(request, ShopItem.class);