From 63b0f5a01a7400cf3559ba62874a79b037a61cb6 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Wed, 1 Jun 2022 11:38:49 +0200 Subject: [PATCH] Polishing. See #1254 --- .../data/jdbc/core/JdbcAggregateTemplate.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java index 1c165b79c..cb2856ff9 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java @@ -124,7 +124,9 @@ public class JdbcAggregateTemplate implements JdbcAggregateOperations { } /** - * @param entityCallbacks + * Sets the callbacks to be invoked on life cycle events. + * + * @param entityCallbacks must not be {@literal null}. * @since 1.1 */ public void setEntityCallbacks(EntityCallbacks entityCallbacks) { @@ -197,10 +199,10 @@ public class JdbcAggregateTemplate implements JdbcAggregateOperations { Assert.notNull(domainType, "Domain type must not be null!"); T entity = accessStrategy.findById(id, domainType); - if (entity != null) { - return triggerAfterConvert(entity); + if (entity == null) { + return null; } - return entity; + return triggerAfterConvert(entity); } @Override