Fix minor issue in HandlerMethod

rstoyanchev · rstoyanchev · commit b9786ccacac2 · 2012-07-05T16:02:36.000-04:00
Before this change HandlerMethod used ClassUtils.getUserClass(Class&lt;?&gt;)
to get the real user class, and not one generated by CGlib. However it
failed to that under all circumstances. This change fixes that.

Issue: SPR-9490
diff --git a/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java b/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java
@@ -124,21 +124,18 @@ public Method getMethod() {
 	 * Note that if the bean type is a CGLIB-generated class, the original, user-defined class is returned.
 	 */
 	public Class<?> getBeanType() {
-		if (bean instanceof String) {
-			String beanName = (String) bean;
-			return beanFactory.getType(beanName);
-		}
-		else {
-			return ClassUtils.getUserClass(bean.getClass());
-		}
+		Class<?> clazz = (this.bean instanceof String)
+				? this.beanFactory.getType((String) this.bean) : this.bean.getClass();
+
+		return ClassUtils.getUserClass(clazz);
 	}
 
 	/**
 	 * If the bean method is a bridge method, this method returns the bridged (user-defined) method.
 	 * Otherwise it returns the same method as {@link #getMethod()}.
 	 */
 	protected Method getBridgedMethod() {
-		return bridgedMethod;
+		return this.bridgedMethod;
 	}
 
 	/**
@@ -153,7 +150,7 @@ public MethodParameter[] getMethodParameters() {
 			}
 			this.parameters = p;
 		}
-		return parameters;
+		return this.parameters;
 	}
 
 	/**
@@ -197,7 +194,7 @@ public HandlerMethod createWithResolvedBean() {
 			String beanName = (String) this.bean;
 			handler = this.beanFactory.getBean(beanName);
 		}
-		return new HandlerMethod(handler, method);
+		return new HandlerMethod(handler, this.method);
 	}
 
 	@Override

Original file line number	Diff line number	Diff line change
`@@ -124,21 +124,18 @@ public Method getMethod() {`
`124`	`124`	`* Note that if the bean type is a CGLIB-generated class, the original, user-defined class is returned.`
`125`	`125`	`*/`
`126`	`126`	`public Class<?> getBeanType() {`
`127`		`- if (bean instanceof String) {`
`128`		`- String beanName = (String) bean;`
`129`		`- return beanFactory.getType(beanName);`
`130`		`- }`
`131`		`- else {`
`132`		`- return ClassUtils.getUserClass(bean.getClass());`
`133`		`- }`
	`127`	`+ Class<?> clazz = (this.bean instanceof String)`
	`128`	`+ ? this.beanFactory.getType((String) this.bean) : this.bean.getClass();`
	`129`	`+`
	`130`	`+ return ClassUtils.getUserClass(clazz);`
`134`	`131`	`}`
`135`	`132`
`136`	`133`	`/**`
`137`	`134`	`* If the bean method is a bridge method, this method returns the bridged (user-defined) method.`
`138`	`135`	`* Otherwise it returns the same method as {@link #getMethod()}.`
`139`	`136`	`*/`
`140`	`137`	`protected Method getBridgedMethod() {`
`141`		`- return bridgedMethod;`
	`138`	`+ return this.bridgedMethod;`
`142`	`139`	`}`
`143`	`140`
`144`	`141`	`/**`
`@@ -153,7 +150,7 @@ public MethodParameter[] getMethodParameters() {`
`153`	`150`	`}`
`154`	`151`	`this.parameters = p;`
`155`	`152`	`}`
`156`		`- return parameters;`
	`153`	`+ return this.parameters;`
`157`	`154`	`}`
`158`	`155`
`159`	`156`	`/**`
`@@ -197,7 +194,7 @@ public HandlerMethod createWithResolvedBean() {`
`197`	`194`	`String beanName = (String) this.bean;`
`198`	`195`	`handler = this.beanFactory.getBean(beanName);`
`199`	`196`	`}`
`200`		`- return new HandlerMethod(handler, method);`
	`197`	`+ return new HandlerMethod(handler, this.method);`
`201`	`198`	`}`
`202`	`199`
`203`	`200`	`@Override`