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

Revert "* Simplify functionalTracingEnabled variable logic"

Browse Source 
This reverts commit d37f603aa4.
This commit is contained in:
Soby Chacko
2022-02-11 12:41:27 -05:00
parent 610d93c860
commit 5a024de166
2 changed files with 3 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,8 +38,9 @@ public abstract class FunctionAroundWrapper implements BiFunction<Object, Functi
@Override @Override
public final Object apply(Object input, FunctionInvocationWrapper targetFunction) { public final Object apply(Object input, FunctionInvocationWrapper targetFunction) {
String functionalTracingEnabledStr = System.getProperty("spring.sleuth.function.enabled", "true"); String functionalTracingEnabledStr = System.getProperty("spring.sleuth.function.enabled");
boolean functionalTracingEnabled = Boolean.parseBoolean(functionalTracingEnabledStr); boolean functionalTracingEnabled =
!StringUtils.hasText(functionalTracingEnabledStr) || Boolean.parseBoolean(functionalTracingEnabledStr);
if (functionalTracingEnabled) { if (functionalTracingEnabled) {
return this.doApply(input, targetFunction); return this.doApply(input, targetFunction);
} }

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

@@ -566,16 +566,6 @@ public class BeanFactoryAwareFunctionRegistryTests {
assertThat(result.getHeaders().get("after")).isEqualTo("bar"); assertThat(result.getHeaders().get("after")).isEqualTo("bar");
} }
@SuppressWarnings({ "rawtypes", "unchecked" })
@Test
public void testWrappedWithAroundAdviseNotMessageReturnConfiguration() {
FunctionCatalog catalog = this.configureCatalog(WrappedWithAroundAdviseNotMessageReturnConfiguration.class);
Function f = catalog.lookup("uppercase");
Message result = (Message) f.apply(MessageBuilder.withPayload("hello").setHeader("myHeader", "myValue").build());
assertThat(result.getHeaders()).containsEntry("myHeader", "myValue").containsEntry("advised", "true");
assertThat(result.getPayload()).isEqualTo("HELLO");
}
@SuppressWarnings({ "rawtypes", "unchecked" }) @SuppressWarnings({ "rawtypes", "unchecked" })
@Test @Test
public void testEachElementInFluxIsProcessed() { public void testEachElementInFluxIsProcessed() {
@@ -927,32 +917,6 @@ public class BeanFactoryAwareFunctionRegistryTests {
} }
} }
@EnableAutoConfiguration
@Configuration
protected static class WrappedWithAroundAdviseNotMessageReturnConfiguration {
@Bean
public Function<Message<String>, String> uppercase() {
return v -> v.getPayload().toUpperCase();
}
@Bean
public FunctionAroundWrapper wrapper() {
return new FunctionAroundWrapper() {
@Override
protected Object doApply(Object input, FunctionInvocationWrapper targetFunction) {
// in this test we know input is a Message
Message<?> mInput = (Message<?>) input;
Message<?> advisedMessage = MessageBuilder.fromMessage(mInput).setHeader("advised", "true").build();
Object result = targetFunction.apply(advisedMessage);
assertThat(result).isInstanceOf(Message.class);
return result;
}
};
}
}
@EnableAutoConfiguration @EnableAutoConfiguration
@Configuration @Configuration
protected static class SampleFunctionConfiguration { protected static class SampleFunctionConfiguration {