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

#32: Fix for bug triggered by including Accept: */* header.

Browse Source
This commit is contained in:
Jon Brisbin
2012-08-20 16:47:00 -05:00
committed by Jon Brisbin
parent 3aa8905b15
commit 9069774dc5
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestController.java
View File

@@ -1859,20 +1859,29 @@ public class RepositoryRestController
MediaType acceptType = config.getDefaultMediaType();
HttpMessageConverter converter = findWriteConverter(resource.getClass(), acceptType);
// If an Accept header is specified that isn't the catch-all, try and find a converter for it.
if(!MediaTypes.ACCEPT_ALL_TYPES.equals(request.getHeaders().getAccept())) {
if(null == converter) {
for(MediaType mt : request.getHeaders().getAccept()) {
if(null != (converter = findWriteConverter(resource.getClass(), mt))) {
if(!"*".equals(mt.getSubtype())) {
acceptType = mt;
}
break;
if(MediaType.ALL.equals(mt)) {
continue;
}
HttpMessageConverter hmc;
if(null == (hmc = findWriteConverter(resource.getClass(), mt))) {
continue;
}
if(!"*".equals(mt.getSubtype())) {
acceptType = mt;
headers.setContentType(acceptType);
converter = hmc;
}
break;
}
}
headers.setContentType(acceptType);
if(null == converter) {
converter = mappingHttpMessageConverter;
headers.setContentType(MediaType.APPLICATION_JSON);
}
final ByteArrayOutputStream bout = new ByteArrayOutputStream();