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

Fixed BeanPropertyRowMapper to only prefix actual upper-case letters with underscores 

Issue: SPR-10547
(cherry picked from commit c8b071c)
This commit is contained in:
Juergen Hoeller 2013-05-16 14:25:40 +02:00
parent 115442242f
commit 615315728b
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2013 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -37,6 +37,7 @@ import org.springframework.dao.DataRetrievalFailureException;
import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.dao.InvalidDataAccessApiUsageException;
import org.springframework.jdbc.support.JdbcUtils; import org.springframework.jdbc.support.JdbcUtils;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
/** /**
* {@link RowMapper} implementation that converts a row into a new instance * {@link RowMapper} implementation that converts a row into a new instance
@ -163,18 +164,19 @@ public class BeanPropertyRowMapper<T> implements RowMapper<T> {
* @return the converted name * @return the converted name
*/ */
private String underscoreName(String name) { private String underscoreName(String name) {
if (!StringUtils.hasLength(name)) {
return "";
}
StringBuilder result = new StringBuilder(); StringBuilder result = new StringBuilder();
if (name != null && name.length() > 0) { result.append(name.substring(0, 1).toLowerCase());
result.append(name.substring(0, 1).toLowerCase()); for (int i = 1; i < name.length(); i++) {
for (int i = 1; i < name.length(); i++) { String s = name.substring(i, i + 1);
String s = name.substring(i, i + 1); String slc = s.toLowerCase();
if (s.equals(s.toUpperCase())) { if (!s.equals(slc)) {
result.append("_"); result.append("_").append(slc);
result.append(s.toLowerCase()); }
} else {
else { result.append(s);
result.append(s);
}
} }
} }
return result.toString(); return result.toString();