Moved populateIfNecessary to Neo4jMappingContext from IdPopulator

src/main/java/org/springframework/data/neo4j/core/mapping/Neo4jMappingContext.java

@@ -50,6 +50,7 @@
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.data.mapping.MappingException;
 import org.springframework.data.mapping.PersistentEntity;
+import org.springframework.data.mapping.PersistentPropertyAccessor;
 import org.springframework.data.mapping.callback.EntityCallbacks;
 import org.springframework.data.mapping.context.AbstractMappingContext;
 import org.springframework.data.mapping.model.EntityInstantiator;
@@ -68,6 +69,7 @@
 import org.springframework.data.util.Lazy;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
 import org.springframework.util.ReflectionUtils;
 
 /**
@@ -119,6 +121,54 @@ public final class Neo4jMappingContext extends AbstractMappingContext<Neo4jPersi
 
 	private final Lazy<PersistentPropertyCharacteristicsProvider> propertyCharacteristicsProvider;
 
+	public Object populateIfNecessary(Object entity) {
+
+		Assert.notNull(entity, "Entity may not be null");
+
+		Neo4jPersistentEntity<?> nodeDescription = getRequiredPersistentEntity(entity.getClass());
+		IdDescription idDescription = nodeDescription.getIdDescription();
+
+		if (idDescription == null) {
+			if (nodeDescription.isRelationshipPropertiesEntity()) {
+				return entity;
+			} else {
+				throw new IllegalStateException(
+						"Cannot persist implicit entity due to missing id property on " + nodeDescription.getUnderlyingClass());
+			}
+		}
+
+		// Filter in two steps to avoid unnecessary object creation.
+		if (!idDescription.isExternallyGeneratedId()) {
+			return entity;
+		}
+
+		PersistentPropertyAccessor<?> propertyAccessor = nodeDescription.getPropertyAccessor(entity);
+		Neo4jPersistentProperty idProperty = nodeDescription.getRequiredIdProperty();
+
+		// Check existing ID
+		if (propertyAccessor.getProperty(idProperty) != null) {
+			return entity;
+		}
+
+		IdGenerator<?> idGenerator;
+
+		// Get or create the shared generator
+		// Ref has precedence over class
+		Optional<String> optionalIdGeneratorRef = idDescription.getIdGeneratorRef();
+		if (optionalIdGeneratorRef.isPresent()) {
+
+			idGenerator = getIdGenerator(optionalIdGeneratorRef.get()).orElseThrow(
+					() -> new IllegalStateException("Id generator named " + optionalIdGeneratorRef.get() + " not found"));
+		} else {
+
+			idGenerator = getOrCreateIdGeneratorOfType(idDescription.getIdGeneratorClass().orElseThrow(
+					() -> new IllegalStateException("Neither generator reference nor generator class configured")));
+		}
+
+		propertyAccessor.setProperty(idProperty, idGenerator.generateId(nodeDescription.getPrimaryLabel(), entity));
+		return propertyAccessor.getBean();
+	}
+
 	/**
 	 * A builder for creating custom instances of a {@link Neo4jMappingContext}.
 	 * @since 6.3.7

src/main/java/org/springframework/data/neo4j/core/mapping/callback/IdGeneratingBeforeBindCallback.java

@@ -27,15 +27,16 @@
  */
 final class IdGeneratingBeforeBindCallback implements BeforeBindCallback<Object>, Ordered {
 
-	private final IdPopulator idPopulator;
+
+	private final Neo4jMappingContext neo4jMappingContext;
 
 	IdGeneratingBeforeBindCallback(Neo4jMappingContext neo4jMappingContext) {
-		this.idPopulator = new IdPopulator(neo4jMappingContext);
+		this.neo4jMappingContext = neo4jMappingContext;
 	}
 
 	@Override
 	public Object onBeforeBind(Object entity) {
-		return idPopulator.populateIfNecessary(entity);
+		return neo4jMappingContext.populateIfNecessary(entity);
 	}
 
 	@Override

src/main/java/org/springframework/data/neo4j/core/mapping/callback/IdPopulator.java

@@ -41,51 +41,4 @@ final class IdPopulator {
 		this.neo4jMappingContext = neo4jMappingContext;
 	}
 
-	Object populateIfNecessary(Object entity) {
-
-		Assert.notNull(entity, "Entity may not be null");
-
-		Neo4jPersistentEntity<?> nodeDescription = neo4jMappingContext.getRequiredPersistentEntity(entity.getClass());
-		IdDescription idDescription = nodeDescription.getIdDescription();
-
-		if (idDescription == null) {
-			if (nodeDescription.isRelationshipPropertiesEntity()) {
-				return entity;
-			} else {
-				throw new IllegalStateException(
-						"Cannot persist implicit entity due to missing id property on " + nodeDescription.getUnderlyingClass());
-			}
-		}
-
-		// Filter in two steps to avoid unnecessary object creation.
-		if (!idDescription.isExternallyGeneratedId()) {
-			return entity;
-		}
-
-		PersistentPropertyAccessor<?> propertyAccessor = nodeDescription.getPropertyAccessor(entity);
-		Neo4jPersistentProperty idProperty = nodeDescription.getRequiredIdProperty();
-
-		// Check existing ID
-		if (propertyAccessor.getProperty(idProperty) != null) {
-			return entity;
-		}
-
-		IdGenerator<?> idGenerator;
-
-		// Get or create the shared generator
-		// Ref has precedence over class
-		Optional<String> optionalIdGeneratorRef = idDescription.getIdGeneratorRef();
-		if (optionalIdGeneratorRef.isPresent()) {
-
-			idGenerator = neo4jMappingContext.getIdGenerator(optionalIdGeneratorRef.get()).orElseThrow(
-					() -> new IllegalStateException("Id generator named " + optionalIdGeneratorRef.get() + " not found"));
-		} else {
-
-			idGenerator = neo4jMappingContext.getOrCreateIdGeneratorOfType(idDescription.getIdGeneratorClass().orElseThrow(
-					() -> new IllegalStateException("Neither generator reference nor generator class configured")));
-		}
-
-		propertyAccessor.setProperty(idProperty, idGenerator.generateId(nodeDescription.getPrimaryLabel(), entity));
-		return propertyAccessor.getBean();
-	}
 }

src/main/java/org/springframework/data/neo4j/core/mapping/callback/ReactiveIdGeneratingBeforeBindCallback.java

@@ -30,16 +30,16 @@
  */
 final class ReactiveIdGeneratingBeforeBindCallback implements ReactiveBeforeBindCallback<Object>, Ordered {
 
-	private final IdPopulator idPopulator;
+	private final Neo4jMappingContext neo4jMappingContext ;
 
 	ReactiveIdGeneratingBeforeBindCallback(Neo4jMappingContext neo4jMappingContext) {
-		this.idPopulator = new IdPopulator(neo4jMappingContext);
+		this.neo4jMappingContext = new Neo4jMappingContext();
 	}
 
 	@Override
 	public Publisher<Object> onBeforeBind(Object entity) {
 
-		return Mono.fromSupplier(() -> idPopulator.populateIfNecessary(entity));
+		return Mono.fromSupplier(() -> neo4jMappingContext.populateIfNecessary(entity));
 	}
 
 	@Override

src/test/java/org/springframework/data/neo4j/core/mapping/callback/IdPopulatorTest.java

@@ -50,8 +50,8 @@ void shouldRejectNullMappingContext() {
 
 	@Test
 	void shouldRejectNullEntity() {
-		IdPopulator idPopulator = new IdPopulator(neo4jMappingContext);
-		Assertions.assertThatIllegalArgumentException().isThrownBy(() -> idPopulator.populateIfNecessary(null))
+		Neo4jMappingContext neo4jMappingContext = new Neo4jMappingContext();
+		Assertions.assertThatIllegalArgumentException().isThrownBy(() -> neo4jMappingContext.populateIfNecessary(null))
 				.withMessage("Entity may not be null");
 	}
 
@@ -62,10 +62,10 @@ void shouldIgnoreInternalIdGenerator() {
 		doReturn(toBeReturned).when(nodeDescription).getIdDescription();
 		doReturn(nodeDescription).when(neo4jMappingContext).getRequiredPersistentEntity(Sample.class);
 
-		IdPopulator idPopulator = new IdPopulator(neo4jMappingContext);
+		Neo4jMappingContext neo4jMappingContext = new Neo4jMappingContext();
 		Sample sample = new Sample();
 
-		assertThat(idPopulator.populateIfNecessary(sample)).isSameAs(sample);
+		assertThat(neo4jMappingContext.populateIfNecessary(sample)).isSameAs(sample);
 
 		verify(nodeDescription).getIdDescription();
 		verify(neo4jMappingContext).getRequiredPersistentEntity(Sample.class);
@@ -76,31 +76,31 @@ void shouldIgnoreInternalIdGenerator() {
 	@Test
 	void shouldNotActOnAssignedProperty() {
 
-		IdPopulator idPopulator = new IdPopulator(new Neo4jMappingContext());
+		Neo4jMappingContext neo4jMappingContext = new Neo4jMappingContext();
 		Sample sample = new Sample();
 		sample.theId = "something";
 
-		Sample populatedSample = (Sample) idPopulator.populateIfNecessary(sample);
+		Sample populatedSample = (Sample) neo4jMappingContext.populateIfNecessary(sample);
 		assertThat(populatedSample).isSameAs(sample);
 		assertThat(populatedSample.theId).isEqualTo("something");
 	}
 
 	@Test
 	void shouldInvokeGenerator() {
 
-		IdPopulator idPopulator = new IdPopulator(new Neo4jMappingContext());
+		Neo4jMappingContext neo4jMappingContext = new Neo4jMappingContext();
 		Sample sample = new Sample();
 
-		Sample populatedSample = (Sample) idPopulator.populateIfNecessary(sample);
+		Sample populatedSample = (Sample) neo4jMappingContext.populateIfNecessary(sample);
 		assertThat(populatedSample).isSameAs(sample);
 		assertThat(populatedSample.theId).isEqualTo("Not necessary unique.");
 	}
 
 	@Test // DATAGRAPH-1423
 	void shouldNotFailWithNPEOnMissingIDGenerator() {
 
-		IdPopulator idPopulator = new IdPopulator(new Neo4jMappingContext());
-		assertThatIllegalStateException().isThrownBy(() -> idPopulator.populateIfNecessary(new ImplicitEntityWithoutId()))
+		Neo4jMappingContext neo4jMappingContext = new Neo4jMappingContext();
+		assertThatIllegalStateException().isThrownBy(() -> neo4jMappingContext.populateIfNecessary(new ImplicitEntityWithoutId()))
 				.withMessage("Cannot persist implicit entity due to missing id property on " + ImplicitEntityWithoutId.class);
 	}