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

Consistent lookup of parameter-level JsonView annotation

Browse Source 
Issue: SPR-13265
This commit is contained in:
Juergen Hoeller
2015-07-29 01:05:25 +02:00
parent b7bdd724b2
commit 02d05ed133
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java
View File

@@ -262,18 +262,16 @@ public class MappingJackson2MessageConverter extends AbstractMessageConverter {
* @param conversionHint the conversion hint Object as passed into the
* converter for the current conversion attempt
* @return the serialization view class, or {@code null} if none
* @since 4.2
*/
protected Class<?> getSerializationView(Object conversionHint) {
if (conversionHint instanceof MethodParameter) {
MethodParameter methodParam = (MethodParameter) conversionHint;
JsonView annotation = methodParam.getParameterAnnotation(JsonView.class);
if (annotation == null) {
annotation = methodParam.getMethodAnnotation(JsonView.class);
if (annotation == null) {
return null;
}
MethodParameter param = (MethodParameter) conversionHint;
JsonView annotation = (param.getParameterIndex() >= 0 ?
param.getParameterAnnotation(JsonView.class) : param.getMethodAnnotation(JsonView.class));
if (annotation != null) {
return extractViewClass(annotation, conversionHint);
}
return extractViewClass(annotation, conversionHint);
}
else if (conversionHint instanceof JsonView) {
return extractViewClass((JsonView) conversionHint, conversionHint);
@@ -281,9 +279,9 @@ public class MappingJackson2MessageConverter extends AbstractMessageConverter {
else if (conversionHint instanceof Class) {
return (Class) conversionHint;
}
else {
return null;
}
// No JSON view specified...
return null;
}
private Class<?> extractViewClass(JsonView annotation, Object conversionHint) {