root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Polishing 

Issue: SPR-9495
This commit is contained in:
Juergen Hoeller 2013-09-04 16:44:07 +02:00
parent b7ff26aafb
commit baa698eddf
4 changed files with 39 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
spring-expression/src/main/java/org/springframework/expression/EvaluationContext.java
View File

@ -33,51 +33,51 @@ import java.util.List;
public interface EvaluationContext {
/**
* @return the default root context object against which unqualified
* properties/methods/etc should be resolved. This can be overridden when
* evaluating an expression.
* Return the default root context object against which unqualified
* properties/methods/etc should be resolved. This can be overridden
* when evaluating an expression.
*/
TypedValue getRootObject();
/**
* @return a list of resolvers that will be asked in turn to locate a constructor
* Return a list of resolvers that will be asked in turn to locate a constructor.
*/
List<ConstructorResolver> getConstructorResolvers();
/**
* @return a list of resolvers that will be asked in turn to locate a method
* Return a list of resolvers that will be asked in turn to locate a method.
*/
List<MethodResolver> getMethodResolvers();
/**
* @return a list of accessors that will be asked in turn to read/write a property
* Return a list of accessors that will be asked in turn to read/write a property.
*/
List<PropertyAccessor> getPropertyAccessors();
/**
* @return a type locator that can be used to find types, either by short or fully
* qualified name.
* Return a type locator that can be used to find types, either by short or
* fully qualified name.
*/
TypeLocator getTypeLocator();
/**
* @return a type converter that can convert (or coerce) a value from one type to another.
* Return a type converter that can convert (or coerce) a value from one type to another.
*/
TypeConverter getTypeConverter();
/**
* @return a type comparator for comparing pairs of objects for equality.
* Return a type comparator for comparing pairs of objects for equality.
*/
TypeComparator getTypeComparator();
/**
* @return an operator overloader that may support mathematical operations
* between more than the standard set of types
* Return an operator overloader that may support mathematical operations
* between more than the standard set of types.
*/
OperatorOverloader getOperatorOverloader();
/**
* @return a bean resolver that can look up beans by name
* Return a bean resolver that can look up beans by name.
*/
BeanResolver getBeanResolver();

15
spring-expression/src/main/java/org/springframework/expression/MethodExecutor.java
View File

@ -21,11 +21,11 @@ package org.springframework.expression;
* repeat an operation quickly without going back to the resolvers. For example, the
* particular method to run on an object may be discovered by the reflection method
* resolver - it will then build a MethodExecutor that executes that method and the
* MethodExecutor can be reused without needing to go back to the resolver to discover the
* method again.
* MethodExecutor can be reused without needing to go back to the resolver to discover
* the method again.
*
* <p>They can become stale, and in that case should throw an AccessException - this will
* cause the infrastructure to go back to the resolvers to ask for a new one.
* <p>They can become stale, and in that case should throw an AccessException:
* This will cause the infrastructure to go back to the resolvers to ask for a new one.
*
* @author Andy Clement
* @since 3.0
@ -33,15 +33,14 @@ package org.springframework.expression;
public interface MethodExecutor {
/**
* Execute a command using the specified arguments, and using the specified expression
* state.
* Execute a command using the specified arguments, and using the specified expression state.
* @param context the evaluation context in which the command is being executed
* @param target the target object of the call - null for static methods
* @param arguments the arguments to the executor, should match (in terms of number
* and type) whatever the command will need to run
* and type) whatever the command will need to run
* @return the value returned from execution
* @throws AccessException if there is a problem executing the command or the
* MethodExecutor is no longer valid
* MethodExecutor is no longer valid
*/
TypedValue execute(EvaluationContext context, Object target, Object... arguments) throws AccessException;

7
spring-expression/src/main/java/org/springframework/expression/MethodResolver.java
View File

@ -32,13 +32,12 @@ public interface MethodResolver {
/**
* Within the supplied context determine a suitable method on the supplied object that
* can handle the specified arguments. Return a MethodExecutor that can be used to
* invoke that method (or {@code null} if no method could be found).
* can handle the specified arguments. Return a {@link MethodExecutor} that can be used
* to invoke that method, or {@code null} if no method could be found.
* @param context the current evaluation context
* @param targetObject the object upon which the method is being called
* @param argumentTypes the arguments that the constructor must be able to handle
* @return a MethodExecutor that can invoke the method, or null if the method cannot
* be found
* @return a MethodExecutor that can invoke the method, or null if the method cannot be found
*/
MethodExecutor resolve(EvaluationContext context, Object targetObject, String name,
List<TypeDescriptor> argumentTypes) throws AccessException;

35
spring-expression/src/main/java/org/springframework/expression/spel/support/StandardEvaluationContext.java
View File

@ -104,17 +104,16 @@ public class StandardEvaluationContext implements EvaluationContext {
return this.constructorResolvers.remove(resolver);
}
public void setConstructorResolvers(List<ConstructorResolver> constructorResolvers) {
this.constructorResolvers = constructorResolvers;
}
@Override
public List<ConstructorResolver> getConstructorResolvers() {
ensureConstructorResolversInitialized();
return this.constructorResolvers;
}
public void setConstructorResolvers(List<ConstructorResolver> constructorResolvers) {
this.constructorResolvers = constructorResolvers;
}
public void addMethodResolver(MethodResolver resolver) {
ensureMethodResolversInitialized();
this.methodResolvers.add(this.methodResolvers.size() - 1, resolver);
@ -125,6 +124,10 @@ public class StandardEvaluationContext implements EvaluationContext {
return this.methodResolvers.remove(methodResolver);
}
public void setMethodResolvers(List<MethodResolver> methodResolvers) {
this.methodResolvers = methodResolvers;
}
@Override
public List<MethodResolver> getMethodResolvers() {
ensureMethodResolversInitialized();
@ -140,11 +143,6 @@ public class StandardEvaluationContext implements EvaluationContext {
return this.beanResolver;
}
public void setMethodResolvers(List<MethodResolver> methodResolvers) {
this.methodResolvers = methodResolvers;
}
public void addPropertyAccessor(PropertyAccessor accessor) {
ensurePropertyAccessorsInitialized();
this.propertyAccessors.add(this.propertyAccessors.size() - 1, accessor);
@ -154,17 +152,16 @@ public class StandardEvaluationContext implements EvaluationContext {
return this.propertyAccessors.remove(accessor);
}
public void setPropertyAccessors(List<PropertyAccessor> propertyAccessors) {
this.propertyAccessors = propertyAccessors;
}
@Override
public List<PropertyAccessor> getPropertyAccessors() {
ensurePropertyAccessorsInitialized();
return this.propertyAccessors;
}
public void setPropertyAccessors(List<PropertyAccessor> propertyAccessors) {
this.propertyAccessors = propertyAccessors;
}
public void setTypeLocator(TypeLocator typeLocator) {
Assert.notNull(typeLocator, "TypeLocator must not be null");
this.typeLocator = typeLocator;
@ -232,10 +229,8 @@ public class StandardEvaluationContext implements EvaluationContext {
/**
* Register a {@code MethodFilter} which will be called during method resolution
* for the specified type.
*
* <p>The {@code MethodFilter} may remove methods and/or sort the methods which
* will then be used by SpEL as the candidates to look through for a match.
*
* @param type the type for which the filter should be called
* @param filter a {@code MethodFilter}, or {@code null} to unregister a filter for the type
* @throws IllegalStateException if the {@link ReflectiveMethodResolver} is not in use
@ -244,7 +239,8 @@ public class StandardEvaluationContext implements EvaluationContext {
ensureMethodResolversInitialized();
if (this.reflectiveMethodResolver != null) {
this.reflectiveMethodResolver.registerMethodFilter(type, filter);
} else {
}
else {
throw new IllegalStateException("Method filter cannot be set as the reflective method resolver is not in use");
}
}
@ -272,7 +268,8 @@ public class StandardEvaluationContext implements EvaluationContext {
private synchronized void initializeMethodResolvers() {
if (this.methodResolvers == null) {
List<MethodResolver> defaultResolvers = new ArrayList<MethodResolver>();
defaultResolvers.add(this.reflectiveMethodResolver = new ReflectiveMethodResolver());
this.reflectiveMethodResolver = new ReflectiveMethodResolver();
defaultResolvers.add(this.reflectiveMethodResolver);
this.methodResolvers = defaultResolvers;
}
}