GH-3036 - Use correct type for mapping.

If there is a class hierarchy scenario, SDN will try to use the best matching child class.
In some cases the parent, non-abstract class is already the best fit and should be used.

Closes #3036

Signed-off-by: Gerrit Meier <meistermeier@gmail.com>

Author: meistermeier

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

@@ -108,8 +108,8 @@ NodeDescriptionAndLabels deriveConcreteNodeDescription(NodeDescription<?> entity
 	private NodeDescriptionAndLabels computeConcreteNodeDescription(NodeDescription<?> entityDescription,
 			List<String> labels) {
 
-		boolean isConcreteClassThatFulfillsEverything = !Modifier
-			.isAbstract(entityDescription.getUnderlyingClass().getModifiers())
+		var isAbstractClassOrInterface = Modifier.isAbstract(entityDescription.getUnderlyingClass().getModifiers());
+		boolean isConcreteClassThatFulfillsEverything = !isAbstractClassOrInterface
 				&& entityDescription.getStaticLabels().containsAll(labels);
 
 		if (labels == null || labels.isEmpty() || isConcreteClassThatFulfillsEverything) {
@@ -126,9 +126,13 @@ private NodeDescriptionAndLabels computeConcreteNodeDescription(NodeDescription<
 
 		if (!haystack.isEmpty()) {
 
-			NodeDescription<?> mostMatchingNodeDescription = null;
+			NodeDescription<?> mostMatchingNodeDescription = !isAbstractClassOrInterface ? entityDescription : null;
+			List<String> mostMatchingStaticLabels = !isAbstractClassOrInterface ? entityDescription.getStaticLabels()
+					: List.of();
 			Map<NodeDescription<?>, Integer> unmatchedLabelsCache = new HashMap<>();
-			List<String> mostMatchingStaticLabels = null;
+			if (!isAbstractClassOrInterface) {
+				unmatchedLabelsCache.put(mostMatchingNodeDescription, labels.size() - mostMatchingStaticLabels.size());
+			}
 
 			for (NodeDescription<?> nd : haystack) {
 
@@ -164,7 +168,7 @@ private NodeDescriptionAndLabels computeConcreteNodeDescription(NodeDescription<
 			}
 
 			Set<String> surplusLabels = new HashSet<>(labels);
-			if (mostMatchingStaticLabels != null) {
+			if (!mostMatchingStaticLabels.isEmpty()) {
 				mostMatchingStaticLabels.forEach(surplusLabels::remove);
 			}
 			if (mostMatchingNodeDescription == null) {

src/test/java/org/springframework/data/neo4j/integration/issues/IssuesIT.java

@@ -199,6 +199,8 @@
 import org.springframework.data.neo4j.integration.issues.gh2973.RelationshipB;
 import org.springframework.data.neo4j.integration.issues.gh2973.RelationshipC;
 import org.springframework.data.neo4j.integration.issues.gh2973.RelationshipD;
+import org.springframework.data.neo4j.integration.issues.gh3036.Vehicle;
+import org.springframework.data.neo4j.integration.issues.gh3036.VehicleRepository;
 import org.springframework.data.neo4j.integration.issues.qbe.A;
 import org.springframework.data.neo4j.integration.issues.qbe.ARepository;
 import org.springframework.data.neo4j.integration.issues.qbe.B;
@@ -1854,6 +1856,23 @@ void abstractedRelationshipTypesShouldBeMappedCorrectly(@Autowired Gh2973Reposit
 		assertThat(relationshipsCFail.get(0)).isNotExactlyInstanceOf(BaseRelationship.class);
 	}
 
+	@Tag("GH-3036")
+	@Test
+	void asdf(@Autowired VehicleRepository repository) {
+		var vehicleWithoutDynamicLabels = new Vehicle();
+		var vehicleWithOneDynamicLabel = new Vehicle();
+		vehicleWithOneDynamicLabel.setLabels(Set.of("label1"));
+		var vehicleWithTwoDynamicLabels = new Vehicle();
+		vehicleWithTwoDynamicLabels.setLabels(Set.of("label1", "label2"));
+
+		repository
+			.saveAll(List.of(vehicleWithoutDynamicLabels, vehicleWithOneDynamicLabel, vehicleWithTwoDynamicLabels));
+
+		var vehicles = repository.findAllVehicles();
+		assertThat(vehicles).hasOnlyElementsOfType(Vehicle.class);
+
+	}
+
 	@Configuration
 	@EnableTransactionManagement
 	@EnableNeo4jRepositories(namedQueriesLocation = "more-custom-queries.properties")

src/test/java/org/springframework/data/neo4j/integration/issues/gh3036/Car.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2011-2025 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.issues.gh3036;
+
+import org.springframework.data.neo4j.core.schema.Node;
+
+/**
+ * Detailed implementation candidate
+ */
+@Node(primaryLabel = "Car")
+public class Car extends Vehicle {
+
+}

src/test/java/org/springframework/data/neo4j/integration/issues/gh3036/Sedan.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2011-2025 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.issues.gh3036;
+
+import org.springframework.data.neo4j.core.schema.Node;
+
+/**
+ * Detailed implementation candidate
+ */
+@Node(primaryLabel = "Sedan")
+public class Sedan extends Car {
+
+}

src/test/java/org/springframework/data/neo4j/integration/issues/gh3036/Vehicle.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2011-2025 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.issues.gh3036;
+
+import java.util.Set;
+
+import org.springframework.data.neo4j.core.schema.DynamicLabels;
+import org.springframework.data.neo4j.core.schema.GeneratedValue;
+import org.springframework.data.neo4j.core.schema.Id;
+import org.springframework.data.neo4j.core.schema.Node;
+import org.springframework.data.neo4j.core.schema.Property;
+
+/**
+ * Parent class
+ */
+@Node(primaryLabel = "Vehicle")
+public class Vehicle {
+
+	@Id
+	@GeneratedValue
+	public String id;
+
+	@Property(name = "name")
+	public String name;
+
+	@DynamicLabels
+	public Set<String> labels = Set.of();
+
+	public String getId() {
+		return this.id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public Set<String> getLabels() {
+		return this.labels;
+	}
+
+	public void setLabels(Set<String> labels) {
+		this.labels = labels;
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+}

src/test/java/org/springframework/data/neo4j/integration/issues/gh3036/VehicleRepository.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2011-2025 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.issues.gh3036;
+
+import java.util.List;
+
+import org.springframework.data.neo4j.repository.Neo4jRepository;
+import org.springframework.data.neo4j.repository.query.Query;
+
+/**
+ * Repository for testing GH-3036
+ */
+public interface VehicleRepository extends Neo4jRepository<Vehicle, String> {
+
+	@Query("MATCH (vehicle:Vehicle) RETURN vehicle")
+	List<Vehicle> findAllVehicles();
+
+}