DATAJDBC-234 - Fixes the default query naming and polishing.

The default name now does include the name of the domain class.
The default name now is no longer used when no query with the name specified in the `@Query` annotation is found.

Simplified the unit tests by extracting common functionality and improving naming.
Simplified test configuration.

Original pull request: #180.

Author: schauder

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

@@ -46,7 +46,7 @@
 
 	/**
 	 * The named query to be used. If not defined, the name of
-	 * {@code $ domainClass}.${queryMethodName}} will be used.
+	 * {@code ${domainClass}.${queryMethodName}} will be used.
 	 */
 	String name() default "";
 

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategy.java

@@ -54,7 +54,6 @@ class JdbcQueryLookupStrategy implements QueryLookupStrategy {
 	private final JdbcConverter converter;
 	private final QueryMappingConfiguration queryMappingConfiguration;
 	private final NamedParameterJdbcOperations operations;
-	
 
 	/*
 	 * (non-Javadoc)
@@ -64,7 +63,7 @@ class JdbcQueryLookupStrategy implements QueryLookupStrategy {
 	public RepositoryQuery resolveQuery(Method method, RepositoryMetadata repositoryMetadata,
 			ProjectionFactory projectionFactory, NamedQueries namedQueries) {
 
-		JdbcQueryMethod queryMethod = new JdbcQueryMethod(method, repositoryMetadata, projectionFactory,namedQueries);
+		JdbcQueryMethod queryMethod = new JdbcQueryMethod(method, repositoryMetadata, projectionFactory, namedQueries);
 
 		RowMapper<?> mapper = queryMethod.isModifyingQuery() ? null : createMapper(queryMethod);
 

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

@@ -22,18 +22,17 @@
 import org.springframework.data.jdbc.repository.query.Modifying;
 import org.springframework.data.jdbc.repository.query.Query;
 import org.springframework.data.projection.ProjectionFactory;
+import org.springframework.data.repository.core.NamedQueries;
 import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.data.repository.query.QueryMethod;
 import org.springframework.jdbc.core.ResultSetExtractor;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.lang.Nullable;
 import org.springframework.util.StringUtils;
-import org.springframework.data.repository.core.NamedQueries;
 
 /**
- * {@link QueryMethod} implementation that implements a method by executing the
- * query from a {@link Query} annotation on that method. Binds method arguments
- * to named parameters in the SQL statement.
+ * {@link QueryMethod} implementation that implements a method by executing the query from a {@link Query} annotation on
+ * that method. Binds method arguments to named parameters in the SQL statement.
  *
  * @author Jens Schauder
  * @author Kazuki Shimizu
@@ -59,49 +58,50 @@ public JdbcQueryMethod(Method method, RepositoryMetadata metadata, ProjectionFac
 	 *
 	 * @return May be {@code null}.
 	 */
-
 	@Nullable
-	public String getAnnotatedQuery() {
+	String getDeclaredQuery() {
+
 		String annotatedValue = getQueryValue();
 		return StringUtils.hasText(annotatedValue) ? annotatedValue : getNamedQuery();
 	}
 
 	/**
-	 * Returns the annotated query with key value if it exists.
+	 * Returns the annotated query if it exists.
 	 *
 	 * @return May be {@code null}.
 	 */
 	@Nullable
-	 String getQueryValue() {
+	private String getQueryValue() {
 		return getMergedAnnotationAttribute("value");
 	}
 
-
 	/**
-	 * Returns the annotated query name.
+	 * Returns the named query for this method if it exists.
 	 *
 	 * @return May be {@code null}.
 	 */
 	@Nullable
-	 String getQueryName() {
-		return getMergedAnnotationAttribute("name");
+	private String getNamedQuery() {
+
+		String name = getQueryName();
+		return this.namedQueries.hasQuery(name) ? this.namedQueries.getQuery(name) : null;
 	}
+
 	/**
-	 * Returns the annotated query with key name if it exists.
+	 * Returns the annotated query name.
 	 *
 	 * @return May be {@code null}.
 	 */
-	@Nullable
-	 String getNamedQuery() {
+
+	private String getQueryName() {
+
 		String annotatedName = getMergedAnnotationAttribute("name");
-		return (StringUtils.hasText(annotatedName) && this.namedQueries.hasQuery(annotatedName))
-				? this.namedQueries.getQuery(annotatedName)
-				: this.namedQueries.getQuery(super.getName());
+
+		return StringUtils.hasText(annotatedName) ? annotatedName : getNamedQueryName();
 	}
 
 	/*
-	 * Returns the class to be used as {@link
-	 * org.springframework.jdbc.core.RowMapper}
+	 * Returns the class to be used as {@link org.springframework.jdbc.core.RowMapper}
 	 *
 	 * @return May be {@code null}.
 	 */
@@ -111,8 +111,7 @@ Class<? extends RowMapper> getRowMapperClass() {
 	}
 
 	/**
-	 * Returns the class to be used as
-	 * {@link org.springframework.jdbc.core.ResultSetExtractor}
+	 * Returns the class to be used as {@link org.springframework.jdbc.core.ResultSetExtractor}
 	 *
 	 * @return May be {@code null}.
 	 */

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryQuery.java

@@ -194,7 +194,7 @@ public JdbcQueryMethod getQueryMethod() {
 
 	private String determineQuery() {
 
-		String query = queryMethod.getAnnotatedQuery();
+		String query = queryMethod.getDeclaredQuery();
 
 		if (StringUtils.isEmpty(query)) {
 			throw new IllegalStateException(String.format("No query specified on %s", queryMethod.getName()));

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

@@ -20,6 +20,9 @@
 
 import lombok.Data;
 
+import java.io.IOException;
+import java.util.List;
+
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
@@ -30,27 +33,19 @@
 import org.springframework.context.annotation.Import;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.jdbc.repository.query.Query;
 import org.springframework.data.jdbc.repository.support.JdbcRepositoryFactory;
-import org.springframework.data.jdbc.testing.QueryNamedTestConfiguration;
+import org.springframework.data.jdbc.testing.TestConfiguration;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.core.NamedQueries;
 import org.springframework.data.repository.core.support.PropertiesBasedNamedQueries;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
-import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.rules.SpringClassRule;
 import org.springframework.test.context.junit4.rules.SpringMethodRule;
 import org.springframework.test.jdbc.JdbcTestUtils;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.io.IOException;
-import java.util.List;
-
-import javax.annotation.PostConstruct;
-;
-
 /**
  * Very simple use cases for creation and usage of JdbcRepositories.
  *
@@ -59,14 +54,12 @@
 @ContextConfiguration
 @Transactional
 public class JdbcRepositoryIntegrationTests {
-	public static final String DUMMY_SELECT_NAME = "DUMMY.SELECT";
 
 	@Configuration
-	@Import(QueryNamedTestConfiguration.class)
+	@Import(TestConfiguration.class)
 	static class Config {
 
-		@Autowired
-		JdbcRepositoryFactory factory;
+		@Autowired JdbcRepositoryFactory factory;
 
 		@Bean
 		Class<?> testClass() {
@@ -76,7 +69,17 @@ Class<?> testClass() {
 		@Bean
 		DummyEntityRepository dummyEntityRepository() {
 			return factory.getRepository(DummyEntityRepository.class);
-		}				
+		}
+
+		@Bean
+		NamedQueries namedQueries() throws IOException {
+
+			PropertiesFactoryBean properties = new PropertiesFactoryBean();
+			properties.setLocation(new ClassPathResource("META-INF/jdbc-named-queries.properties"));
+			properties.afterPropertiesSet();
+			return new PropertiesBasedNamedQueries(properties.getObject());
+
+		}
 	}
 
 	@ClassRule public static final SpringClassRule classRule = new SpringClassRule();
@@ -256,10 +259,10 @@ public void findByIdReturnsEmptyWhenNoneFound() {
 	}
 
 	@Test // DATAJDBC-234
-	public void findAllQueryName() {
+	public void findAllByQueryName() {
 
 		repository.save(createDummyEntity());
-		assertThat(repository.findAllQueryName().size() > 0);
+		assertThat(repository.findAllByNamedQuery()).hasSize(1);
 	}
 
 	private static DummyEntity createDummyEntity() {
@@ -271,8 +274,7 @@ private static DummyEntity createDummyEntity() {
 
 	interface DummyEntityRepository extends CrudRepository<DummyEntity, Long> {
 
-		@Query(name = DUMMY_SELECT_NAME)
-		List<DummyEntity> findAllQueryName();
+		List<DummyEntity> findAllByNamedQuery();
 	}
 
 	@Data