DATADOC-48 added new @RelatedDocument annotation

Author: Thomas Risberg

spring-data-document-core/src/main/java/org/springframework/data/document/annotation/RelatedDocument.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2011 by the original author(s).
+ *
+ * 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.document.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author Thomas Risberg
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({
+    ElementType.FIELD
+})
+public @interface RelatedDocument {
+
+  String collection() default "";
+
+}

spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/mongo/MongoDocumentBacking.aj

@@ -13,7 +13,7 @@ import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.reflect.FieldSignature;
 
 import org.springframework.dao.DataAccessException;
-import org.springframework.data.document.mongodb.mapping.Document;
+import org.springframework.data.document.annotation.RelatedDocument;
 
 import org.springframework.data.persistence.document.DocumentBacked;
 import org.springframework.data.persistence.document.DocumentBackedTransactionSynchronization;
@@ -47,7 +47,7 @@ public aspect MongoDocumentBacking {
   declare parents : (@Entity *) implements DocumentBacked;
 
   // The annotated fields that will be persisted in MongoDB rather than with JPA
-  declare @field: @Document * (@Entity+ *).*:@Transient;
+  declare @field: @RelatedDocument * (@Entity+ *).*:@Transient;
 
   // -------------------------------------------------------------------------
   // Advise user-defined constructors of ChangeSetBacked objects to create a new
@@ -65,12 +65,12 @@ public aspect MongoDocumentBacking {
 		args(cs);
 
   protected pointcut entityFieldGet(DocumentBacked entity) :
-        get(@Document * DocumentBacked+.*) &&
+        get(@RelatedDocument * DocumentBacked+.*) &&
         this(entity) &&
         !get(* DocumentBacked.*);
 
   protected pointcut entityFieldSet(DocumentBacked entity, Object newVal) :
-        set(@Document * DocumentBacked+.*) &&
+        set(@RelatedDocument * DocumentBacked+.*) &&
         this(entity) &&
         args(newVal) &&
         !set(* DocumentBacked.*);

spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/test/Person.java

@@ -3,7 +3,7 @@
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
-import org.springframework.data.document.mongodb.mapping.Document;
+import org.springframework.data.document.annotation.RelatedDocument;
 
 @Entity
 public class Person {
@@ -17,7 +17,7 @@ public class Person {
 
   private java.util.Date birthDate;
 
-  @Document
+  @RelatedDocument
   public Resume resume;
 
   public Person() {

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/Document.java

@@ -29,8 +29,7 @@
 @Persistent
 @Retention(RetentionPolicy.RUNTIME)
 @Target({
-    ElementType.TYPE,
-    ElementType.FIELD
+    ElementType.TYPE
 })
 public @interface Document {