Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactored internal mechanism to resolve RepositoryQuery instances.

Browse Source 
Simplified creation of RepositoryQuery instances by changing the QueryLookupStrategy interface method to take a plain Method instead of a QueryMethod. This way we get rid of an indirection where subclasses have to implement two methods (one creating a QueryMethod, one returning the QueryLookupStrategy). Thus a QueryLookupStrategy is responsible for creating RepositoryQueries from a Method and using a QueryMethod is an implementation detail of QueryLookupStrategy implementations actually.
This commit is contained in:
Oliver Gierke
2010-11-30 12:40:12 +01:00
parent 1c80a56626
commit e82b896fa9
3 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-data-commons-core/src/main/java/org/springframework/data/repository/query/QueryLookupStrategy.java
View File

@@ -1,5 +1,6 @@
package org.springframework.data.repository.query;
import java.lang.reflect.Method;
import java.util.Locale;
import org.springframework.util.StringUtils;
@@ -10,7 +11,7 @@ import org.springframework.util.StringUtils;
*
* @author Oliver Gierke
*/
public interface QueryLookupStrategy<Q extends QueryMethod> {
public interface QueryLookupStrategy {
public static enum Key {
@@ -40,5 +41,5 @@ public interface QueryLookupStrategy<Q extends QueryMethod> {
* @param method
* @return
*/
RepositoryQuery resolveQuery(Q method);
RepositoryQuery resolveQuery(Method method);
}

4
spring-data-commons-core/src/main/java/org/springframework/data/repository/support/RepositoryFactoryBeanSupport.java
View File

@@ -38,7 +38,7 @@ import org.springframework.util.Assert;
public abstract class RepositoryFactoryBeanSupport<T extends Repository<?, ?>>
implements FactoryBean<T>, InitializingBean, BeanFactoryAware {
private RepositoryFactorySupport<?> factory;
private RepositoryFactorySupport factory;
private Key queryLookupStrategyKey;
private Class<? extends T> repositoryInterface;
@@ -150,7 +150,7 @@ public abstract class RepositoryFactoryBeanSupport<T extends Repository<?, ?>>
*
* @return
*/
protected abstract RepositoryFactorySupport<?> createRepositoryFactory();
protected abstract RepositoryFactorySupport createRepositoryFactory();
/*

19
spring-data-commons-core/src/main/java/org/springframework/data/repository/support/RepositoryFactorySupport.java
View File

@@ -49,7 +49,7 @@ import org.springframework.util.Assert;
*
* @author Oliver Gierke
*/
public abstract class RepositoryFactorySupport<Q extends QueryMethod> {
public abstract class RepositoryFactorySupport {
private QueryLookupStrategy.Key queryLookupStrategyKey;
@@ -147,15 +147,6 @@ public abstract class RepositoryFactorySupport<Q extends QueryMethod> {
Class<T> domainClass);
/**
* Create a {@link QueryMethod} instance for the given {@link Method}.
*
* @param method
* @return
*/
protected abstract Q getQueryMethod(Method method);
/**
* Determines the base class for the repository to be created.
*
@@ -171,7 +162,7 @@ public abstract class RepositoryFactorySupport<Q extends QueryMethod> {
* @param key can be {@literal null}
* @return
*/
protected abstract QueryLookupStrategy<Q> getQueryLookupStrategy(Key key);
protected abstract QueryLookupStrategy getQueryLookupStrategy(Key key);
/**
@@ -360,12 +351,12 @@ public abstract class RepositoryFactorySupport<Q extends QueryMethod> {
this.customImplementation = customImplementation;
this.target = target;
QueryLookupStrategy<Q> strategy =
QueryLookupStrategy lookupStrategy =
getQueryLookupStrategy(queryLookupStrategyKey);
for (Method method : getFinderMethods(repositoryInterface)) {
Q queryMethod = getQueryMethod(method);
queries.put(method, strategy.resolveQuery(queryMethod));
queries.put(method, lookupStrategy.resolveQuery(method));
}
}