GH-2199 - More relaxed inheritance mapping.

Author: meistermeier

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

@@ -111,7 +111,9 @@ public <R> R read(Class<R> targetType, MapAccessor mapAccessor) {
 
 	private <R> MapAccessor determineQueryRoot(MapAccessor mapAccessor, Neo4jPersistentEntity<R> rootNodeDescription) {
 
-		String primaryLabel = rootNodeDescription.getPrimaryLabel();
+		List<String> primaryLabels = new ArrayList<>();
+		primaryLabels.add(rootNodeDescription.getPrimaryLabel());
+		rootNodeDescription.getChildNodeDescriptionsInHierarchy().forEach(nodeDescription -> primaryLabels.add(nodeDescription.getPrimaryLabel()));
 
 		// Massage the initial mapAccessor into something we can deal with
 		Iterable<Value> recordValues = mapAccessor instanceof Value && ((Value) mapAccessor).hasType(nodeType) ?
@@ -123,7 +125,7 @@ private <R> MapAccessor determineQueryRoot(MapAccessor mapAccessor, Neo4jPersist
 		for (Value value : recordValues) {
 			if (value.hasType(nodeType)) { // It is a node
 				Node node = value.asNode();
-				if (node.hasLabel(primaryLabel)) { // it has a matching label
+				if (primaryLabels.stream().anyMatch(node::hasLabel)) { // it has a matching label
 					// We haven't seen this node yet, so we take it
 					if (knownObjects.getObject(node.id()) == null) {
 						matchingNodes.add(node);

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

@@ -65,12 +65,6 @@ final class DefaultNeo4jPersistentEntity<T> extends BasicPersistentEntity<T, Neo
 
 	private static final LogAccessor log = new LogAccessor(LogFactory.getLog(DefaultNeo4jPersistentProperty.class));
 
-	/**
-	 * If an entity is annotated with {@link Node}, we consider this as an explicit entity that should get validated more
-	 * strictly.
-	 */
-	private final Boolean isExplicitEntity;
-
 	/**
 	 * The label that describes the label most concrete.
 	 */
@@ -96,7 +90,6 @@ final class DefaultNeo4jPersistentEntity<T> extends BasicPersistentEntity<T, Neo
 	DefaultNeo4jPersistentEntity(TypeInformation<T> information) {
 		super(information);
 
-		this.isExplicitEntity = this.isAnnotationPresent(Node.class) || this.isAnnotationPresent(Persistent.class);
 		this.primaryLabel = computePrimaryLabel();
 		this.additionalLabels = Lazy.of(this::computeAdditionalLabels);
 		this.graphProperties = Lazy.of(this::computeGraphProperties);
@@ -213,7 +206,9 @@ public void verify() {
 
 	private void verifyIdDescription() {
 
-		if (this.getIdDescription() == null && isExplicitEntity) {
+		if (this.getIdDescription() == null
+			&& (this.isAnnotationPresent(Node.class) || this.isAnnotationPresent(Persistent.class))) {
+
 			throw new IllegalStateException("Missing id property on " + this.getUnderlyingClass() + ".");
 		}
 	}
@@ -352,12 +347,16 @@ private List<String> computeOwnAdditionalLabels() {
 	@NonNull
 	private List<String> computeParentLabels() {
 		List<String> parentLabels = new ArrayList<>();
-		NodeDescription<?> parentNodeDescriptionCalculated = parentNodeDescription;
+		Neo4jPersistentEntity<?> parentNodeDescriptionCalculated = (Neo4jPersistentEntity<?>) parentNodeDescription;
 
 		while (parentNodeDescriptionCalculated != null) {
-			parentLabels.add(parentNodeDescriptionCalculated.getPrimaryLabel());
-			parentLabels.addAll(parentNodeDescriptionCalculated.getAdditionalLabels());
-			parentNodeDescriptionCalculated = parentNodeDescriptionCalculated.getParentNodeDescription();
+			if (parentNodeDescriptionCalculated.isAnnotationPresent(Node.class)
+					|| parentNodeDescriptionCalculated.isAnnotationPresent(Persistent.class)) {
+
+				parentLabels.add(parentNodeDescriptionCalculated.getPrimaryLabel());
+				parentLabels.addAll(parentNodeDescriptionCalculated.getAdditionalLabels());
+			}
+			parentNodeDescriptionCalculated = (Neo4jPersistentEntity<?>) parentNodeDescriptionCalculated.getParentNodeDescription();
 		}
 		return parentLabels;
 	}

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

@@ -48,7 +48,6 @@
 import org.springframework.data.neo4j.core.convert.Neo4jPersistentPropertyConverterFactory;
 import org.springframework.data.neo4j.core.convert.Neo4jSimpleTypes;
 import org.springframework.data.neo4j.core.schema.IdGenerator;
-import org.springframework.data.neo4j.core.schema.Node;
 import org.springframework.data.util.ReflectionUtils;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.lang.Nullable;
@@ -208,10 +207,7 @@ private boolean isValidParentNode(@Nullable Class<?> parentClass) {
 			return false;
 		}
 
-		boolean isExplicitNode = parentClass.isAnnotationPresent(Node.class);
-		boolean isAbstractClass = Modifier.isAbstract(parentClass.getModifiers());
-
-		return isExplicitNode && isAbstractClass;
+		return Modifier.isAbstract(parentClass.getModifiers());
 	}
 
 	/*

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

@@ -42,5 +42,11 @@ public interface Neo4jPersistentEntity<T>
 	 */
 	Optional<Neo4jPersistentProperty> getDynamicLabelsProperty();
 
+	/**
+	 * Determines if the entity is annotated with {@link org.springframework.data.neo4j.core.schema.RelationshipProperties}
+	 *
+	 * @return true if this is a relationship properties class, otherwise false.
+	 */
 	boolean isRelationshipPropertiesEntity();
+
 }

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

@@ -19,16 +19,21 @@
 import org.junit.jupiter.api.Test;
 import org.neo4j.driver.Driver;
 import org.neo4j.driver.Session;
+import org.neo4j.driver.Transaction;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.neo4j.config.AbstractNeo4jConfig;
+import org.springframework.data.neo4j.integration.shared.common.AbstractPet;
+import org.springframework.data.neo4j.integration.shared.common.Cat;
+import org.springframework.data.neo4j.integration.shared.common.Dog;
 import org.springframework.data.neo4j.integration.shared.common.Inheritance;
 import org.springframework.data.neo4j.repository.Neo4jRepository;
 import org.springframework.data.neo4j.repository.config.EnableNeo4jRepositories;
+import org.springframework.data.neo4j.repository.query.Query;
 import org.springframework.data.neo4j.test.Neo4jExtension;
 import org.springframework.data.neo4j.test.Neo4jIntegrationTest;
-import org.springframework.stereotype.Repository;
+import org.springframework.data.repository.query.Param;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import java.util.Collection;
@@ -129,10 +134,34 @@ void resultCollectionShouldHaveCorrectTypes(@Autowired TerritoryRepository repos
 		);
 	}
 
-	@Repository
+	@Test // GH-2199
+	void findAndMapAllConcreteSubclassesWithoutParentLabel(@Autowired PetsRepository petsRepository) {
+
+		try (Session session = driver.session()) {
+			Transaction transaction = session.beginTransaction();
+			transaction.run("CREATE (:Cat{name:'a'})");
+			transaction.run("CREATE (:Cat{name:'a'})");
+			transaction.run("CREATE (:Cat{name:'a'})");
+			transaction.run("CREATE (:Dog{name:'a'})");
+			transaction.commit();
+		}
+
+		List<AbstractPet> pets = petsRepository.findPets("a");
+		assertThat(pets)
+				.hasOnlyElementsOfType(AbstractPet.class)
+				.hasAtLeastOneElementOfType(Dog.class)
+				.hasAtLeastOneElementOfType(Cat.class);
+	}
+
+	interface PetsRepository extends Neo4jRepository<AbstractPet, Long> {
+
+		@Query("MATCH (n {name: $name}) RETURN n")
+		List<AbstractPet> findPets(@Param("name") String name);
+
+	}
+
 	interface BuildingRepository extends Neo4jRepository<Inheritance.Building, Long> {}
 
-	@Repository
 	interface TerritoryRepository extends Neo4jRepository<Inheritance.BaseTerritory, Long> {}
 
 	@Configuration

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

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2011-2021 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 lombok.Getter;
+import lombok.Setter;
+import org.springframework.data.neo4j.core.schema.GeneratedValue;
+import org.springframework.data.neo4j.core.schema.Id;
+
+/**
+ * @author Gerrit Meier
+ */
+public abstract class AbstractPet {
+
+	@Id
+	@GeneratedValue
+	private Long id;
+
+	@Getter @Setter
+	private String name;
+
+}

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

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2011-2021 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.Node;
+
+/**
+ * @author Gerrit Meier
+ */
+@Node(labels = "Cat")
+public class Cat extends AbstractPet {
+
+}

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

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2011-2021 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.Node;
+
+/**
+ * @author Gerrit Meier
+ */
+@Node(labels = "Dog")
+public class Dog extends AbstractPet {
+
+}