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

Polish

Browse Source
This commit is contained in:
Moritz Halbritter
2024-10-25 13:34:36 +02:00
parent 36a22fcd59
commit 85b1c55bb8
8 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/client/HttpClientProperties.java
View File

@@ -56,7 +56,7 @@ public class HttpClientProperties {
/**
* Default SSL configuration for a client HTTP request.
*/
private Ssl ssl = new Ssl();
private final Ssl ssl = new Ssl();
public Factory getFactory() {
return this.factory;

6
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactorySettings.java
View File

@@ -47,7 +47,7 @@ public record ClientHttpRequestFactorySettings(Redirects redirects, Duration con
/**
* Return a new {@link ClientHttpRequestFactorySettings} instance with an updated
* connect timeout setting .
* connect timeout setting.
* @param connectTimeout the new connect timeout setting
* @return a new {@link ClientHttpRequestFactorySettings} instance
*/
@@ -116,12 +116,12 @@ public record ClientHttpRequestFactorySettings(Redirects redirects, Duration con
FOLLOW_WHEN_POSSIBLE,
/**
* Follow redirects (fail if the underlying library has not support).
* Follow redirects (fail if the underlying library has no support).
*/
FOLLOW,
/**
* Don't follow redirects (fail if the underlying library has not support).
* Don't follow redirects (fail if the underlying library has no support).
*/
DONT_FOLLOW

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

@@ -32,7 +32,6 @@ import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuil
import org.apache.hc.client5.http.protocol.RedirectStrategy;
import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy;
import org.apache.hc.client5.http.ssl.DefaultHostnameVerifier;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.io.SocketConfig;
@@ -97,8 +96,7 @@ public final class HttpComponentsClientHttpRequestFactoryBuilder
private RedirectStrategy asRedirectStrategy(Redirects redirects) {
return switch (redirects) {
case FOLLOW_WHEN_POSSIBLE -> DefaultRedirectStrategy.INSTANCE;
case FOLLOW -> DefaultRedirectStrategy.INSTANCE;
case FOLLOW_WHEN_POSSIBLE, FOLLOW -> DefaultRedirectStrategy.INSTANCE;
case DONT_FOLLOW -> NoFollowRedirectStrategy.INSTANCE;
};
}
@@ -113,9 +111,8 @@ public final class HttpComponentsClientHttpRequestFactoryBuilder
private DefaultClientTlsStrategy createTlsSocketStrategy(SslBundle sslBundle) {
SslOptions options = sslBundle.getOptions();
DefaultClientTlsStrategy tlsSocketStrategy = new DefaultClientTlsStrategy(sslBundle.createSslContext(),
options.getEnabledProtocols(), options.getCiphers(), null, new DefaultHostnameVerifier());
return tlsSocketStrategy;
return new DefaultClientTlsStrategy(sslBundle.createSslContext(), options.getEnabledProtocols(),
options.getCiphers(), null, new DefaultHostnameVerifier());
}
private SocketConfig createSocketConfig(Duration readTimeout) {
@@ -133,14 +130,12 @@ public final class HttpComponentsClientHttpRequestFactoryBuilder
}
@Override
public boolean isRedirected(HttpRequest request, HttpResponse response, HttpContext context)
throws HttpException {
public boolean isRedirected(HttpRequest request, HttpResponse response, HttpContext context) {
return false;
}
@Override
public URI getLocationURI(HttpRequest request, HttpResponse response, HttpContext context)
throws HttpException {
public URI getLocationURI(HttpRequest request, HttpResponse response, HttpContext context) {
return null;
}

3
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/JdkClientHttpRequestFactoryBuilder.java
View File

@@ -78,8 +78,7 @@ public class JdkClientHttpRequestFactoryBuilder
private Redirect asHttpClientRedirect(Redirects redirects) {
return switch (redirects) {
case FOLLOW_WHEN_POSSIBLE -> Redirect.NORMAL;
case FOLLOW -> Redirect.NORMAL;
case FOLLOW_WHEN_POSSIBLE, FOLLOW -> Redirect.NORMAL;
case DONT_FOLLOW -> Redirect.NEVER;
};
}

3
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/JettyClientHttpRequestFactoryBuilder.java
View File

@@ -102,8 +102,7 @@ public final class JettyClientHttpRequestFactoryBuilder
private boolean followRedirects(Redirects redirects) {
return switch (redirects) {
case FOLLOW_WHEN_POSSIBLE -> true;
case FOLLOW -> true;
case FOLLOW_WHEN_POSSIBLE, FOLLOW -> true;
case DONT_FOLLOW -> false;
};
}

3
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ReactorClientHttpRequestFactoryBuilder.java
View File

@@ -87,8 +87,7 @@ public final class ReactorClientHttpRequestFactoryBuilder
private boolean followRedirects(Redirects redirects) {
return switch (redirects) {
case FOLLOW_WHEN_POSSIBLE -> true;
case FOLLOW -> true;
case FOLLOW_WHEN_POSSIBLE, FOLLOW -> true;
case DONT_FOLLOW -> false;
};
}

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ReflectiveComponentsClientHttpRequestFactoryBuilder.java
View File

@@ -41,7 +41,7 @@ import org.springframework.util.ReflectionUtils;
final class ReflectiveComponentsClientHttpRequestFactoryBuilder<T extends ClientHttpRequestFactory>
implements ClientHttpRequestFactoryBuilder<T> {
private Supplier<T> requestFactorySupplier;
private final Supplier<T> requestFactorySupplier;
ReflectiveComponentsClientHttpRequestFactoryBuilder(Supplier<T> requestFactorySupplier) {
Assert.notNull(requestFactorySupplier, "'requestFactorySupplier' must not be null");

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactorySettings.java
View File

@@ -48,7 +48,7 @@ public record ClientHttpRequestFactorySettings(Duration connectTimeout, Duration
/**
* Return a new {@link ClientHttpRequestFactorySettings} instance with an updated
* connect timeout setting .
* connect timeout setting.
* @param connectTimeout the new connect timeout setting
* @return a new {@link ClientHttpRequestFactorySettings} instance
*/