Browse Source

Make DefaultConversionService usable by the upcoming client

pull/1111/head
Sebastien Deleuze 10 years ago
parent
commit
01ae961820
  1. 4
      spring-web-reactive/src/main/java/org/springframework/reactive/convert/support/DefaultConversionService.java
  2. 1
      spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/RequestMappingHandlerAdapter.java
  3. 1
      spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/ResponseBodyResultHandler.java

4
spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/DefaultConversionService.java → spring-web-reactive/src/main/java/org/springframework/reactive/convert/support/DefaultConversionService.java

@ -14,7 +14,7 @@ @@ -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 @@ -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);

1
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; @@ -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;

1
spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/ResponseBodyResultHandler.java

@ -35,6 +35,7 @@ import org.springframework.http.MediaType; @@ -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;

Loading…
Cancel
Save