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

Consistent PropertyAccessor method order as declared in the interface 

Issue: SPR-11609
(cherry picked from commit b70148c)
This commit is contained in:
Juergen Hoeller 2014-03-26 21:47:56 +01:00
parent d8180e1e20
commit e8c06c6d99
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spring-context/src/main/java/org/springframework/context/expression/BeanFactoryAccessor.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2009 the original author or authors.
* Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -32,6 +32,11 @@ import org.springframework.expression.TypedValue;
*/
public class BeanFactoryAccessor implements PropertyAccessor {
public Class<?>[] getSpecificTargetClasses() {
return new Class<?>[] {BeanFactory.class};
}
@Override
public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException {
return (((BeanFactory) target).containsBean(name));
}
@ -48,8 +53,4 @@ public class BeanFactoryAccessor implements PropertyAccessor {
throw new AccessException("Beans in a BeanFactory are read-only");
}
public Class[] getSpecificTargetClasses() {
return new Class[] {BeanFactory.class};
}
}

10
spring-context/src/main/java/org/springframework/context/expression/MapAccessor.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -33,6 +33,10 @@ import org.springframework.expression.TypedValue;
*/
public class MapAccessor implements PropertyAccessor {
public Class<?>[] getSpecificTargetClasses() {
return new Class<?>[] {Map.class};
}
public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException {
Map map = (Map) target;
return map.containsKey(name);
@ -57,10 +61,6 @@ public class MapAccessor implements PropertyAccessor {
map.put(name, newValue);
}
public Class<?>[] getSpecificTargetClasses() {
return new Class<?>[] {Map.class};
}
/**
* Exception thrown from {@code read} in order to reset a cached