Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make PropertyMatches public

Browse Source 
Issue: SPR-13054
This commit is contained in:
Stephane Nicoll
2015-05-21 20:16:20 +02:00
parent 6fb3190353
commit a87d5f8a63
1 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
spring-beans/src/main/java/org/springframework/beans/PropertyMatches.java
View File

@@ -27,8 +27,11 @@ import org.springframework.util.ReflectionUtils;
import org.springframework.util.StringUtils;
/**
* Helper class for calculating bean property matches, according to.
* Used by BeanWrapperImpl to suggest alternatives for an invalid property name.
* Helper class for calculating property matches, according to a configurable
* distance. Provide the list of potential matches and an easy way to generate
* an error message. Works for both java bean properties and fields.
* <p>
* Mainly for use within the framework and in particular the binding facility
*
* @author Alef Arendsen
* @author Arjen Poutsma
@@ -36,8 +39,9 @@ import org.springframework.util.StringUtils;
* @author Stephane Nicoll
* @since 2.0
* @see #forProperty(String, Class)
* @see #forField(String, Class)
*/
abstract class PropertyMatches {
public abstract class PropertyMatches {
//---------------------------------------------------------------------
// Static section
@@ -123,6 +127,21 @@ abstract class PropertyMatches {
*/
public abstract String buildErrorMessage();
protected void appendHintMessage(StringBuilder msg) {
msg.append("Did you mean ");
for (int i = 0; i < this.possibleMatches.length; i++) {
msg.append('\'');
msg.append(this.possibleMatches[i]);
if (i < this.possibleMatches.length - 2) {
msg.append("', ");
}
else if (i == this.possibleMatches.length - 2) {
msg.append("', or ");
}
}
msg.append("'?");
}
/**
* Calculate the distance between the given two Strings
* according to the Levenshtein algorithm.
@@ -208,18 +227,7 @@ abstract class PropertyMatches {
msg.append("Does the parameter type of the setter match the return type of the getter?");
}
else {
msg.append("Did you mean ");
for (int i = 0; i < possibleMatches.length; i++) {
msg.append('\'');
msg.append(possibleMatches[i]);
if (i < possibleMatches.length - 2) {
msg.append("', ");
}
else if (i == possibleMatches.length - 2) {
msg.append("', or ");
}
}
msg.append("'?");
appendHintMessage(msg);
}
return msg.toString();
}
@@ -258,18 +266,7 @@ abstract class PropertyMatches {
msg.append("' has no matching field. ");
if (!ObjectUtils.isEmpty(possibleMatches)) {
msg.append("Did you mean ");
for (int i = 0; i < possibleMatches.length; i++) {
msg.append('\'');
msg.append(possibleMatches[i]);
if (i < possibleMatches.length - 2) {
msg.append("', ");
}
else if (i == possibleMatches.length - 2) {
msg.append("', or ");
}
}
msg.append("'?");
appendHintMessage(msg);
}
return msg.toString();
}