DATAGRAPH-1396 - Fix saving of scalar RelationshipProperties.

Author: meistermeier

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

@@ -146,15 +146,20 @@ public static NestedRelationshipContext of(Association<Neo4jPersistentProperty>
 				}
 				value = relationshipProperties;
 			} else {
-				List<MappingSupport.RelationshipPropertiesWithEntityHolder> relationshipProperties = new ArrayList<>();
-				for (Object relationshipProperty : ((Collection<Object>) value)) {
+				if (inverse.isCollectionLike()) {
+					List<MappingSupport.RelationshipPropertiesWithEntityHolder> relationshipProperties = new ArrayList<>();
+					for (Object relationshipProperty : ((Collection<Object>) value)) {
 
-					MappingSupport.RelationshipPropertiesWithEntityHolder oneOfThem =
-							new MappingSupport.RelationshipPropertiesWithEntityHolder(relationshipProperty,
-									getTargetNode(relationshipPropertiesEntity, relationshipProperty));
-					relationshipProperties.add(oneOfThem);
+						MappingSupport.RelationshipPropertiesWithEntityHolder oneOfThem =
+								new MappingSupport.RelationshipPropertiesWithEntityHolder(relationshipProperty,
+										getTargetNode(relationshipPropertiesEntity, relationshipProperty));
+						relationshipProperties.add(oneOfThem);
+					}
+					value = relationshipProperties;
+				} else {
+					value = new MappingSupport.RelationshipPropertiesWithEntityHolder(value,
+							getTargetNode(relationshipPropertiesEntity, value));
 				}
-				value = relationshipProperties;
 			}
 		}
 

src/test/java/org/springframework/data/neo4j/integration/imperative/RepositoryIT.java

@@ -1044,6 +1044,12 @@ void saveEntityWithRelationshipWithProperties(
 			hobbies.add(rel2);
 			person.setHobbies(hobbies);
 
+			WorksInClubRelationship worksInClub = new WorksInClubRelationship(2002);
+			Club club = new Club();
+			club.setName("BlubbClub");
+			worksInClub.setClub(club);
+			person.setClub(worksInClub);
+
 			// when
 			PersonWithRelationshipWithProperties shouldBeDifferentPerson = repository.save(person);
 
@@ -3052,6 +3058,8 @@ interface RelationshipRepository extends Neo4jRepository<PersonWithRelationship,
 
 		PersonWithRelationship findByPetsName(String petName);
 
+		PersonWithRelationship findByName(String name);
+
 		PersonWithRelationship findByHobbiesNameOrPetsName(String hobbyName, String petName);
 
 		PersonWithRelationship findByHobbiesNameAndPetsName(String hobbyName, String petName);

src/test/java/org/springframework/data/neo4j/integration/reactive/ReactiveRepositoryIT.java

@@ -21,6 +21,7 @@
 
 import org.springframework.data.neo4j.integration.shared.AltLikedByPersonRelationship;
 import org.springframework.data.neo4j.integration.shared.AltPerson;
+import org.springframework.data.neo4j.integration.shared.WorksInClubRelationship;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
@@ -1055,11 +1056,17 @@ void saveEntityWithRelationshipWithProperties(
 			List<LikesHobbyRelationship> hobbies = new ArrayList<>();
 			hobbies.add(rel1);
 			hobbies.add(rel2);
-			PersonWithRelationshipWithProperties clonePerson = new PersonWithRelationshipWithProperties("Freddie clone");
-			clonePerson.setHobbies(hobbies);
+			PersonWithRelationshipWithProperties person = new PersonWithRelationshipWithProperties("Freddie clone");
+			person.setHobbies(hobbies);
+
+			WorksInClubRelationship worksInClub = new WorksInClubRelationship(2002);
+			Club club = new Club();
+			club.setName("BlubbClub");
+			worksInClub.setClub(club);
+			person.setClub(worksInClub);
 
 			// when
-			Mono<PersonWithRelationshipWithProperties> operationUnderTest = repository.save(clonePerson);
+			Mono<PersonWithRelationshipWithProperties> operationUnderTest = repository.save(person);
 
 			// then
 			List<PersonWithRelationshipWithProperties> shouldBeDifferentPersons = new ArrayList<>();
@@ -1071,7 +1078,7 @@ void saveEntityWithRelationshipWithProperties(
 			assertThat(shouldBeDifferentPersons).size().isEqualTo(1);
 
 			PersonWithRelationshipWithProperties shouldBeDifferentPerson = shouldBeDifferentPersons.get(0);
-			assertThat(shouldBeDifferentPerson).isNotNull().isEqualToComparingOnlyGivenFields(clonePerson, "hobbies");
+			assertThat(shouldBeDifferentPerson).isNotNull().isEqualToComparingOnlyGivenFields(person, "hobbies");
 			assertThat(shouldBeDifferentPerson.getName()).isEqualToIgnoringCase("Freddie clone");
 
 			// check content of db