root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Property actually throws exception for no write method found 

Issue: SPR-15507
(cherry picked from commit 817e80c)
This commit is contained in:
Juergen Hoeller 2017-05-02 21:16:31 +02:00
parent d643e57318
commit aa8cf190d3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-core/src/main/java/org/springframework/core/convert/Property.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2016 the original author or authors. * Copyright 2002-2017 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.
@ -144,10 +144,11 @@ public final class Property {
return StringUtils.uncapitalize(this.readMethod.getName().substring(index)); return StringUtils.uncapitalize(this.readMethod.getName().substring(index));
} }
else { else {
int index = this.writeMethod.getName().indexOf("set") + 3; int index = this.writeMethod.getName().indexOf("set");
if (index == -1) { if (index == -1) {
throw new IllegalArgumentException("Not a setter method"); throw new IllegalArgumentException("Not a setter method");
} }
index += 3;
return StringUtils.uncapitalize(this.writeMethod.getName().substring(index)); return StringUtils.uncapitalize(this.writeMethod.getName().substring(index));
} }
} }
@ -194,7 +195,8 @@ public final class Property {
private Annotation[] resolveAnnotations() { private Annotation[] resolveAnnotations() {
Annotation[] annotations = annotationCache.get(this); Annotation[] annotations = annotationCache.get(this);
if (annotations == null) { if (annotations == null) {
Map<Class<? extends Annotation>, Annotation> annotationMap = new LinkedHashMap<Class<? extends Annotation>, Annotation>(); Map<Class<? extends Annotation>, Annotation> annotationMap =
new LinkedHashMap<Class<? extends Annotation>, Annotation>();
addAnnotationsToMap(annotationMap, getReadMethod()); addAnnotationsToMap(annotationMap, getReadMethod());
addAnnotationsToMap(annotationMap, getWriteMethod()); addAnnotationsToMap(annotationMap, getWriteMethod());
addAnnotationsToMap(annotationMap, getField()); addAnnotationsToMap(annotationMap, getField());