From 341ac76209a0a5ad34cb80385179040d47636974 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <juergen.hoeller@broadcom.com>
Date: Tue, 6 Feb 2024 08:20:15 +0100
Subject: [PATCH] Rely on HashSet for uniqueness of mapped names

See gh-32199
---
 .../jdbc/core/BeanPropertyRowMapper.java             | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java
index 1d61b7a43a1..ca9a8e4a48e 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java
@@ -242,6 +242,9 @@ public class BeanPropertyRowMapper<T> implements RowMapper<T> {
 	/**
 	 * Initialize the mapping meta-data for the given class.
 	 * @param mappedClass the mapped class
+	 * @see #setMappedClass
+	 * @see BeanUtils#getPropertyDescriptors
+	 * @see #mappedNames(PropertyDescriptor)
 	 */
 	protected void initialize(Class<T> mappedClass) {
 		this.mappedClass = mappedClass;
@@ -280,17 +283,14 @@ public class BeanPropertyRowMapper<T> implements RowMapper<T> {
 	 * @param pd the property descriptor discovered on initialization
 	 * @return a set of mapped names
 	 * @since 6.1.4
+	 * @see #initialize
 	 * @see #lowerCaseName
 	 * @see #underscoreName
 	 */
 	protected Set<String> mappedNames(PropertyDescriptor pd) {
 		Set<String> mappedNames = new HashSet<>(4);
-		String lowerCaseName = lowerCaseName(pd.getName());
-		mappedNames.add(lowerCaseName);
-		String underscoreName = underscoreName(pd.getName());
-		if (!lowerCaseName.equals(underscoreName)) {
-			mappedNames.add(underscoreName);
-		}
+		mappedNames.add(lowerCaseName(pd.getName()));
+		mappedNames.add(underscoreName(pd.getName()));
 		return mappedNames;
 	}