From d041b73c106913ad9ff012f4d672bc2eafdc3a91 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Tue, 19 Apr 2016 16:43:50 -0400 Subject: [PATCH] Polish --- .../server/UnsupportedMediaTypeStatusException.java | 12 ++++++------ .../RequestMappingInfoHandlerMappingTests.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-web-reactive/src/main/java/org/springframework/web/server/UnsupportedMediaTypeStatusException.java b/spring-web-reactive/src/main/java/org/springframework/web/server/UnsupportedMediaTypeStatusException.java index 0ac7be9def..456913655c 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/server/UnsupportedMediaTypeStatusException.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/server/UnsupportedMediaTypeStatusException.java @@ -31,7 +31,7 @@ public class UnsupportedMediaTypeStatusException extends ResponseStatusException private final MediaType contentType; - private final List supportedContentTypes; + private final List supportedMediaTypes; /** @@ -40,16 +40,16 @@ public class UnsupportedMediaTypeStatusException extends ResponseStatusException public UnsupportedMediaTypeStatusException(String reason) { super(HttpStatus.UNSUPPORTED_MEDIA_TYPE, reason); this.contentType = null; - this.supportedContentTypes = Collections.emptyList(); + this.supportedMediaTypes = Collections.emptyList(); } /** * Constructor for when the Content-Type can be parsed but is not supported. */ - public UnsupportedMediaTypeStatusException(MediaType contentType, List supportedContentTypes) { + public UnsupportedMediaTypeStatusException(MediaType contentType, List supportedMediaTypes) { super(HttpStatus.UNSUPPORTED_MEDIA_TYPE, "Content type '" + contentType + "' not supported"); this.contentType = contentType; - this.supportedContentTypes = Collections.unmodifiableList(supportedContentTypes); + this.supportedMediaTypes = Collections.unmodifiableList(supportedMediaTypes); } @@ -64,8 +64,8 @@ public class UnsupportedMediaTypeStatusException extends ResponseStatusException * Return the list of supported content types in cases when the Content-Type * header is parsed but not supported, or an empty list otherwise. */ - public List getSupportedContentTypes() { - return this.supportedContentTypes; + public List getSupportedMediaTypes() { + return this.supportedMediaTypes; } } diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMappingTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMappingTests.java index 174e99458c..2c26457328 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMappingTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMappingTests.java @@ -379,7 +379,7 @@ public class RequestMappingInfoHandlerMappingTests { assertError(mono, UnsupportedMediaTypeStatusException.class, ex -> assertEquals("Invalid supported consumable media types", Collections.singletonList(new MediaType("application", "xml")), - ex.getSupportedContentTypes())); + ex.getSupportedMediaTypes())); } private void testHttpOptions(String requestURI, String allowHeader) throws Exception {