From ace0dc740a6375968a4b2b8343679edaf1a2b429 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 8 Dec 2020 15:12:47 +0100 Subject: [PATCH] Remove duplicate "property" in PropertyCacheKey.toString() Closes gh-26237 --- .../spel/support/ReflectivePropertyAccessor.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 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 cd9d3157df..06b9b1b541 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 @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2020 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. @@ -46,7 +46,7 @@ import org.springframework.util.StringUtils; /** * A powerful {@link PropertyAccessor} that uses reflection to access properties - * for reading and possibly also for writing. + * for reading and possibly also for writing on a target instance. * *

A property can be referenced through a public getter method (when being read) * or a public setter method (when being written), and also as a public field. @@ -96,8 +96,8 @@ public class ReflectivePropertyAccessor implements PropertyAccessor { } /** - * Create a new property accessor for reading and possibly writing. - * @param allowWrite whether to also allow for write operations + * Create a new property accessor for reading and possibly also writing. + * @param allowWrite whether to allow write operations on a target instance * @since 4.3.15 * @see #canWrite */ @@ -615,8 +615,8 @@ public class ReflectivePropertyAccessor implements PropertyAccessor { @Override public String toString() { - return "CacheKey [clazz=" + this.clazz.getName() + ", property=" + this.property + ", " + - this.property + ", targetIsClass=" + this.targetIsClass + "]"; + return "PropertyCacheKey [clazz=" + this.clazz.getName() + ", property=" + this.property + + ", targetIsClass=" + this.targetIsClass + "]"; } @Override @@ -640,6 +640,9 @@ public class ReflectivePropertyAccessor implements PropertyAccessor { */ public static class OptimalPropertyAccessor implements CompilablePropertyAccessor { + /** + * The member being accessed. + */ public final Member member; private final TypeDescriptor typeDescriptor;