From 585299cd74c792ca60a15899e135bc2f2acf8b9f Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Mon, 7 Dec 2020 19:46:40 +0100 Subject: [PATCH] DATAES-995 - Code Cleanup after DATACMNS-1838. Original PR: #570 --- .../mapping/SimpleElasticsearchPersistentEntity.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntity.java b/src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntity.java index 0f24a6ac0..d4cd96f25 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntity.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntity.java @@ -79,7 +79,6 @@ public class SimpleElasticsearchPersistentEntity extends BasicPersistentEntit private boolean createIndexAndMapping; private final Map fieldNamePropertyCache = new ConcurrentHashMap<>(); - private EvaluationContextProvider evaluationContextProvider = EvaluationContextProvider.DEFAULT;; private final ConcurrentHashMap indexNameExpressions = new ConcurrentHashMap<>(); private final Lazy indexNameEvaluationContext = Lazy.of(this::getIndexNameEvaluationContext); @@ -321,13 +320,6 @@ public class SimpleElasticsearchPersistentEntity extends BasicPersistentEntit } // region SpEL handling - - @Override - public void setEvaluationContextProvider(EvaluationContextProvider provider) { - super.setEvaluationContextProvider(provider); - this.evaluationContextProvider = provider; - } - /** * resolves all the names in the IndexCoordinates object. If a name cannot be resolved, the original name is returned. * @@ -390,7 +382,7 @@ public class SimpleElasticsearchPersistentEntity extends BasicPersistentEntit ExpressionDependencies expressionDependencies = expression != null ? ExpressionDependencies.discover(expression) : ExpressionDependencies.none(); - return evaluationContextProvider.getEvaluationContext(null, expressionDependencies); + return getEvaluationContext(null, expressionDependencies); } // endregion