GH-2262 - Fetch all properties when querying via a base interface.

When a statement is generated for a node description that describes an interface, we now always add the `__allProperties__` attribute to the map of properties pointing to `*`. We must do this because we cannot assume that every implementation of the interface actually has only the properties of the interface, but an arbitrary set of unknowns.

The converter will now always look for this property if a requested property is not found on the surrounding map accessor.

This fixes #2262.

Author: michael-simons

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

@@ -559,7 +559,7 @@ private List<Object> projectNodeProperties(NodeDescription<?> nodeDescription, S
 			nodePropertiesProjection.add(graphProperty.getPropertyName());
 		}
 
-		if (hasCompositeProperties) {
+		if (hasCompositeProperties || nodeDescription.describesInterface()) {
 			nodePropertiesProjection.add(Constants.NAME_OF_ALL_PROPERTIES);
 			nodePropertiesProjection.add(node.project(Cypher.asterisk()));
 		}

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

@@ -35,6 +35,7 @@
 
 import org.neo4j.driver.Value;
 import org.neo4j.driver.Values;
+import org.neo4j.driver.internal.value.NullValue;
 import org.neo4j.driver.types.Entity;
 import org.neo4j.driver.types.MapAccessor;
 import org.neo4j.driver.types.Node;
@@ -559,7 +560,13 @@ private static Value extractValueOf(Neo4jPersistentProperty property, MapAccesso
 			}
 		} else {
 			String graphPropertyName = property.getPropertyName();
-			return propertyContainer.get(graphPropertyName);
+			if (propertyContainer.containsKey(graphPropertyName)) {
+				return propertyContainer.get(graphPropertyName);
+			} else if (propertyContainer.containsKey(Constants.NAME_OF_ALL_PROPERTIES)) {
+				return propertyContainer.get(Constants.NAME_OF_ALL_PROPERTIES).get(graphPropertyName);
+			} else {
+				return NullValue.NULL;
+			}
 		}
 	}
 

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

@@ -44,6 +44,8 @@
 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.integration.shared.common.KotlinAnimationMovie;
+import org.springframework.data.neo4j.integration.shared.common.KotlinCinema;
 import org.springframework.data.neo4j.repository.Neo4jRepository;
 import org.springframework.data.neo4j.repository.config.EnableNeo4jRepositories;
 import org.springframework.data.neo4j.repository.query.Query;
@@ -383,6 +385,26 @@ void shouldMatchPolymorphicInterfacesWhenFetchingAll(@Autowired ParentModelRepos
 		assertThat(divisions).first().satisfies(twoDifferentInterfacesHaveBeenLoaded());
 	}
 
+	@Test // GH-2262
+	void shouldMatchPolymorphicKotlinInterfacesWhenFetchingAll(@Autowired CinemaRepository repository) {
+
+		try (Session session = driver.session(bookmarkCapture.createSessionConfig()); Transaction transaction = session.beginTransaction()) {
+			transaction.run("CREATE (:KotlinMovie:KotlinAnimationMovie {id: 'movie001', name: 'movie-001', studio: 'Pixar'})<-[:Plays]-(c:KotlinCinema {id:'cine-01', name: 'GrandRex'}) RETURN id(c) AS id")
+					.single().get(0).asLong();
+			transaction.commit();
+			bookmarkCapture.seedWith(session.lastBookmark());
+		}
+
+		List<KotlinCinema> divisions = repository.findAll();
+		assertThat(divisions).hasSize(1);
+		assertThat(divisions).first().satisfies(c -> {
+			assertThat(c.getPlays()).hasSize(1);
+			assertThat(c.getPlays()).first().isInstanceOf(KotlinAnimationMovie.class)
+					.extracting(m -> ((KotlinAnimationMovie) m).getStudio())
+					.isEqualTo("Pixar");
+		});
+	}
+
 	private Consumer<Inheritance.ParentModel2> twoDifferentInterfacesHaveBeenLoaded() {
 		return d -> {
 			assertThat(d.getIsRelatedTo()).hasSize(2);
@@ -441,6 +463,8 @@ interface DivisionRepository extends Neo4jRepository<Inheritance.Division, Long>
 
 	interface ParentModelRepository extends Neo4jRepository<Inheritance.ParentModel2, Long> {}
 
+	interface CinemaRepository extends Neo4jRepository<KotlinCinema, String> {}
+
 	@Configuration
 	@EnableNeo4jRepositories(considerNestedRepositories = true)
 	@EnableTransactionManagement

src/test/kotlin/org/springframework/data/neo4j/integration/imperative/KotlinInheritanceIT.kt

@@ -29,10 +29,9 @@ import org.springframework.data.neo4j.core.Neo4jTemplate
 import org.springframework.data.neo4j.core.findById
 import org.springframework.data.neo4j.core.transaction.Neo4jBookmarkManager
 import org.springframework.data.neo4j.core.transaction.Neo4jTransactionManager
-import org.springframework.data.neo4j.integration.shared.common.ConcreteDataNodeWithAbstractKotlinBase
-import org.springframework.data.neo4j.integration.shared.common.ConcreteDataNodeWithOpenKotlinBase
-import org.springframework.data.neo4j.integration.shared.common.ConcreteNodeWithAbstractKotlinBase
-import org.springframework.data.neo4j.integration.shared.common.ConcreteNodeWithOpenKotlinBase
+import org.springframework.data.neo4j.integration.shared.common.*
+import org.springframework.data.neo4j.repository.Neo4jRepository
+import org.springframework.data.neo4j.repository.config.EnableNeo4jRepositories
 import org.springframework.data.neo4j.test.BookmarkCapture
 import org.springframework.data.neo4j.test.Neo4jExtension
 import org.springframework.data.neo4j.test.Neo4jIntegrationTest
@@ -192,8 +191,32 @@ class KotlinInheritanceIT @Autowired constructor(
 		assertThat(cnt).isEqualTo(1L)
 	}
 
+	@Test // GH-2262
+	fun shouldMatchPolymorphicInterfacesWhenFetchingAll(@Autowired cinemaRepository: KotlinCinemaRepository) {
+
+		driver.session(bookmarkCapture.createSessionConfig()).use { session ->
+			session.writeTransaction { tx ->
+				tx.run("CREATE (:KotlinMovie:KotlinAnimationMovie {id: 'movie001', name: 'movie-001', studio: 'Pixar'})<-[:Plays]-(c:KotlinCinema {id:'cine-01', name: 'GrandRex'}) RETURN id(c) AS id")
+						.single()["id"].asLong()
+			}
+			bookmarkCapture.seedWith(session.lastBookmark())
+		}
+
+		val cinemas = cinemaRepository.findAll()
+		assertThat(cinemas).hasSize(1);
+		assertThat(cinemas).first().satisfies { c ->
+			assertThat(c.plays).hasSize(1);
+			assertThat(c.plays).first().isInstanceOf(KotlinAnimationMovie::class.java)
+					.extracting { m -> (m as KotlinAnimationMovie).studio }
+					.isEqualTo("Pixar")
+		}
+	}
+
+	interface KotlinCinemaRepository: Neo4jRepository<KotlinCinema, String>
+
 	@Configuration
 	@EnableTransactionManagement
+	@EnableNeo4jRepositories(considerNestedRepositories = true)
 	open class MyConfig : AbstractNeo4jConfig() {
 		@Bean
 		override fun driver(): Driver {
@@ -205,6 +228,10 @@ class KotlinInheritanceIT @Autowired constructor(
 			return BookmarkCapture()
 		}
 
+		override fun getMappingBasePackages(): Collection<String?>? {
+			return setOf(Inheritance::class.java.getPackage().name)
+		}
+
 		@Bean
 		override fun transactionManager(driver: Driver, databaseNameProvider: DatabaseSelectionProvider): PlatformTransactionManager {
 			val bookmarkCapture = bookmarkCapture()

src/test/kotlin/org/springframework/data/neo4j/integration/shared/common/KotlinInheritance.kt

@@ -19,6 +19,7 @@ import org.springframework.data.annotation.Transient
 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.Relationship
 
 /**
  * @author Michael J. Simons
@@ -71,3 +72,19 @@ class ConcreteNodeWithOpenKotlinBase(name: String, val anotherProperty: String)
 @Node
 data class ConcreteDataNodeWithOpenKotlinBase(override @Transient val name: String, val anotherProperty: String) : OpenKotlinBase(name) {
 }
+
+
+@Node
+interface KotlinMovie {
+	val id: String
+	val name: String
+}
+
+
+@Node
+class KotlinCinema(@Id val id: String, val name: String,
+				   @Relationship("Plays", direction = Relationship.Direction.OUTGOING) val plays: List<KotlinMovie>
+)
+
+@Node
+class KotlinAnimationMovie(@Id override val id: String, override val name: String, val studio: String?) : KotlinMovie