From 2a0603054fd723e82a5df001f010f3be5c3dbd84 Mon Sep 17 00:00:00 2001
From: JoseLion <joseluis5000l@gmail.com>
Date: Wed, 24 Nov 2021 19:52:46 -0500
Subject: [PATCH] Use BeforeConvert callback result on non-versioned updates.

Previously, we used the original entity.

Closes #689
Original pull request: #690.
---
 .../data/r2dbc/core/R2dbcEntityTemplate.java  |  3 +-
 .../core/R2dbcEntityTemplateUnitTests.java    | 42 +++++++++----------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java b/src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java
index 875d4a3..3bec1f3 100644
--- a/src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java
+++ b/src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java
@@ -89,6 +89,7 @@ import org.springframework.util.Assert;
  * @author Mark Paluch
  * @author Bogdan Ilchyshyn
  * @author Jens Schauder
+ * @author Jose Luis Leon
  * @since 1.1
  */
 public class R2dbcEntityTemplate implements R2dbcEntityOperations, BeanFactoryAware, ApplicationContextAware {
@@ -657,7 +658,7 @@ public class R2dbcEntityTemplate implements R2dbcEntityOperations, BeanFactoryAw
 				entityToUse = incrementVersion(persistentEntity, it);
 			} else {
 
-				entityToUse = entity;
+				entityToUse = it;
 				matchingVersionCriteria = null;
 			}
 
diff --git a/src/test/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplateUnitTests.java b/src/test/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplateUnitTests.java
index feb5962..104c274 100644
--- a/src/test/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplateUnitTests.java
+++ b/src/test/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplateUnitTests.java
@@ -67,6 +67,7 @@ import org.springframework.util.CollectionUtils;
  * Unit tests for {@link R2dbcEntityTemplate}.
  *
  * @author Mark Paluch
+ * @author Jose Luis Leon
  */
 public class R2dbcEntityTemplateUnitTests {
 
@@ -245,8 +246,8 @@ public class R2dbcEntityTemplateUnitTests {
 	@Test // gh-220
 	void shouldDeleteEntity() {
 
-		Person person = new Person();
-		person.id = "Walter";
+		Person person = Person.empty() //
+				.withId("Walter");
 		recorder.addStubbing(s -> s.startsWith("DELETE"), Collections.emptyList());
 
 		entityTemplate.delete(person) //
@@ -390,7 +391,7 @@ public class R2dbcEntityTemplateUnitTests {
 		ValueCapturingAfterSaveCallback afterSave = new ValueCapturingAfterSaveCallback();
 
 		entityTemplate.setEntityCallbacks(ReactiveEntityCallbacks.create(beforeConvert, beforeSave, afterSave));
-		entityTemplate.insert(new Person()).as(StepVerifier::create) //
+		entityTemplate.insert(Person.empty()).as(StepVerifier::create) //
 				.assertNext(actual -> {
 					assertThat(actual.id).isEqualTo("after-save");
 					assertThat(actual.name).isEqualTo("before-convert");
@@ -439,10 +440,10 @@ public class R2dbcEntityTemplateUnitTests {
 		ValueCapturingBeforeSaveCallback beforeSave = new ValueCapturingBeforeSaveCallback();
 		ValueCapturingAfterSaveCallback afterSave = new ValueCapturingAfterSaveCallback();
 
-		Person person = new Person();
-		person.id = "the-id";
-		person.name = "name";
-		person.description = "description";
+		Person person = Person.empty() //
+				.withId("the-id") //
+				.withName("name") //
+				.withDescription("description");
 
 		entityTemplate.setEntityCallbacks(ReactiveEntityCallbacks.create(beforeConvert, beforeSave, afterSave));
 		entityTemplate.update(person).as(StepVerifier::create) //
@@ -460,7 +461,8 @@ public class R2dbcEntityTemplateUnitTests {
 				Parameter.from("before-save"));
 	}
 
-	@ToString
+	@Value
+	@With
 	static class Person {
 
 		@Id String id;
@@ -469,12 +471,8 @@ public class R2dbcEntityTemplateUnitTests {
 
 		String description;
 
-		public String getName() {
-			return name;
-		}
-
-		public void setName(String name) {
-			this.name = name;
+		public static Person empty() {
+			return new Person(null, null, null);
 		}
 	}
 
@@ -548,8 +546,8 @@ public class R2dbcEntityTemplateUnitTests {
 		public Mono<Person> onBeforeConvert(Person entity, SqlIdentifier table) {
 
 			capture(entity);
-			entity.name = "before-convert";
-			return Mono.just(entity);
+			Person person = entity.withName("before-convert");
+			return Mono.just(person);
 		}
 	}
 
@@ -573,9 +571,9 @@ public class R2dbcEntityTemplateUnitTests {
 
 			capture(entity);
 
-			Person person = new Person();
-			person.id = "after-save";
-			person.name = entity.name;
+			Person person = Person.empty() //
+					.withId("after-save") //
+					.withName(entity.getName());
 
 			return Mono.just(person);
 		}
@@ -588,9 +586,9 @@ public class R2dbcEntityTemplateUnitTests {
 		public Mono<Person> onAfterConvert(Person entity, SqlIdentifier table) {
 
 			capture(entity);
-			Person person = new Person();
-			person.id = "after-convert";
-			person.name = entity.name;
+			Person person = Person.empty() //
+					.withId("after-convert") //
+					.withName(entity.getName());
 
 			return Mono.just(person);
 		}