Skip to content

Commit 7b08c07

Browse files
philwebbphilwebb
committed
Replace ClientHttpRequestFactorySettings.Redirects with HttpRedirects
Closes gh-45505
1 parent 8f6a9b9 commit 7b08c07

File tree

25 files changed

+78
-132
lines changed

25 files changed

+78
-132
lines changed

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/client/ClientHttpRequestFactories.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.springframework.boot.autoconfigure.http.client.AbstractHttpRequestFactoryProperties.Factory;
2727
import org.springframework.boot.http.client.ClientHttpRequestFactoryBuilder;
2828
import org.springframework.boot.http.client.ClientHttpRequestFactorySettings;
29-
import org.springframework.boot.http.client.ClientHttpRequestFactorySettings.Redirects;
3029
import org.springframework.boot.http.client.HttpRedirects;
3130
import org.springframework.boot.ssl.SslBundle;
3231
import org.springframework.boot.ssl.SslBundles;
@@ -64,7 +63,7 @@ public ClientHttpRequestFactorySettings settings() {
6463
StringUtils::hasLength);
6564
SslBundle sslBundle = (StringUtils.hasLength(sslBundleName))
6665
? this.sslBundles.getObject().getBundle(sslBundleName) : null;
67-
return new ClientHttpRequestFactorySettings(Redirects.of(redirects), connectTimeout, readTimeout, sslBundle);
66+
return new ClientHttpRequestFactorySettings(redirects, connectTimeout, readTimeout, sslBundle);
6867
}
6968

7069
private <T> T getProperty(Function<AbstractHttpRequestFactoryProperties, T> accessor) {

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/client/ClientHttpRequestFactoriesTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.springframework.beans.factory.ObjectFactory;
2424
import org.springframework.boot.autoconfigure.http.client.AbstractHttpRequestFactoryProperties.Factory;
2525
import org.springframework.boot.http.client.ClientHttpRequestFactorySettings;
26-
import org.springframework.boot.http.client.ClientHttpRequestFactorySettings.Redirects;
2726
import org.springframework.boot.http.client.HttpComponentsClientHttpRequestFactoryBuilder;
2827
import org.springframework.boot.http.client.HttpRedirects;
2928
import org.springframework.boot.http.client.JettyClientHttpRequestFactoryBuilder;
@@ -88,7 +87,7 @@ void settingsWhenHasMultipleSettingProperties() {
8887
p3.getSsl().setBundle("p3");
8988
ClientHttpRequestFactories factories = new ClientHttpRequestFactories(this.sslBundles, p1, p2, p3);
9089
ClientHttpRequestFactorySettings settings = factories.settings();
91-
assertThat(settings).isEqualTo(new ClientHttpRequestFactorySettings(Redirects.DONT_FOLLOW,
90+
assertThat(settings).isEqualTo(new ClientHttpRequestFactorySettings(HttpRedirects.DONT_FOLLOW,
9291
Duration.ofSeconds(1), Duration.ofSeconds(2), this.bundleRegistry.getBundle("p2")));
9392
}
9493

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/client/HttpClientAutoConfigurationTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
import org.springframework.boot.autoconfigure.ssl.SslAutoConfiguration;
2727
import org.springframework.boot.http.client.ClientHttpRequestFactoryBuilder;
2828
import org.springframework.boot.http.client.ClientHttpRequestFactorySettings;
29-
import org.springframework.boot.http.client.ClientHttpRequestFactorySettings.Redirects;
3029
import org.springframework.boot.http.client.HttpComponentsClientHttpRequestFactoryBuilder;
30+
import org.springframework.boot.http.client.HttpRedirects;
3131
import org.springframework.boot.http.client.JdkClientHttpRequestFactoryBuilder;
3232
import org.springframework.boot.http.client.JettyClientHttpRequestFactoryBuilder;
3333
import org.springframework.boot.http.client.ReactorClientHttpRequestFactoryBuilder;
@@ -73,7 +73,7 @@ void configuresClientHttpRequestFactorySettings() {
7373
"spring.http.client.read-timeout=20s", "spring.http.client.ssl.bundle=test")
7474
.run((context) -> {
7575
ClientHttpRequestFactorySettings settings = context.getBean(ClientHttpRequestFactorySettings.class);
76-
assertThat(settings.redirects()).isEqualTo(Redirects.DONT_FOLLOW);
76+
assertThat(settings.redirects()).isEqualTo(HttpRedirects.DONT_FOLLOW);
7777
assertThat(settings.connectTimeout()).isEqualTo(Duration.ofSeconds(10));
7878
assertThat(settings.readTimeout()).isEqualTo(Duration.ofSeconds(20));
7979
assertThat(settings.sslBundle().getKey().getAlias()).isEqualTo("alias1");
@@ -87,7 +87,7 @@ void configuresClientHttpRequestFactorySettingsUsingDeprecatedProperties() {
8787
"spring.http.client.read-timeout=20s", "spring.http.client.ssl.bundle=test")
8888
.run((context) -> {
8989
ClientHttpRequestFactorySettings settings = context.getBean(ClientHttpRequestFactorySettings.class);
90-
assertThat(settings.redirects()).isEqualTo(Redirects.DONT_FOLLOW);
90+
assertThat(settings.redirects()).isEqualTo(HttpRedirects.DONT_FOLLOW);
9191
assertThat(settings.connectTimeout()).isEqualTo(Duration.ofSeconds(10));
9292
assertThat(settings.readTimeout()).isEqualTo(Duration.ofSeconds(20));
9393
assertThat(settings.sslBundle().getKey().getAlias()).isEqualTo("alias1");

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/client/service/HttpServiceClientAutoConfigurationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.springframework.boot.autoconfigure.web.client.RestClientAutoConfiguration;
3434
import org.springframework.boot.http.client.ClientHttpRequestFactoryBuilder;
3535
import org.springframework.boot.http.client.ClientHttpRequestFactorySettings;
36-
import org.springframework.boot.http.client.ClientHttpRequestFactorySettings.Redirects;
36+
import org.springframework.boot.http.client.HttpRedirects;
3737
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
3838
import org.springframework.boot.web.client.RestClientCustomizer;
3939
import org.springframework.context.annotation.Bean;
@@ -212,7 +212,7 @@ static class RequestFactorySettingsConfiguration {
212212

213213
@Bean
214214
ClientHttpRequestFactorySettings requestFactorySettings() {
215-
return ClientHttpRequestFactorySettings.defaults().withRedirects(Redirects.DONT_FOLLOW);
215+
return ClientHttpRequestFactorySettings.defaults().withRedirects(HttpRedirects.DONT_FOLLOW);
216216
}
217217

218218
}

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/client/AutoConfiguredRestClientSslTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
import org.springframework.boot.http.client.ClientHttpRequestFactoryBuilder;
2828
import org.springframework.boot.http.client.ClientHttpRequestFactorySettings;
29-
import org.springframework.boot.http.client.ClientHttpRequestFactorySettings.Redirects;
29+
import org.springframework.boot.http.client.HttpRedirects;
3030
import org.springframework.boot.ssl.SslBundle;
3131
import org.springframework.boot.ssl.SslBundles;
3232
import org.springframework.http.client.ClientHttpRequestFactory;
@@ -47,7 +47,7 @@ class AutoConfiguredRestClientSslTests {
4747

4848
private final ClientHttpRequestFactorySettings settings = ClientHttpRequestFactorySettings
4949
.ofSslBundle(mock(SslBundle.class, "Default SslBundle"))
50-
.withRedirects(Redirects.DONT_FOLLOW)
50+
.withRedirects(HttpRedirects.DONT_FOLLOW)
5151
.withReadTimeout(Duration.ofSeconds(10))
5252
.withConnectTimeout(Duration.ofSeconds(30));
5353

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/client/RestClientAutoConfigurationTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.springframework.boot.autoconfigure.task.TaskExecutionAutoConfiguration;
3131
import org.springframework.boot.http.client.ClientHttpRequestFactoryBuilder;
3232
import org.springframework.boot.http.client.ClientHttpRequestFactorySettings;
33-
import org.springframework.boot.http.client.ClientHttpRequestFactorySettings.Redirects;
33+
import org.springframework.boot.http.client.HttpRedirects;
3434
import org.springframework.boot.ssl.SslBundle;
3535
import org.springframework.boot.ssl.SslBundles;
3636
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
@@ -77,7 +77,7 @@ void shouldSupplyBeans() {
7777
void shouldSupplyRestClientSslIfSslBundlesIsThereWithCustomHttpSettingsAndBuilder() {
7878
SslBundles sslBundles = mock(SslBundles.class);
7979
ClientHttpRequestFactorySettings clientHttpRequestFactorySettings = ClientHttpRequestFactorySettings.defaults()
80-
.withRedirects(Redirects.DONT_FOLLOW)
80+
.withRedirects(HttpRedirects.DONT_FOLLOW)
8181
.withConnectTimeout(Duration.ofHours(1))
8282
.withReadTimeout(Duration.ofDays(1))
8383
.withSslBundle(mock(SslBundle.class));
@@ -217,7 +217,7 @@ void whenHasFactoryProperty() {
217217
@Test
218218
void shouldSupplyRestClientBuilderConfigurerWithCustomSettings() {
219219
ClientHttpRequestFactorySettings clientHttpRequestFactorySettings = ClientHttpRequestFactorySettings.defaults()
220-
.withRedirects(Redirects.DONT_FOLLOW);
220+
.withRedirects(HttpRedirects.DONT_FOLLOW);
221221
ClientHttpRequestFactoryBuilder<?> clientHttpRequestFactoryBuilder = mock(
222222
ClientHttpRequestFactoryBuilder.class);
223223
RestClientCustomizer customizer1 = mock(RestClientCustomizer.class);

‎spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949

5050
import org.springframework.boot.http.client.ClientHttpRequestFactoryBuilder;
5151
import org.springframework.boot.http.client.ClientHttpRequestFactorySettings;
52-
import org.springframework.boot.http.client.ClientHttpRequestFactorySettings.Redirects;
5352
import org.springframework.boot.http.client.HttpComponentsClientHttpRequestFactoryBuilder;
53+
import org.springframework.boot.http.client.HttpRedirects;
5454
import org.springframework.boot.ssl.SslBundle;
5555
import org.springframework.boot.web.client.RestTemplateBuilder;
5656
import org.springframework.boot.web.client.RootUriTemplateHandler;
@@ -164,7 +164,7 @@ private static RestTemplateBuilder createInitialBuilder(RestTemplateBuilder buil
164164
builder = builder.requestFactoryBuilder(applyHttpClientOptions(
165165
(HttpComponentsClientHttpRequestFactoryBuilder) requestFactoryBuilder, httpClientOptions));
166166
if (HttpClientOption.ENABLE_REDIRECTS.isPresent(httpClientOptions)) {
167-
builder = builder.redirects(Redirects.FOLLOW);
167+
builder = builder.redirects(HttpRedirects.FOLLOW);
168168
}
169169
}
170170
if (username != null || password != null) {
@@ -976,14 +976,14 @@ public TestRestTemplate withBasicAuth(String username, String password) {
976976

977977
/**
978978
* Creates a new {@code TestRestTemplate} with the same configuration as this one,
979-
* except that it will apply the given {@link Redirects}. The request factory used is
980-
* a new instance of the underlying {@link RestTemplate}'s request factory type (when
981-
* possible).
979+
* except that it will apply the given {@link HttpRedirects}. The request factory used
980+
* is a new instance of the underlying {@link RestTemplate}'s request factory type
981+
* (when possible).
982982
* @param redirects the new redirect settings
983983
* @return the new template
984984
* @since 3.5.0
985985
*/
986-
public TestRestTemplate withRedirects(Redirects redirects) {
986+
public TestRestTemplate withRedirects(HttpRedirects redirects) {
987987
return withRequestFactorySettings((settings) -> settings.withRedirects(redirects));
988988
}
989989

@@ -1060,7 +1060,7 @@ public enum HttpClientOption {
10601060
/**
10611061
* Enable redirects.
10621062
* @deprecated since 3.5.0 for removal in 4.0.0 in favor of
1063-
* {@link TestRestTemplate#withRedirects(Redirects)}
1063+
* {@link TestRestTemplate#withRedirects(HttpRedirects)}
10641064
*/
10651065
@Deprecated(since = "3.5.0", forRemoval = true)
10661066
ENABLE_REDIRECTS,
@@ -1112,7 +1112,7 @@ public CustomHttpComponentsClientHttpRequestFactory(HttpClientOption[] httpClien
11121112
ClientHttpRequestFactorySettings settings) {
11131113
this.cookieSpec = (HttpClientOption.ENABLE_COOKIES.isPresent(httpClientOptions) ? StandardCookieSpec.STRICT
11141114
: StandardCookieSpec.IGNORE);
1115-
this.enableRedirects = settings.redirects() != Redirects.DONT_FOLLOW;
1115+
this.enableRedirects = settings.redirects() != HttpRedirects.DONT_FOLLOW;
11161116
boolean ssl = HttpClientOption.SSL.isPresent(httpClientOptions);
11171117
if (settings.readTimeout() != null || ssl) {
11181118
setHttpClient(createHttpClient(settings.readTimeout(), ssl));

‎spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
import org.springframework.boot.http.client.ClientHttpRequestFactoryBuilder;
3636
import org.springframework.boot.http.client.ClientHttpRequestFactorySettings;
37-
import org.springframework.boot.http.client.ClientHttpRequestFactorySettings.Redirects;
37+
import org.springframework.boot.http.client.HttpRedirects;
3838
import org.springframework.boot.test.web.client.TestRestTemplate.HttpClientOption;
3939
import org.springframework.boot.web.client.RestTemplateBuilder;
4040
import org.springframework.core.ParameterizedTypeReference;
@@ -152,9 +152,9 @@ void options() {
152152
void jdkBuilderCanBeSpecifiedWithSpecificRedirects() {
153153
RestTemplateBuilder builder = new RestTemplateBuilder()
154154
.requestFactoryBuilder(ClientHttpRequestFactoryBuilder.jdk());
155-
TestRestTemplate templateWithRedirects = new TestRestTemplate(builder.redirects(Redirects.FOLLOW));
155+
TestRestTemplate templateWithRedirects = new TestRestTemplate(builder.redirects(HttpRedirects.FOLLOW));
156156
assertThat(getJdkHttpClient(templateWithRedirects).followRedirects()).isEqualTo(Redirect.NORMAL);
157-
TestRestTemplate templateWithoutRedirects = new TestRestTemplate(builder.redirects(Redirects.DONT_FOLLOW));
157+
TestRestTemplate templateWithoutRedirects = new TestRestTemplate(builder.redirects(HttpRedirects.DONT_FOLLOW));
158158
assertThat(getJdkHttpClient(templateWithoutRedirects).followRedirects()).isEqualTo(Redirect.NEVER);
159159
}
160160

@@ -167,29 +167,30 @@ void httpComponentsAreBuiltConsideringSettingsInRestTemplateBuilder() {
167167
assertThat(getRedirectStrategy(null, HttpClientOption.ENABLE_REDIRECTS)).matches(this::isFollowStrategy);
168168
assertThat(getRedirectStrategy(builder)).matches(this::isFollowStrategy);
169169
assertThat(getRedirectStrategy(builder, HttpClientOption.ENABLE_REDIRECTS)).matches(this::isFollowStrategy);
170-
assertThat(getRedirectStrategy(builder.redirects(Redirects.DONT_FOLLOW))).matches(this::isDontFollowStrategy);
171-
assertThat(getRedirectStrategy(builder.redirects(Redirects.DONT_FOLLOW), HttpClientOption.ENABLE_REDIRECTS))
170+
assertThat(getRedirectStrategy(builder.redirects(HttpRedirects.DONT_FOLLOW)))
171+
.matches(this::isDontFollowStrategy);
172+
assertThat(getRedirectStrategy(builder.redirects(HttpRedirects.DONT_FOLLOW), HttpClientOption.ENABLE_REDIRECTS))
172173
.matches(this::isFollowStrategy);
173174
}
174175

175176
@Test
176177
void withRequestFactorySettingsRedirectsForHttpComponents() {
177178
TestRestTemplate template = new TestRestTemplate();
178179
assertThat(getRedirectStrategy(template)).matches(this::isFollowStrategy);
179-
assertThat(getRedirectStrategy(template
180-
.withRequestFactorySettings(ClientHttpRequestFactorySettings.defaults().withRedirects(Redirects.FOLLOW))))
180+
assertThat(getRedirectStrategy(template.withRequestFactorySettings(
181+
ClientHttpRequestFactorySettings.defaults().withRedirects(HttpRedirects.FOLLOW))))
181182
.matches(this::isFollowStrategy);
182183
assertThat(getRedirectStrategy(template.withRequestFactorySettings(
183-
ClientHttpRequestFactorySettings.defaults().withRedirects(Redirects.DONT_FOLLOW))))
184+
ClientHttpRequestFactorySettings.defaults().withRedirects(HttpRedirects.DONT_FOLLOW))))
184185
.matches(this::isDontFollowStrategy);
185186
}
186187

187188
@Test
188189
void withRedirects() {
189190
TestRestTemplate template = new TestRestTemplate();
190191
assertThat(getRedirectStrategy(template)).matches(this::isFollowStrategy);
191-
assertThat(getRedirectStrategy(template.withRedirects(Redirects.FOLLOW))).matches(this::isFollowStrategy);
192-
assertThat(getRedirectStrategy(template.withRedirects(Redirects.DONT_FOLLOW)))
192+
assertThat(getRedirectStrategy(template.withRedirects(HttpRedirects.FOLLOW))).matches(this::isFollowStrategy);
193+
assertThat(getRedirectStrategy(template.withRedirects(HttpRedirects.DONT_FOLLOW)))
193194
.matches(this::isDontFollowStrategy);
194195
}
195196

@@ -199,7 +200,7 @@ void withRequestFactorySettingsRedirectsForJdk() {
199200
new RestTemplateBuilder().requestFactoryBuilder(ClientHttpRequestFactoryBuilder.jdk()));
200201
assertThat(getJdkHttpClient(template).followRedirects()).isEqualTo(Redirect.NORMAL);
201202
assertThat(getJdkHttpClient(template.withRequestFactorySettings(
202-
ClientHttpRequestFactorySettings.defaults().withRedirects(Redirects.DONT_FOLLOW)))
203+
ClientHttpRequestFactorySettings.defaults().withRedirects(HttpRedirects.DONT_FOLLOW)))
203204
.followRedirects()).isEqualTo(Redirect.NEVER);
204205
}
205206

@@ -209,7 +210,7 @@ void withRequestFactorySettingsUpdateRedirectsForJdk() {
209210
new RestTemplateBuilder().requestFactoryBuilder(ClientHttpRequestFactoryBuilder.jdk()));
210211
assertThat(getJdkHttpClient(template).followRedirects()).isEqualTo(Redirect.NORMAL);
211212
assertThat(getJdkHttpClient(
212-
template.withRequestFactorySettings((settings) -> settings.withRedirects(Redirects.DONT_FOLLOW)))
213+
template.withRequestFactorySettings((settings) -> settings.withRedirects(HttpRedirects.DONT_FOLLOW)))
213214
.followRedirects()).isEqualTo(Redirect.NEVER);
214215
}
215216

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/AbstractClientHttpRequestFactoryBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ public final T build(ClientHttpRequestFactorySettings settings) {
7474
protected abstract T createClientHttpRequestFactory(ClientHttpRequestFactorySettings settings);
7575

7676
protected final HttpClientSettings asHttpClientSettings(ClientHttpRequestFactorySettings settings) {
77-
return (settings != null) ? new HttpClientSettings(settings.redirects().httpClientRedirects(),
78-
settings.connectTimeout(), settings.readTimeout(), settings.sslBundle()) : null;
77+
return (settings != null) ? new HttpClientSettings(settings.redirects(), settings.connectTimeout(),
78+
settings.readTimeout(), settings.sslBundle()) : null;
7979
}
8080

8181
}

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactorySettings.java

Lines changed: 3 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535
* @since 3.4.0
3636
* @see ClientHttpRequestFactoryBuilder
3737
*/
38-
public record ClientHttpRequestFactorySettings(Redirects redirects, Duration connectTimeout, Duration readTimeout,
38+
public record ClientHttpRequestFactorySettings(HttpRedirects redirects, Duration connectTimeout, Duration readTimeout,
3939
SslBundle sslBundle) {
4040

4141
private static final ClientHttpRequestFactorySettings defaults = new ClientHttpRequestFactorySettings(null, null,
4242
null, null);
4343

4444
public ClientHttpRequestFactorySettings {
45-
redirects = (redirects != null) ? redirects : Redirects.FOLLOW_WHEN_POSSIBLE;
45+
redirects = (redirects != null) ? redirects : HttpRedirects.FOLLOW_WHEN_POSSIBLE;
4646
}
4747

4848
/**
@@ -92,7 +92,7 @@ public ClientHttpRequestFactorySettings withSslBundle(SslBundle sslBundle) {
9292
* @param redirects the new redirects setting
9393
* @return a new {@link ClientHttpRequestFactorySettings} instance
9494
*/
95-
public ClientHttpRequestFactorySettings withRedirects(Redirects redirects) {
95+
public ClientHttpRequestFactorySettings withRedirects(HttpRedirects redirects) {
9696
return new ClientHttpRequestFactorySettings(redirects, this.connectTimeout, this.readTimeout, this.sslBundle);
9797
}
9898

@@ -115,50 +115,4 @@ public static ClientHttpRequestFactorySettings defaults() {
115115
return defaults;
116116
}
117117

118-
/**
119-
* Redirect strategies.
120-
*/
121-
public enum Redirects {
122-
123-
/**
124-
* Follow redirects (if the underlying library has support).
125-
*/
126-
FOLLOW_WHEN_POSSIBLE(HttpRedirects.FOLLOW_WHEN_POSSIBLE),
127-
128-
/**
129-
* Follow redirects (fail if the underlying library has no support).
130-
*/
131-
FOLLOW(HttpRedirects.FOLLOW),
132-
133-
/**
134-
* Don't follow redirects (fail if the underlying library has no support).
135-
*/
136-
DONT_FOLLOW(HttpRedirects.DONT_FOLLOW);
137-
138-
private final HttpRedirects httpClientRedirects;
139-
140-
Redirects(HttpRedirects httpClientRedirects) {
141-
this.httpClientRedirects = httpClientRedirects;
142-
}
143-
144-
HttpRedirects httpClientRedirects() {
145-
return this.httpClientRedirects;
146-
}
147-
148-
/**
149-
* Return the related {@link Redirects} for the given {@link HttpRedirects}.
150-
* @param httpRedirects the HTTP redirects
151-
* @return the related redirects
152-
* @since 3.5.0
153-
*/
154-
public static Redirects of(HttpRedirects httpRedirects) {
155-
return (httpRedirects != null) ? switch (httpRedirects) {
156-
case FOLLOW_WHEN_POSSIBLE -> FOLLOW_WHEN_POSSIBLE;
157-
case FOLLOW -> FOLLOW;
158-
case DONT_FOLLOW -> DONT_FOLLOW;
159-
} : null;
160-
}
161-
162-
}
163-
164118
}

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpComponentsRedirectStrategy.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,8 @@
2424
import org.apache.hc.core5.http.HttpResponse;
2525
import org.apache.hc.core5.http.protocol.HttpContext;
2626

27-
import org.springframework.boot.http.client.ClientHttpRequestFactorySettings.Redirects;
28-
2927
/**
30-
* Adapts {@link Redirects} to an
28+
* Adapts {@link HttpRedirects} to an
3129
* <a href="https://hc.apache.org/httpcomponents-client-ga/">Apache HttpComponents</a>
3230
* {@link RedirectStrategy}.
3331
*

0 commit comments

Comments
 (0)