diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index f8daf6a0e..16c6ea14d 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -17,6 +17,7 @@ 1.8 0.0.1.BUILD-SNAPSHOT + 3.0.4.RELEASE diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-pojo/pom.xml b/spring-cloud-function-samples/spring-cloud-function-sample-pojo/pom.xml index e33a8e2a8..c29c64741 100644 --- a/spring-cloud-function-samples/spring-cloud-function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/spring-cloud-function-sample-pojo/pom.xml @@ -25,6 +25,12 @@ + + + io.projectreactor + reactor-core + ${reactor.version} + org.springframework.cloud spring-cloud-function-web diff --git a/spring-cloud-function-samples/spring-cloud-function-sample/pom.xml b/spring-cloud-function-samples/spring-cloud-function-sample/pom.xml index 2449aadae..1d3e614df 100644 --- a/spring-cloud-function-samples/spring-cloud-function-sample/pom.xml +++ b/spring-cloud-function-samples/spring-cloud-function-sample/pom.xml @@ -22,9 +22,16 @@ 1.0.0.BUILD-SNAPSHOT 0.0.1.BUILD-SNAPSHOT 3.0.4.RELEASE + 1.5.0.BUILD-SNAPSHOT + + + io.projectreactor + reactor-core + ${reactor.version} + org.springframework.cloud spring-cloud-function-web @@ -49,15 +56,10 @@ - - org.apache.maven.plugins - maven-jar-plugin - 3.0.0 - org.springframework.boot spring-boot-maven-plugin - 1.5.0.BUILD-SNAPSHOT + ${spring-boot.version} org.springframework.boot.experimental diff --git a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/RestApplication.java b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/RestApplication.java index aea2fd5a3..f59f2afe5 100644 --- a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/RestApplication.java +++ b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/RestApplication.java @@ -29,3 +29,4 @@ public class RestApplication { SpringApplication.run(RestApplication.class, args); } } + diff --git a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/ReactorAutoConfiguration.java b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/ReactorAutoConfiguration.java index 271c52a2f..bfcdcab14 100644 --- a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/ReactorAutoConfiguration.java +++ b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/ReactorAutoConfiguration.java @@ -48,10 +48,10 @@ public class ReactorAutoConfiguration extends WebMvcConfigurerAdapter { } @Configuration - protected static class MessageConverters { + protected static class FluxMessageConverterConfiguration { @Bean - public HttpMessageConverters httpMessageConverters() { - return new HttpMessageConverters(new FluxHttpMessageConverter()); + public FluxHttpMessageConverter fluxHttpMessageConverter() { + return new FluxHttpMessageConverter(); } } diff --git a/spring-cloud-function-web/src/main/resources/META-INF/spring.factories b/spring-cloud-function-web/src/main/resources/META-INF/spring.factories index 14109c4d6..8c24235c9 100644 --- a/spring-cloud-function-web/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-function-web/src/main/resources/META-INF/spring.factories @@ -1,2 +1,3 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.function.web.FunctionController \ No newline at end of file +org.springframework.cloud.function.web.FunctionController,\ +org.springframework.cloud.function.web.flux.ReactorAutoConfiguration \ No newline at end of file