Fix auditing immutable entities

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

Author: kaliy

src/main/java/org/springframework/data/couchbase/core/mapping/event/AuditingEntityCallback.java

@@ -30,6 +30,7 @@
  * {@link EntityCallback} to populate auditing related fields on an entity about to be saved.
  *
  * @author Jorge Rodríguez Martín
+ * @author Artur Kalimullin
  * @since 4.2
  */
 public class AuditingEntityCallback implements BeforeConvertCallback<Object>, AfterConvertCallback<Object>, Ordered {
@@ -54,9 +55,7 @@ public AuditingEntityCallback(ObjectFactory<IsNewAwareAuditingHandler> auditingH
 	 */
 	@Override
 	public Object onBeforeConvert(Object entity, String collection) {
-		// LOG.trace("onBeforeConvert " + entity);
-		return entity; // markAudited called in AuditingEventListener.onApplicationEvent()
-										// auditingHandlerFactory.getObject().markAudited(entity);
+		return auditingHandlerFactory.getObject().markAudited(entity);
 	}
 
 	/*

src/main/java/org/springframework/data/couchbase/repository/auditing/CouchbaseAuditingRegistrar.java

@@ -32,7 +32,6 @@
 import org.springframework.data.couchbase.config.BeanNames;
 import org.springframework.data.couchbase.core.mapping.CouchbaseMappingContext;
 import org.springframework.data.couchbase.core.mapping.event.AuditingEntityCallback;
-import org.springframework.data.couchbase.core.mapping.event.AuditingEventListener;
 import org.springframework.util.Assert;
 
 /**
@@ -44,6 +43,7 @@
  * @author Simon Baslé
  * @author Michael Reiche
  * @author Jorge Rodríguez Martín
+ * @author Artur Kalimullin
  */
 public class CouchbaseAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport {
 
@@ -85,8 +85,6 @@ protected void registerAuditListenerBeanDefinition(BeanDefinition auditingHandle
 		Assert.notNull(auditingHandlerDefinition, "BeanDefinition must not be null!");
 		Assert.notNull(registry, "BeanDefinitionRegistry must not be null!");
 
-		// Register the AuditEntityCallback
-
 		BeanDefinitionBuilder listenerBeanDefinitionBuilder = BeanDefinitionBuilder
 				.rootBeanDefinition(AuditingEntityCallback.class);
 		listenerBeanDefinitionBuilder
@@ -95,16 +93,6 @@ protected void registerAuditListenerBeanDefinition(BeanDefinition auditingHandle
 		registerInfrastructureBeanWithId(listenerBeanDefinitionBuilder.getBeanDefinition(),
 				AuditingEntityCallback.class.getName(), registry);
 
-		// Register the AuditingEventListener
-
-		BeanDefinitionBuilder listenerBeanDefinitionBuilder2 = BeanDefinitionBuilder
-				.rootBeanDefinition(AuditingEventListener.class);
-		listenerBeanDefinitionBuilder2
-				.addConstructorArgValue(ParsingUtils.getObjectFactoryBeanDefinition(getAuditingHandlerBeanName(), registry));
-
-		registerInfrastructureBeanWithId(listenerBeanDefinitionBuilder2.getBeanDefinition(),
-				AuditingEventListener.class.getName(), registry);
-
 	}
 
 	private void ensureMappingContext(BeanDefinitionRegistry registry, Object source) {

src/test/java/org/springframework/data/couchbase/core/mapping/event/AuditingEntityCallbackTests.java

@@ -0,0 +1,48 @@
+/*
+ * 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.core.mapping.event;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+
+import java.time.Instant;
+import java.util.Optional;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.data.auditing.IsNewAwareAuditingHandler;
+import org.springframework.data.couchbase.core.mapping.CouchbaseMappingContext;
+import org.springframework.data.couchbase.domain.AuditedRecord;
+
+/**
+ * @author Artur Kalimullin
+ */
+class AuditingEntityCallbackTests {
+
+	@Test
+	void returnsAuditedImmutableEntity() {
+		Instant now = Instant.parse("2026-08-12T09:00:00Z");
+		IsNewAwareAuditingHandler auditingHandler = IsNewAwareAuditingHandler.from(new CouchbaseMappingContext());
+		auditingHandler.setDateTimeProvider(() -> Optional.of(now));
+
+		AuditedRecord original = new AuditedRecord("id", 0, null, null, "value");
+		AuditingEntityCallback callback = new AuditingEntityCallback(() -> auditingHandler);
+		AuditedRecord audited = (AuditedRecord) callback.onBeforeConvert(original, "collection");
+
+		assertNotSame(original, audited);
+		assertEquals(now, audited.createdDate());
+		assertEquals(now, audited.lastModifiedDate());
+	}
+}

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

@@ -0,0 +1,64 @@
+/*
+ * 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 java.time.Instant;
+
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.annotation.Version;
+import org.springframework.data.couchbase.core.mapping.Document;
+import org.springframework.data.couchbase.core.mapping.id.GeneratedValue;
+import org.springframework.data.couchbase.core.mapping.id.GenerationStrategy;
+
+/**
+ * @author Artur Kalimullin
+ */
+@Document
+public class AuditedImmutableEntity {
+
+	@Id
+	@GeneratedValue(strategy = GenerationStrategy.UNIQUE) private final String id;
+	@Version private final long version;
+	@CreatedDate private final Instant createdDate;
+	@LastModifiedDate private final Instant lastModifiedDate;
+	private final String value;
+
+	public AuditedImmutableEntity(String id, long version, Instant createdDate, Instant lastModifiedDate, String value) {
+		this.id = id;
+		this.version = version;
+		this.createdDate = createdDate;
+		this.lastModifiedDate = lastModifiedDate;
+		this.value = value;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public long getVersion() {
+		return version;
+	}
+
+	public Instant getCreatedDate() {
+		return createdDate;
+	}
+
+	public Instant getLastModifiedDate() {
+		return lastModifiedDate;
+	}
+}

src/test/java/org/springframework/data/couchbase/domain/AuditedImmutableEntityRepository.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.CrudRepository;
+
+/**
+ * @author Artur Kalimullin
+ */
+public interface AuditedImmutableEntityRepository extends CrudRepository<AuditedImmutableEntity, String> {}

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

@@ -0,0 +1,34 @@
+/*
+ * 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 java.time.Instant;
+
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.annotation.Version;
+import org.springframework.data.couchbase.core.mapping.Document;
+import org.springframework.data.couchbase.core.mapping.id.GeneratedValue;
+import org.springframework.data.couchbase.core.mapping.id.GenerationStrategy;
+
+/**
+ * @author Artur Kalimullin
+ */
+@Document
+public record AuditedRecord(@Id @GeneratedValue(strategy = GenerationStrategy.UNIQUE) String id, @Version long version,
+        @CreatedDate Instant createdDate, @LastModifiedDate Instant lastModifiedDate, String value) {
+}

src/test/java/org/springframework/data/couchbase/domain/AuditedRecordRepository.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.CrudRepository;
+
+/**
+ * @author Artur Kalimullin
+ */
+public interface AuditedRecordRepository extends CrudRepository<AuditedRecord, String> {}

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

@@ -21,7 +21,6 @@
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.auditing.DateTimeProvider;
 import org.springframework.data.couchbase.CouchbaseClientFactory;
 import org.springframework.data.couchbase.SimpleCouchbaseClientFactory;
 import org.springframework.data.couchbase.cache.CouchbaseCacheManager;
@@ -51,6 +50,7 @@
  * @author Michael Nitschinger
  * @author Michael Reiche
  * @author Jorge Rodriguez Martin
+ * @author Artur Kalimullin
  * @since 3.0
  */
 @Configuration
@@ -128,7 +128,7 @@ public ReactiveNaiveAuditorAware testReactiveAuditorAware() {
 	}
 
 	@Bean(name = "dateTimeProviderRef")
-	public DateTimeProvider testDateTimeProvider() {
+	public AuditingDateTimeProvider testDateTimeProvider() {
 		return new AuditingDateTimeProvider();
 	}
 
@@ -211,7 +211,8 @@ public MappingCouchbaseConverter mappingCouchbaseConverter(CouchbaseMappingConte
 		// that has an getAliasFor(info) that just returns getType().getName().
 		// Our CustomMappingCouchbaseConverter uses a TypeBasedCouchbaseTypeMapper that will
 		// use the DocumentType annotation
-		MappingCouchbaseConverter converter = new CustomMappingCouchbaseConverter(couchbaseMappingContext, typeKey(), couchbaseCustomConversions);
+		MappingCouchbaseConverter converter = new CustomMappingCouchbaseConverter(couchbaseMappingContext, typeKey(),
+				couchbaseCustomConversions);
 		return converter;
 	}
 

src/test/java/org/springframework/data/couchbase/domain/time/AuditingDateTimeProvider.java

@@ -21,6 +21,9 @@
 
 import org.springframework.data.auditing.DateTimeProvider;
 
+/**
+ * @author Artur Kalimullin
+ */
 public class AuditingDateTimeProvider implements DateTimeProvider {
 
 	private DateTimeService dateTimeService = new FixedDateTimeService();
@@ -31,6 +34,10 @@ public AuditingDateTimeProvider(DateTimeService dateTimeService) {
 		this.dateTimeService = dateTimeService;
 	}
 
+	public void setDateTimeService(DateTimeService dateTimeService) {
+		this.dateTimeService = dateTimeService;
+	}
+
 	@Override
 	public Optional<TemporalAccessor> getNow() {
 		return Optional.of(Instant.ofEpochSecond(dateTimeService.getCurrentDateAndTime().toEpochSecond()));