32
32
import java .util .function .Predicate ;
33
33
import java .util .function .Supplier ;
34
34
import java .util .stream .Collectors ;
35
- import java .util .stream .Stream ;
36
35
import java .util .stream .StreamSupport ;
37
36
38
37
import org .neo4j .driver .Value ;
61
60
import org .springframework .lang .NonNull ;
62
61
import org .springframework .lang .Nullable ;
63
62
import org .springframework .util .Assert ;
64
- import org .springframework .util .CollectionUtils ;
65
63
66
64
/**
67
65
* @author Michael J. Simons
@@ -553,7 +551,7 @@ private AssociationHandler<Neo4jPersistentProperty> populateFrom(MapAccessor que
553
551
if (dings .hasRelationshipProperties ()) {
554
552
Object existingIdPropertyValue = ((Neo4jPersistentEntity <?>) dings .getRelationshipPropertiesEntity ()).getPropertyAccessor (existingValueInCollection ).getProperty (((Neo4jPersistentEntity <?>) dings .getRelationshipPropertiesEntity ()).getIdProperty ());
555
553
mergedValues .put (existingIdPropertyValue , existingValueInCollection );
556
- } else if (!dings .isDynamic ()){ // should not happen because this is all inside populatedCollection (but better safe than sorry)
554
+ } else if (!dings .isDynamic ()) { // should not happen because this is all inside populatedCollection (but better safe than sorry)
557
555
Object existingIdPropertyValue = ((Neo4jPersistentEntity <?>) dings .getTarget ()).getPropertyAccessor (existingValueInCollection ).getProperty (((Neo4jPersistentEntity <?>) dings .getTarget ()).getIdProperty ());
558
556
mergedValues .put (existingIdPropertyValue , existingValueInCollection );
559
557
}
@@ -562,7 +560,7 @@ private AssociationHandler<Neo4jPersistentProperty> populateFrom(MapAccessor que
562
560
if (dings .hasRelationshipProperties ()) {
563
561
Object existingIdPropertyValue = ((Neo4jPersistentEntity <?>) dings .getRelationshipPropertiesEntity ()).getPropertyAccessor (providedValueInCollection ).getProperty (((Neo4jPersistentEntity <?>) dings .getRelationshipPropertiesEntity ()).getIdProperty ());
564
562
mergedValues .put (existingIdPropertyValue , providedValueInCollection );
565
- } else if (!dings .isDynamic ()){ // should not happen because this is all inside populatedCollection (but better safe than sorry)
563
+ } else if (!dings .isDynamic ()) { // should not happen because this is all inside populatedCollection (but better safe than sorry)
566
564
Object existingIdPropertyValue = ((Neo4jPersistentEntity <?>) dings .getTarget ()).getPropertyAccessor (providedValueInCollection ).getProperty (((Neo4jPersistentEntity <?>) dings .getTarget ()).getIdProperty ());
567
565
mergedValues .put (existingIdPropertyValue , providedValueInCollection );
568
566
}
0 commit comments