Update cyclic test cases

Author: christophstrobl

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateDocumentReferenceTests.java

@@ -23,14 +23,14 @@
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import lombok.ToString;
 import org.bson.Document;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -39,7 +39,6 @@
 import org.springframework.data.annotation.Id;
 import org.springframework.data.convert.WritingConverter;
 import org.springframework.data.mongodb.core.convert.LazyLoadingTestUtils;
-import org.springframework.data.mongodb.core.mapping.DBRef;
 import org.springframework.data.mongodb.core.mapping.DocumentPointer;
 import org.springframework.data.mongodb.core.mapping.DocumentReference;
 import org.springframework.data.mongodb.core.mapping.Field;
@@ -52,14 +51,14 @@
 import com.mongodb.client.model.Filters;
 
 /**
- * {@link DBRef} related integration tests for {@link MongoTemplate}.
+ * {@link DocumentReference} related integration tests for {@link MongoTemplate}.
  *
  * @author Christoph Strobl
  */
 @ExtendWith(MongoClientExtension.class)
 public class MongoTemplateDocumentReferenceTests {
 
-	public static final String DB_NAME = "manual-reference-tests";
+	public static final String DB_NAME = "document-reference-tests";
 
 	static @Client MongoClient client;
 
@@ -492,16 +491,43 @@ void testLazyCyclic() {
 
 		WithRefB b = new WithRefB();
 		b.id = "b";
-		b.toA = a;
 
 		a.toB = b;
+		b.lazyToA = a;
 
 		template.save(a);
 		template.save(b);
 
 		WithRefA loadedA = template.query(WithRefA.class).matching(where("id").is(a.id)).firstValue();
 		assertThat(loadedA).isNotNull();
 		assertThat(loadedA.getToB()).isNotNull();
+		LazyLoadingTestUtils.assertProxy(loadedA.getToB().lazyToA, (proxy) -> {
+
+			assertThat(proxy.isResolved()).isFalse();
+			assertThat(proxy.currentValue()).isNull();
+		});
+	}
+
+	@Test
+	void testEagerCyclic() {
+
+		WithRefA a = new WithRefA();
+		a.id = "a";
+
+		WithRefB b = new WithRefB();
+		b.id = "b";
+
+		a.toB = b;
+		b.eagerToA = a;
+
+		template.save(a);
+		template.save(b);
+
+		WithRefA loadedA = template.query(WithRefA.class).matching(where("id").is(a.id)).firstValue();
+
+		assertThat(loadedA).isNotNull();
+		assertThat(loadedA.getToB()).isNotNull();
+		assertThat(loadedA.getToB().eagerToA).isSameAs(loadedA);
 	}
 
 	@Data
@@ -573,7 +599,6 @@ static class SimpleObjectRef {
 
 		@Id String id;
 		String value;
-
 	}
 
 	@Getter
@@ -683,8 +708,9 @@ public Object toReference() {
 	static class WithRefB/* to A */ implements ReferenceAble {
 
 		@Id String id;
-		@DocumentReference //(lazy = true)
-		WithRefA toA;
+		@DocumentReference(lazy = true) WithRefA lazyToA;
+
+		@DocumentReference WithRefA eagerToA;
 
 		@Override
 		public Object toReference() {