Fixes annotated named queries.

@Query.name wasn't considered when trying to find a named query for a query method.

Closes #1022
Original pull request: #1039.

Author: schauder

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/JdbcQueryMethod.java

@@ -147,21 +147,16 @@ private String getQueryValue() {
 	@Nullable
 	private String getNamedQuery() {
 
-		String name = getQueryName();
+		String name = getNamedQueryName();
 		return this.namedQueries.hasQuery(name) ? this.namedQueries.getQuery(name) : null;
 	}
 
-	/**
-	 * Returns the annotated query name.
-	 *
-	 * @return May be {@code null}.
-	 */
-
-	private String getQueryName() {
+	@Override
+	public String getNamedQueryName() {
 
 		String annotatedName = getMergedAnnotationAttribute("name");
 
-		return StringUtils.hasText(annotatedName) ? annotatedName : getNamedQueryName();
+		return StringUtils.hasText(annotatedName) ? annotatedName : super.getNamedQueryName();
 	}
 
 	/**
@@ -174,7 +169,6 @@ Class<? extends RowMapper> getRowMapperClass() {
 		return getMergedAnnotationAttribute("rowMapperClass");
 	}
 
-
 	/**
 	 * Returns the name of the bean to be used as {@link org.springframework.jdbc.core.RowMapper}
 	 *
@@ -225,24 +219,11 @@ private <T> T getMergedAnnotationAttribute(String attribute) {
 
 	/**
 	 * Returns whether the method has an annotated query.
-	 *
-	 * @return
 	 */
 	public boolean hasAnnotatedQuery() {
 		return findAnnotatedQuery().isPresent();
 	}
 
-	/**
-	 * Returns the query string declared in a {@link Query} annotation or {@literal null} if neither the annotation found
-	 * nor the attribute was specified.
-	 *
-	 * @return
-	 */
-	@Nullable
-	String getAnnotatedQuery() {
-		return findAnnotatedQuery().orElse(null);
-	}
-
 	private Optional<String> findAnnotatedQuery() {
 
 		return lookupQueryAnnotation() //

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIntegrationTests.java

@@ -331,6 +331,13 @@ public void findAllByQueryName() {
 		assertThat(repository.findAllByNamedQuery()).hasSize(1);
 	}
 
+	@Test // GH-1022
+	public void findAllByCustomQueryName() {
+
+		repository.save(createDummyEntity());
+		assertThat(repository.findAllByCustomNamedQuery()).hasSize(1);
+	}
+
 	@Test // DATAJDBC-341
 	public void findWithMissingQuery() {
 
@@ -444,6 +451,8 @@ public void sliceByNameShouldReturnCorrectResult() {
 	interface DummyEntityRepository extends CrudRepository<DummyEntity, Long> {
 
 		List<DummyEntity> findAllByNamedQuery();
+		@Query(name = "DummyEntity.customQuery")
+		List<DummyEntity> findAllByCustomNamedQuery();
 
 		List<DummyEntity> findAllByPointInTimeAfter(Instant instant);
 

spring-data-jdbc/src/test/resources/META-INF/jdbc-named-queries.properties

@@ -1 +1,2 @@
-DummyEntity.findAllByNamedQuery=SELECT * FROM DUMMY_ENTITY
+DummyEntity.findAllByNamedQuery=SELECT * FROM DUMMY_ENTITY
+DummyEntity.customQuery=SELECT * FROM DUMMY_ENTITY