From 7b341ae5e29a5a23f850e4c4b49cb7db122f9510 Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Wed, 18 Jan 2017 16:16:18 +0100 Subject: [PATCH] Moved UnsupportedMediaTypeException Moved UnsupportedMediaTypeException next to Body[Inserters|Extractors], as that is where they are used. This move should have been done as part of the inserter and extractor move, but was forgotten. --- .../springframework/web/reactive/function/BodyExtractors.java | 1 - .../springframework/web/reactive/function/BodyInserters.java | 1 - .../web/reactive/function}/UnsupportedMediaTypeException.java | 4 ++-- .../web/reactive/function/BodyExtractorsTests.java | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) rename {spring-web/src/main/java/org/springframework/http/codec => spring-web-reactive/src/main/java/org/springframework/web/reactive/function}/UnsupportedMediaTypeException.java (95%) diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/BodyExtractors.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/BodyExtractors.java index d8ad5513539..227790a17b6 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/BodyExtractors.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/BodyExtractors.java @@ -32,7 +32,6 @@ import org.springframework.http.HttpMessage; import org.springframework.http.MediaType; import org.springframework.http.ReactiveHttpInputMessage; import org.springframework.http.codec.HttpMessageReader; -import org.springframework.http.codec.UnsupportedMediaTypeException; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.util.Assert; import org.springframework.util.MultiValueMap; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/BodyInserters.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/BodyInserters.java index 84c9f928819..2bccd10eeb3 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/BodyInserters.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/BodyInserters.java @@ -32,7 +32,6 @@ import org.springframework.http.ReactiveHttpOutputMessage; import org.springframework.http.client.reactive.ClientHttpRequest; import org.springframework.http.codec.HttpMessageWriter; import org.springframework.http.codec.ServerSentEvent; -import org.springframework.http.codec.UnsupportedMediaTypeException; import org.springframework.http.server.reactive.ServerHttpResponse; import org.springframework.util.Assert; import org.springframework.util.MultiValueMap; diff --git a/spring-web/src/main/java/org/springframework/http/codec/UnsupportedMediaTypeException.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/UnsupportedMediaTypeException.java similarity index 95% rename from spring-web/src/main/java/org/springframework/http/codec/UnsupportedMediaTypeException.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/function/UnsupportedMediaTypeException.java index ca38457d32b..4f53dbf084a 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/UnsupportedMediaTypeException.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/UnsupportedMediaTypeException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2017 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.codec; +package org.springframework.web.reactive.function; import java.util.Collections; import java.util.List; diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/BodyExtractorsTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/BodyExtractorsTests.java index 02f2339a6ce..a6f4b54ea20 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/BodyExtractorsTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/BodyExtractorsTests.java @@ -43,7 +43,6 @@ import org.springframework.http.ReactiveHttpInputMessage; import org.springframework.http.codec.DecoderHttpMessageReader; import org.springframework.http.codec.FormHttpMessageReader; import org.springframework.http.codec.HttpMessageReader; -import org.springframework.http.codec.UnsupportedMediaTypeException; import org.springframework.http.codec.json.Jackson2JsonDecoder; import org.springframework.http.codec.xml.Jaxb2XmlDecoder; import org.springframework.http.server.reactive.ServerHttpRequest;