Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-05-30 16:52:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

DATAES-995 - Code Cleanup after DATACMNS-1838.

Browse Source 
Original PR:  #570
This commit is contained in:
Peter-Josef Meisch 2020-12-07 19:46:40 +01:00 committed by GitHub
parent d25f7fe7b8
commit 585299cd74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntity.java
View File

@ -79,7 +79,6 @@ public class SimpleElasticsearchPersistentEntity<T> extends BasicPersistentEntit
private boolean createIndexAndMapping; private boolean createIndexAndMapping;
private final Map<String, ElasticsearchPersistentProperty> fieldNamePropertyCache = new ConcurrentHashMap<>(); private final Map<String, ElasticsearchPersistentProperty> fieldNamePropertyCache = new ConcurrentHashMap<>();
private EvaluationContextProvider evaluationContextProvider = EvaluationContextProvider.DEFAULT;;
private final ConcurrentHashMap<String, Expression> indexNameExpressions = new ConcurrentHashMap<>(); private final ConcurrentHashMap<String, Expression> indexNameExpressions = new ConcurrentHashMap<>();
private final Lazy<EvaluationContext> indexNameEvaluationContext = Lazy.of(this::getIndexNameEvaluationContext); private final Lazy<EvaluationContext> indexNameEvaluationContext = Lazy.of(this::getIndexNameEvaluationContext);
@ -321,13 +320,6 @@ public class SimpleElasticsearchPersistentEntity<T> extends BasicPersistentEntit
} }
// region SpEL handling // 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. * 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<T> extends BasicPersistentEntit
ExpressionDependencies expressionDependencies = expression != null ? ExpressionDependencies.discover(expression) ExpressionDependencies expressionDependencies = expression != null ? ExpressionDependencies.discover(expression)
: ExpressionDependencies.none(); : ExpressionDependencies.none();
return evaluationContextProvider.getEvaluationContext(null, expressionDependencies); return getEvaluationContext(null, expressionDependencies);
} }
// endregion // endregion