From 08ba9728e1fa5c03bb4260bd7a48aac56f201ea3 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 8 Mar 2024 12:20:57 -0500 Subject: [PATCH] =?UTF-8?q?Revert=20"fix:=20combine=20the=20form=20map=20a?= =?UTF-8?q?nd=20queryParams=20to=20pass=20to=20RequestWrapper=20(=E2=80=A6?= =?UTF-8?q?"=20(#3289)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 12fa425ef24ec9a91b5bcb23a07de55c0e9e8764. --- .../cloud/gateway/server/mvc/filter/FormFilter.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/FormFilter.java b/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/FormFilter.java index 4affbee3..9191f5ae 100644 --- a/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/FormFilter.java +++ b/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/FormFilter.java @@ -24,7 +24,6 @@ import java.io.Writer; import java.net.URLEncoder; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.Enumeration; @@ -49,7 +48,6 @@ import org.springframework.core.Ordered; import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; import org.springframework.lang.Nullable; -import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.util.StringUtils; import org.springframework.web.util.UriComponentsBuilder; @@ -153,15 +151,9 @@ public class FormFilter implements Filter, Ordered { } writer.flush(); - MultiValueMap combineQueryParams = new LinkedMultiValueMap<>(); - for (Map.Entry entry : form.entrySet()) { - combineQueryParams.put(entry.getKey(), new ArrayList<>(Arrays.asList(entry.getValue()))); - } - combineQueryParams.addAll(queryParams); - ByteArrayServletInputStream servletInputStream = new ByteArrayServletInputStream( new ByteArrayInputStream(bos.toByteArray())); - return new FormContentRequestWrapper(request, combineQueryParams) { + return new FormContentRequestWrapper(request, queryParams) { @Override public ServletInputStream getInputStream() throws IOException { return servletInputStream;