Skip to content

Commit b0c97cc

Browse files
committed
Polishing
1 parent 433d529 commit b0c97cc

File tree

4 files changed

+18
-25
lines changed

4 files changed

+18
-25
lines changed

src/main/java/org/springframework/data/elasticsearch/client/elc/ResponseConverter.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,7 @@ private TemplateResponse clusterGetComponentTemplate(
121121
.build();
122122
}
123123

124-
private TemplateResponseData clusterGetComponentTemplateData(
125-
ComponentTemplateSummary componentTemplateSummary) {
124+
private TemplateResponseData clusterGetComponentTemplateData(ComponentTemplateSummary componentTemplateSummary) {
126125

127126
var mapping = typeMapping(componentTemplateSummary.mappings());
128127
var settings = new Settings();
@@ -326,7 +325,7 @@ private TemplateResponse indexGetComponentTemplate(IndexTemplateItem indexTempla
326325
}
327326

328327
private TemplateResponseData indexGetComponentTemplateData(IndexTemplateSummary indexTemplateSummary,
329-
List<String> composedOf) {
328+
List<String> composedOf) {
330329
var mapping = typeMapping(indexTemplateSummary.mappings());
331330

332331
Function<IndexSettings, Settings> indexSettingsToSettings = indexSettings -> {

src/main/java/org/springframework/data/elasticsearch/client/elc/SearchDocumentResponseBuilder.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,10 @@ public static <T> SearchDocumentResponse from(HitsMetadata<?> hitsMetadata, @Nul
169169

170170
private static SearchShardStatistics shardsFrom(ShardStatistics shards) {
171171
List<ShardFailure> failures = shards.failures();
172-
List<SearchShardStatistics.Failure> searchFailures = failures.stream()
173-
.map(f -> SearchShardStatistics.Failure.of(f.index(), f.node(), f.status(), f.shard(), null,
174-
ResponseConverter.toErrorCause(f.reason())))
175-
.toList();
176-
return SearchShardStatistics.of(shards.failed(), shards.successful(), shards.total(), shards.skipped(), searchFailures);
172+
List<SearchShardStatistics.Failure> searchFailures = failures.stream().map(f -> SearchShardStatistics.Failure
173+
.of(f.index(), f.node(), f.status(), f.shard(), null, ResponseConverter.toErrorCause(f.reason()))).toList();
174+
return SearchShardStatistics.of(shards.failed(), shards.successful(), shards.total(), shards.skipped(),
175+
searchFailures);
177176
}
178177

179178
@Nullable
@@ -235,9 +234,8 @@ private static PhraseSuggestion getPhraseSuggestion(String name, List<Suggestion
235234
var phraseSuggest = suggestionES.phrase();
236235
var phraseSuggestOptions = phraseSuggest.options();
237236
List<PhraseSuggestion.Entry.Option> options = new ArrayList<>();
238-
phraseSuggestOptions.forEach(optionES -> options
239-
.add(new PhraseSuggestion.Entry.Option(optionES.text(), optionES.highlighted(), optionES.score(),
240-
optionES.collateMatch())));
237+
phraseSuggestOptions.forEach(optionES -> options.add(new PhraseSuggestion.Entry.Option(optionES.text(),
238+
optionES.highlighted(), optionES.score(), optionES.collateMatch())));
241239
entries.add(new PhraseSuggestion.Entry(phraseSuggest.text(), phraseSuggest.offset(), phraseSuggest.length(),
242240
options, null));
243241
});

src/main/java/org/springframework/data/elasticsearch/core/SearchHitMapping.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -235,13 +235,13 @@ private SearchHits<?> mapInnerDocuments(SearchHits<SearchDocument> searchHits, C
235235
scrollId = searchHitsImpl.getScrollId();
236236
}
237237

238-
return new SearchHitsImpl<>(searchHits.getTotalHits(), //
239-
searchHits.getTotalHitsRelation(), //
240-
searchHits.getMaxScore(), //
241-
scrollId, //
242-
searchHits.getPointInTimeId(), //
243-
convertedSearchHits, //
244-
searchHits.getAggregations(), //
238+
return new SearchHitsImpl<>(searchHits.getTotalHits(),
239+
searchHits.getTotalHitsRelation(),
240+
searchHits.getMaxScore(),
241+
scrollId,
242+
searchHits.getPointInTimeId(),
243+
convertedSearchHits,
244+
searchHits.getAggregations(),
245245
searchHits.getSuggest(),
246246
searchHits.getSearchShardStatistics());
247247
}

src/test/java/org/springframework/data/elasticsearch/client/elc/SearchDocumentResponseBuilderUnitTests.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -140,16 +140,12 @@ void shouldGetShardStatisticsInfo() {
140140
.shard(1)
141141
.reason(rb -> rb
142142
.reason("this is a mock failure in shards")
143-
.causedBy(cbb ->
144-
cbb.reason("inner reason")
145-
.metadata(Map.of("hello", JsonData.of("world")))
146-
)
143+
.causedBy(cbb -> cbb.reason("inner reason")
144+
.metadata(Map.of("hello", JsonData.of("world"))))
147145
.type("reason-type")
148146

149147
)
150-
.status("fail")
151-
)
152-
))
148+
.status("fail"))))
153149
.build();
154150

155151
// act

0 commit comments

Comments
 (0)