From 3d2c5a9235d3305c0f9f2abed39260d108f0f482 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@pivotal.io>
Date: Tue, 25 Jul 2017 13:56:20 +0200
Subject: [PATCH] DATAMONGO-1753 - IndexEnsuringQueryCreationListener now skips
 query methods without a predicate.

---
 .../IndexEnsuringQueryCreationListener.java   |  9 ++-
 ...nsuringQueryCreationListenerUnitTests.java | 66 +++++++++++++++++++
 2 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListenerUnitTests.java

diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListener.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListener.java
index 84421d437..2c018f885 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListener.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListener.java
@@ -22,11 +22,11 @@ import java.util.Set;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.domain.Sort;
-import org.springframework.data.domain.Sort.Order;
 import org.springframework.data.domain.Sort.Direction;
-import org.springframework.data.mongodb.core.index.IndexOperationsProvider;
+import org.springframework.data.domain.Sort.Order;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.index.Index;
+import org.springframework.data.mongodb.core.index.IndexOperationsProvider;
 import org.springframework.data.mongodb.repository.query.MongoEntityMetadata;
 import org.springframework.data.mongodb.repository.query.PartTreeMongoQuery;
 import org.springframework.data.repository.core.support.QueryCreationListener;
@@ -68,6 +68,11 @@ class IndexEnsuringQueryCreationListener implements QueryCreationListener<PartTr
 	public void onCreation(PartTreeMongoQuery query) {
 
 		PartTree tree = query.getTree();
+
+		if (!tree.hasPredicate()) {
+			return;
+		}
+
 		Index index = new Index();
 		index.named(query.getQueryMethod().getName());
 		Sort sort = tree.getSort();
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListenerUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListenerUnitTests.java
new file mode 100644
index 000000000..aa2713549
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListenerUnitTests.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.repository.support;
+
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.springframework.data.mongodb.core.index.IndexOperationsProvider;
+import org.springframework.data.mongodb.repository.query.PartTreeMongoQuery;
+import org.springframework.data.repository.query.parser.PartTree;
+
+/**
+ * Unit tests for {@link IndexEnsuringQueryCreationListener}.
+ * 
+ * @author Oliver Gierke
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class IndexEnsuringQueryCreationListenerUnitTests {
+
+	IndexEnsuringQueryCreationListener listener;
+
+	@Mock IndexOperationsProvider provider;
+
+	@Before
+	public void setUp() {
+		this.listener = new IndexEnsuringQueryCreationListener(provider);
+	}
+
+	@Test // DATAMONGO-1753
+	public void skipsQueryCreationForMethodWithoutPredicate() {
+
+		PartTree tree = mock(PartTree.class);
+		when(tree.hasPredicate()).thenReturn(false);
+
+		PartTreeMongoQuery query = mock(PartTreeMongoQuery.class, Answers.RETURNS_MOCKS);
+		when(query.getTree()).thenReturn(tree);
+
+		listener.onCreation(query);
+
+		verify(provider, times(0)).indexOps(any());
+	}
+
+	interface SampleRepository {
+
+		Object findAllBy();
+	}
+}