diff --git a/README.adoc b/README.adoc index 3306641db..cbddaccba 100644 --- a/README.adoc +++ b/README.adoc @@ -179,7 +179,7 @@ For example, the following listener will get invoked before an Aggregate gets sa [source,java] ---- @Bean -public ApplicationListener timeStampingSaveTime() { +public ApplicationListener timeStampingSaveTime() { return event -> { @@ -196,21 +196,21 @@ public ApplicationListener timeStampingSaveTime() { |=== | Event | When It's Published -| https://github.com/spring-projects/spring-data-jdbc/blob/master/src/main/java/org/springframework/data/jdbc/mapping/event/BeforeDelete.java[`BeforeDelete`] +| https://github.com/spring-projects/spring-data-jdbc/blob/master/src/main/java/org/springframework/data/jdbc/mapping/event/BeforeDeleteEvent.java[`BeforeDeleteEvent`] | before an aggregate root gets deleted. -| https://github.com/spring-projects/spring-data-jdbc/blob/master/src/main/java/org/springframework/data/jdbc/mapping/event/AfterDelete.java[`AfterDelete`] +| https://github.com/spring-projects/spring-data-jdbc/blob/master/src/main/java/org/springframework/data/jdbc/mapping/event/AfterDeleteEvent.java[`AfterDeleteEvent`] | after an aggregate root got deleted. -| https://github.com/spring-projects/spring-data-jdbc/blob/master/src/main/java/org/springframework/data/jdbc/mapping/event/BeforeSave.java[`BeforeSave`] +| https://github.com/spring-projects/spring-data-jdbc/blob/master/src/main/java/org/springframework/data/jdbc/mapping/event/BeforeSaveEvent.java[`BeforeSaveEvent`] | before an aggregate root gets saved, i.e. inserted or updated but after the decision was made if it will get updated or deleted. The event has a reference to an https://github.com/spring-projects/spring-data-jdbc/blob/master/src/main/java/org/springframework/data/jdbc/core/conversion/AggregateChange.java[`AggregateChange`] instance. The instance can be modified by adding or removing https://github.com/spring-projects/spring-data-jdbc/blob/master/src/main/java/org/springframework/data/jdbc/core/conversion/DbAction.java[`DbAction`]s. -| https://github.com/spring-projects/spring-data-jdbc/blob/master/src/main/java/org/springframework/data/jdbc/mapping/event/AfterSave.java[`AfterSave`] +| https://github.com/spring-projects/spring-data-jdbc/blob/master/src/main/java/org/springframework/data/jdbc/mapping/event/AfterSaveEvent.java[`AfterSaveEvent`] | after an aggregate root gets saved, i.e. inserted or updated. -| https://github.com/spring-projects/spring-data-jdbc/blob/master/src/main/java/org/springframework/data/jdbc/mapping/event/AfterCreation.java[`AfterCreation`] +| https://github.com/spring-projects/spring-data-jdbc/blob/master/src/main/java/org/springframework/data/jdbc/mapping/event/AfterLoadEvent.java[`AfterLoadEvent`] | after an aggregate root got created from a database `ResultSet` and all it's property set |=== diff --git a/src/main/java/org/springframework/data/jdbc/core/JdbcEntityTemplate.java b/src/main/java/org/springframework/data/jdbc/core/JdbcEntityTemplate.java index 5ded36222..928fb4b65 100644 --- a/src/main/java/org/springframework/data/jdbc/core/JdbcEntityTemplate.java +++ b/src/main/java/org/springframework/data/jdbc/core/JdbcEntityTemplate.java @@ -23,11 +23,11 @@ import org.springframework.data.jdbc.core.conversion.AggregateChange.Kind; 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.AfterDelete; +import org.springframework.data.jdbc.mapping.event.AfterDeleteEvent; import org.springframework.data.jdbc.mapping.event.AfterLoadEvent; -import org.springframework.data.jdbc.mapping.event.AfterSave; -import org.springframework.data.jdbc.mapping.event.BeforeDelete; -import org.springframework.data.jdbc.mapping.event.BeforeSave; +import org.springframework.data.jdbc.mapping.event.AfterSaveEvent; +import org.springframework.data.jdbc.mapping.event.BeforeDeleteEvent; +import org.springframework.data.jdbc.mapping.event.BeforeSaveEvent; import org.springframework.data.jdbc.mapping.event.Identifier; import org.springframework.data.jdbc.mapping.event.Identifier.Specified; import org.springframework.data.jdbc.mapping.model.JdbcMappingContext; @@ -71,7 +71,7 @@ public class JdbcEntityTemplate implements JdbcEntityOperations { AggregateChange change = createChange(instance); - publisher.publishEvent(new BeforeSave( // + publisher.publishEvent(new BeforeSaveEvent( // Identifier.ofNullable(entityInformation.getId(instance)), // instance, // change // @@ -79,7 +79,7 @@ public class JdbcEntityTemplate implements JdbcEntityOperations { change.executeWith(interpreter); - publisher.publishEvent(new AfterSave( // + publisher.publishEvent(new AfterSaveEvent( // Identifier.of(entityInformation.getId(instance)), // instance, // change // @@ -148,11 +148,11 @@ public class JdbcEntityTemplate implements JdbcEntityOperations { Specified specifiedId = Identifier.of(id); Optional optionalEntity = Optional.ofNullable(entity); - publisher.publishEvent(new BeforeDelete(specifiedId, optionalEntity, change)); + publisher.publishEvent(new BeforeDeleteEvent(specifiedId, optionalEntity, change)); change.executeWith(interpreter); - publisher.publishEvent(new AfterDelete(specifiedId, optionalEntity, change)); + publisher.publishEvent(new AfterDeleteEvent(specifiedId, optionalEntity, change)); } @SuppressWarnings("unchecked") diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/AfterDelete.java b/src/main/java/org/springframework/data/jdbc/mapping/event/AfterDeleteEvent.java similarity index 90% rename from src/main/java/org/springframework/data/jdbc/mapping/event/AfterDelete.java rename to src/main/java/org/springframework/data/jdbc/mapping/event/AfterDeleteEvent.java index 9eaaccfb4..d7599c97d 100644 --- a/src/main/java/org/springframework/data/jdbc/mapping/event/AfterDelete.java +++ b/src/main/java/org/springframework/data/jdbc/mapping/event/AfterDeleteEvent.java @@ -27,7 +27,7 @@ import org.springframework.data.jdbc.mapping.event.Identifier.Specified; * @author Jens Schauder * @since 1.0 */ -public class AfterDelete extends JdbcEventWithId { +public class AfterDeleteEvent extends JdbcEventWithId { private static final long serialVersionUID = 3594807189931141582L; @@ -36,7 +36,7 @@ public class AfterDelete extends JdbcEventWithId { * @param instance the deleted entity if it is available. * @param change the {@link AggregateChange} encoding the planned actions to be performed on the database. */ - public AfterDelete(Specified id, Optional instance, AggregateChange change) { + public AfterDeleteEvent(Specified id, Optional instance, AggregateChange change) { super(id, instance, change); } } diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/AfterSave.java b/src/main/java/org/springframework/data/jdbc/mapping/event/AfterSaveEvent.java similarity index 89% rename from src/main/java/org/springframework/data/jdbc/mapping/event/AfterSave.java rename to src/main/java/org/springframework/data/jdbc/mapping/event/AfterSaveEvent.java index 077a5e28a..9a9bb05c4 100644 --- a/src/main/java/org/springframework/data/jdbc/mapping/event/AfterSave.java +++ b/src/main/java/org/springframework/data/jdbc/mapping/event/AfterSaveEvent.java @@ -24,7 +24,7 @@ import org.springframework.data.jdbc.mapping.event.Identifier.Specified; * @author Jens Schauder * @since 1.0 */ -public class AfterSave extends JdbcEventWithIdAndEntity { +public class AfterSaveEvent extends JdbcEventWithIdAndEntity { private static final long serialVersionUID = 8982085767296982848L; @@ -33,7 +33,7 @@ public class AfterSave extends JdbcEventWithIdAndEntity { * @param instance the newly saved entity. * @param change the {@link AggregateChange} encoding the planned actions to be performed on the database. */ - public AfterSave(Specified id, Object instance, AggregateChange change) { + public AfterSaveEvent(Specified id, Object instance, AggregateChange change) { super(id, instance, change); } } diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/BeforeDelete.java b/src/main/java/org/springframework/data/jdbc/mapping/event/BeforeDeleteEvent.java similarity index 89% rename from src/main/java/org/springframework/data/jdbc/mapping/event/BeforeDelete.java rename to src/main/java/org/springframework/data/jdbc/mapping/event/BeforeDeleteEvent.java index 499ba5e78..9b8b17bb9 100644 --- a/src/main/java/org/springframework/data/jdbc/mapping/event/BeforeDelete.java +++ b/src/main/java/org/springframework/data/jdbc/mapping/event/BeforeDeleteEvent.java @@ -26,7 +26,7 @@ import org.springframework.data.jdbc.mapping.event.Identifier.Specified; * @author Jens Schauder * @since 1.0 */ -public class BeforeDelete extends JdbcEventWithId { +public class BeforeDeleteEvent extends JdbcEventWithId { private static final long serialVersionUID = -5483432053368496651L; @@ -35,7 +35,7 @@ public class BeforeDelete extends JdbcEventWithId { * @param entity the entity about to get deleted. Might be empty. * @param change the {@link AggregateChange} encoding the planned actions to be performed on the database. */ - public BeforeDelete(Specified id, Optional entity, AggregateChange change) { + public BeforeDeleteEvent(Specified id, Optional entity, AggregateChange change) { super(id, entity, change); } } diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/BeforeSave.java b/src/main/java/org/springframework/data/jdbc/mapping/event/BeforeSaveEvent.java similarity index 88% rename from src/main/java/org/springframework/data/jdbc/mapping/event/BeforeSave.java rename to src/main/java/org/springframework/data/jdbc/mapping/event/BeforeSaveEvent.java index 701a8e4b8..722ce741d 100644 --- a/src/main/java/org/springframework/data/jdbc/mapping/event/BeforeSave.java +++ b/src/main/java/org/springframework/data/jdbc/mapping/event/BeforeSaveEvent.java @@ -23,7 +23,7 @@ import org.springframework.data.jdbc.core.conversion.AggregateChange; * @author Jens Schauder * @since 1.0 */ -public class BeforeSave extends JdbcEventWithEntity { +public class BeforeSaveEvent extends JdbcEventWithEntity { private static final long serialVersionUID = -6996874391990315443L; @@ -32,7 +32,7 @@ public class BeforeSave extends JdbcEventWithEntity { * @param instance the entity about to get saved. * @param change */ - public BeforeSave(Identifier id, Object instance, AggregateChange change) { + public BeforeSaveEvent(Identifier id, Object instance, AggregateChange change) { super(id, instance, change); } } diff --git a/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryManipulateDbActionsIntegrationTests.java b/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryManipulateDbActionsIntegrationTests.java index 8cbb6136a..2ca4c0a02 100644 --- a/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryManipulateDbActionsIntegrationTests.java +++ b/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryManipulateDbActionsIntegrationTests.java @@ -38,8 +38,8 @@ import org.springframework.context.annotation.Import; import org.springframework.data.annotation.Id; import org.springframework.data.annotation.PersistenceConstructor; import org.springframework.data.jdbc.core.conversion.DbAction; -import org.springframework.data.jdbc.mapping.event.BeforeDelete; -import org.springframework.data.jdbc.mapping.event.BeforeSave; +import org.springframework.data.jdbc.mapping.event.BeforeDeleteEvent; +import org.springframework.data.jdbc.mapping.event.BeforeSaveEvent; import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories; import org.springframework.data.jdbc.testing.TestConfiguration; import org.springframework.data.repository.CrudRepository; @@ -196,7 +196,7 @@ public class JdbcRepositoryManipulateDbActionsIntegrationTests { } @Bean - ApplicationListener softDeleteListener() { + ApplicationListener softDeleteListener() { return event -> { @@ -210,9 +210,9 @@ public class JdbcRepositoryManipulateDbActionsIntegrationTests { } @Bean - ApplicationListener logOnSaveListener() { + ApplicationListener logOnSaveListener() { - // this would actually be easier to implement with an AfterSave listener, but we want to test AggregateChange + // this would actually be easier to implement with an AfterSaveEvent listener, but we want to test AggregateChange // manipulation. return event -> { diff --git a/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryPropertyConversionIntegrationTests.java b/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryPropertyConversionIntegrationTests.java index 2dacef3e9..6ecf3cc22 100644 --- a/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryPropertyConversionIntegrationTests.java +++ b/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryPropertyConversionIntegrationTests.java @@ -40,7 +40,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.data.annotation.Id; -import org.springframework.data.jdbc.mapping.event.BeforeSave; +import org.springframework.data.jdbc.mapping.event.BeforeSaveEvent; import org.springframework.data.jdbc.repository.support.JdbcRepositoryFactory; import org.springframework.data.jdbc.testing.TestConfiguration; import org.springframework.data.repository.CrudRepository; @@ -77,7 +77,7 @@ public class JdbcRepositoryPropertyConversionIntegrationTests { @Bean ApplicationListener applicationListener() { - return (ApplicationListener) beforeInsert -> ((EntityWithColumnsRequiringConversions) beforeInsert + return (ApplicationListener) beforeInsert -> ((EntityWithColumnsRequiringConversions) beforeInsert .getEntity()).setIdTimestamp(getNow()); } diff --git a/src/test/java/org/springframework/data/jdbc/repository/SimpleJdbcRepositoryEventsUnitTests.java b/src/test/java/org/springframework/data/jdbc/repository/SimpleJdbcRepositoryEventsUnitTests.java index 6eed8c564..b901799d2 100644 --- a/src/test/java/org/springframework/data/jdbc/repository/SimpleJdbcRepositoryEventsUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/repository/SimpleJdbcRepositoryEventsUnitTests.java @@ -23,11 +23,11 @@ import org.springframework.context.ApplicationEventPublisher; 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.AfterDelete; +import org.springframework.data.jdbc.mapping.event.AfterDeleteEvent; import org.springframework.data.jdbc.mapping.event.AfterLoadEvent; -import org.springframework.data.jdbc.mapping.event.AfterSave; -import org.springframework.data.jdbc.mapping.event.BeforeDelete; -import org.springframework.data.jdbc.mapping.event.BeforeSave; +import org.springframework.data.jdbc.mapping.event.AfterSaveEvent; +import org.springframework.data.jdbc.mapping.event.BeforeDeleteEvent; +import org.springframework.data.jdbc.mapping.event.BeforeSaveEvent; import org.springframework.data.jdbc.mapping.event.Identifier; import org.springframework.data.jdbc.mapping.event.JdbcEvent; import org.springframework.data.jdbc.mapping.model.JdbcMappingContext; @@ -79,8 +79,8 @@ public class SimpleJdbcRepositoryEventsUnitTests { assertThat(publisher.events) // .extracting(e -> (Class) e.getClass()) // .containsExactly( // - BeforeSave.class, // - AfterSave.class // + BeforeSaveEvent.class, // + AfterSaveEvent.class // ); } @@ -95,10 +95,10 @@ public class SimpleJdbcRepositoryEventsUnitTests { assertThat(publisher.events) // .extracting(e -> (Class) e.getClass()) // .containsExactly( // - BeforeSave.class, // - AfterSave.class, // - BeforeSave.class, // - AfterSave.class // + BeforeSaveEvent.class, // + AfterSaveEvent.class, // + BeforeSaveEvent.class, // + AfterSaveEvent.class // ); } @@ -114,8 +114,8 @@ public class SimpleJdbcRepositoryEventsUnitTests { e -> e.getOptionalEntity().orElseGet(AssertionFailedError::new), // JdbcEvent::getId // ).containsExactly( // - Tuple.tuple(BeforeDelete.class, entity, Identifier.of(23L)), // - Tuple.tuple(AfterDelete.class, entity, Identifier.of(23L)) // + Tuple.tuple(BeforeDeleteEvent.class, entity, Identifier.of(23L)), // + Tuple.tuple(AfterDeleteEvent.class, entity, Identifier.of(23L)) // ); } @@ -127,8 +127,8 @@ public class SimpleJdbcRepositoryEventsUnitTests { assertThat(publisher.events) // .extracting(e -> (Class) e.getClass()) // .containsExactly( // - BeforeDelete.class, // - AfterDelete.class // + BeforeDeleteEvent.class, // + AfterDeleteEvent.class // ); }