diff --git a/src/main/java/org/springframework/data/elasticsearch/core/CriteriaQueryProcessor.java b/src/main/java/org/springframework/data/elasticsearch/core/CriteriaQueryProcessor.java
index f3b19d241..e253dbb2d 100644
--- a/src/main/java/org/springframework/data/elasticsearch/core/CriteriaQueryProcessor.java
+++ b/src/main/java/org/springframework/data/elasticsearch/core/CriteriaQueryProcessor.java
@@ -15,7 +15,7 @@
  */
 package org.springframework.data.elasticsearch.core;
 
-import static org.elasticsearch.index.query.Operator.AND;
+import static org.elasticsearch.index.query.Operator.*;
 import static org.elasticsearch.index.query.QueryBuilders.*;
 import static org.springframework.data.elasticsearch.core.query.Criteria.*;
 
@@ -26,7 +26,8 @@ import java.util.List;
 import java.util.ListIterator;
 
 import org.apache.lucene.queryparser.flexible.core.util.StringUtils;
-import org.elasticsearch.index.query.*;
+import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilder;
 import org.springframework.data.elasticsearch.core.query.Criteria;
 import org.springframework.util.Assert;
 
@@ -41,7 +42,6 @@ import org.springframework.util.Assert;
  */
 class CriteriaQueryProcessor {
 
-
 	QueryBuilder createQueryFromCriteria(Criteria criteria) {
 		if (criteria == null)
 			return null;
@@ -106,7 +106,6 @@ class CriteriaQueryProcessor {
 		return query;
 	}
 
-
 	private QueryBuilder createQueryFragmentForCriteria(Criteria chainedCriteria) {
 		if (chainedCriteria.getQueryCriteriaEntries().isEmpty())
 			return null;
@@ -133,8 +132,8 @@ class CriteriaQueryProcessor {
 		return query;
 	}
 
-
-	private QueryBuilder processCriteriaEntry(Criteria.CriteriaEntry entry,/* OperationKey key, Object value,*/ String fieldName) {
+	private QueryBuilder processCriteriaEntry(Criteria.CriteriaEntry entry,
+			/* OperationKey key, Object value,*/ String fieldName) {
 		Object value = entry.getValue();
 		if (value == null) {
 			return null;
@@ -189,7 +188,7 @@ class CriteriaQueryProcessor {
 		return query;
 	}
 
-	private static List<String> toStringList(Iterable<?> iterable){
+	private static List<String> toStringList(Iterable<?> iterable) {
 		List<String> list = new ArrayList<>();
 		for (Object item : iterable) {
 			list.add(StringUtils.toString(item));
diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/custommethod/CustomMethodRepositoryBaseTests.java b/src/test/java/org/springframework/data/elasticsearch/repositories/custommethod/CustomMethodRepositoryBaseTests.java
index db0523cce..cb8115db8 100644
--- a/src/test/java/org/springframework/data/elasticsearch/repositories/custommethod/CustomMethodRepositoryBaseTests.java
+++ b/src/test/java/org/springframework/data/elasticsearch/repositories/custommethod/CustomMethodRepositoryBaseTests.java
@@ -358,7 +358,7 @@ public abstract class CustomMethodRepositoryBaseTests {
 		List<SampleEntity> list = repository.findByKeywordIn(keywords);
 
 		// then
-		assertThat(list.size()).isEqualTo(1L);
+        assertThat(list).hasSize(1);
 		assertThat(list.get(0).getId()).isEqualTo(documentId1);
 	}
 
@@ -389,7 +389,7 @@ public abstract class CustomMethodRepositoryBaseTests {
 		List<SampleEntity> list = repository.findByKeywordNotIn(keywords);
 
 		// then
-		assertThat(list.size()).isEqualTo(1L);
+		assertThat(list).hasSize(1);
 		assertThat(list.get(0).getId()).isEqualTo(documentId2);
 	}