Fix index creation

Author: christophstrobl

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultIndexOperationsProvider.java

@@ -47,7 +47,7 @@ class DefaultIndexOperationsProvider implements IndexOperationsProvider {
 	 * @see org.springframework.data.mongodb.core.index.IndexOperationsProvider#reactiveIndexOps(java.lang.String)
 	 */
 	@Override
-	public IndexOperations indexOps(String collectionName) {
-		return new DefaultIndexOperations(mongoDbFactory, collectionName, mapper);
+	public IndexOperations indexOps(String collectionName, Class<?> type) {
+		return new DefaultIndexOperations(mongoDbFactory, collectionName, mapper, type);
 	}
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java

@@ -715,20 +715,26 @@ public void dropCollection(String collectionName) {
 		});
 	}
 
+
+	@Override
+	public IndexOperations indexOps(String collectionName) {
+		return indexOps(collectionName, null);
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#indexOps(java.lang.String)
 	 */
-	public IndexOperations indexOps(String collectionName) {
-		return new DefaultIndexOperations(this, collectionName, null);
+	public IndexOperations indexOps(String collectionName, @Nullable Class<?> type) {
+		return new DefaultIndexOperations(this, collectionName, type);
 	}
 
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#indexOps(java.lang.Class)
 	 */
 	public IndexOperations indexOps(Class<?> entityClass) {
-		return new DefaultIndexOperations(this, getCollectionName(entityClass), entityClass);
+		return indexOps(getCollectionName(entityClass), entityClass);
 	}
 
 	/*

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexOperationsProvider.java

@@ -15,6 +15,8 @@
  */
 package org.springframework.data.mongodb.core.index;
 
+import org.springframework.lang.Nullable;
+
 /**
  * Provider interface to obtain {@link IndexOperations} by MongoDB collection name.
  *
@@ -25,11 +27,23 @@
 @FunctionalInterface
 public interface IndexOperationsProvider {
 
+	/**
+	 * Returns the operations that can be performed on indexes
+	 *
+	 * @param collectionName name of the MongoDB collection, must not be {@literal null}.
+	 * @param type the type used for field mapping. Can be {@literal null}.
+	 * @return index operations on the named collection
+	 * @since 2.5
+	 */
+	IndexOperations indexOps(String collectionName, @Nullable Class<?> type);
+
 	/**
 	 * Returns the operations that can be performed on indexes
 	 *
 	 * @param collectionName name of the MongoDB collection, must not be {@literal null}.
 	 * @return index operations on the named collection
 	 */
-	IndexOperations indexOps(String collectionName);
+	default IndexOperations indexOps(String collectionName) {
+		return indexOps(collectionName, null);
+	}
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListener.java

@@ -15,12 +15,15 @@
  */
 package org.springframework.data.mongodb.repository.support;
 
+import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.core.annotation.AnnotatedElementUtils;
+import org.springframework.data.annotation.Embedded;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.domain.Sort.Order;
@@ -36,8 +39,10 @@
 import org.springframework.data.repository.query.parser.Part.Type;
 import org.springframework.data.repository.query.parser.PartTree;
 import org.springframework.util.Assert;
+import org.springframework.util.ReflectionUtils;
 
 import com.mongodb.MongoException;
+import org.springframework.util.StringUtils;
 
 /**
  * {@link QueryCreationListener} inspecting {@link PartTreeMongoQuery}s and creating an index for the properties it
@@ -82,9 +87,14 @@ public void onCreation(PartTreeMongoQuery query) {
 		Sort sort = tree.getSort();
 
 		for (Part part : tree.getParts()) {
+
 			if (GEOSPATIAL_TYPES.contains(part.getType())) {
 				return;
 			}
+			if(isIndexOnEmbeddedType(part)) {
+				return;
+			}
+
 			String property = part.getProperty().toDotPath();
 			Direction order = toDirection(sort, property);
 			index.on(property, order);
@@ -107,7 +117,7 @@ public void onCreation(PartTreeMongoQuery query) {
 
 		MongoEntityMetadata<?> metadata = query.getQueryMethod().getEntityInformation();
 		try {
-			indexOperationsProvider.indexOps(metadata.getCollectionName()).ensureIndex(index);
+			indexOperationsProvider.indexOps(metadata.getCollectionName(), metadata.getJavaType()).ensureIndex(index);
 		} catch (UncategorizedMongoDbException e) {
 
 			if (e.getCause() instanceof MongoException) {
@@ -129,6 +139,19 @@ public void onCreation(PartTreeMongoQuery query) {
 		LOG.debug(String.format("Created %s!", index));
 	}
 
+	public boolean isIndexOnEmbeddedType(Part part) {
+
+		// TODO we could do it for nested fields in the
+		Field field = ReflectionUtils.findField(part.getProperty().getOwningType().getType(),
+				part.getProperty().getSegment());
+
+		if (field == null) {
+			return false;
+		}
+
+		return AnnotatedElementUtils.hasAnnotation(field, Embedded.class);
+	}
+
 	private static Direction toDirection(Sort sort, String property) {
 
 		if (sort.isUnsorted()) {

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactoryBean.java

@@ -90,7 +90,7 @@ protected RepositoryFactorySupport createRepositoryFactory() {
 
 		if (createIndexesForQueryMethods) {
 			factory.addQueryCreationListener(
-					new IndexEnsuringQueryCreationListener(collectionName -> operations.indexOps(collectionName)));
+					new IndexEnsuringQueryCreationListener((collectionName, javaType) -> operations.indexOps(javaType)));
 		}
 
 		return factory;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFactoryBean.java

@@ -97,7 +97,7 @@ protected RepositoryFactorySupport createRepositoryFactory() {
 
 		if (createIndexesForQueryMethods) {
 			factory.addQueryCreationListener(new IndexEnsuringQueryCreationListener(
-					collectionName -> IndexOperationsAdapter.blocking(operations.indexOps(collectionName))));
+					(collectionName, javaType) -> IndexOperationsAdapter.blocking(operations.indexOps(javaType))));
 		}
 
 		return factory;

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/RepositoryIndexCreationIntegrationTests.java

@@ -78,6 +78,7 @@ public void testname() {
 
 		assertHasIndexForField(indexInfo, "lastname");
 		assertHasIndexForField(indexInfo, "firstname");
+		assertHasIndexForField(indexInfo, "add");
 	}
 
 	private static void assertHasIndexForField(List<IndexInfo> indexInfo, String... fields) {

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListenerUnitTests.java

@@ -66,7 +66,7 @@ void setUp() {
 
 		partTreeQuery = mock(PartTreeMongoQuery.class, Answers.RETURNS_MOCKS);
 		when(partTreeQuery.getTree()).thenReturn(partTree);
-		when(provider.indexOps(anyString())).thenReturn(indexOperations);
+		when(provider.indexOps(anyString(), any())).thenReturn(indexOperations);
 		when(queryMethod.getEntityInformation()).thenReturn(entityInformation);
 		when(entityInformation.getCollectionName()).thenReturn("persons");
 	}