GH-2289 - Now also available in reactive flavour.

Author: meistermeier

src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jTemplate.java

@@ -837,6 +837,7 @@ private <T> Mono<T> processNestedRelations(Neo4jPersistentEntity<?> sourceEntity
 										targetPropertyAccessor.setProperty(targetEntity.getVersionProperty(), idAndVersion.getT2()[0]);
 									}
 									stateMachine.markValueAsProcessedAs(relatedObjectBeforeCallbacksApplied, targetPropertyAccessor.getBean());
+									stateMachine.markRelationshipAsProcessed(relatedInternalId, relationshipDescription.getRelationshipObverse());
 
 									Object idValue = idProperty != null
 											? relationshipContext

src/test/java/org/springframework/data/neo4j/integration/issues/gh2289/GH2289IT.java

@@ -17,7 +17,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.RepeatedTest;
 import org.neo4j.driver.Driver;
@@ -71,25 +70,25 @@ void testNewRelation(@Autowired SkuRepository skuRepo) {
 		a.rangeRelationTo(d, 1, 1, RelationType.MULTIPLICATIVE);
 		a = skuRepo.save(a);
 
-		Assertions.assertThat(a.getRangeRelationsOut()).hasSize(3);
+		assertThat(a.getRangeRelationsOut()).hasSize(3);
 		b = skuRepo.findById(b.getId()).get();
-		Assertions.assertThat(b.getRangeRelationsIn()).hasSize(1);
+		assertThat(b.getRangeRelationsIn()).hasSize(1);
 
-		Assertions.assertThat(b.getRangeRelationsIn().stream().findFirst().get().getTargetSku().getRangeRelationsOut()).hasSize(3);
+		assertThat(b.getRangeRelationsIn().stream().findFirst().get().getTargetSku().getRangeRelationsOut()).hasSize(3);
 
 		b.rangeRelationTo(c, 1, 1, RelationType.MULTIPLICATIVE);
 		b = skuRepo.save(b);
-		Assertions.assertThat(b.getRangeRelationsIn()).hasSize(1);
-		Assertions.assertThat(b.getRangeRelationsOut()).hasSize(1);
+		assertThat(b.getRangeRelationsIn()).hasSize(1);
+		assertThat(b.getRangeRelationsOut()).hasSize(1);
 
 		a = skuRepo.findById(a.getId()).get();
-		Assertions.assertThat(a.getRangeRelationsOut()).hasSize(3);
-		Assertions.assertThat(a.getRangeRelationsOut()).allSatisfy(r -> {
+		assertThat(a.getRangeRelationsOut()).hasSize(3);
+		assertThat(a.getRangeRelationsOut()).allSatisfy(r -> {
 			int expectedSize = 1;
 			if ("C".equals(r.getTargetSku().getName())) {
 				expectedSize = 2;
 			}
-			Assertions.assertThat(r.getTargetSku().getRangeRelationsIn()).hasSize(expectedSize);
+			assertThat(r.getTargetSku().getRangeRelationsIn()).hasSize(expectedSize);
 		});
 	}
 

src/test/java/org/springframework/data/neo4j/integration/issues/gh2289/ReactiveGH2289IT.java

@@ -69,6 +69,7 @@ protected static void setupData(@Autowired BookmarkCapture bookmarkCapture) {
 	@RepeatedTest(23)
 	void testNewRelation(@Autowired SkuRepository skuRepo) {
 
+		AtomicLong aId = new AtomicLong();
 		AtomicLong bId = new AtomicLong();
 		AtomicReference<Sku> cRef = new AtomicReference<>();
 		skuRepo.save(new Sku(0L, "A"))
@@ -87,7 +88,10 @@ void testNewRelation(@Autowired SkuRepository skuRepo) {
 			a.rangeRelationTo(d, 1, 1, RelationType.MULTIPLICATIVE);
 			return skuRepo.save(a);
 		}).as(StepVerifier::create)
-				.expectNextMatches(a -> a.getRangeRelationsOut().size() == 3)
+				.expectNextMatches(a -> {
+					aId.set(a.getId()); // side-effects for the win
+					return a.getRangeRelationsOut().size() == 3;
+				})
 				.verifyComplete();
 
 		skuRepo.findById(bId.get())
@@ -97,7 +101,24 @@ void testNewRelation(@Autowired SkuRepository skuRepo) {
 					return skuRepo.save(b);
 				})
 				.as(StepVerifier::create)
-				.expectNextMatches(a -> a.getRangeRelationsIn().size() == 1 && a.getRangeRelationsOut().size() == 1)
+				.assertNext(b -> {
+					assertThat(b.getRangeRelationsIn()).hasSize(1);
+					assertThat(b.getRangeRelationsOut()).hasSize(1);
+				})
+				.verifyComplete();
+
+		skuRepo.findById(aId.get())
+				.as(StepVerifier::create)
+				.assertNext(a -> {
+					assertThat(a.getRangeRelationsOut()).hasSize(3);
+					assertThat(a.getRangeRelationsOut()).allSatisfy(r -> {
+						int expectedSize = 1;
+						if ("C".equals(r.getTargetSku().getName())) {
+							expectedSize = 2;
+						}
+						assertThat(r.getTargetSku().getRangeRelationsIn()).hasSize(expectedSize);
+					});
+				})
 				.verifyComplete();
 	}