Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace Stream usage with iteration to avoid non-null requirements.

Browse Source 
SpelEvaluator now iterates over the parameter map instead of using the Java 8 Stream API. Previously, expressions resulting in a null value failed in the collector as Java 8 streams require non-null values for map values.

Closes #2904
This commit is contained in:
Mark Paluch
2023-08-16 15:09:58 +02:00
parent b0ffb1a046
commit ea9bf5bf86
3 changed files with 70 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/springframework/data/repository/query/SpelEvaluator.java
View File

@@ -15,9 +15,8 @@
*/
package org.springframework.data.repository.query;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.stream.Collectors;
import org.springframework.data.repository.query.SpelQueryContext.SpelExtractor;
import org.springframework.data.spel.ExpressionDependencies;
@@ -62,11 +61,12 @@ public class SpelEvaluator {
Assert.notNull(values, "Values must not be null.");
Map<String, String> parameterMap = extractor.getParameterMap();
Map<String, Object> results = new LinkedHashMap<>(parameterMap.size());
return extractor.getParameters().collect(Collectors.toMap(//
Entry::getKey, //
it -> getSpElValue(it.getValue(), values) //
));
parameterMap.forEach((parameter, expression) -> results.put(parameter, getSpElValue(expression, values)));
return results;
}
/**

5
src/main/java/org/springframework/data/repository/query/SpelQueryContext.java
View File

@@ -22,11 +22,9 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.function.BiFunction;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Stream;
import org.springframework.data.domain.Range;
import org.springframework.data.domain.Range.Bound;
@@ -288,9 +286,6 @@ public class SpelQueryContext {
return expressions;
}
Stream<Entry<String, String>> getParameters() {
return expressions.entrySet().stream();
}
}
/**