Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix withDefaultRequestConfigCustomizer method name

Browse Source 
The work `manager` was accidentally included due to a copy/paste
mistake.

Closes gh-43139
This commit is contained in:
Phillip Webb
2024-11-20 09:54:50 -08:00
parent 042b4958f7
commit 223427e96d
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilder.java
View File

@@ -65,7 +65,7 @@ public final class HttpComponentsClientHttpRequestFactoryBuilder
private final Consumer<SocketConfig.Builder> socketConfigCustomizer;
private final Consumer<RequestConfig.Builder> defaultRequestConfigManagerCustomizer;
private final Consumer<RequestConfig.Builder> defaultRequestConfigCustomizer;
private final Function<SslBundle, TlsSocketStrategy> tlsSocketStrategyFactory;
@@ -85,13 +85,13 @@ public final class HttpComponentsClientHttpRequestFactoryBuilder
Consumer<HttpClientBuilder> httpClientCustomizer,
Consumer<PoolingHttpClientConnectionManagerBuilder> connectionManagerCustomizer,
Consumer<SocketConfig.Builder> socketConfigCustomizer,
Consumer<RequestConfig.Builder> defaultRequestConfigManagerCustomizer,
Consumer<RequestConfig.Builder> defaultRequestConfigCustomizer,
Function<SslBundle, TlsSocketStrategy> tlsSocketStrategyFactory) {
super(customizers);
this.httpClientCustomizer = httpClientCustomizer;
this.connectionManagerCustomizer = connectionManagerCustomizer;
this.socketConfigCustomizer = socketConfigCustomizer;
this.defaultRequestConfigManagerCustomizer = defaultRequestConfigManagerCustomizer;
this.defaultRequestConfigCustomizer = defaultRequestConfigCustomizer;
this.tlsSocketStrategyFactory = tlsSocketStrategyFactory;
}
@@ -100,7 +100,7 @@ public final class HttpComponentsClientHttpRequestFactoryBuilder
Consumer<HttpComponentsClientHttpRequestFactory> customizer) {
return new HttpComponentsClientHttpRequestFactoryBuilder(mergedCustomizers(customizer),
this.httpClientCustomizer, this.connectionManagerCustomizer, this.socketConfigCustomizer,
this.defaultRequestConfigManagerCustomizer, this.tlsSocketStrategyFactory);
this.defaultRequestConfigCustomizer, this.tlsSocketStrategyFactory);
}
@Override
@@ -108,7 +108,7 @@ public final class HttpComponentsClientHttpRequestFactoryBuilder
Collection<Consumer<HttpComponentsClientHttpRequestFactory>> customizers) {
return new HttpComponentsClientHttpRequestFactoryBuilder(mergedCustomizers(customizers),
this.httpClientCustomizer, this.connectionManagerCustomizer, this.socketConfigCustomizer,
this.defaultRequestConfigManagerCustomizer, this.tlsSocketStrategyFactory);
this.defaultRequestConfigCustomizer, this.tlsSocketStrategyFactory);
}
/**
@@ -122,7 +122,7 @@ public final class HttpComponentsClientHttpRequestFactoryBuilder
Assert.notNull(httpClientCustomizer, "'httpClientCustomizer' must not be null");
return new HttpComponentsClientHttpRequestFactoryBuilder(getCustomizers(),
this.httpClientCustomizer.andThen(httpClientCustomizer), this.connectionManagerCustomizer,
this.socketConfigCustomizer, this.defaultRequestConfigManagerCustomizer, this.tlsSocketStrategyFactory);
this.socketConfigCustomizer, this.defaultRequestConfigCustomizer, this.tlsSocketStrategyFactory);
}
/**
@@ -137,7 +137,7 @@ public final class HttpComponentsClientHttpRequestFactoryBuilder
Assert.notNull(connectionManagerCustomizer, "'connectionManagerCustomizer' must not be null");
return new HttpComponentsClientHttpRequestFactoryBuilder(getCustomizers(), this.httpClientCustomizer,
this.connectionManagerCustomizer.andThen(connectionManagerCustomizer), this.socketConfigCustomizer,
this.defaultRequestConfigManagerCustomizer, this.tlsSocketStrategyFactory);
this.defaultRequestConfigCustomizer, this.tlsSocketStrategyFactory);
}
/**
@@ -152,7 +152,7 @@ public final class HttpComponentsClientHttpRequestFactoryBuilder
Assert.notNull(socketConfigCustomizer, "'socketConfigCustomizer' must not be null");
return new HttpComponentsClientHttpRequestFactoryBuilder(getCustomizers(), this.httpClientCustomizer,
this.connectionManagerCustomizer, this.socketConfigCustomizer.andThen(socketConfigCustomizer),
this.defaultRequestConfigManagerCustomizer, this.tlsSocketStrategyFactory);
this.defaultRequestConfigCustomizer, this.tlsSocketStrategyFactory);
}
/**
@@ -167,7 +167,7 @@ public final class HttpComponentsClientHttpRequestFactoryBuilder
Assert.notNull(tlsSocketStrategyFactory, "'tlsSocketStrategyFactory' must not be null");
return new HttpComponentsClientHttpRequestFactoryBuilder(getCustomizers(), this.httpClientCustomizer,
this.connectionManagerCustomizer, this.socketConfigCustomizer,
this.defaultRequestConfigManagerCustomizer, tlsSocketStrategyFactory);
this.defaultRequestConfigCustomizer, tlsSocketStrategyFactory);
}
/**
@@ -178,7 +178,7 @@ public final class HttpComponentsClientHttpRequestFactoryBuilder
* @param defaultRequestConfigManagerCustomizer the customizer to apply
* @return a new {@link HttpComponentsClientHttpRequestFactoryBuilder} instance
*/
public HttpComponentsClientHttpRequestFactoryBuilder withDefaultRequestConfigManagerCustomizer(
public HttpComponentsClientHttpRequestFactoryBuilder withDefaultRequestConfigCustomizer(
Consumer<RequestConfig.Builder> defaultRequestConfigManagerCustomizer) {
Assert.notNull(defaultRequestConfigManagerCustomizer,
"'defaultRequestConfigManagerCustomizer' must not be null");
@@ -236,7 +236,7 @@ public final class HttpComponentsClientHttpRequestFactoryBuilder
private RequestConfig createDefaultRequestConfig() {
RequestConfig.Builder builder = RequestConfig.custom();
this.defaultRequestConfigManagerCustomizer.accept(builder);
this.defaultRequestConfigCustomizer.accept(builder);
return builder.build();
}

6
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilderTests.java
View File

@@ -55,19 +55,19 @@ class HttpComponentsClientHttpRequestFactoryBuilderTests
TestCustomizer<HttpClientBuilder> httpClientCustomizer2 = new TestCustomizer<>();
TestCustomizer<PoolingHttpClientConnectionManagerBuilder> connectionManagerCustomizer = new TestCustomizer<>();
TestCustomizer<SocketConfig.Builder> socketConfigCustomizer = new TestCustomizer<>();
TestCustomizer<RequestConfig.Builder> defaultRequestConfigManagerCustomizer = new TestCustomizer<>();
TestCustomizer<RequestConfig.Builder> defaultRequestConfigCustomizer = new TestCustomizer<>();
ClientHttpRequestFactoryBuilder.httpComponents()
.withHttpClientCustomizer(httpClientCustomizer1)
.withHttpClientCustomizer(httpClientCustomizer2)
.withConnectionManagerCustomizer(connectionManagerCustomizer)
.withSocketConfigCustomizer(socketConfigCustomizer)
.withDefaultRequestConfigManagerCustomizer(defaultRequestConfigManagerCustomizer)
.withDefaultRequestConfigCustomizer(defaultRequestConfigCustomizer)
.build();
httpClientCustomizer1.assertCalled();
httpClientCustomizer2.assertCalled();
connectionManagerCustomizer.assertCalled();
socketConfigCustomizer.assertCalled();
defaultRequestConfigManagerCustomizer.assertCalled();
defaultRequestConfigCustomizer.assertCalled();
}
@Test