From 121b47e1befe981644e4b7d498a6638641648c90 Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Tue, 27 Jun 2023 22:26:10 +0200 Subject: [PATCH] Fix IndicesBoost error. Original Pull Request #2606 Closes #2598 (cherry picked from commit d9fd722bb6af81068fb9b723b77c60efddbf06d3) --- .../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 9158736c5..d5f006908 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 @@ -1246,11 +1246,9 @@ class RequestConverter { } 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(), @@ -1412,11 +1410,9 @@ class RequestConverter { } 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())) {