SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed auto-fluxing Supplier result when Supplier is not reactive

Browse Source
This commit is contained in:
Oleg Zhurakousky
2019-07-26 15:33:26 +02:00
parent 74ca973bc9
commit 9b1e69f05d
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java
View File

@@ -433,7 +433,7 @@ public class BeanFactoryAwareFunctionRegistry
* This is ONLY relevant for web, so consider exposing some property or may be * This is ONLY relevant for web, so consider exposing some property or may be
* the fact that this is a rare case (Supplier) leave it temporarily as is. * the fact that this is a rare case (Supplier) leave it temporarily as is.
*/ */
return Flux.just(result); // return Flux.just(result);
} }
return result; return result;

8
spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/SpringFunctionAppConfigurationTests.java
View File

@@ -53,9 +53,9 @@ public abstract class SpringFunctionAppConfigurationTests {
@Test @Test
public void test() throws Exception { public void test() throws Exception {
Supplier<Flux<String>> function = this.catalog.lookup(Supplier.class, Supplier<String> function = this.catalog.lookup(Supplier.class,
"function0"); "function0");
assertThat(function.get().blockFirst()).isEqualTo("one"); assertThat(function.get()).isEqualTo("one");
} }
} }
@@ -66,9 +66,9 @@ public abstract class SpringFunctionAppConfigurationTests {
@Test @Test
public void test() throws Exception { public void test() throws Exception {
Supplier<Flux<Integer>> function = this.catalog.lookup(Supplier.class, Supplier<Integer> function = this.catalog.lookup(Supplier.class,
"function0|function1"); "function0|function1");
assertThat(function.get().blockFirst()).isEqualTo(3); assertThat(function.get()).isEqualTo(3);
} }
} }

8
spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/SpringFunctionAppExplodedConfigurationTests.java
View File

@@ -53,9 +53,9 @@ public abstract class SpringFunctionAppExplodedConfigurationTests {
@Test @Test
public void test() throws Exception { public void test() throws Exception {
Supplier<Flux<String>> function = this.catalog.lookup(Supplier.class, Supplier<String> function = this.catalog.lookup(Supplier.class,
"function0"); "function0");
assertThat(function.get().blockFirst()).isEqualTo("one"); assertThat(function.get()).isEqualTo("one");
} }
} }
@@ -67,9 +67,9 @@ public abstract class SpringFunctionAppExplodedConfigurationTests {
@Test @Test
public void test() throws Exception { public void test() throws Exception {
Supplier<Flux<Integer>> function = this.catalog.lookup(Supplier.class, Supplier<Integer> function = this.catalog.lookup(Supplier.class,
"function0|function1"); "function0|function1");
assertThat(function.get().blockFirst()).isEqualTo(3); assertThat(function.get()).isEqualTo(3);
} }
} }

4
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/RequestProcessor.java
View File

@@ -112,12 +112,14 @@ public class RequestProcessor {
return new FunctionWrapper(function, null); return new FunctionWrapper(function, null);
} }
@SuppressWarnings("rawtypes")
public Mono<ResponseEntity<?>> get(FunctionWrapper wrapper) { public Mono<ResponseEntity<?>> get(FunctionWrapper wrapper) {
if (wrapper.function() != null) { if (wrapper.function() != null) {
return response(wrapper, wrapper.function(), value(wrapper), true, true); return response(wrapper, wrapper.function(), value(wrapper), true, true);
} }
else { else {
return response(wrapper, wrapper.supplier(), wrapper.supplier().get(), null, Object result = wrapper.supplier().get();
return response(wrapper, wrapper.supplier(), result instanceof Publisher ? (Publisher) result : Flux.just(result), null,
true); true);
} }