DATAMONGO-1373 - Allow usage of @AliasFor with mapping and indexing a…

…nnotations. We now support @AliasFor to build composed annotations with: @document, @id, @field, @indexed, @CompoundIndex, @GeoSpatialIndexed, @TextIndexed, @query, and @meta. Added missing license header to @field. Original pull request: #347.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2015 the original author or authors.
+ * Copyright 2010-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.
@@ -27,8 +27,9 @@
  * @author Laurent Canet
  * @author Thomas Darimont
  * @author Christoph Strobl
+ * @author Mark Paluch
  */
-@Target(ElementType.FIELD)
+@Target({ElementType.FIELD, ElementType.ANNOTATION_TYPE})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface GeoSpatialIndexed {
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-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.
@@ -26,10 +26,11 @@
  * all fields marked with {@link TextIndexed} are combined into one single index. <br />
  * 
  * @author Christoph Strobl
+ * @author Mark Paluch
  * @since 1.6
  */
 @Documented
-@Target({ ElementType.FIELD })
+@Target({ ElementType.FIELD, ElementType.ANNOTATION_TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface TextIndexed {
 

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

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2015 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.data.mongodb.core.mapping;
 
 import java.lang.annotation.Documented;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-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.
@@ -25,10 +25,11 @@
 
 /**
  * @author Christoph Strobl
+ * @author Mark Paluch
  * @since 1.6
  */
 @Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE})
 @Documented
 @QueryAnnotation
 public @interface Meta {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 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.
@@ -30,9 +30,10 @@
  * @author Oliver Gierke
  * @author Thomas Darimont
  * @author Christoph Strobl
+ * @author Mark Paluch
  */
 @Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE})
 @Documented
 @QueryAnnotation
 public @interface Query {

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryMethod.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.
@@ -20,6 +20,7 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.springframework.core.annotation.AnnotatedElementUtils;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.data.geo.GeoPage;
 import org.springframework.data.geo.GeoResult;
@@ -43,6 +44,7 @@
  * 
  * @author Oliver Gierke
  * @author Christoph Strobl
+ * @author Mark Paluch
  */
 public class MongoQueryMethod extends QueryMethod {
 
@@ -191,7 +193,7 @@ private boolean isGeoNearQuery(Method method) {
  * @return
  */
 Query getQueryAnnotation() {
-return method.getAnnotation(Query.class);
+return AnnotatedElementUtils.findMergedAnnotation(method, Query.class);
 }
 
 TypeInformation<?> getReturnType() {
@@ -213,7 +215,7 @@ public boolean hasQueryMetaAttributes() {
  * @since 1.6
  */
 Meta getMetaAnnotation() {
-return method.getAnnotation(Meta.class);
+return AnnotatedElementUtils.findMergedAnnotation(method, Meta.class);
 }
 
 /**