priority Custom type AND field filter

[JeremyZQJ]

[JeremyZQJ]

super.handleReturnValue(this.convertReturnValue(returnValue, returnType), returnType, mavContainer, webRequest);

private Object convertReturnValue(Object source, MethodParameter returnType) {
Match match = Match.match();
if (returnType.getMethod().isAnnotationPresent(PropertyFiltration.class)) {
PropertyFiltration serializedField = returnType.getMethodAnnotation(PropertyFiltration.class);
String[] includes = serializedField.includes();
String[] excludes = serializedField.excludes();
if (excludes.length > 0) {
match.exclude(excludes);
}
if (includes.length > 0) {
match.include(includes);
}
}
return this.json.use(JsonView.with(source).onClass(returnType.getParameterType(), match)).returnValue();
}