diff --git a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java
index 13dd48026..5306e9b1f 100644
--- a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java
+++ b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java
@@ -951,7 +951,7 @@ public class ElasticsearchRestTemplate
 		}
 
 		if (query instanceof SearchQuery) {
-			SearchQuery searchQuery	= (SearchQuery) query;
+			SearchQuery searchQuery = (SearchQuery) query;
 
 			if (searchQuery.getHighlightFields() != null || searchQuery.getHighlightBuilder() != null) {
 				HighlightBuilder highlightBuilder = searchQuery.getHighlightBuilder();
diff --git a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java
index ae7ca3ced..7689aa4a0 100755
--- a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java
+++ b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java
@@ -810,7 +810,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
 		}
 
 		if (query instanceof SearchQuery) {
-			SearchQuery searchQuery	= (SearchQuery) query;
+			SearchQuery searchQuery = (SearchQuery) query;
 
 			if (searchQuery.getHighlightFields() != null || searchQuery.getHighlightBuilder() != null) {
 				HighlightBuilder highlightBuilder = searchQuery.getHighlightBuilder();
@@ -1090,7 +1090,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
 
 	private <T> SearchRequestBuilder prepareSearch(Query query, Class<T> clazz) {
 		setPersistentEntityIndexAndType(query, clazz);
-        return prepareSearch(query, getPersistentEntity(clazz));
+		return prepareSearch(query, getPersistentEntity(clazz));
 	}
 
 	private SearchRequestBuilder prepareSearch(Query query, @Nullable ElasticsearchPersistentEntity<?> entity) {
diff --git a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java
index 87c4d2054..f49f00320 100755
--- a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java
+++ b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java
@@ -1615,8 +1615,7 @@ public class ElasticsearchTemplateTests {
 
 		SearchQuery searchQuery = new NativeSearchQueryBuilder()
 				.withQuery(boolQuery().must(termQuery("type", "test")).must(termQuery("message", "test")))
-				.withPageable(PageRequest.of(0, 10))
-				.withHighlightBuilder(highlightBuilder).build();
+				.withPageable(PageRequest.of(0, 10)).withHighlightBuilder(highlightBuilder).build();
 
 		SearchResultMapper searchResultMapper = new SearchResultMapper() {
 			@Override
@@ -1653,9 +1652,11 @@ public class ElasticsearchTemplateTests {
 		};
 
 		// when
-		ScrolledPage<SampleEntity> scroll = elasticsearchTemplate.startScroll(scrollTimeInMillis, searchQuery, SampleEntity.class, searchResultMapper);
+		ScrolledPage<SampleEntity> scroll = elasticsearchTemplate.startScroll(scrollTimeInMillis, searchQuery,
+				SampleEntity.class, searchResultMapper);
 		while (scroll.hasContent()) {
-			scroll = elasticsearchTemplate.continueScroll(scroll.getScrollId(), scrollTimeInMillis, SampleEntity.class, searchResultMapper);
+			scroll = elasticsearchTemplate.continueScroll(scroll.getScrollId(), scrollTimeInMillis, SampleEntity.class,
+					searchResultMapper);
 		}
 
 		elasticsearchTemplate.clearScroll(scroll.getScrollId());