From 9de725dab00e61c6aa172523907b849c3b937b89 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Fri, 20 Dec 2024 11:01:43 +0100 Subject: [PATCH] Remove deprecations --- .../cloud/function/web/flux/FunctionController.java | 4 ++-- .../web/function/FunctionEndpointInitializer.java | 4 ++-- .../cloud/function/web/util/FunctionWrapper.java | 10 ---------- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/FunctionController.java b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/FunctionController.java index 98666d756..4a19c8b76 100644 --- a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/FunctionController.java +++ b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/FunctionController.java @@ -179,9 +179,9 @@ public Mono> get(ServerWebExchange request) { private FunctionWrapper wrapper(ServerWebExchange request) { FunctionInvocationWrapper function = (FunctionInvocationWrapper) request .getAttribute(WebRequestConstants.HANDLER); - HttpHeaders headers = HttpHeaders.writableHttpHeaders(request.getRequest().getHeaders()); + HttpHeaders headers = new HttpHeaders(request.getRequest().getHeaders()); headers.set("uri", request.getRequest().getURI().toString()); - FunctionWrapper wrapper = new FunctionWrapper(function); + FunctionWrapper wrapper = new FunctionWrapper(function, null); wrapper.setHeaders(headers); wrapper.getParams().addAll(request.getRequest().getQueryParams()); String argument = (String) request.getAttribute(WebRequestConstants.ARGUMENT); diff --git a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializer.java b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializer.java index 4696c1d52..29f31acf5 100644 --- a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializer.java +++ b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializer.java @@ -244,7 +244,7 @@ public RouterFunction functionEndpoints() { FunctionInvocationWrapper funcWrapper = extract(request); Class outputType = funcWrapper == null ? Object.class : FunctionTypeUtils.getRawType(FunctionTypeUtils.getGenericType(funcWrapper.getOutputType())); - FunctionWrapper wrapper = new FunctionWrapper(funcWrapper); + FunctionWrapper wrapper = new FunctionWrapper(funcWrapper, null); Mono> stream = request.bodyToMono(String.class) .flatMap(content -> (Mono>) FunctionWebRequestProcessingHelper.processRequest(wrapper, content, false, functionHttpProperties.getIgnoredHeaders(), functionHttpProperties.getRequestOnlyHeaders())); @@ -270,7 +270,7 @@ public RouterFunction functionEndpoints() { return ServerResponse.ok().body(result, outputType); } else { - FunctionWrapper wrapper = new FunctionWrapper(funcWrapper); + FunctionWrapper wrapper = new FunctionWrapper(funcWrapper, null); wrapper.setHeaders(request.headers().asHttpHeaders()); String argument = (String) request.attribute(WebRequestConstants.ARGUMENT).get(); diff --git a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/FunctionWrapper.java b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/FunctionWrapper.java index d9b6af26d..627cf9508 100644 --- a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/FunctionWrapper.java +++ b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/FunctionWrapper.java @@ -39,16 +39,6 @@ public class FunctionWrapper { private final String method; - /** - * - * @param function instance of {@link FunctionInvocationWrapper} - * @deprecated since 4.0.4 in favor of the constructor that takes Http method as second argument. - */ - @Deprecated - public FunctionWrapper(FunctionInvocationWrapper function) { - this(function, null); - } - public FunctionWrapper(FunctionInvocationWrapper function, String method) { this.function = function; this.method = method;