diff --git a/src/main/java/org/springframework/data/mapping/model/BasicPersistentEntity.java b/src/main/java/org/springframework/data/mapping/model/BasicPersistentEntity.java index 320cec6f66..d809f69a60 100644 --- a/src/main/java/org/springframework/data/mapping/model/BasicPersistentEntity.java +++ b/src/main/java/org/springframework/data/mapping/model/BasicPersistentEntity.java @@ -457,7 +457,7 @@ public P next() { * @return the evaluation context including all potential extensions. * @since 2.1 */ - protected EvaluationContext getEvaluationContext(Object rootObject) { + protected EvaluationContext getEvaluationContext(@Nullable Object rootObject) { return evaluationContextProvider.getEvaluationContext(rootObject); } @@ -469,7 +469,7 @@ protected EvaluationContext getEvaluationContext(Object rootObject) { * @return the evaluation context with extensions loaded that satisfy {@link ExpressionDependencies}. * @since 2.5 */ - protected EvaluationContext getEvaluationContext(Object rootObject, ExpressionDependencies dependencies) { + protected EvaluationContext getEvaluationContext(@Nullable Object rootObject, ExpressionDependencies dependencies) { return evaluationContextProvider.getEvaluationContext(rootObject, dependencies); } @@ -480,7 +480,7 @@ protected EvaluationContext getEvaluationContext(Object rootObject, ExpressionDe * @return the evaluation context including all potential extensions. * @since 3.3 */ - protected ValueEvaluationContext getValueEvaluationContext(Object rootObject) { + protected ValueEvaluationContext getValueEvaluationContext(@Nullable Object rootObject) { return ValueEvaluationContext.of(getEnvironment(), getEvaluationContext(rootObject)); } @@ -492,7 +492,8 @@ protected ValueEvaluationContext getValueEvaluationContext(Object rootObject) { * @return the evaluation context with extensions loaded that satisfy {@link ExpressionDependencies}. * @since 3.3 */ - protected ValueEvaluationContext getValueEvaluationContext(Object rootObject, ExpressionDependencies dependencies) { + protected ValueEvaluationContext getValueEvaluationContext(@Nullable Object rootObject, + ExpressionDependencies dependencies) { return ValueEvaluationContext.of(getEnvironment(), getEvaluationContext(rootObject, dependencies)); }