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

GH-951 remove acceptContentTypes from FunctionWebRequestProcessingHelper as it is not used

Browse Source 
Resolves #951
Resolves #954
This commit is contained in:
Neokeld
2022-11-04 13:46:28 +01:00
committed by Oleg Zhurakousky
parent 643f360a54
commit 210596c7c3
4 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/FunctionHandlerMapping.java
View File

@@ -84,7 +84,7 @@ public class FunctionHandlerMapping extends RequestMappingHandlerMapping
path = path.substring(this.prefix.length()); path = path.substring(this.prefix.length());
} }
Object function = FunctionWebRequestProcessingHelper Object function = FunctionWebRequestProcessingHelper
.findFunction(this.functionProperties, request.getRequest().getMethod(), this.functions, request.getAttributes(), path, new String[] {}); .findFunction(this.functionProperties, request.getRequest().getMethod(), this.functions, request.getAttributes(), path);
if (function != null) { if (function != null) {
if (this.logger.isDebugEnabled()) { if (this.logger.isDebugEnabled()) {

3
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializer.java
View File

@@ -227,9 +227,8 @@ class FunctionEndpointFactory {
function = this.functionCatalog.lookup(Function.class, handler); function = this.functionCatalog.lookup(Function.class, handler);
} }
else { else {
String[] accept = FunctionWebRequestProcessingHelper.acceptContentTypes(request.headers().accept());
function = FunctionWebRequestProcessingHelper.findFunction(this.functionProperties, request.method(), functionCatalog, request.attributes(), function = FunctionWebRequestProcessingHelper.findFunction(this.functionProperties, request.method(), functionCatalog, request.attributes(),
request.path(), accept); request.path());
} }
return function; return function;
} }

2
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/mvc/FunctionHandlerMapping.java
View File

@@ -98,7 +98,7 @@ public class FunctionHandlerMapping extends RequestMappingHandlerMapping
} }
Object function = FunctionWebRequestProcessingHelper.findFunction(this.functionProperties, HttpMethod.resolve(request.getMethod()), Object function = FunctionWebRequestProcessingHelper.findFunction(this.functionProperties, HttpMethod.resolve(request.getMethod()),
this.functions, new HttpRequestAttributeDelegate(request), path, new String[] {}); this.functions, new HttpRequestAttributeDelegate(request), path);
if (function != null) { if (function != null) {
if (this.logger.isDebugEnabled()) { if (this.logger.isDebugEnabled()) {
this.logger.debug("Found function for GET: " + path); this.logger.debug("Found function for GET: " + path);

32
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/FunctionWebRequestProcessingHelper.java
View File

@@ -24,16 +24,12 @@ import java.util.stream.Collectors;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.reactivestreams.Publisher; import org.reactivestreams.Publisher;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import org.springframework.cloud.function.context.FunctionCatalog; import org.springframework.cloud.function.context.FunctionCatalog;
import org.springframework.cloud.function.context.FunctionProperties; import org.springframework.cloud.function.context.FunctionProperties;
import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry.FunctionInvocationWrapper; import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry.FunctionInvocationWrapper;
import org.springframework.cloud.function.web.constants.WebRequestConstants; import org.springframework.cloud.function.web.constants.WebRequestConstants;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod; import org.springframework.http.HttpMethod;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.http.ResponseEntity.BodyBuilder; import org.springframework.http.ResponseEntity.BodyBuilder;
import org.springframework.messaging.Message; import org.springframework.messaging.Message;
@@ -41,6 +37,9 @@ import org.springframework.messaging.support.MessageBuilder;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
/** /**
* !INTERNAL USE ONLY! * !INTERNAL USE ONLY!
* *
@@ -56,28 +55,15 @@ public final class FunctionWebRequestProcessingHelper {
} }
public static FunctionInvocationWrapper findFunction(FunctionProperties functionProperties, HttpMethod method, FunctionCatalog functionCatalog, public static FunctionInvocationWrapper findFunction(FunctionProperties functionProperties, HttpMethod method, FunctionCatalog functionCatalog,
Map<String, Object> attributes, String path, String[] acceptContentTypes) { Map<String, Object> attributes, String path) {
if (method.equals(HttpMethod.GET) || method.equals(HttpMethod.POST)) { if (method.equals(HttpMethod.GET) || method.equals(HttpMethod.POST)) {
return doFindFunction(functionProperties.getDefinition(), method, functionCatalog, attributes, path, acceptContentTypes); return doFindFunction(functionProperties.getDefinition(), method, functionCatalog, attributes, path);
} }
else { else {
throw new IllegalStateException("HTTP method '" + method + "' is not supported;"); throw new IllegalStateException("HTTP method '" + method + "' is not supported;");
} }
} }
public static String[] acceptContentTypes(List<MediaType> acceptHeaders) {
String[] acceptContentTypes = new String[] {};
if (!CollectionUtils.isEmpty(acceptHeaders)) {
acceptContentTypes = acceptHeaders.stream().map(mediaType -> mediaType.toString()).toArray(String[]::new);
}
else {
acceptContentTypes = new String[] {MediaType.APPLICATION_JSON.toString()};
}
acceptContentTypes = new String[] {StringUtils.arrayToCommaDelimitedString(acceptContentTypes)};
return new String[] {};
}
public static Object invokeFunction(FunctionInvocationWrapper function, Object input, boolean isMessage) { public static Object invokeFunction(FunctionInvocationWrapper function, Object input, boolean isMessage) {
Object result = function.apply(input); Object result = function.apply(input);
return postProcessResult(result, isMessage); return postProcessResult(result, isMessage);
@@ -159,11 +145,11 @@ public final class FunctionWebRequestProcessingHelper {
} }
private static FunctionInvocationWrapper doFindFunction(String functionDefinition, HttpMethod method, FunctionCatalog functionCatalog, private static FunctionInvocationWrapper doFindFunction(String functionDefinition, HttpMethod method, FunctionCatalog functionCatalog,
Map<String, Object> attributes, String path, String[] acceptContentTypes) { Map<String, Object> attributes, String path) {
path = path.startsWith("/") ? path.substring(1) : path; path = path.startsWith("/") ? path.substring(1) : path;
if (method.equals(HttpMethod.GET)) { if (method.equals(HttpMethod.GET)) {
FunctionInvocationWrapper function = functionCatalog.lookup(path, acceptContentTypes); FunctionInvocationWrapper function = functionCatalog.lookup(path);
if (function != null && function.isSupplier()) { if (function != null && function.isSupplier()) {
attributes.put(WebRequestConstants.SUPPLIER, function); attributes.put(WebRequestConstants.SUPPLIER, function);
return function; return function;
@@ -181,14 +167,14 @@ public final class FunctionWebRequestProcessingHelper {
name = builder.toString(); name = builder.toString();
value = path.length() > name.length() ? path.substring(name.length() + 1) value = path.length() > name.length() ? path.substring(name.length() + 1)
: null; : null;
FunctionInvocationWrapper function = functionCatalog.lookup(name, acceptContentTypes); FunctionInvocationWrapper function = functionCatalog.lookup(name);
if (function != null) { if (function != null) {
return postProcessFunction(function, value, attributes); return postProcessFunction(function, value, attributes);
} }
} }
if (StringUtils.hasText(functionDefinition)) { if (StringUtils.hasText(functionDefinition)) {
FunctionInvocationWrapper function = functionCatalog.lookup(functionDefinition, acceptContentTypes); FunctionInvocationWrapper function = functionCatalog.lookup(functionDefinition);
if (function != null) { if (function != null) {
return postProcessFunction(function, value, attributes); return postProcessFunction(function, value, attributes);
} }