Support sub-types of ResponseEntity

rstoyanchev · rstoyanchev · commit a3e190e1bf80 · 2013-01-22T17:26:51.000-05:00
Issue: SPR-10207
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java
@@ -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");
  * you may not use this file except in compliance with the License.
@@ -68,7 +68,7 @@ public boolean supportsParameter(MethodParameter parameter) {
 
 	public boolean supportsReturnType(MethodParameter returnType) {
 		Class<?> parameterType = returnType.getParameterType();
-		return HttpEntity.class.equals(parameterType) || ResponseEntity.class.equals(parameterType);
+		return HttpEntity.class.isAssignableFrom(parameterType) || ResponseEntity.class.isAssignableFrom(parameterType);
 	}
 
 	public Object resolveArgument(

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2012 the original author or authors.`
	`2`	`+ * Copyright 2002-2013 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -68,7 +68,7 @@ public boolean supportsParameter(MethodParameter parameter) {`
`68`	`68`
`69`	`69`	`public boolean supportsReturnType(MethodParameter returnType) {`
`70`	`70`	`Class<?> parameterType = returnType.getParameterType();`
`71`		`- return HttpEntity.class.equals(parameterType) \|\| ResponseEntity.class.equals(parameterType);`
	`71`	`+ return HttpEntity.class.isAssignableFrom(parameterType) \|\| ResponseEntity.class.isAssignableFrom(parameterType);`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`public Object resolveArgument(`