Skip to content

Commit 3e91eeb

Browse files
committed
GH-2600 - Checkstyle is right.
1 parent 6c4eef3 commit 3e91eeb

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

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

+2-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import java.util.function.Predicate;
3333
import java.util.function.Supplier;
3434
import java.util.stream.Collectors;
35-
import java.util.stream.Stream;
3635
import java.util.stream.StreamSupport;
3736

3837
import org.neo4j.driver.Value;
@@ -61,7 +60,6 @@
6160
import org.springframework.lang.NonNull;
6261
import org.springframework.lang.Nullable;
6362
import org.springframework.util.Assert;
64-
import org.springframework.util.CollectionUtils;
6563

6664
/**
6765
* @author Michael J. Simons
@@ -553,7 +551,7 @@ private AssociationHandler<Neo4jPersistentProperty> populateFrom(MapAccessor que
553551
if (dings.hasRelationshipProperties()) {
554552
Object existingIdPropertyValue = ((Neo4jPersistentEntity<?>) dings.getRelationshipPropertiesEntity()).getPropertyAccessor(existingValueInCollection).getProperty(((Neo4jPersistentEntity<?>) dings.getRelationshipPropertiesEntity()).getIdProperty());
555553
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)
557555
Object existingIdPropertyValue = ((Neo4jPersistentEntity<?>) dings.getTarget()).getPropertyAccessor(existingValueInCollection).getProperty(((Neo4jPersistentEntity<?>) dings.getTarget()).getIdProperty());
558556
mergedValues.put(existingIdPropertyValue, existingValueInCollection);
559557
}
@@ -562,7 +560,7 @@ private AssociationHandler<Neo4jPersistentProperty> populateFrom(MapAccessor que
562560
if (dings.hasRelationshipProperties()) {
563561
Object existingIdPropertyValue = ((Neo4jPersistentEntity<?>) dings.getRelationshipPropertiesEntity()).getPropertyAccessor(providedValueInCollection).getProperty(((Neo4jPersistentEntity<?>) dings.getRelationshipPropertiesEntity()).getIdProperty());
564562
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)
566564
Object existingIdPropertyValue = ((Neo4jPersistentEntity<?>) dings.getTarget()).getPropertyAccessor(providedValueInCollection).getProperty(((Neo4jPersistentEntity<?>) dings.getTarget()).getIdProperty());
567565
mergedValues.put(existingIdPropertyValue, providedValueInCollection);
568566
}

0 commit comments

Comments
 (0)