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 getPropertyTypeDescriptor to work for nested indexed property as well as for array property (SPR-6710)

This commit is contained in:
Juergen Hoeller 2010-01-20 15:31:20 +00:00
parent 5abd3b99b9
commit 081d81e5b0
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.springframework.beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java
View File

@ -355,7 +355,8 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
public TypeDescriptor getPropertyTypeDescriptor(String propertyName) throws BeansException { public TypeDescriptor getPropertyTypeDescriptor(String propertyName) throws BeansException {
try { try {
PropertyDescriptor pd = getPropertyDescriptorInternal(propertyName); String actualPropertyName = PropertyAccessorUtils.getPropertyName(propertyName);
PropertyDescriptor pd = getPropertyDescriptorInternal(actualPropertyName);
if (pd != null) { if (pd != null) {
Class type = getPropertyType(propertyName); Class type = getPropertyType(propertyName);
if (pd.getReadMethod() != null) { if (pd.getReadMethod() != null) {

5
org.springframework.beans/src/main/java/org/springframework/beans/PropertyAccessorUtils.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2008 the original author or authors. * Copyright 2002-2010 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.
@ -32,7 +32,8 @@ public abstract class PropertyAccessorUtils {
* @return the actual property name, without any key elements * @return the actual property name, without any key elements
*/ */
public static String getPropertyName(String propertyPath) { public static String getPropertyName(String propertyPath) {
int separatorIndex = propertyPath.indexOf(PropertyAccessor.PROPERTY_KEY_PREFIX_CHAR); int separatorIndex = (propertyPath.endsWith(PropertyAccessor.PROPERTY_KEY_SUFFIX) ?
propertyPath.indexOf(PropertyAccessor.PROPERTY_KEY_PREFIX_CHAR) : -1);
return (separatorIndex != -1 ? propertyPath.substring(0, separatorIndex) : propertyPath); return (separatorIndex != -1 ? propertyPath.substring(0, separatorIndex) : propertyPath);
} }