GH-2261 - Improve checks whether a query method belongs to CypherDSL statement executor.

This changes uses Spring's ClassUtils to test whether a specific method
belongs to `CypherdslStatementExecutor` or
`ReactiveCypherdslStatementExecutor` as criteria if it needs to be
executed as a `CypherdslBasedQuery` or not.

Before this only the declaring class was checked which is not enough, as
this will prevent all derived query methods from working in a repository
that extends `CypherdslStatementExecutor`.

This fixes #2261.

Author: michael-simons

src/main/java/org/springframework/data/neo4j/repository/query/Neo4jQueryMethod.java

@@ -29,6 +29,7 @@
 import org.springframework.data.repository.query.Parameters;
 import org.springframework.data.repository.query.QueryMethod;
 import org.springframework.lang.Nullable;
+import org.springframework.util.ClassUtils;
 
 /**
  * Neo4j specific implementation of {@link QueryMethod}. It contains a custom implementation of {@link Parameter} which
@@ -64,7 +65,8 @@ class Neo4jQueryMethod extends QueryMethod {
 
 		Class<?> declaringClass = method.getDeclaringClass();
 		this.repositoryName = declaringClass.getName();
-		this.cypherBasedProjection = CypherdslStatementExecutor.class.isAssignableFrom(declaringClass) || ReactiveCypherdslStatementExecutor.class.isAssignableFrom(declaringClass);
+		this.cypherBasedProjection = ClassUtils.hasMethod(CypherdslStatementExecutor.class, method) || ClassUtils
+				.hasMethod(ReactiveCypherdslStatementExecutor.class, method);
 		this.queryAnnotation = AnnotatedElementUtils.findMergedAnnotation(method, Query.class);
 	}
 

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

@@ -203,13 +203,24 @@ void existsShouldWork(@Autowired PersonRepository repository) {
 		assertThat(repository.exists(firstName.eq(Cypher.literalOf("A")))).isTrue();
 	}
 
+	@Test // GH-2261
+	void standardDerivedFinderMethodsShouldWork(@Autowired ARepositoryWithDerivedFinderMethods repository) {
+
+		assertThat(repository.findByFirstName("Helge")).isNotNull();
+	}
+
 	// tag::sdn-mixins.dynamic-conditions.add-mixin[]
 	interface PersonRepository extends
 			Neo4jRepository<Person, Long>, // <.>
 			CypherdslConditionExecutor<Person> { // <.>
 	}
 	// end::sdn-mixins.dynamic-conditions.add-mixin[]
 
+	interface ARepositoryWithDerivedFinderMethods extends Neo4jRepository<Person, Long>, CypherdslConditionExecutor<Person> {
+
+		Person findByFirstName(String firstName);
+	}
+
 	@Configuration
 	@EnableTransactionManagement
 	@EnableNeo4jRepositories(considerNestedRepositories = true)

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

@@ -221,13 +221,25 @@ void findPageProjectedShouldWork(@Autowired PersonRepository repository) {
 				.containsExactly("Bela B.", "Helge Schneider");
 	}
 
+	@Test // GH-2261
+	void standardDerivedFinderMethodsShouldWork(@Autowired ARepositoryWithDerivedFinderMethods repository) {
+
+		assertThat(repository.findByFirstName("Helge")).isNotNull();
+	}
+
 	// tag::sdn-mixins.using-cypher-dsl-statements.add-mixin[]
 	interface PersonRepository extends
 			Neo4jRepository<Person, Long>,
 			CypherdslStatementExecutor<Person> {
 	}
 	// end::sdn-mixins.using-cypher-dsl-statements.add-mixin[]
 
+	interface ARepositoryWithDerivedFinderMethods extends Neo4jRepository<Person, Long>,
+			CypherdslStatementExecutor<Person> {
+
+		Person findByFirstName(String firstName);
+	}
+
 	@Configuration
 	@EnableTransactionManagement
 	@EnableNeo4jRepositories(considerNestedRepositories = true)