Fixes merge errors

Author: spencergibb

spring-cloud-gateway-proxyexchange-webmvc/pom.xml

@@ -63,5 +63,10 @@
 			<artifactId>spring-boot-configuration-processor</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-security</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 </project>

spring-cloud-gateway-server-webflux/src/test/java/org/springframework/cloud/gateway/filter/headers/TransferEncodingNormalizationHeadersFilterIntegrationTests.java

@@ -70,27 +70,21 @@ public class TransferEncodingNormalizationHeadersFilterIntegrationTests {
 	@LocalServerPort
 	private int port;
 
-	@Test
-	void invalidRequestShouldFail() throws Exception {
-		// Issue a crafted request with smuggling attempt
-		assertStatus("Should Fail", invalidRequest, "400 Bad Request");
-	}
-
 	@Test
 	void legitRequestShouldNotFail() throws Exception {
 		// Issue a legit request, which should not fail
-		assertStatusWith("200 OK", "Should Not Fail", validRequest.getBytes());
+		assertStatusWith("200 OK", "Should Not Fail", validRequest);
 	}
 
 	@Test
 	void badRequestShouldFail() throws Exception {
 		// Issue a crafted request with smuggling attempt
-		assertStatusWith("400 Bad Request", "Should Fail", invalidRequest.getBytes());
+		assertStatusWith("400 Bad Request", "Should Fail", invalidRequest);
 	}
 
-	private void assertStatusWith(String status, String name, byte[] payload) throws Exception {
+	private void assertStatusWith(String status, String name, String payload) throws Exception {
 		final String response = execute("localhost", port, payload);
-		log.info(LogMessage.format("Request to localhost:%d %s\n%s", port, name, new String(payload)));
+		log.info(LogMessage.format("Request to localhost:%d %s\n%s", port, name, payload));
 		assertThat(response).isNotNull();
 		log.info(LogMessage.format("Response %s\n%s", name, response));
 		assertThat(response).matches("HTTP/1.\\d " + status);

spring-cloud-gateway-server-webmvc/src/test/java/org/springframework/cloud/gateway/server/mvc/ServerMvcIntegrationTests.java

@@ -84,7 +84,6 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 import org.springframework.web.servlet.function.HandlerFunction;
 import org.springframework.web.servlet.function.RouterFunction;
 import org.springframework.web.servlet.function.ServerRequest;