From b0c97ccf27e3592dbe3bc9800afb4951fd1fdab5 Mon Sep 17 00:00:00 2001
From: Peter-Josef Meisch <pj.meisch@sothawo.com>
Date: Thu, 28 Dec 2023 13:53:42 +0100
Subject: [PATCH] Polishing

---
 .../client/elc/ResponseConverter.java              |  5 ++---
 .../client/elc/SearchDocumentResponseBuilder.java  | 14 ++++++--------
 .../data/elasticsearch/core/SearchHitMapping.java  | 14 +++++++-------
 .../SearchDocumentResponseBuilderUnitTests.java    | 10 +++-------
 4 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/src/main/java/org/springframework/data/elasticsearch/client/elc/ResponseConverter.java b/src/main/java/org/springframework/data/elasticsearch/client/elc/ResponseConverter.java
index 7ad69c2aa..9449682c1 100644
--- a/src/main/java/org/springframework/data/elasticsearch/client/elc/ResponseConverter.java
+++ b/src/main/java/org/springframework/data/elasticsearch/client/elc/ResponseConverter.java
@@ -121,8 +121,7 @@ class ResponseConverter {
 				.build();
 	}
 
-	private TemplateResponseData clusterGetComponentTemplateData(
-			ComponentTemplateSummary componentTemplateSummary) {
+	private TemplateResponseData clusterGetComponentTemplateData(ComponentTemplateSummary componentTemplateSummary) {
 
 		var mapping = typeMapping(componentTemplateSummary.mappings());
 		var settings = new Settings();
@@ -326,7 +325,7 @@ class ResponseConverter {
 	}
 
 	private TemplateResponseData indexGetComponentTemplateData(IndexTemplateSummary indexTemplateSummary,
-																														 List<String> composedOf) {
+			List<String> composedOf) {
 		var mapping = typeMapping(indexTemplateSummary.mappings());
 
 		Function<IndexSettings, Settings> indexSettingsToSettings = indexSettings -> {
diff --git a/src/main/java/org/springframework/data/elasticsearch/client/elc/SearchDocumentResponseBuilder.java b/src/main/java/org/springframework/data/elasticsearch/client/elc/SearchDocumentResponseBuilder.java
index 68148ef21..0eddc80d8 100644
--- a/src/main/java/org/springframework/data/elasticsearch/client/elc/SearchDocumentResponseBuilder.java
+++ b/src/main/java/org/springframework/data/elasticsearch/client/elc/SearchDocumentResponseBuilder.java
@@ -169,11 +169,10 @@ class SearchDocumentResponseBuilder {
 
 	private static SearchShardStatistics shardsFrom(ShardStatistics shards) {
 		List<ShardFailure> failures = shards.failures();
-		List<SearchShardStatistics.Failure> searchFailures = failures.stream()
-				.map(f -> SearchShardStatistics.Failure.of(f.index(), f.node(), f.status(), f.shard(), null,
-						ResponseConverter.toErrorCause(f.reason())))
-				.toList();
-		return SearchShardStatistics.of(shards.failed(), shards.successful(), shards.total(), shards.skipped(), searchFailures);
+		List<SearchShardStatistics.Failure> searchFailures = failures.stream().map(f -> SearchShardStatistics.Failure
+				.of(f.index(), f.node(), f.status(), f.shard(), null, ResponseConverter.toErrorCause(f.reason()))).toList();
+		return SearchShardStatistics.of(shards.failed(), shards.successful(), shards.total(), shards.skipped(),
+				searchFailures);
 	}
 
 	@Nullable
@@ -235,9 +234,8 @@ class SearchDocumentResponseBuilder {
 			var phraseSuggest = suggestionES.phrase();
 			var phraseSuggestOptions = phraseSuggest.options();
 			List<PhraseSuggestion.Entry.Option> options = new ArrayList<>();
-			phraseSuggestOptions.forEach(optionES -> options
-					.add(new PhraseSuggestion.Entry.Option(optionES.text(), optionES.highlighted(), optionES.score(),
-							optionES.collateMatch())));
+			phraseSuggestOptions.forEach(optionES -> options.add(new PhraseSuggestion.Entry.Option(optionES.text(),
+					optionES.highlighted(), optionES.score(), optionES.collateMatch())));
 			entries.add(new PhraseSuggestion.Entry(phraseSuggest.text(), phraseSuggest.offset(), phraseSuggest.length(),
 					options, null));
 		});
diff --git a/src/main/java/org/springframework/data/elasticsearch/core/SearchHitMapping.java b/src/main/java/org/springframework/data/elasticsearch/core/SearchHitMapping.java
index e6dc1ba7a..e46e644dc 100644
--- a/src/main/java/org/springframework/data/elasticsearch/core/SearchHitMapping.java
+++ b/src/main/java/org/springframework/data/elasticsearch/core/SearchHitMapping.java
@@ -235,13 +235,13 @@ public class SearchHitMapping<T> {
 					scrollId = searchHitsImpl.getScrollId();
 				}
 
-				return new SearchHitsImpl<>(searchHits.getTotalHits(), //
-						searchHits.getTotalHitsRelation(), //
-						searchHits.getMaxScore(), //
-						scrollId, //
-						searchHits.getPointInTimeId(), //
-						convertedSearchHits, //
-						searchHits.getAggregations(), //
+				return new SearchHitsImpl<>(searchHits.getTotalHits(),
+						searchHits.getTotalHitsRelation(),
+						searchHits.getMaxScore(),
+						scrollId,
+						searchHits.getPointInTimeId(),
+						convertedSearchHits,
+						searchHits.getAggregations(),
 						searchHits.getSuggest(),
 						searchHits.getSearchShardStatistics());
 			}
diff --git a/src/test/java/org/springframework/data/elasticsearch/client/elc/SearchDocumentResponseBuilderUnitTests.java b/src/test/java/org/springframework/data/elasticsearch/client/elc/SearchDocumentResponseBuilderUnitTests.java
index e1980a06c..8e2363b83 100644
--- a/src/test/java/org/springframework/data/elasticsearch/client/elc/SearchDocumentResponseBuilderUnitTests.java
+++ b/src/test/java/org/springframework/data/elasticsearch/client/elc/SearchDocumentResponseBuilderUnitTests.java
@@ -140,16 +140,12 @@ class SearchDocumentResponseBuilderUnitTests {
 								.shard(1)
 								.reason(rb -> rb
 										.reason("this is a mock failure in shards")
-										.causedBy(cbb ->
-												cbb.reason("inner reason")
-														.metadata(Map.of("hello", JsonData.of("world")))
-										)
+										.causedBy(cbb -> cbb.reason("inner reason")
+												.metadata(Map.of("hello", JsonData.of("world"))))
 										.type("reason-type")
 
 								)
-								.status("fail")
-						)
-				))
+								.status("fail"))))
 				.build();
 
 		// act