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

Revert "GH-816 Fix support for function that returns Iterable with target-protocol set"

Browse Source 
This reverts commit 3f36528341.
This commit is contained in:
Oleg Zhurakousky
2022-02-23 15:16:55 +01:00
parent 3f36528341
commit 3785a7c0b0
3 changed files with 2 additions and 22 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/FunctionTypeUtils.java
View File

@@ -82,7 +82,7 @@ public final class FunctionTypeUtils {
} }
type = getGenericType(type); type = getGenericType(type);
Class<?> rawType = type instanceof ParameterizedType ? getRawType(type) : (Class<?>) type; Class<?> rawType = type instanceof ParameterizedType ? getRawType(type) : (Class<?>) type;
return Iterable.class.isAssignableFrom(rawType); return Collection.class.isAssignableFrom(rawType);
} }
public static boolean isTypeArray(Type type) { public static boolean isTypeArray(Type type) {

9
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java
View File

@@ -53,7 +53,6 @@ import org.springframework.cloud.function.context.FunctionProperties.FunctionCon
import org.springframework.cloud.function.context.FunctionRegistration; import org.springframework.cloud.function.context.FunctionRegistration;
import org.springframework.cloud.function.context.FunctionRegistry; import org.springframework.cloud.function.context.FunctionRegistry;
import org.springframework.cloud.function.context.config.RoutingFunction; import org.springframework.cloud.function.context.config.RoutingFunction;
import org.springframework.cloud.function.context.message.MessageUtils;
import org.springframework.cloud.function.core.FunctionInvocationHelper; import org.springframework.cloud.function.core.FunctionInvocationHelper;
import org.springframework.cloud.function.json.JsonMapper; import org.springframework.cloud.function.json.JsonMapper;
import org.springframework.context.expression.BeanFactoryResolver; import org.springframework.context.expression.BeanFactoryResolver;
@@ -1150,13 +1149,7 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
convertedOutput = this.convertOutputPublisherIfNecessary((Publisher) output, type, contentType); convertedOutput = this.convertOutputPublisherIfNecessary((Publisher) output, type, contentType);
} }
else if (output instanceof Message) { else if (output instanceof Message) {
Message m = (Message) output; convertedOutput = this.convertOutputMessageIfNecessary(output, ObjectUtils.isEmpty(contentType) ? null : contentType[0]);
if (m.getHeaders().containsKey(MessageUtils.TARGET_PROTOCOL) && FunctionTypeUtils.isTypeCollection(this.outputType)) {
convertedOutput = this.convertMultipleOutputValuesIfNecessary(m.getPayload(), ObjectUtils.isEmpty(contentType) ? null : contentType);
}
else {
convertedOutput = this.convertOutputMessageIfNecessary(output, ObjectUtils.isEmpty(contentType) ? null : contentType[0]);
}
} }
else if (output instanceof Collection && this.isOutputTypeMessage()) { else if (output instanceof Collection && this.isOutputTypeMessage()) {
convertedOutput = this.convertMultipleOutputValuesIfNecessary(output, ObjectUtils.isEmpty(contentType) ? null : contentType); convertedOutput = this.convertMultipleOutputValuesIfNecessary(output, ObjectUtils.isEmpty(contentType) ? null : contentType);

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

@@ -56,7 +56,6 @@ import org.springframework.cloud.function.context.FunctionRegistration;
import org.springframework.cloud.function.context.FunctionRegistry; import org.springframework.cloud.function.context.FunctionRegistry;
import org.springframework.cloud.function.context.FunctionType; import org.springframework.cloud.function.context.FunctionType;
import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry.FunctionInvocationWrapper; import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry.FunctionInvocationWrapper;
import org.springframework.cloud.function.context.message.MessageUtils;
import org.springframework.cloud.function.json.JsonMapper; import org.springframework.cloud.function.json.JsonMapper;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
@@ -433,18 +432,6 @@ public class BeanFactoryAwareFunctionRegistryTests {
assertThat(result instanceof Message).isFalse(); assertThat(result instanceof Message).isFalse();
} }
@Test
public void testMultipleValuesInOutputHandlingWithTargetProtocol() throws Exception {
FunctionCatalog catalog = this.configureCatalog(CollectionOutConfiguration.class);
FunctionInvocationWrapper function = catalog.lookup("parseToList", "application/json");
assertThat(function).isNotNull();
Object result = function.apply(MessageBuilder.withPayload("1, 2, 3".getBytes())
.setHeader(MessageHeaders.CONTENT_TYPE, "text/plain")
.setHeader(MessageUtils.TARGET_PROTOCOL, "integration")
.build());
assertThat(result instanceof List).isTrue();
}
/** /**
* The following two tests test the fallback mechanism when an accept header has several values. * The following two tests test the fallback mechanism when an accept header has several values.
* The function produces Integer, which cannot be serialized by the default converter supporting text/plain * The function produces Integer, which cannot be serialized by the default converter supporting text/plain