fix errors after rebase

Author: sothawo

Diff for: src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntity.java

@@ -80,7 +80,7 @@ public class SimpleElasticsearchPersistentEntity<T> extends BasicPersistentEntit
 	private @Nullable VersionType versionType;
 	private boolean createIndexAndMapping;
 	private final Map<String, ElasticsearchPersistentProperty> fieldNamePropertyCache = new ConcurrentHashMap<>();
-	private final ConcurrentHashMap<String, Expression> templateExpressions = new ConcurrentHashMap<>();
+	private final ConcurrentHashMap<String, Expression> routingExpressions = new ConcurrentHashMap<>();
 	private @Nullable String routing;
 
 	private final ConcurrentHashMap<String, Expression> indexNameExpressions = new ConcurrentHashMap<>();
@@ -111,10 +111,11 @@ public SimpleElasticsearchPersistentEntity(TypeInformation<T> typeInformation) {
 				this.routing = document.routing();
 			}
 
-		Setting setting = AnnotatedElementUtils.getMergedAnnotation(clazz, Setting.class);
+			Setting setting = AnnotatedElementUtils.getMergedAnnotation(clazz, Setting.class);
 
-		if (setting != null) {
-			this.settingPath = setting.settingPath();
+			if (setting != null) {
+				this.settingPath = setting.settingPath();
+			}
 		}
 	}
 
@@ -183,6 +184,7 @@ public String settingPath() {
 	public boolean isCreateIndexAndMapping() {
 		return createIndexAndMapping;
 	}
+
 	@Override
 	public boolean hasScoreProperty() {
 		return scoreProperty != null;
@@ -194,7 +196,6 @@ public ElasticsearchPersistentProperty getScoreProperty() {
 		return scoreProperty;
 	}
 
-
 	@Override
 	@Nullable
 	public String getRouting() {
@@ -366,7 +367,8 @@ private String resolve(String name) {
 
 		Expression expression = getExpressionForIndexName(name);
 
-		String resolvedName = expression != null ? expression.getValue(indexNameEvaluationContext.get(), String.class) : null;
+		String resolvedName = expression != null ? expression.getValue(indexNameEvaluationContext.get(), String.class)
+				: null;
 		return resolvedName != null ? resolvedName : name;
 	}
 
@@ -400,13 +402,12 @@ private EvaluationContext getIndexNameEvaluationContext() {
 		return getEvaluationContext(null, expressionDependencies);
 	}
 
-
 	@Override
 	public String resolveRouting(Object bean) {
 		String resolved = null;
 
 		if (hasRouting()) {
-			Expression expression = expressions.computeIfAbsent(getRouting(), PARSER::parseExpression);
+			Expression expression = routingExpressions.computeIfAbsent(getRouting(), PARSER::parseExpression);
 
 			try {
 				EvaluationContext context = getEvaluationContext(bean);