diff --git a/src/main/java/org/springframework/data/elasticsearch/core/query/highlight/HighlightCommonParameters.java b/src/main/java/org/springframework/data/elasticsearch/core/query/highlight/HighlightCommonParameters.java
index 428072ef2..db94150b5 100644
--- a/src/main/java/org/springframework/data/elasticsearch/core/query/highlight/HighlightCommonParameters.java
+++ b/src/main/java/org/springframework/data/elasticsearch/core/query/highlight/HighlightCommonParameters.java
@@ -141,8 +141,7 @@ public abstract class HighlightCommonParameters {
 		private int noMatchSize = -1;
 		private int numberOfFragments = -1;
 		/**
-		 * Only the search query part of the {@link Query} takes effect,
-		 * others are just ignored.
+		 * Only the search query part of the {@link Query} takes effect, others are just ignored.
 		 */
 		@Nullable private Query highlightQuery = null;
 		private String order = "";
diff --git a/src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchQueryMethod.java b/src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchQueryMethod.java
index f5510b32a..fb8f261df 100644
--- a/src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchQueryMethod.java
+++ b/src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchQueryMethod.java
@@ -15,6 +15,14 @@
  */
 package org.springframework.data.elasticsearch.repository.query;
 
+import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Stream;
+
 import org.springframework.core.annotation.AnnotatedElementUtils;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.elasticsearch.annotations.Highlight;
@@ -47,14 +55,6 @@ import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Stream;
-
 /**
  * ElasticsearchQueryMethod
  *
@@ -370,7 +370,8 @@ public class ElasticsearchQueryMethod extends QueryMethod {
 			ElasticsearchConverter elasticsearchConverter) {
 
 		if (hasAnnotatedHighlight()) {
-			query.setHighlightQuery(getAnnotatedHighlightQuery(new HighlightConverter(parameterAccessor, elasticsearchConverter)));
+			query.setHighlightQuery(
+					getAnnotatedHighlightQuery(new HighlightConverter(parameterAccessor, elasticsearchConverter)));
 		}
 
 		var sourceFilter = getSourceFilter(parameterAccessor, elasticsearchConverter);
diff --git a/src/main/java/org/springframework/data/elasticsearch/repository/query/HighlightConverter.java b/src/main/java/org/springframework/data/elasticsearch/repository/query/HighlightConverter.java
index 68b2e9c67..06334192f 100644
--- a/src/main/java/org/springframework/data/elasticsearch/repository/query/HighlightConverter.java
+++ b/src/main/java/org/springframework/data/elasticsearch/repository/query/HighlightConverter.java
@@ -15,6 +15,9 @@
  */
 package org.springframework.data.elasticsearch.repository.query;
 
+import java.util.Arrays;
+import java.util.List;
+
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.query.Query;
 import org.springframework.data.elasticsearch.core.query.StringQuery;
@@ -24,9 +27,6 @@ import org.springframework.data.elasticsearch.core.query.highlight.HighlightPara
 import org.springframework.data.elasticsearch.repository.support.StringQueryUtil;
 import org.springframework.util.Assert;
 
-import java.util.Arrays;
-import java.util.List;
-
 /**
  * Convert {@link org.springframework.data.elasticsearch.annotations.Highlight} to {@link Highlight}.
  *
@@ -38,7 +38,7 @@ public class HighlightConverter {
 	private final ElasticsearchConverter elasticsearchConverter;
 
 	HighlightConverter(ElasticsearchParametersParameterAccessor parameterAccessor,
-					   ElasticsearchConverter elasticsearchConverter) {
+			ElasticsearchConverter elasticsearchConverter) {
 		this.parameterAccessor = parameterAccessor;
 		this.elasticsearchConverter = elasticsearchConverter;
 	}
diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/custommethod/CustomMethodRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/repositories/custommethod/CustomMethodRepositoryIntegrationTests.java
index 8760c1e25..4bf090e32 100644
--- a/src/test/java/org/springframework/data/elasticsearch/repositories/custommethod/CustomMethodRepositoryIntegrationTests.java
+++ b/src/test/java/org/springframework/data/elasticsearch/repositories/custommethod/CustomMethodRepositoryIntegrationTests.java
@@ -1952,10 +1952,9 @@ public abstract class CustomMethodRepositoryIntegrationTests {
 				    ]
 				  }
 				}
-				"""
-		)
+				""")
 		@Highlight(
-				fields = {@HighlightField(name = "type")},
+				fields = { @HighlightField(name = "type") },
 				parameters = @HighlightParameters(
 						highlightQuery = @Query("""
 								{
@@ -1969,10 +1968,7 @@ public abstract class CustomMethodRepositoryIntegrationTests {
 								    ]
 								  }
 								}
-								"""
-						)
-				)
-		)
+								""")))
 		SearchHits<SampleEntity> queryByStringWithSeparateHighlight(String type, String highlight);
 
 		List<SearchHit<SampleEntity>> queryByMessage(String message);