Return audited immutable entities from save

Signed-off-by: Artur Kalimullin <kalimullin@gmail.com>

Author: kaliy

src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplateSupport.java

@@ -40,6 +40,7 @@
  * @author Jorge Rodriguez Martin
  * @author Carlos Espinaco
  * @author Emilien Bevierre
+ * @author Artur Kalimullin
  * @since 3.0
  */
 class CouchbaseTemplateSupport extends AbstractTemplateSupport implements ApplicationContextAware, TemplateSupport {
@@ -59,6 +60,7 @@ public CouchbaseDocument encodeEntity(final Object entityToEncode) {
 		Object maybeNewEntity = maybeCallBeforeConvert(entityToEncode, "");
 		final CouchbaseDocument converted = new CouchbaseDocument();
 		converter.write(maybeNewEntity, converted);
+		converted.setEntityToWrite(maybeNewEntity);
 		maybeCallAfterConvert(entityToEncode, converted, "");
 		maybeEmitEvent(new BeforeSaveEvent<>(entityToEncode, converted));
 		return converted;
@@ -77,9 +79,10 @@ public <T> T decodeEntity(Object id, byte[] source, Long cas, Instant expiryTime
 	}
 
 	@Override
-	public <T> T applyResult(T entity, CouchbaseDocument converted, Object id, long cas,
-			Object txResultHolder, CouchbaseResourceHolder holder) {
-		return applyResultBase(entity, converted, id, cas, txResultHolder, holder);
+	@SuppressWarnings("unchecked")
+	public <T> T applyResult(T entity, CouchbaseDocument converted, Object id, long cas, Object txResultHolder,
+			CouchbaseResourceHolder holder) {
+		return (T) applyResultBase(converted.getEntityToWrite(), converted, id, cas, txResultHolder, holder);
 	}
 
 	@Override

src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateSupport.java

@@ -41,6 +41,7 @@
  * @author Carlos Espinaco
  * @author Michael Reiche
  * @author Emilien Bevierre
+ * @author Artur Kalimullin
  * @since 4.2
  */
 class ReactiveCouchbaseTemplateSupport extends AbstractTemplateSupport
@@ -61,6 +62,7 @@ public Mono<CouchbaseDocument> encodeEntity(final Object entityToEncode) {
 				.flatMap(entity -> maybeCallBeforeConvert(entity, "")).map(maybeNewEntity -> {
 					final CouchbaseDocument converted = new CouchbaseDocument();
 					converter.write(maybeNewEntity, converted);
+					converted.setEntityToWrite(maybeNewEntity);
 					return converted;
 				}).flatMap(converted -> maybeCallAfterConvert(entityToEncode, converted, "").thenReturn(converted))
 				.doOnNext(converted -> maybeEmitEvent(new BeforeSaveEvent<>(entityToEncode, converted)));
@@ -88,9 +90,11 @@ public <T> Mono<T> decodeEntity(Object id, byte[] source, Long cas, Instant expi
 	}
 
 	@Override
-	public <T> Mono<T> applyResult(T entity, CouchbaseDocument converted, Object id, Long cas,
-			Object txResultHolder, CouchbaseResourceHolder holder) {
-		return Mono.fromSupplier(() -> applyResultBase(entity, converted, id, cas, txResultHolder, holder));
+	@SuppressWarnings("unchecked")
+	public <T> Mono<T> applyResult(T entity, CouchbaseDocument converted, Object id, Long cas, Object txResultHolder,
+			CouchbaseResourceHolder holder) {
+		return Mono.fromSupplier(
+				() -> (T) applyResultBase(converted.getEntityToWrite(), converted, id, cas, txResultHolder, holder));
 	}
 
 	@Override

src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseDocument.java

@@ -33,6 +33,7 @@
  * topmost document most likely has an ID.
  *
  * @author Michael Nitschinger
+ * @author Artur Kalimullin
  */
 public class CouchbaseDocument implements CouchbaseStorable {
 
@@ -56,6 +57,11 @@ public class CouchbaseDocument implements CouchbaseStorable {
 	 */
 	private int expiration;
 
+	/**
+	 * Contains the entity encoded into this document.
+	 */
+	private Object entityToWrite;
+
 	/**
 	 * Creates a completely empty {@link CouchbaseDocument}.
 	 */
@@ -260,6 +266,26 @@ public CouchbaseDocument setId(Object id) {
 		return this;
 	}
 
+	/**
+	 * Returns the entity encoded into this document.
+	 *
+	 * @return the entity encoded into this document.
+	 */
+	public Object getEntityToWrite() {
+		return entityToWrite;
+	}
+
+	/**
+	 * Sets the entity encoded into this document.
+	 *
+	 * @param entityToWrite the entity encoded into this document.
+	 * @return this document.
+	 */
+	public CouchbaseDocument setEntityToWrite(Object entityToWrite) {
+		this.entityToWrite = entityToWrite;
+		return this;
+	}
+
 	/**
 	 * Verifies that only values of a certain and supported type can be stored.
 	 * <p>

src/test/java/org/springframework/data/couchbase/domain/ReactiveAuditedRecordRepository.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2026 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
+ *
+ *        https://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.couchbase.domain;
+
+import org.springframework.data.repository.reactive.ReactiveCrudRepository;
+
+/**
+ * @author Artur Kalimullin
+ */
+public interface ReactiveAuditedRecordRepository extends ReactiveCrudRepository<AuditedRecord, String> {}

src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryKeyValueIntegrationTests.java

@@ -53,6 +53,7 @@
 import org.springframework.data.couchbase.domain.LibraryRepository;
 import org.springframework.data.couchbase.domain.PersonValue;
 import org.springframework.data.couchbase.domain.PersonValueRepository;
+import org.springframework.data.couchbase.domain.ReactiveAuditedRecordRepository;
 import org.springframework.data.couchbase.domain.Submission;
 import org.springframework.data.couchbase.domain.SubscriptionToken;
 import org.springframework.data.couchbase.domain.SubscriptionTokenRepository;
@@ -89,6 +90,7 @@ public class CouchbaseRepositoryKeyValueIntegrationTests extends ClusterAwareInt
 	@Autowired AirlineRepository airlineRepository;
 	@Autowired AuditedImmutableEntityRepository auditedImmutableEntityRepository;
 	@Autowired AuditedRecordRepository auditedRecordRepository;
+	@Autowired ReactiveAuditedRecordRepository reactiveAuditedRecordRepository;
 	@Autowired PersonValueRepository personValueRepository;
 	@Autowired CouchbaseTemplate couchbaseTemplate;
 	@Autowired AuditingDateTimeProvider auditingDateTimeProvider;
@@ -188,6 +190,8 @@ void saveAuditedRecord() {
 
 			assertNotNull(found.id());
 			assertNotEquals(0, found.version());
+			assertEquals(createdAt, saved.createdDate());
+			assertEquals(createdAt, saved.lastModifiedDate());
 			assertEquals(createdAt, found.createdDate());
 			assertEquals(createdAt, found.lastModifiedDate());
 
@@ -221,6 +225,8 @@ void saveAuditedImmutableEntity() {
 			saved = auditedImmutableEntityRepository.save(new AuditedImmutableEntity(null, 0, null, null, "value"));
 			AuditedImmutableEntity found = auditedImmutableEntityRepository.findById(saved.getId()).orElseThrow();
 
+			assertEquals(createdAt, saved.getCreatedDate());
+			assertEquals(createdAt, saved.getLastModifiedDate());
 			assertEquals(createdAt, found.getCreatedDate());
 			assertEquals(createdAt, found.getLastModifiedDate());
 
@@ -242,6 +248,27 @@ void saveAuditedImmutableEntity() {
 		}
 	}
 
+	@Test
+	@IgnoreWhen(clusterTypes = ClusterType.MOCKED)
+	void reactiveSaveAuditedRecord() {
+		Instant createdAt = Instant.parse("2026-08-12T09:00:00Z");
+		AuditedRecord saved = null;
+		setAuditingTime(createdAt);
+
+		try {
+			saved = reactiveAuditedRecordRepository.save(new AuditedRecord(null, 0, null, null, "value")).block();
+
+			assertNotNull(saved);
+			assertEquals(createdAt, saved.createdDate());
+			assertEquals(createdAt, saved.lastModifiedDate());
+		} finally {
+			resetAuditingTime();
+			if (saved != null) {
+				reactiveAuditedRecordRepository.deleteById(saved.id()).block();
+			}
+		}
+	}
+
 	private void setAuditingTime(Instant time) {
 		auditingDateTimeProvider.setDateTimeService(() -> ZonedDateTime.ofInstant(time, ZoneOffset.UTC));
 	}