diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/DefaultConversionService.java b/spring-web-reactive/src/main/java/org/springframework/reactive/convert/support/DefaultConversionService.java similarity index 92% rename from spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/DefaultConversionService.java rename to spring-web-reactive/src/main/java/org/springframework/reactive/convert/support/DefaultConversionService.java index f38d00a063e..a3e345f1f1d 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/DefaultConversionService.java +++ b/spring-web-reactive/src/main/java/org/springframework/reactive/convert/support/DefaultConversionService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.reactive.web.dispatch.method.annotation; +package org.springframework.reactive.convert.support; import reactor.core.publisher.convert.DependencyUtils; @@ -28,7 +28,7 @@ import org.springframework.core.convert.support.ReactiveStreamsToRxJava1Converte * TODO temporary class designed to be replaced by org.springframework.core.convert.support.DefaultConversionService when it will contain Reactive Streams converter * @author Sebastien Deleuze */ -class DefaultConversionService extends GenericConversionService { +public class DefaultConversionService extends GenericConversionService { public DefaultConversionService() { addDefaultConverters(this); diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/RequestMappingHandlerAdapter.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/RequestMappingHandlerAdapter.java index 3ffa44d83c3..ad2bfef86e5 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/RequestMappingHandlerAdapter.java +++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/RequestMappingHandlerAdapter.java @@ -29,6 +29,7 @@ import org.springframework.reactive.codec.decoder.ByteToMessageDecoder; import org.springframework.reactive.codec.decoder.JacksonJsonDecoder; import org.springframework.reactive.codec.decoder.JsonObjectDecoder; import org.springframework.reactive.codec.decoder.StringDecoder; +import org.springframework.reactive.convert.support.DefaultConversionService; import org.springframework.reactive.web.dispatch.HandlerAdapter; import org.springframework.reactive.web.dispatch.HandlerResult; import org.springframework.reactive.web.dispatch.method.HandlerMethodArgumentResolver; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/ResponseBodyResultHandler.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/ResponseBodyResultHandler.java index 0bfd9cdd479..43b189e2999 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/ResponseBodyResultHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/ResponseBodyResultHandler.java @@ -35,6 +35,7 @@ import org.springframework.http.MediaType; import org.springframework.http.server.ReactiveServerHttpRequest; import org.springframework.http.server.ReactiveServerHttpResponse; import org.springframework.reactive.codec.encoder.MessageToByteEncoder; +import org.springframework.reactive.convert.support.DefaultConversionService; import org.springframework.reactive.web.dispatch.HandlerResult; import org.springframework.reactive.web.dispatch.HandlerResultHandler; import org.springframework.web.bind.annotation.ResponseBody;