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

#360 - Tweaked TypeConstrainedMappingJackson2HttpMessageConverter to reject all types not matching the configured one.

Browse Source 
We now also override canRead(Type, Class<?>, MediaType) to make sure we can opt out of being used for generic type matching.
This commit is contained in:
Oliver Gierke
2015-06-19 16:52:58 +02:00
parent a356dc3b89
commit 28234e16a5
2 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/org/springframework/hateoas/mvc/TypeConstrainedMappingJackson2HttpMessageConverter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014 the original author or authors.
* Copyright 2014-2015 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.
@@ -15,6 +15,8 @@
*/
package org.springframework.hateoas.mvc;
import java.lang.reflect.Type;
import org.springframework.http.MediaType;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.util.Assert;
@@ -24,7 +26,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
/**
* Extension of {@link MappingJackson2HttpMessageConverter} to constrain the ability to read and write HTTP message
* based on the target type. Useful in case the {@link ObjectMapper} about to be configured has customizations that
* sholny be applied to object trees of a certain base type.
* shall only be applied to object trees of a certain base type.
*
* @author Oliver Gierke
*/
@@ -49,7 +51,21 @@ public class TypeConstrainedMappingJackson2HttpMessageConverter extends MappingJ
*/
@Override
public boolean canRead(Class<?> clazz, MediaType mediaType) {
return type.isAssignableFrom(clazz) && super.canRead(clazz, mediaType);
return type.isAssignableFrom(clazz) && super.canRead(mediaType);
}
/*
* (non-Javadoc)
* @see org.springframework.http.converter.json.MappingJackson2HttpMessageConverter#canRead(java.lang.reflect.Type, java.lang.Class, org.springframework.http.MediaType)
*/
@Override
public boolean canRead(Type type, Class<?> contextClass, MediaType mediaType) {
if (type instanceof Class) {
return canRead((Class<?>) type, mediaType);
}
return super.canRead(type, contextClass, mediaType);
}
/*