DATACMNS-750 - Fixed part creation in query methods that have keywords in property paths.

If a keyword was contained in a complex property path (like In in SomeInfo), the property path was invalidly cut of in the middle. We now simply use the length of the keyword to extract the actual property from the candidate. This should be faster anyway as it doesn't require another lookup of the pattern in the source candidate.

Related pull request: #136.

Author: odrotbohm

src/main/java/org/springframework/data/repository/query/parser/Part.java

@@ -298,7 +298,7 @@ public String extractProperty(String part) {
 
 			for (String keyword : keywords) {
 				if (candidate.endsWith(keyword)) {
-					return candidate.substring(0, candidate.indexOf(keyword));
+					return candidate.substring(0, candidate.length() - keyword.length());
 				}
 			}
 

src/test/java/org/springframework/data/repository/query/parser/PartTreeUnitTests.java

@@ -27,6 +27,7 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.hamcrest.Matchers;
 import org.junit.Test;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
@@ -670,6 +671,24 @@ public void buildsPartTreeForNotContainingCorrectly() throws Exception {
 		assertPart(tree, new Part[] { new Part("legalNameNotContaining", Organization.class) });
 	}
 
+	/**
+	 * @see DATACMNS-750
+	 */
+	@Test
+	public void doesNotFailOnPropertiesContainingAKeyword() {
+
+		PartTree partTree = new PartTree("findBySomeInfoIn", Category.class);
+
+		Iterable<Part> parts = partTree.getParts();
+
+		assertThat(parts, is(Matchers.<Part> iterableWithSize(1)));
+
+		Part part = parts.iterator().next();
+
+		assertThat(part.getType(), is(Type.IN));
+		assertThat(part.getProperty(), is(PropertyPath.from("someInfo", Category.class)));
+	}
+
 	private static void assertLimiting(String methodName, Class<?> entityType, boolean limiting, Integer maxResults) {
 		assertLimiting(methodName, entityType, limiting, maxResults, false);
 	}
@@ -791,6 +810,8 @@ interface Product {
 	interface Category {
 
 		Long getId();
+
+		String getSomeInfo();
 	}
 
 	interface Order {