DATAJDBC-400 - Polishing.

Add version since which deprecations are in place. Inline variables.

Original pull request: #164.

Author: mp911de

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java

@@ -301,8 +301,7 @@ private <T> T store(T aggregateRoot, Function<T, AggregateChange<T>> changeCreat
 
 		Assert.notNull(aggregateRoot, "Aggregate instance must not be null!");
 
-		aggregateRoot = triggerBeforeConvert(aggregateRoot,
-				persistentEntity.getIdentifierAccessor(aggregateRoot).getIdentifier());
+		aggregateRoot = triggerBeforeConvert(aggregateRoot);
 
 		AggregateChange<T> change = changeCreator.apply(aggregateRoot);
 
@@ -376,26 +375,19 @@ private <T> Iterable<T> triggerAfterLoad(Iterable<T> all) {
 
 	private <T> 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> T triggerBeforeConvert(T aggregateRoot, @Nullable Object id) {
-
-		Identifier identifier = Identifier.ofNullable(id);
-
+	private <T> T triggerBeforeConvert(T aggregateRoot) {
 		return entityCallbacks.callback(BeforeConvertCallback.class, aggregateRoot);
 	}
 
 	private <T> T triggerBeforeSave(T aggregateRoot, @Nullable Object id, AggregateChange<T> change) {
 
-		Identifier identifier = Identifier.ofNullable(id);
-
 		publisher.publishEvent(new BeforeSaveEvent( //
-				identifier, //
+				Identifier.ofNullable(id), //
 				aggregateRoot, //
 				change //
 		));
@@ -418,9 +410,7 @@ private <T> T triggerAfterSave(T aggregateRoot, Object id, AggregateChange<T> ch
 
 	private <T> 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 @@ private <T> void triggerAfterDelete(@Nullable T aggregateRoot, Object id, Aggreg
 	@Nullable
 	private <T> 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);

spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/event/RelationalEventWithId.java

@@ -42,7 +42,7 @@ public RelationalEventWithId(Specified id, Optional<?> entity, @Nullable Aggrega
 	/**
 	 * 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

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 @@ public Optional<Object> getOptionalEntity() {
 	/**
 	 * 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.