Polishing

(cherry picked from commit dfc1be2)
(cherry picked from commit fdc03cf)

Author: sothawo

src/main/java/org/springframework/data/elasticsearch/core/SearchHitMapping.java

@@ -153,8 +153,7 @@ private Map<String, List<String>> getHighlightsAndRemapFieldNames(SearchDocument
 		}
 
 		return highlightFields.entrySet().stream().collect(Collectors.toMap(entry -> {
-			ElasticsearchPersistentProperty property = persistentEntity
-					.getPersistentPropertyWithFieldName(entry.getKey());
+			ElasticsearchPersistentProperty property = persistentEntity.getPersistentPropertyWithFieldName(entry.getKey());
 			return property != null ? property.getName() : entry.getKey();
 		}, Map.Entry::getValue));
 	}