DATAMONGO-1854 - Polishing.

Author: mp911de

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

@@ -119,7 +119,7 @@ public static Collation of(CollationLocale locale) {
 	}
 
 	/**
-	 * Parse the given collation string into a {@link Collation}.
+	 * Parse the given {@code collation} string into a {@link Collation}.
 	 *
 	 * @param collation the collation to parse. Can be a simple string like {@code en_US} or a
 	 *          {@link Document#parse(String) parsable} document like <code>&#123; 'locale' : '?0' &#125;</code> .

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

@@ -97,11 +97,9 @@
 	String sort() default "";
 
 	/**
-	 * Defines the collation to apply when executing the query. <br />
-	 *
-	 * <pre>
-	 *     <code>
+	 * Defines the collation to apply when executing the query.
 	 *
+	 * <pre class="code">
 	 * // Fixed value
 	 * &#64;Query(collation = "en_US")
 	 * List<Entry> findAllByFixedCollation();
@@ -121,7 +119,6 @@
 	 * // SpEL expression
 	 * &#64;Query(collation = "?#{[0]}")
 	 * List<Entry> findAllByDynamicSpElCollation(String collation);
-	 *     </code>
 	 * </pre>
 	 *
 	 * @since 2.2

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryMethod.java

@@ -335,7 +335,7 @@ public boolean hasAnnotatedCollation() {
 	/**
 	 * Get the collation value extracted from the {@link Query} annotation.
 	 *
-	 * @return the {@link Query#sort()} value.
+	 * @return the {@link Query#collation()} value.
 	 * @throws IllegalStateException if method not annotated with {@link Query}. Make sure to check
 	 *           {@link #hasAnnotatedQuery()} first.
 	 * @since 2.2

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

@@ -96,6 +96,7 @@ public void onCreation(PartTreeMongoQuery query) {
 
 		if (query.getQueryMethod().hasAnnotatedCollation()) {
 
+			// TODO: SPEL
 			String collation = query.getQueryMethod().getAnnotatedCollation();
 			if (!collation.contains("?")) {
 				index = index.collation(Collation.parse(collation));