UnsupportedMediaType[Status]Exception reports body type
Issue: SPR-16805
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2002-2017 the original author or authors.
|
||||
* Copyright 2002-2018 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.
|
||||
@@ -19,6 +19,7 @@ package org.springframework.web.server;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.core.ResolvableType;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.lang.Nullable;
|
||||
@@ -37,6 +38,9 @@ public class UnsupportedMediaTypeStatusException extends ResponseStatusException
|
||||
|
||||
private final List<MediaType> supportedMediaTypes;
|
||||
|
||||
@Nullable
|
||||
private final ResolvableType bodyType;
|
||||
|
||||
|
||||
/**
|
||||
* Constructor for when the specified Content-Type is invalid.
|
||||
@@ -45,16 +49,32 @@ public class UnsupportedMediaTypeStatusException extends ResponseStatusException
|
||||
super(HttpStatus.UNSUPPORTED_MEDIA_TYPE, reason);
|
||||
this.contentType = null;
|
||||
this.supportedMediaTypes = Collections.emptyList();
|
||||
this.bodyType = null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor for when the Content-Type can be parsed but is not supported.
|
||||
*/
|
||||
public UnsupportedMediaTypeStatusException(@Nullable MediaType contentType, List<MediaType> supportedMediaTypes) {
|
||||
super(HttpStatus.UNSUPPORTED_MEDIA_TYPE,
|
||||
"Content type '" + (contentType != null ? contentType : "") + "' not supported");
|
||||
public UnsupportedMediaTypeStatusException(@Nullable MediaType contentType, List<MediaType> supportedTypes) {
|
||||
this(contentType, supportedTypes, null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor for when trying to encode from or decode to a specific Java type.
|
||||
* @since 5.1
|
||||
*/
|
||||
public UnsupportedMediaTypeStatusException(@Nullable MediaType contentType, List<MediaType> supportedTypes,
|
||||
@Nullable ResolvableType bodyType) {
|
||||
|
||||
super(HttpStatus.UNSUPPORTED_MEDIA_TYPE, initReason(contentType, bodyType));
|
||||
this.contentType = contentType;
|
||||
this.supportedMediaTypes = Collections.unmodifiableList(supportedMediaTypes);
|
||||
this.supportedMediaTypes = Collections.unmodifiableList(supportedTypes);
|
||||
this.bodyType = bodyType;
|
||||
}
|
||||
|
||||
private static String initReason(@Nullable MediaType contentType, @Nullable ResolvableType bodyType) {
|
||||
return "Content type '" + (contentType != null ? contentType : "") + "' not supported" +
|
||||
(bodyType != null ? " for bodyType=" + bodyType.toString() : "");
|
||||
}
|
||||
|
||||
|
||||
@@ -75,4 +95,16 @@ public class UnsupportedMediaTypeStatusException extends ResponseStatusException
|
||||
return this.supportedMediaTypes;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the body type in the context of which this exception was generated.
|
||||
* This is applicable when the exception was raised as a result trying to
|
||||
* encode from or decode to a specific Java type.
|
||||
* @return the body type, or {@code null}
|
||||
* @since 5.1
|
||||
*/
|
||||
@Nullable
|
||||
public ResolvableType getBodyType() {
|
||||
return this.bodyType;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user