Browse Source

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.
pull/32991/head
rstoyanchev 2 years ago
parent
commit
48ad7b1bcd
  1. 23
      spring-web/src/main/java/org/springframework/web/server/adapter/WebHttpHandlerBuilder.java

23
spring-web/src/main/java/org/springframework/web/server/adapter/WebHttpHandlerBuilder.java

@ -1,5 +1,5 @@ @@ -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 { @@ -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 { @@ -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)

Loading…
Cancel
Save