DATAJDBC-99 - Polishing.

Events now use the id as source. The id is encapsulated in a value object to support null ids in BeforeInsert events. Entity references in events are now Optionals. Dropped redundant Event suffix from events. Added "@SInCE 2.0" to classes. Replaced constructors and getters with Lombok annotations. Simplified pom.xml. Extracted interface JdbcPersistentEntity and JdbcPersistentProperty. Integration tests use the Spring Test framework. Fixed test for entities with primitive id type.

Original pull request: #5.

Author: schauder

lombok.config

@@ -0,0 +1,2 @@
+lombok.nonNull.exceptionType = IllegalArgumentException
+lombok.log.fieldName = LOG

pom.xml

@@ -128,61 +128,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.12</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-instrument</artifactId>
-                        <version>${spring}</version>
-                        <scope>runtime</scope>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.hsqldb</groupId>
-                        <artifactId>hsqldb</artifactId>
-                        <version>${hsqldb1}</version>
-                        <scope>runtime</scope>
-                    </dependency>
-                </dependencies>
-                <executions>
-                    <execution>
-                        <id>default-test</id>
-                        <configuration>
-                            <excludes>
-                                <exclude>**/*</exclude>
-                            </excludes>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>unit-tests</id>
-                        <goals>
-                            <goal>test</goal>
-                        </goals>
-                        <phase>test</phase>
-                        <configuration>
-                            <includes>
-                                <include>**/*UnitTests.java</include>
-                            </includes>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>integration-tests</id>
-                        <goals>
-                            <goal>test</goal>
-                        </goals>
-                        <phase>test</phase>
-                        <configuration>
-                            <includes>
-                                <include>**/*IntegrationTests.java</include>
-                                <include>**/*Tests.java</include>
-                            </includes>
-                            <excludes>
-                                <exclude>**/*UnitTests.java</exclude>
-\                            </excludes>
-                            <argLine>
-                                -javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco}/org.jacoco.agent-${jacoco}-runtime.jar=destfile=${jacoco.destfile}
-                            </argLine>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

src/main/java/org/springframework/data/jdbc/mapping/context/JdbcMappingContext.java

@@ -17,6 +17,8 @@
 
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Field;
+
+import org.springframework.data.jdbc.mapping.model.BasicJdbcPersistentProperty;
 import org.springframework.data.jdbc.mapping.model.JdbcPersistentEntity;
 import org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty;
 import org.springframework.data.mapping.context.AbstractMappingContext;
@@ -25,17 +27,22 @@
 
 /**
  * @author Jens Schauder
+ * @since 2.0
  */
 public class JdbcMappingContext extends AbstractMappingContext<JdbcPersistentEntity<?>, JdbcPersistentProperty> {
 
-
 	@Override
 	protected <T> JdbcPersistentEntity createPersistentEntity(TypeInformation<T> typeInformation) {
 		return new JdbcPersistentEntity(typeInformation);
 	}
 
 	@Override
-	protected JdbcPersistentProperty createPersistentProperty(Field field, PropertyDescriptor descriptor, JdbcPersistentEntity owner, SimpleTypeHolder simpleTypeHolder) {
-		return new JdbcPersistentProperty(field, descriptor, owner, simpleTypeHolder);
+	protected JdbcPersistentProperty createPersistentProperty( //
+			Field field, //
+			PropertyDescriptor descriptor, //
+			JdbcPersistentEntity owner, //
+			SimpleTypeHolder simpleTypeHolder //
+	) {
+		return new BasicJdbcPersistentProperty(field, descriptor, owner, simpleTypeHolder);
 	}
 }

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

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jdbc.mapping.event;
+
+import org.springframework.data.jdbc.mapping.event.Identifier.Specified;
+
+/**
+ * Gets published after instantiation and setting of all the properties of an entity. This allows to do some postprocessing of entities.
+ *
+ * @author Jens Schauder
+ * @since 2.0
+ */
+public class AfterCreation extends JdbcEventWithIdAndEntity {
+
+	/**
+	 * @param id of the entity
+	 * @param entity the newly instantiated entity.
+	 */
+	public AfterCreation(Specified id, Object entity) {
+		super(id, entity);
+	}
+}

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

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jdbc.mapping.event;
+
+import java.util.Optional;
+
+import org.springframework.data.jdbc.mapping.event.Identifier.Specified;
+
+/**
+ * Gets published after deletion of an entity. It will have a {@link Specified} identifier.
+ *
+ * If the entity is empty or not depends on the delete method used.
+ *
+ * @author Jens Schauder
+ * @since 2.0
+ */
+public class AfterDelete extends JdbcEventWithId{
+
+	/**
+	 * @param id of the entity.
+	 * @param instance the deleted entity if it is available.
+	 */
+	public AfterDelete(Specified id, Optional<Object> instance) {
+		super(id, instance);
+	}
+}

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

@@ -15,21 +15,21 @@
  */
 package org.springframework.data.jdbc.mapping.event;
 
-import java.util.function.Function;
+import org.springframework.data.jdbc.mapping.event.Identifier.Specified;
 
 /**
- * gets published after an entity got inserted into the database.
+ * Gets published after an entity got inserted into the database.
  *
  * @author Jens Schauder
+ * @since 2.0
  */
-public class AfterInsertEvent extends AfterSaveEvent {
+public class AfterInsert extends AfterSave {
 
 	/**
+	 * @param id identifier of the entity triggering the event.
 	 * @param instance the newly inserted entity.
-	 * @param idProvider a function providing the id, for the instance.
-	 * @param <T> type of the entity and the argument of the {@code idProvider}
 	 */
-	public <T> AfterInsertEvent(T instance, Function<T, Object> idProvider) {
-		super(instance, idProvider);
+	public AfterInsert(Specified id, Object instance) {
+		super(id, instance);
 	}
 }

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

@@ -15,20 +15,23 @@
  */
 package org.springframework.data.jdbc.mapping.event;
 
-import java.util.function.Function;
+import java.util.Optional;
+
+import org.springframework.data.jdbc.mapping.event.Identifier.Specified;
 
 /**
- * subclasses of this get published after a new instance or a changed instance was saved in the database
+ * Subclasses of this get published after a new instance or a changed instance was saved in the database.
+ *
  * @author Jens Schauder
+ * @since 2.0
  */
-public class AfterSaveEvent extends JdbcEvent{
+public class AfterSave extends JdbcEventWithIdAndEntity {
 
 	/**
+	 * @param id identifier of
 	 * @param instance the newly saved entity.
-	 * @param idProvider a function providing the id, for the instance.
-	 * @param <T> type of the entity and the argument of the {@code idProvider}
 	 */
-	<T> AfterSaveEvent(T instance, Function<T, Object> idProvider) {
-		super(instance, idProvider);
+	AfterSave(Specified id, Object instance) {
+		super(id, instance);
 	}
 }

src/main/java/org/springframework/data/jdbc/mapping/event/AfterInsertEvent.java src/main/java/org/springframework/data/jdbc/mapping/event/AfterInsert.java

@@ -15,21 +15,21 @@
  */
 package org.springframework.data.jdbc.mapping.event;
 
-import java.util.function.Function;
+import org.springframework.data.jdbc.mapping.event.Identifier.Specified;
 
 /**
- * gets published after an entity was updated in the database.
+ * Gets published after an entity was updated in the database.
  *
  * @author Jens Schauder
+ * @since 2.0
  */
-public class AfterUpdateEvent extends AfterSaveEvent {
+public class AfterUpdate extends AfterSave {
 
 	/**
+	 * @param id of the entity
 	 * @param instance the updated entity.
-	 * @param idProvider a function providing the id, for the instance.
-	 * @param <T> type of the entity and the argument of the {@code idProvider}
 	 */
-	public <T> AfterUpdateEvent(T instance, Function<T, Object> idProvider) {
-		super(instance, idProvider);
+	public AfterUpdate(Specified id, Object instance) {
+		super(id, instance);
 	}
 }

src/main/java/org/springframework/data/jdbc/mapping/event/AfterSaveEvent.java src/main/java/org/springframework/data/jdbc/mapping/event/AfterSave.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jdbc.mapping.event;
+
+import java.util.Optional;
+
+import org.springframework.data.jdbc.mapping.event.Identifier.Specified;
+
+/**
+ * Gets published when an entity is about to get deleted.
+ *
+ * @author Jens Schauder
+ * @since 2.0
+ */
+public class BeforeDelete extends JdbcEventWithId {
+
+	/**
+	 * @param id the id of the entity
+	 * @param entity the entity about to get deleted. Might be empty.
+	 */
+	public <T> BeforeDelete(Specified id, Optional<Object> entity) {
+		super(id, entity);
+	}
+}