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

DATACMNS-533 - Polishing of special parameter handling.

Browse Source 
Collapsed variable gathering methods into one, make sure we expose all values (also null ones). Renamed unit test for ExtensionAwareEvaluationContextProvider according to the class name. Some further cleanups in the test case.

Related pull request: spring-projects/spring-data-jpa#101
Related ticket: DATAJPA-564
This commit is contained in:
Oliver Gierke
2014-07-08 13:13:30 +02:00
parent 31848f87eb
commit 39f028bb6c
2 changed files with 65 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/main/java/org/springframework/data/repository/query/ExtensionAwareEvaluationContextProvider.java
View File

@@ -109,52 +109,41 @@ public class ExtensionAwareEvaluationContextProvider implements EvaluationContex
// Add parameters for indexed access
ec.setRootObject(parameterValues);
Map<String, Object> variables = collectVariables(parameters, parameterValues);
ec.setVariables(variables);
ec.setVariables(collectVariables(parameters, parameterValues));
return ec;
}
protected <T extends Parameters<T, ? extends Parameter>> Map<String, Object> collectVariables(T parameters,
Object[] parameterValues) {
/**
* Exposes variables for all named parameters for the given arguments. Also exposes non-bindable parameters under the
* names of their types.
*
* @param parameters must not be {@literal null}.
* @param arguments must not be {@literal null}.
* @return
*/
private <T extends Parameters<T, ? extends Parameter>> Map<String, Object> collectVariables(T parameters,
Object[] arguments) {
Map<String, Object> variables = new HashMap<String, Object>();
registerSpecialParameterVariablesIfPresent(parameters, parameterValues, variables);
registerNamedMethodParameterVariables(parameters, parameterValues, variables);
for (Parameter param : parameters) {
if (param.isSpecialParameter()) {
return variables;
}
String key = StringUtils.uncapitalize(param.getType().getSimpleName());
Object value = arguments[param.getIndex()];
protected <T extends Parameters<T, ? extends Parameter>> void registerNamedMethodParameterVariables(T parameters,
Object[] parameterValues, Map<String, Object> variables) {
variables.put(key, value);
}
}
for (Parameter param : parameters) {
if (param.isNamedParameter()) {
variables.put(param.getName(), parameterValues[param.getIndex()]);
variables.put(param.getName(), arguments[param.getIndex()]);
}
}
}
protected <T extends Parameters<T, ? extends Parameter>> void registerSpecialParameterVariablesIfPresent(
T parameters, Object[] parameterValues, Map<String, Object> variables) {
if (parameters.hasSpecialParameter()) {
for (Parameter param : parameters) {
if (param.isSpecialParameter()) {
Object paramValue = parameterValues[param.getIndex()];
if (paramValue == null) {
continue;
}
variables.put(StringUtils.uncapitalize(param.getType().getSimpleName()), paramValue);
}
}
}
return variables;
}
/**