Polishing.

Refactoring.

See #1249

Author: schauder

spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/RelationalEntityDeleteWriter.java

@@ -18,12 +18,12 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.function.Consumer;
 
 import org.springframework.data.convert.EntityWriter;
-import org.springframework.data.mapping.PersistentProperty;
+import org.springframework.data.mapping.PersistentPropertyPath;
 import org.springframework.data.relational.core.mapping.PersistentPropertyPathExtension;
 import org.springframework.data.relational.core.mapping.RelationalMappingContext;
-import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
 import org.springframework.data.relational.core.mapping.RelationalPersistentProperty;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
@@ -74,10 +74,7 @@ private List<DbAction<?>> deleteAll(Class<?> entityType) {
 
 		List<DbAction<?>> deleteReferencedActions = new ArrayList<>();
 
-		context.findPersistentPropertyPaths(entityType, PersistentProperty::isEntity) //
-				.filter(p -> !p.getRequiredLeafProperty().isEmbedded() //
-						&& PersistentPropertyPathExtension.isWritable(p)) //
-				.forEach(p -> deleteReferencedActions.add(new DbAction.DeleteAll<>(p)));
+		forAllTableRepresentingPaths(entityType, p -> deleteReferencedActions.add(new DbAction.DeleteAll<>(p)));
 
 		Collections.reverse(deleteReferencedActions);
 
@@ -118,14 +115,18 @@ private List<DbAction<?>> deleteReferencedEntities(Object id, AggregateChange<?>
 
 		List<DbAction<?>> actions = new ArrayList<>();
 
-		context.findPersistentPropertyPaths(aggregateChange.getEntityType(), p -> p.isEntity()) //
-				.filter(p -> !p.getRequiredLeafProperty().isEmbedded() //
-						&& PersistentPropertyPathExtension.isWritable(p)) //
-				.forEach(p -> actions.add(new DbAction.Delete<>(id, p)));
+		forAllTableRepresentingPaths(aggregateChange.getEntityType(), p -> actions.add(new DbAction.Delete<>(id, p)));
 
 		Collections.reverse(actions);
 
 		return actions;
 	}
 
+	private void forAllTableRepresentingPaths(Class<?> entityType,
+			Consumer<PersistentPropertyPath<RelationalPersistentProperty>> pathConsumer) {
+
+		context.findPersistentPropertyPaths(entityType, property -> property.isEntity() && !property.isEmbedded()) //
+				.filter(PersistentPropertyPathExtension::isWritable) //
+				.forEach(pathConsumer);
+	}
 }

spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/WritingContext.java

@@ -25,7 +25,7 @@
 import java.util.stream.Collectors;
 
 import org.springframework.data.mapping.PersistentPropertyPath;
-import org.springframework.data.mapping.PersistentPropertyPaths;
+import org.springframework.data.relational.core.mapping.PersistentPropertyPathExtension;
 import org.springframework.data.relational.core.mapping.RelationalMappingContext;
 import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
 import org.springframework.data.relational.core.mapping.RelationalPersistentProperty;
@@ -47,7 +47,7 @@ class WritingContext<T> {
 	private final RelationalMappingContext context;
 	private final T root;
 	private final Class<T> entityType;
-	private final PersistentPropertyPaths<?, RelationalPersistentProperty> paths;
+	private final List<PersistentPropertyPath<RelationalPersistentProperty>> paths;
 	private final Map<PathNode, DbAction<?>> previousActions = new HashMap<>();
 	private final Map<PersistentPropertyPath<RelationalPersistentProperty>, List<PathNode>> nodesCache = new HashMap<>();
 	private final IdValueSource rootIdValueSource;
@@ -63,7 +63,9 @@ class WritingContext<T> {
 		this.aggregateChange = aggregateChange;
 		this.rootIdValueSource = IdValueSource.forInstance(root,
 				context.getRequiredPersistentEntity(aggregateChange.getEntityType()));
-		this.paths = context.findPersistentPropertyPaths(entityType, (p) -> p.isEntity() && !p.isEmbedded() && p.isWritable());
+		this.paths = context.findPersistentPropertyPaths(entityType, (p) -> p.isEntity() && !p.isEmbedded()) //
+				.filter(PersistentPropertyPathExtension::isWritable) //
+				.stream().toList();
 	}
 
 	/**