From 70a545e13ad6afa18540fc332beb2411ec84fa38 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Tue, 5 Mar 2024 11:52:30 +0100 Subject: [PATCH] Use appropriate variable names in ReflectivePropertyAccessor --- .../support/ReflectivePropertyAccessor.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java index 632860a4a37..b7f892f6cc5 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java @@ -530,37 +530,37 @@ public class ReflectivePropertyAccessor implements PropertyAccessor { } 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) { - Method method = (Method) (invocationTarget != null ? invocationTarget.member : null); + if (invokerPair == null || invokerPair.member instanceof Method) { + Method method = (Method) (invokerPair != null ? invokerPair.member : null); if (method == null) { method = findGetterForProperty(name, type, target); if (method != null) { TypeDescriptor typeDescriptor = new TypeDescriptor(new MethodParameter(method, -1)); method = ClassUtils.getInterfaceMethodIfPossible(method, type); - invocationTarget = new InvokerPair(method, typeDescriptor); + invokerPair = new InvokerPair(method, typeDescriptor); ReflectionUtils.makeAccessible(method); - this.readerCache.put(cacheKey, invocationTarget); + this.readerCache.put(cacheKey, invokerPair); } } if (method != null) { - return new OptimalPropertyAccessor(invocationTarget); + return new OptimalPropertyAccessor(invokerPair); } } - if (invocationTarget == null || invocationTarget.member instanceof Field) { - Field field = (invocationTarget != null ? (Field) invocationTarget.member : null); + if (invokerPair == null || invokerPair.member instanceof Field) { + Field field = (invokerPair != null ? (Field) invokerPair.member : null); if (field == null) { field = findField(name, type, target instanceof Class); if (field != null) { - invocationTarget = new InvokerPair(field, new TypeDescriptor(field)); + invokerPair = new InvokerPair(field, new TypeDescriptor(field)); ReflectionUtils.makeAccessible(field); - this.readerCache.put(cacheKey, invocationTarget); + this.readerCache.put(cacheKey, invokerPair); } } if (field != null) { - return new OptimalPropertyAccessor(invocationTarget); + return new OptimalPropertyAccessor(invokerPair); } } @@ -641,9 +641,9 @@ public class ReflectivePropertyAccessor implements PropertyAccessor { private final TypeDescriptor typeDescriptor; - OptimalPropertyAccessor(InvokerPair target) { - this.member = target.member; - this.typeDescriptor = target.typeDescriptor; + OptimalPropertyAccessor(InvokerPair invokerPair) { + this.member = invokerPair.member; + this.typeDescriptor = invokerPair.typeDescriptor; } @Override