BeanPropertyRowMapper uses US locale for lower-case conversion by def…

…ault

Issue: SPR-13216

spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -22,6 +22,7 @@
 import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
@@ -136,9 +137,51 @@ public void setMappedClass(Class<T> mappedClass) {
 		}
 	}
 
+	/**
+	 * Get the class that we are mapping to.
+	 */
+	public final Class<T> getMappedClass() {
+		return this.mappedClass;
+	}
+
+	/**
+	 * Set whether we're strictly validating that all bean properties have been mapped
+	 * from corresponding database fields.
+	 * <p>Default is {@code false}, accepting unpopulated properties in the target bean.
+	 */
+	public void setCheckFullyPopulated(boolean checkFullyPopulated) {
+		this.checkFullyPopulated = checkFullyPopulated;
+	}
+
+	/**
+	 * Return whether we're strictly validating that all bean properties have been
+	 * mapped from corresponding database fields.
+	 */
+	public boolean isCheckFullyPopulated() {
+		return this.checkFullyPopulated;
+	}
+
+	/**
+	 * Set whether we're defaulting Java primitives in the case of mapping a null value
+	 * from corresponding database fields.
+	 * <p>Default is {@code false}, throwing an exception when nulls are mapped to Java primitives.
+	 */
+	public void setPrimitivesDefaultedForNullValue(boolean primitivesDefaultedForNullValue) {
+		this.primitivesDefaultedForNullValue = primitivesDefaultedForNullValue;
+	}
+
+	/**
+	 * Return whether we're defaulting Java primitives in the case of mapping a null value
+	 * from corresponding database fields.
+	 */
+	public boolean isPrimitivesDefaultedForNullValue() {
+		return this.primitivesDefaultedForNullValue;
+	}
+
+
 	/**
 	 * Initialize the mapping metadata for the given class.
-	 * @param mappedClass the mapped class.
+	 * @param mappedClass the mapped class
 	 */
 	protected void initialize(Class<T> mappedClass) {
 		this.mappedClass = mappedClass;
@@ -147,9 +190,9 @@ protected void initialize(Class<T> mappedClass) {
 		PropertyDescriptor[] pds = BeanUtils.getPropertyDescriptors(mappedClass);
 		for (PropertyDescriptor pd : pds) {
 			if (pd.getWriteMethod() != null) {
-				this.mappedFields.put(pd.getName().toLowerCase(), pd);
+				this.mappedFields.put(lowerCaseName(pd.getName()), pd);
 				String underscoredName = underscoreName(pd.getName());
-				if (!pd.getName().toLowerCase().equals(underscoredName)) {
+				if (!lowerCaseName(pd.getName()).equals(underscoredName)) {
 					this.mappedFields.put(underscoredName, pd);
 				}
 				this.mappedProperties.add(pd.getName());
@@ -160,18 +203,20 @@ protected void initialize(Class<T> mappedClass) {
 	/**
 	 * Convert a name in camelCase to an underscored name in lower case.
 	 * Any upper case letters are converted to lower case with a preceding underscore.
-	 * @param name the string containing original name
+	 * @param name the original name
 	 * @return the converted name
+	 * @since 4.2
+	 * @see #lowerCaseName
 	 */
-	private String underscoreName(String name) {
+	protected String underscoreName(String name) {
 		if (!StringUtils.hasLength(name)) {
 			return "";
 		}
 		StringBuilder result = new StringBuilder();
-		result.append(name.substring(0, 1).toLowerCase());
+		result.append(lowerCaseName(name.substring(0, 1)));
 		for (int i = 1; i < name.length(); i++) {
 			String s = name.substring(i, i + 1);
-			String slc = s.toLowerCase();
+			String slc = lowerCaseName(s);
 			if (!s.equals(slc)) {
 				result.append("_").append(slc);
 			}
@@ -183,45 +228,14 @@ private String underscoreName(String name) {
 	}
 
 	/**
-	 * Get the class that we are mapping to.
-	 */
-	public final Class<T> getMappedClass() {
-		return this.mappedClass;
-	}
-
-	/**
-	 * Set whether we're strictly validating that all bean properties have been
-	 * mapped from corresponding database fields.
-	 * <p>Default is {@code false}, accepting unpopulated properties in the
-	 * target bean.
-	 */
-	public void setCheckFullyPopulated(boolean checkFullyPopulated) {
-		this.checkFullyPopulated = checkFullyPopulated;
-	}
-
-	/**
-	 * Return whether we're strictly validating that all bean properties have been
-	 * mapped from corresponding database fields.
-	 */
-	public boolean isCheckFullyPopulated() {
-		return this.checkFullyPopulated;
-	}
-
-	/**
-	 * Set whether we're defaulting Java primitives in the case of mapping a null value
-	 * from corresponding database fields.
-	 * <p>Default is {@code false}, throwing an exception when nulls are mapped to Java primitives.
-	 */
-	public void setPrimitivesDefaultedForNullValue(boolean primitivesDefaultedForNullValue) {
-		this.primitivesDefaultedForNullValue = primitivesDefaultedForNullValue;
-	}
-
-	/**
-	 * Return whether we're defaulting Java primitives in the case of mapping a null value
-	 * from corresponding database fields.
+	 * Convert the given name to lower case.
+	 * By default, conversions will happen within the US locale.
+	 * @param name the original name
+	 * @return the converted name
+	 * @since 4.2
 	 */
-	public boolean isPrimitivesDefaultedForNullValue() {
-		return primitivesDefaultedForNullValue;
+	protected String lowerCaseName(String name) {
+		return name.toLowerCase(Locale.US);
 	}
 
 
@@ -243,7 +257,7 @@ public T mapRow(ResultSet rs, int rowNumber) throws SQLException {
 
 		for (int index = 1; index <= columnCount; index++) {
 			String column = JdbcUtils.lookupColumnName(rsmd, index);
-			PropertyDescriptor pd = this.mappedFields.get(column.replaceAll(" ", "").toLowerCase());
+			PropertyDescriptor pd = this.mappedFields.get(lowerCaseName(column.replaceAll(" ", "")));
 			if (pd != null) {
 				try {
 					Object value = getColumnValue(rs, index, pd);
@@ -254,15 +268,14 @@ public T mapRow(ResultSet rs, int rowNumber) throws SQLException {
 					try {
 						bw.setPropertyValue(pd.getName(), value);
 					}
-					catch (TypeMismatchException e) {
-						if (value == null && primitivesDefaultedForNullValue) {
-							logger.debug("Intercepted TypeMismatchException for row " + rowNumber +
-									" and column '" + column + "' with value " + value +
-									" when setting property '" + pd.getName() + "' of type " + pd.getPropertyType() +
-									" on object: " + mappedObject);
+					catch (TypeMismatchException ex) {
+						if (value == null && this.primitivesDefaultedForNullValue) {
+							logger.debug("Intercepted TypeMismatchException for row " + rowNumber + " and column '" +
+									column + "' with null value when setting property '" + pd.getName() +
+									"' of type " + pd.getPropertyType() + " on object: " + mappedObject);
 						}
 						else {
-							throw e;
+							throw ex;
 						}
 					}
 					if (populatedProperties != null) {