DATAMONGO-1087 - Fix index resolver detecting cycles for partial match.

We now check for presence of a dot path to verify that we’ve detected a cycle.

Original pull request: #240.

Author: christophstrobl

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

@@ -465,7 +465,7 @@ boolean cycles(MongoPersistentProperty property, String path) {
 					return false;
 				}
 
-				return path.contains(this.path);
+				return path.equals(this.path) || path.contains(this.path + ".") || path.contains("." + this.path);
 			}
 		}
 	}

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexResolverUnitTests.java

@@ -630,6 +630,32 @@ public void shouldUseIndexNameOnRootLevel() {
 			assertThat((String) indexDefinitions.get(0).getIndexOptions().get("name"), equalTo("property_index"));
 		}
 
+		/**
+		 * @see DATAMONGO-1087
+		 */
+		@Test
+		public void shouldAllowMultiplePropertiesOfSameTypeWithMatchingStartLettersOnRoot() {
+
+			List<IndexDefinitionHolder> indexDefinitions = prepareMappingContextAndResolveIndexForType(MultiplePropertiesOfSameTypeWithMatchingStartLetters.class);
+
+			assertThat(indexDefinitions, hasSize(2));
+			assertThat((String) indexDefinitions.get(0).getIndexOptions().get("name"), equalTo("name.component"));
+			assertThat((String) indexDefinitions.get(1).getIndexOptions().get("name"), equalTo("nameLast.component"));
+		}
+
+		/**
+		 * @see DATAMONGO-1087
+		 */
+		@Test
+		public void shouldAllowMultiplePropertiesOfSameTypeWithMatchingStartLettersOnNestedProperty() {
+
+			List<IndexDefinitionHolder> indexDefinitions = prepareMappingContextAndResolveIndexForType(MultiplePropertiesOfSameTypeWithMatchingStartLettersOnNestedProperty.class);
+
+			assertThat(indexDefinitions, hasSize(2));
+			assertThat((String) indexDefinitions.get(0).getIndexOptions().get("name"), equalTo("component.nameLast"));
+			assertThat((String) indexDefinitions.get(1).getIndexOptions().get("name"), equalTo("component.name"));
+		}
+
 		@Document
 		static class MixedIndexRoot {
 
@@ -770,6 +796,30 @@ static class DocumentWithNestedTypeHavingNamedIndex {
 			TypeWithNamedIndex propertyOfTypeHavingNamedIndex;
 		}
 
+		@Document
+		public class MultiplePropertiesOfSameTypeWithMatchingStartLetters {
+
+			public class NameComponent {
+
+				@Indexed String component;
+			}
+
+			NameComponent name;
+			NameComponent nameLast;
+		}
+
+		@Document
+		public class MultiplePropertiesOfSameTypeWithMatchingStartLettersOnNestedProperty {
+
+			public class NameComponent {
+
+				@Indexed String nameLast;
+				@Indexed String name;
+			}
+
+			NameComponent component;
+		}
+
 	}
 
 	private static List<IndexDefinitionHolder> prepareMappingContextAndResolveIndexForType(Class<?> type) {