DATAMONGO-1403 - Add maxExecutionTimeMs alias for @Meta(maxExcecutionTime).

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-mongodb-parent</artifactId>
-	<version>1.9.0.BUILD-SNAPSHOT</version>
+	<version>1.9.0.DATAMONGO-1403-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data MongoDB</name>

spring-data-mongodb-cross-store/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.9.0.BUILD-SNAPSHOT</version>
+		<version>1.9.0.DATAMONGO-1403-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -48,7 +48,7 @@
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-mongodb</artifactId>
-			<version>1.9.0.BUILD-SNAPSHOT</version>
+			<version>1.9.0.DATAMONGO-1403-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>

spring-data-mongodb-distribution/pom.xml

@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.9.0.BUILD-SNAPSHOT</version>
+		<version>1.9.0.DATAMONGO-1403-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-mongodb-log4j/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.9.0.BUILD-SNAPSHOT</version>
+		<version>1.9.0.DATAMONGO-1403-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-mongodb/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.9.0.BUILD-SNAPSHOT</version>
+		<version>1.9.0.DATAMONGO-1403-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

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

@@ -21,6 +21,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.springframework.core.annotation.AliasFor;
 import org.springframework.data.annotation.QueryAnnotation;
 
 /**
@@ -36,28 +37,41 @@
 
 	/**
 	 * Set the maximum time limit in milliseconds for processing operations.
-	 * 
+	 *
+	 * @deprecated because of spelling issues. Please use {@link #maxExecutionTimeMs()} instead.
 	 * @return
 	 */
+	@AliasFor("maxExecutionTimeMs")
+	@Deprecated
 	long maxExcecutionTime() default -1;
 
+	/**
+	 * Set the maximum time limit in milliseconds for processing operations.
+	 * This is an alias for {@link #maxExcecutionTime()}
+	 *
+	 * @return
+	 * @since 1.10
+	 */
+	@AliasFor("maxExcecutionTime")
+	long maxExecutionTimeMs() default -1;
+
 	/**
 	 * Only scan the specified number of documents.
-	 * 
+	 *
 	 * @return
 	 */
 	long maxScanDocuments() default -1;
 
 	/**
 	 * Add a comment to the query.
-	 * 
+	 *
 	 * @return
 	 */
 	String comment() default "";
 
 	/**
 	 * Using snapshot prevents the cursor from returning a document more than once.
-	 * 
+	 *
 	 * @return
 	 */
 	boolean snapshot() default false;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2015 the original author or authors.
+ * Copyright 2011-2016 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.
@@ -43,9 +43,10 @@
 
 /**
  * Unit test for {@link MongoQueryMethod}.
- * 
+ *
  * @author Oliver Gierke
  * @author Christoph Strobl
+ * @author Mark Paluch
  */
 public class MongoQueryMethodUnitTests {
 
@@ -151,6 +152,19 @@ public void createsMongoQueryMethodWithMaxExecutionTimeCorrectly() throws Except
 		assertThat(method.getQueryMetaAttributes().getMaxTimeMsec(), is(100L));
 	}
 
+
+	/**
+	 * @see DATAMONGO-1403
+	 */
+	@Test
+	public void createsMongoQueryMethodWithSpellFixedMaxExecutionTimeCorrectly() throws Exception {
+
+		MongoQueryMethod method = queryMethod(PersonRepository.class, "metaWithSpellFixedMaxExecutionTime");
+
+		assertThat(method.hasQueryMetaAttributes(), is(true));
+		assertThat(method.getQueryMetaAttributes().getMaxTimeMsec(), is(100L));
+	}
+
 	/**
 	 * @see DATAMONGO-957
 	 */
@@ -224,6 +238,9 @@ interface PersonRepository extends Repository<User, Long> {
 		@Meta(maxExcecutionTime = 100)
 		List<User> metaWithMaxExecutionTime();
 
+		@Meta(maxExecutionTimeMs = 100)
+		List<User> metaWithSpellFixedMaxExecutionTime();
+
 		@Meta(maxScanDocuments = 10)
 		List<User> metaWithMaxScan();