From 52de53bd4faa2bcfdb69985acd5465402b066fa6 Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Tue, 27 Jun 2023 22:24:03 +0200 Subject: [PATCH] Fix IndicesBoost error. Closes #2598 --- .../client/elc/RequestConverter.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java b/src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java index 7803cfdc6..a4d8122fd 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java @@ -1250,11 +1250,9 @@ public MsearchRequest searchMsearchRequest( } if (!isEmpty(query.getIndicesBoost())) { - Map boosts = new LinkedHashMap<>(); - query.getIndicesBoost() - .forEach(indexBoost -> boosts.put(indexBoost.getIndexName(), (double) indexBoost.getBoost())); - // noinspection unchecked - bb.indicesBoost(boosts); + bb.indicesBoost(query.getIndicesBoost().stream() + .map(indexBoost -> Map.of(indexBoost.getIndexName(), Double.valueOf(indexBoost.getBoost()))) + .collect(Collectors.toList())); } query.getScriptedFields().forEach(scriptedField -> bb.scriptFields(scriptedField.getFieldName(), @@ -1419,11 +1417,9 @@ private void prepareSearchRequest(Query query, @Nullable String routing, @Nu } if (!isEmpty(query.getIndicesBoost())) { - Map boosts = new LinkedHashMap<>(); - query.getIndicesBoost() - .forEach(indexBoost -> boosts.put(indexBoost.getIndexName(), (double) indexBoost.getBoost())); - // noinspection unchecked - builder.indicesBoost(boosts); + builder.indicesBoost(query.getIndicesBoost().stream() + .map(indexBoost -> Map.of(indexBoost.getIndexName(), Double.valueOf(indexBoost.getBoost()))) + .collect(Collectors.toList())); } if (!isEmpty(query.getDocValueFields())) {