DATAJDBC-197 - Repositories find methods now emit AfterCreation events as intended.

Event publishing moved into the JdbcEntityTemplate in order to ensure events for AggregateRoots.

Removed superfluous AggregateChange from AfterCreation event.

Author: schauder

src/main/java/org/springframework/data/jdbc/core/EventPublishingEntityRowMapper.java

@@ -23,6 +23,7 @@
 import org.springframework.data.jdbc.core.conversion.Interpreter;
 import org.springframework.data.jdbc.core.conversion.JdbcEntityDeleteWriter;
 import org.springframework.data.jdbc.core.conversion.JdbcEntityWriter;
+import org.springframework.data.jdbc.mapping.event.AfterCreation;
 import org.springframework.data.jdbc.mapping.event.AfterDelete;
 import org.springframework.data.jdbc.mapping.event.AfterSave;
 import org.springframework.data.jdbc.mapping.event.BeforeDelete;
@@ -90,7 +91,12 @@ public long count(Class<?> domainType) {
 
 	@Override
 	public <T> T findById(Object id, Class<T> domainType) {
-		return accessStrategy.findById(id, domainType);
+
+		T entity = accessStrategy.findById(id, domainType);
+		if (entity != null) {
+			publishAfterCreation(id, entity);
+		}
+		return entity;
 	}
 
 	@Override
@@ -100,12 +106,18 @@ public <T> boolean existsById(Object id, Class<T> domainType) {
 
 	@Override
 	public <T> Iterable<T> findAll(Class<T> domainType) {
-		return accessStrategy.findAll(domainType);
+
+		Iterable<T> all = accessStrategy.findAll(domainType);
+		publishAfterCreation(all);
+		return all;
 	}
 
 	@Override
 	public <T> Iterable<T> findAllById(Iterable<?> ids, Class<T> domainType) {
-		return accessStrategy.findAllById(ids, domainType);
+
+		Iterable<T> allById = accessStrategy.findAllById(ids, domainType);
+		publishAfterCreation(allById);
+		return allById;
 	}
 
 	@Override
@@ -161,4 +173,15 @@ private AggregateChange createDeletingChange(Class<?> domainType) {
 		jdbcEntityDeleteWriter.write(null, aggregateChange);
 		return aggregateChange;
 	}
+
+	private <T> void publishAfterCreation(Iterable<T> all) {
+
+		all.forEach(e -> {
+			publishAfterCreation(context.getRequiredPersistentEntityInformation((Class<T>) e.getClass()).getRequiredId(e), e);
+		});
+	}
+
+	private <T> void publishAfterCreation(Object id, T entity) {
+		publisher.publishEvent(new AfterCreation(Identifier.of(id), entity));
+	}
 }

src/main/java/org/springframework/data/jdbc/core/JdbcEntityTemplate.java

@@ -15,7 +15,6 @@
  */
 package org.springframework.data.jdbc.mapping.event;
 
-import org.springframework.data.jdbc.core.conversion.AggregateChange;
 import org.springframework.data.jdbc.mapping.event.Identifier.Specified;
 
 /**
@@ -32,9 +31,8 @@ public class AfterCreation extends JdbcEventWithIdAndEntity {
 	/**
 	 * @param id of the entity
 	 * @param entity the newly instantiated entity.
-	 * @param change
 	 */
-	public AfterCreation(Specified id, Object entity, AggregateChange change) {
-		super(id, entity, change);
+	public AfterCreation(Specified id, Object entity) {
+		super(id, entity, null);
 	}
 }

src/main/java/org/springframework/data/jdbc/mapping/event/AfterCreation.java

@@ -21,6 +21,7 @@
 import org.springframework.data.annotation.Id;
 import org.springframework.data.jdbc.core.DefaultDataAccessStrategy;
 import org.springframework.data.jdbc.core.SqlGeneratorSource;
+import org.springframework.data.jdbc.mapping.event.AfterCreation;
 import org.springframework.data.jdbc.mapping.event.AfterDelete;
 import org.springframework.data.jdbc.mapping.event.AfterSave;
 import org.springframework.data.jdbc.mapping.event.BeforeDelete;
@@ -42,18 +43,22 @@ public class SimpleJdbcRepositoryEventsUnitTests {
 	FakePublisher publisher = new FakePublisher();
 
 	DummyEntityRepository repository;
+	DefaultDataAccessStrategy dataAccessStrategy;
 
 	@Before
 	public void before() {
 
 		final JdbcMappingContext context = new JdbcMappingContext(createIdGeneratingOperations());
+
+		dataAccessStrategy = spy(new DefaultDataAccessStrategy( //
+				new SqlGeneratorSource(context), //
+				context //
+		));
+
 		JdbcRepositoryFactory factory = new JdbcRepositoryFactory( //
 				publisher, //
 				context, //
-				new DefaultDataAccessStrategy( //
-						new SqlGeneratorSource(context), //
-						context //
-				) //
+				dataAccessStrategy //
 		);
 
 		repository = factory.getRepository(DummyEntityRepository.class);
@@ -122,6 +127,57 @@ public void publishesEventsOnDeleteById() {
 		);
 	}
 
+	@Test // DATAJDBC-197
+	public void publishesEventsOnFindAll() {
+
+		DummyEntity entity1 = new DummyEntity(42L);
+		DummyEntity entity2 = new DummyEntity(23L);
+
+		doReturn(asList(entity1, entity2)).when(dataAccessStrategy).findAll(any(Class.class));
+
+		repository.findAll();
+
+		assertThat(publisher.events) //
+				.extracting(e -> (Class) e.getClass()) //
+				.containsExactly( //
+						AfterCreation.class, //
+						AfterCreation.class //
+		);
+	}
+
+	@Test // DATAJDBC-197
+	public void publishesEventsOnFindAllById() {
+
+		DummyEntity entity1 = new DummyEntity(42L);
+		DummyEntity entity2 = new DummyEntity(23L);
+
+		doReturn(asList(entity1, entity2)).when(dataAccessStrategy).findAllById(any(Iterable.class), any(Class.class));
+
+		repository.findAllById(asList(42L, 23L));
+
+		assertThat(publisher.events) //
+				.extracting(e -> (Class) e.getClass()) //
+				.containsExactly( //
+						AfterCreation.class, //
+						AfterCreation.class //
+		);
+	}
+
+	@Test // DATAJDBC-197
+	public void publishesEventsOnFindById() {
+
+		DummyEntity entity1 = new DummyEntity(23L);
+		doReturn(entity1).when(dataAccessStrategy).findById(eq(23L), any(Class.class));
+
+		repository.findById(23L);
+
+		assertThat(publisher.events) //
+				.extracting(e -> (Class) e.getClass()) //
+				.containsExactly( //
+						AfterCreation.class //
+		);
+	}
+
 	private static NamedParameterJdbcOperations createIdGeneratingOperations() {
 
 		Answer<Integer> setIdInKeyHolder = invocation -> {