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

Re-enable FunctionAroundWrapper

Browse Source
This commit is contained in:
Oleg Zhurakousky
2021-07-28 11:26:23 +02:00
parent 166937cdab
commit eca03a49d8
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java
View File

@@ -37,12 +37,12 @@ public abstract class FunctionAroundWrapper implements BiFunction<Object, Functi
@SuppressWarnings("unchecked")
@Override
public final Object apply(Object input, FunctionInvocationWrapper targetFunction) {
// if (input instanceof Message) {
// return this.doApply((Message<byte[]>) input, targetFunction);
// }
// else if (targetFunction.isSupplier() && !targetFunction.isOutputTypePublisher()) {
// return this.doApply(null, targetFunction);
// }
if (input instanceof Message) {
return this.doApply((Message<byte[]>) input, targetFunction);
}
else if (targetFunction.isSupplier() && !targetFunction.isOutputTypePublisher()) {
return this.doApply(null, targetFunction);
}
return targetFunction.apply(input);
}

2
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java
View File

@@ -38,7 +38,6 @@ import java.util.stream.Collectors;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.reactivestreams.Publisher;
import reactor.core.publisher.Flux;
@@ -540,7 +539,6 @@ public class BeanFactoryAwareFunctionRegistryTests {
@SuppressWarnings({ "rawtypes", "unchecked" })
@Test
@Disabled
public void testWrappedWithAroundAdviseConfiguration() {
FunctionCatalog catalog = this.configureCatalog(WrappedWithAroundAdviseConfiguration.class);
Function f = catalog.lookup("uppercase");

2
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/MarcinSleuthTests.java
View File

@@ -19,7 +19,6 @@ package org.springframework.cloud.function.context.catalog;
import java.util.function.Function;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -37,7 +36,6 @@ import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Oleg Zhurakousky
*/
@Disabled
public class MarcinSleuthTests {
private ApplicationContext context;