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

Use appropriate variable names in ReflectivePropertyAccessor

This commit is contained in:
Sam Brannen 2024-03-05 11:52:30 +01:00
parent c29c67839b
commit 70a545e13a
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java
View File

@ -530,37 +530,37 @@ public class ReflectivePropertyAccessor implements PropertyAccessor {
} }
PropertyCacheKey cacheKey = new PropertyCacheKey(type, name, target instanceof Class); PropertyCacheKey cacheKey = new PropertyCacheKey(type, name, target instanceof Class);
InvokerPair invocationTarget = this.readerCache.get(cacheKey); InvokerPair invokerPair = this.readerCache.get(cacheKey);
if (invocationTarget == null || invocationTarget.member instanceof Method) { if (invokerPair == null || invokerPair.member instanceof Method) {
Method method = (Method) (invocationTarget != null ? invocationTarget.member : null); Method method = (Method) (invokerPair != null ? invokerPair.member : null);
if (method == null) { if (method == null) {
method = findGetterForProperty(name, type, target); method = findGetterForProperty(name, type, target);
if (method != null) { if (method != null) {
TypeDescriptor typeDescriptor = new TypeDescriptor(new MethodParameter(method, -1)); TypeDescriptor typeDescriptor = new TypeDescriptor(new MethodParameter(method, -1));
method = ClassUtils.getInterfaceMethodIfPossible(method, type); method = ClassUtils.getInterfaceMethodIfPossible(method, type);
invocationTarget = new InvokerPair(method, typeDescriptor); invokerPair = new InvokerPair(method, typeDescriptor);
ReflectionUtils.makeAccessible(method); ReflectionUtils.makeAccessible(method);
this.readerCache.put(cacheKey, invocationTarget); this.readerCache.put(cacheKey, invokerPair);
} }
} }
if (method != null) { if (method != null) {
return new OptimalPropertyAccessor(invocationTarget); return new OptimalPropertyAccessor(invokerPair);
} }
} }
if (invocationTarget == null || invocationTarget.member instanceof Field) { if (invokerPair == null || invokerPair.member instanceof Field) {
Field field = (invocationTarget != null ? (Field) invocationTarget.member : null); Field field = (invokerPair != null ? (Field) invokerPair.member : null);
if (field == null) { if (field == null) {
field = findField(name, type, target instanceof Class); field = findField(name, type, target instanceof Class);
if (field != null) { if (field != null) {
invocationTarget = new InvokerPair(field, new TypeDescriptor(field)); invokerPair = new InvokerPair(field, new TypeDescriptor(field));
ReflectionUtils.makeAccessible(field); ReflectionUtils.makeAccessible(field);
this.readerCache.put(cacheKey, invocationTarget); this.readerCache.put(cacheKey, invokerPair);
} }
} }
if (field != null) { if (field != null) {
return new OptimalPropertyAccessor(invocationTarget); return new OptimalPropertyAccessor(invokerPair);
} }
} }
@ -641,9 +641,9 @@ public class ReflectivePropertyAccessor implements PropertyAccessor {
private final TypeDescriptor typeDescriptor; private final TypeDescriptor typeDescriptor;
OptimalPropertyAccessor(InvokerPair target) { OptimalPropertyAccessor(InvokerPair invokerPair) {
this.member = target.member; this.member = invokerPair.member;
this.typeDescriptor = target.typeDescriptor; this.typeDescriptor = invokerPair.typeDescriptor;
} }
@Override @Override