From 1fb404a84e120e93f58ea6854e2e4c4f230af01a Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 29 Jul 2019 14:14:00 +0200 Subject: [PATCH] DATAJDBC-400 - Polishing. Add version since which deprecations are in place. Inline variables. Original pull request: #164. --- .../data/jdbc/core/JdbcAggregateTemplate.java | 24 +++++-------------- .../mapping/event/RelationalEventWithId.java | 2 +- .../mapping/event/SimpleRelationalEvent.java | 4 ++-- 3 files changed, 9 insertions(+), 21 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 6644b334..3e4b3144 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 @@ -301,8 +301,7 @@ public class JdbcAggregateTemplate implements JdbcAggregateOperations { Assert.notNull(aggregateRoot, "Aggregate instance must not be null!"); - aggregateRoot = triggerBeforeConvert(aggregateRoot, - persistentEntity.getIdentifierAccessor(aggregateRoot).getIdentifier()); + aggregateRoot = triggerBeforeConvert(aggregateRoot); AggregateChange change = changeCreator.apply(aggregateRoot); @@ -376,26 +375,19 @@ public class JdbcAggregateTemplate implements JdbcAggregateOperations { private T triggerAfterLoad(Object id, T entity) { - Specified identifier = Identifier.of(id); - - publisher.publishEvent(new AfterLoadEvent(identifier, entity)); + publisher.publishEvent(new AfterLoadEvent(Identifier.of(id), entity)); return entityCallbacks.callback(AfterLoadCallback.class, entity); } - private T triggerBeforeConvert(T aggregateRoot, @Nullable Object id) { - - Identifier identifier = Identifier.ofNullable(id); - + private T triggerBeforeConvert(T aggregateRoot) { return entityCallbacks.callback(BeforeConvertCallback.class, aggregateRoot); } private T triggerBeforeSave(T aggregateRoot, @Nullable Object id, AggregateChange change) { - Identifier identifier = Identifier.ofNullable(id); - publisher.publishEvent(new BeforeSaveEvent( // - identifier, // + Identifier.ofNullable(id), // aggregateRoot, // change // )); @@ -418,9 +410,7 @@ public class JdbcAggregateTemplate implements JdbcAggregateOperations { private void triggerAfterDelete(@Nullable T aggregateRoot, Object id, AggregateChange change) { - Specified identifier = Identifier.of(id); - - publisher.publishEvent(new AfterDeleteEvent(identifier, Optional.ofNullable(aggregateRoot), change)); + publisher.publishEvent(new AfterDeleteEvent(Identifier.of(id), Optional.ofNullable(aggregateRoot), change)); if (aggregateRoot != null) { entityCallbacks.callback(AfterDeleteCallback.class, aggregateRoot); @@ -430,9 +420,7 @@ public class JdbcAggregateTemplate implements JdbcAggregateOperations { @Nullable private T triggerBeforeDelete(@Nullable T aggregateRoot, Object id, AggregateChange change) { - Specified identifier = Identifier.of(id); - - publisher.publishEvent(new BeforeDeleteEvent(identifier, Optional.ofNullable(aggregateRoot), change)); + publisher.publishEvent(new BeforeDeleteEvent(Identifier.of(id), Optional.ofNullable(aggregateRoot), change)); if (aggregateRoot != null) { return entityCallbacks.callback(BeforeDeleteCallback.class, aggregateRoot, change); diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/event/RelationalEventWithId.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/event/RelationalEventWithId.java index 23db57fc..2b52461e 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/event/RelationalEventWithId.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/event/RelationalEventWithId.java @@ -42,7 +42,7 @@ public class RelationalEventWithId extends SimpleRelationalEvent implements With /** * Events with an identifier will always return a {@link Specified} one. * - * @deprecated obtain the id from the entity instead. + * @deprecated since 1.1, obtain the id from the entity instead. */ @Override @Deprecated diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/event/SimpleRelationalEvent.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/event/SimpleRelationalEvent.java index 66a77dc9..81975701 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/event/SimpleRelationalEvent.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/event/SimpleRelationalEvent.java @@ -44,7 +44,7 @@ class SimpleRelationalEvent extends ApplicationEvent implements RelationalEvent } /** - * @deprecated obtain the id from the entity instead. + * @deprecated since 1.1, obtain the id from the entity instead. */ @Override @Deprecated @@ -64,7 +64,7 @@ class SimpleRelationalEvent extends ApplicationEvent implements RelationalEvent /** * Returns the an {@link AggregateChange} instance representing the SQL statements performed by the action that * triggered this event. - * + * * @return Guaranteed to be not {@literal null}. * @deprecated There is currently no replacement for this. If something like this is required please create an issue * outlining your use case.