GH-2505 - Respect simple type and conversion service on DTO save.

Closes #2505

Author: meistermeier

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

@@ -29,6 +29,7 @@
 import org.springframework.data.mapping.PreferredConstructor;
 import org.springframework.data.mapping.PreferredConstructor.Parameter;
 import org.springframework.data.mapping.model.ParameterValueProvider;
+import org.springframework.data.neo4j.core.convert.Neo4jConversionService;
 import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.data.util.ReflectionUtils;
 import org.springframework.lang.Nullable;
@@ -46,6 +47,7 @@ public final class EntityFromDtoInstantiatingConverter<T> implements Converter<O
 	private final Neo4jMappingContext context;
 
 	private final Map<Class<?>, EntityFromDtoInstantiatingConverter<?>> converterCache = new ConcurrentHashMap<>();
+	private final Neo4jConversionService conversionService;
 
 	/**
 	 * Creates a new {@link Converter} to instantiate Entities from DTOs.
@@ -60,6 +62,7 @@ public EntityFromDtoInstantiatingConverter(Class<T> entityType, Neo4jMappingCont
 
 		this.targetEntityType = entityType;
 		this.context = context;
+		this.conversionService = context.getConversionService();
 	}
 
 	@Override
@@ -131,9 +134,13 @@ Object getPropertyValueFor(PersistentProperty<?> targetProperty, PersistentEntit
 		}
 
 		if (propertyValue != null && !targetPropertyType.isInstance(propertyValue)) {
-			EntityFromDtoInstantiatingConverter<?> nestedConverter = converterCache.computeIfAbsent(targetProperty.getType(),
-					t -> new EntityFromDtoInstantiatingConverter<>(t, context));
-			return nestedConverter.convert(propertyValue);
+			if (conversionService.isSimpleType(targetPropertyType)) {
+				return conversionService.convert(propertyValue, targetPropertyType);
+			} else {
+				EntityFromDtoInstantiatingConverter<?> nestedConverter = converterCache.computeIfAbsent(targetProperty.getType(),
+						t -> new EntityFromDtoInstantiatingConverter<>(t, context));
+				return nestedConverter.convert(propertyValue);
+			}
 		}
 
 		return propertyValue;

src/test/java/org/springframework/data/neo4j/integration/imperative/Neo4jTemplateIT.java

@@ -57,6 +57,7 @@
 import org.springframework.data.neo4j.integration.issues.gh2415.BaseNodeEntity;
 import org.springframework.data.neo4j.integration.issues.gh2415.NodeEntity;
 import org.springframework.data.neo4j.integration.issues.gh2415.NodeWithDefinedCredentials;
+import org.springframework.data.neo4j.integration.shared.common.EntityWithPrimitiveConstructorArguments;
 import org.springframework.data.neo4j.integration.shared.common.Person;
 import org.springframework.data.neo4j.integration.shared.common.PersonWithAllConstructor;
 import org.springframework.data.neo4j.integration.shared.common.PersonWithAssignedId;
@@ -391,6 +392,15 @@ void saveProjectionShouldWork() {
 		assertThat(person.getAddress()).isNotNull();
 	}
 
+	@Test // GH-2505
+	void savePrimitivesShouldWork() {
+		EntityWithPrimitiveConstructorArguments entity = new EntityWithPrimitiveConstructorArguments(true, 42);
+		EntityWithPrimitiveConstructorArguments savedEntity = neo4jTemplate.save(EntityWithPrimitiveConstructorArguments.class).one(entity);
+
+		assertThat(savedEntity.someIntValue).isEqualTo(entity.someIntValue);
+		assertThat(savedEntity.someBooleanValue).isEqualTo(entity.someBooleanValue);
+	}
+
 	@Test // GH-2215
 	void saveAllProjectionShouldWork() {
 

src/test/java/org/springframework/data/neo4j/integration/shared/common/EntityWithPrimitiveConstructorArguments.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2011-2022 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.neo4j.integration.shared.common;
+
+import org.springframework.data.neo4j.core.schema.GeneratedValue;
+import org.springframework.data.neo4j.core.schema.Id;
+import org.springframework.data.neo4j.core.schema.Node;
+
+/**
+ * Reproducer class for Gh-2505
+ */
+@Node
+public class EntityWithPrimitiveConstructorArguments {
+	@Id @GeneratedValue public Long id;
+
+	public final boolean someBooleanValue;
+	public final int someIntValue;
+
+	public EntityWithPrimitiveConstructorArguments(boolean someBooleanValue, int someIntValue) {
+		this.someBooleanValue = someBooleanValue;
+		this.someIntValue = someIntValue;
+	}
+}