From 48ad7b1bcd56ba408fee2105025f5cc1ec002dc6 Mon Sep 17 00:00:00 2001
From: rstoyanchev <rossen.stoyanchev@broadcom.com>
Date: Tue, 14 May 2024 13:05:25 +0100
Subject: [PATCH] Remove unused code in WebHttpHandlerBuilder

The code was necessary while ForwardedHeaderFilter was deprecated
but still possible to use. When the filter was removed, this code
could have been removed as well.
---
 .../server/adapter/WebHttpHandlerBuilder.java | 23 +------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/server/adapter/WebHttpHandlerBuilder.java b/spring-web/src/main/java/org/springframework/web/server/adapter/WebHttpHandlerBuilder.java
index 68f0992936d..b68e25a7b62 100644
--- a/spring-web/src/main/java/org/springframework/web/server/adapter/WebHttpHandlerBuilder.java
+++ b/spring-web/src/main/java/org/springframework/web/server/adapter/WebHttpHandlerBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -243,7 +243,6 @@ public final class WebHttpHandlerBuilder {
 	public WebHttpHandlerBuilder filter(WebFilter... filters) {
 		if (!ObjectUtils.isEmpty(filters)) {
 			this.filters.addAll(Arrays.asList(filters));
-			updateFilters();
 		}
 		return this;
 	}
@@ -254,29 +253,9 @@ public final class WebHttpHandlerBuilder {
 	 */
 	public WebHttpHandlerBuilder filters(Consumer<List<WebFilter>> consumer) {
 		consumer.accept(this.filters);
-		updateFilters();
 		return this;
 	}
 
-	private void updateFilters() {
-		if (this.filters.isEmpty()) {
-			return;
-		}
-
-		List<WebFilter> filtersToUse = this.filters.stream()
-				.peek(filter -> {
-					if (filter instanceof ForwardedHeaderTransformer forwardedHeaderTransformerFilter
-							&& this.forwardedHeaderTransformer == null) {
-						this.forwardedHeaderTransformer = forwardedHeaderTransformerFilter;
-					}
-				})
-				.filter(filter -> !(filter instanceof ForwardedHeaderTransformer))
-				.toList();
-
-		this.filters.clear();
-		this.filters.addAll(filtersToUse);
-	}
-
 	/**
 	 * Add the given exception handler(s).
 	 * @param handlers the exception handler(s)