GH-2289 - Mark obverse relationship as processed while persisting.

Author: meistermeier

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

@@ -745,6 +745,7 @@ private <T> T processNestedRelations(Neo4jPersistentEntity<?> sourceEntity, Pers
 					TemplateSupport.updateVersionPropertyIfPossible(targetEntity, targetPropertyAccessor, savedEntity);
 				}
 				stateMachine.markValueAsProcessedAs(relatedObjectBeforeCallbacksApplied, targetPropertyAccessor.getBean());
+				stateMachine.markRelationshipAsProcessed(relatedInternalId, relationshipDescription.getRelationshipObverse());
 
 				Object idValue = idProperty != null
 						? relationshipContext

src/main/java/org/springframework/data/neo4j/core/mapping/NestedRelationshipProcessingStateMachine.java

@@ -143,7 +143,10 @@ public int hashCode() {
 	 *
 	 * @param relationshipDescription To be marked as processed
 	 */
-	public void markRelationshipAsProcessed(Object fromId, RelationshipDescription relationshipDescription) {
+	public void markRelationshipAsProcessed(Object fromId, @Nullable RelationshipDescription relationshipDescription) {
+		if (relationshipDescription == null) {
+			return;
+		}
 
 		try {
 			write.lock();

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

@@ -17,6 +17,7 @@
 
 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;
@@ -70,17 +71,29 @@ void testNewRelation(@Autowired SkuRepository skuRepo) {
 		a.rangeRelationTo(d, 1, 1, RelationType.MULTIPLICATIVE);
 		a = skuRepo.save(a);
 
-		assertThat(a.getRangeRelationsOut()).hasSize(3);
+		Assertions.assertThat(a.getRangeRelationsOut()).hasSize(3);
 		b = skuRepo.findById(b.getId()).get();
-		assertThat(b.getRangeRelationsIn()).hasSize(1);
+		Assertions.assertThat(b.getRangeRelationsIn()).hasSize(1);
+
+		Assertions.assertThat(b.getRangeRelationsIn().stream().findFirst().get().getTargetSku().getRangeRelationsOut()).hasSize(3);
 
 		b.rangeRelationTo(c, 1, 1, RelationType.MULTIPLICATIVE);
 		b = skuRepo.save(b);
-		assertThat(b.getRangeRelationsIn()).hasSize(1);
-		assertThat(b.getRangeRelationsOut()).hasSize(1);
+		Assertions.assertThat(b.getRangeRelationsIn()).hasSize(1);
+		Assertions.assertThat(b.getRangeRelationsOut()).hasSize(1);
+
+		a = skuRepo.findById(a.getId()).get();
+		Assertions.assertThat(a.getRangeRelationsOut()).hasSize(3);
+		Assertions.assertThat(a.getRangeRelationsOut()).allSatisfy(r -> {
+			int expectedSize = 1;
+			if ("C".equals(r.getTargetSku().getName())) {
+				expectedSize = 2;
+			}
+			Assertions.assertThat(r.getTargetSku().getRangeRelationsIn()).hasSize(expectedSize);
+		});
 	}
 
-	@RepeatedTest(5) // GH-2294
+	 @RepeatedTest(5) // GH-2294
 	void testNewRelationRo(@Autowired SkuRORepository skuRepo) {
 		SkuRO a = skuRepo.findOneByName("A");
 		SkuRO b = skuRepo.findOneByName("B");

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

@@ -62,4 +62,13 @@ public RangeRelation rangeRelationTo(Sku sku, double minDelta, double maxDelta,
 		sku.rangeRelationsIn.add(relationIn);
 		return relationOut;
 	}
+
+	@Override
+	public String toString() {
+		return "Sku{" +
+				"id=" + id +
+				", number=" + number +
+				", name='" + name +
+				'}';
+	}
 }