From 8510c640c1ba2fb30df4b8a69691d11a4eb24525 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Mon, 15 Oct 2018 08:43:39 +0200 Subject: [PATCH] DATAJDBC-263 - Polishing. Improved formatting, added author tags and issue comments. Changed "entity" to "aggregate" in test names to make it more precise. Original pull request: #94. --- .../jdbc/repository/support/JdbcQueryLookupStrategy.java | 1 + .../jdbc/repository/support/JdbcRepositoryQuery.java | 3 +++ .../support/JdbcQueryLookupStrategyUnitTests.java | 1 + .../repository/support/JdbcRepositoryQueryUnitTests.java | 9 +++++---- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategy.java b/src/main/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategy.java index 099740e3..113b1da7 100644 --- a/src/main/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategy.java +++ b/src/main/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategy.java @@ -41,6 +41,7 @@ import org.springframework.util.Assert; * @author Kazuki Shimizu * @author Oliver Gierke * @author Mark Paluch + * @author Maciej Walkowiak */ class JdbcQueryLookupStrategy implements QueryLookupStrategy { diff --git a/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryQuery.java b/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryQuery.java index 246447ab..d85735c6 100644 --- a/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryQuery.java +++ b/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryQuery.java @@ -99,12 +99,14 @@ class JdbcRepositoryQuery implements RepositoryQuery { } if (queryMethod.isCollectionQuery() || queryMethod.isStreamQuery()) { + List result = operations.query(query, parameters, rowMapper); publishAfterLoad(result); return result; } try { + Object result = operations.queryForObject(query, parameters, rowMapper); publishAfterLoad(result); return result; @@ -166,6 +168,7 @@ class JdbcRepositoryQuery implements RepositoryQuery { private void publishAfterLoad(@Nullable T entity) { if (entity != null && context.hasPersistentEntityFor(entity.getClass())) { + RelationalPersistentEntity e = context.getRequiredPersistentEntity(entity.getClass()); Object identifier = e.getIdentifierAccessor(entity) .getIdentifier(); diff --git a/src/test/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategyUnitTests.java b/src/test/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategyUnitTests.java index a5b61df2..c6dba937 100644 --- a/src/test/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategyUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategyUnitTests.java @@ -47,6 +47,7 @@ import org.springframework.jdbc.core.namedparam.SqlParameterSource; * @author Jens Schauder * @author Oliver Gierke * @author Mark Paluch + * @author Maciej Walkowiak */ public class JdbcQueryLookupStrategyUnitTests { diff --git a/src/test/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryQueryUnitTests.java b/src/test/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryQueryUnitTests.java index 85bb0679..6a86e70b 100644 --- a/src/test/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryQueryUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryQueryUnitTests.java @@ -38,6 +38,7 @@ import org.springframework.jdbc.core.namedparam.SqlParameterSource; * * @author Jens Schauder * @author Oliver Gierke + * @author Maciej Walkowiak */ public class JdbcRepositoryQueryUnitTests { @@ -108,8 +109,8 @@ public class JdbcRepositoryQueryUnitTests { .queryForObject(anyString(), any(SqlParameterSource.class), isA(CustomRowMapper.class)); } - @Test - public void publishesSingleEventWhenQueryReturnsSingleElement() { + @Test // DATAJDBC-263 + public void publishesSingleEventWhenQueryReturnsSingleAggregate() { doReturn("some sql statement").when(queryMethod).getAnnotatedQuery(); doReturn(false).when(queryMethod).isCollectionQuery(); @@ -122,8 +123,8 @@ public class JdbcRepositoryQueryUnitTests { verify(publisher).publishEvent(any(AfterLoadEvent.class)); } - @Test - public void publishesAsManyEventsAsReturnedEntities() { + @Test // DATAJDBC-263 + public void publishesAsManyEventsAsReturnedAggregates() { doReturn("some sql statement").when(queryMethod).getAnnotatedQuery(); doReturn(true).when(queryMethod).isCollectionQuery();