Change BeforeSaveEvent to BeforeConvertEvent in integration tests where callback was setting id.

+ Ids must be set before the aggregate root is converted to a change, since inserts now depend on whether the id is set.

Author: ctailor2

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryPropertyConversionIntegrationTests.java

@@ -46,7 +46,7 @@
 import org.springframework.data.jdbc.testing.EnabledOnFeature;
 import org.springframework.data.jdbc.testing.TestConfiguration;
 import org.springframework.data.relational.core.mapping.MappedCollection;
-import org.springframework.data.relational.core.mapping.event.BeforeSaveEvent;
+import org.springframework.data.relational.core.mapping.event.BeforeConvertEvent;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestExecutionListeners;
@@ -182,7 +182,7 @@ DummyEntityRepository dummyEntityRepository() {
 
 		@Bean
 		ApplicationListener<?> applicationListener() {
-			return (ApplicationListener<BeforeSaveEvent>) beforeInsert -> ((EntityWithColumnsRequiringConversions) beforeInsert
+			return (ApplicationListener<BeforeConvertEvent>) event -> ((EntityWithColumnsRequiringConversions) event
 					.getEntity()).setIdTimestamp(getNow());
 		}
 	}

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithCollectionsAndManuallyAssignedIdHsqlIntegrationTests.java

@@ -36,7 +36,7 @@
 import org.springframework.data.annotation.Id;
 import org.springframework.data.jdbc.repository.support.JdbcRepositoryFactory;
 import org.springframework.data.jdbc.testing.TestConfiguration;
-import org.springframework.data.relational.core.mapping.event.BeforeSaveEvent;
+import org.springframework.data.relational.core.mapping.event.BeforeConvertEvent;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.test.context.ActiveProfiles;
@@ -76,7 +76,7 @@ DummyEntityRepository dummyEntityRepository() {
 		@Bean
 		public ApplicationListener<?> idSetting() {
 
-			return (ApplicationListener<BeforeSaveEvent>) event -> {
+			return (ApplicationListener<BeforeConvertEvent>) event -> {
 
 				if (event.getEntity() instanceof DummyEntity) {
 					setIds((DummyEntity) event.getEntity());