Skip to content

Commit ffd0c37

Browse files
committed
Update deprecations.
1 parent 1770f0b commit ffd0c37

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/FeignBlockingLoadBalancerClient.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2013-2022 the original author or authors.
2+
* Copyright 2013-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -71,7 +71,7 @@ public class FeignBlockingLoadBalancerClient implements Client {
7171
* @deprecated in favour of
7272
* {@link FeignBlockingLoadBalancerClient#FeignBlockingLoadBalancerClient(Client, LoadBalancerClient, LoadBalancerClientFactory, List)}
7373
*/
74-
@Deprecated
74+
@Deprecated(forRemoval = true)
7575
public FeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient,
7676
LoadBalancerProperties properties, LoadBalancerClientFactory loadBalancerClientFactory) {
7777
this.delegate = delegate;
@@ -84,7 +84,7 @@ public FeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadB
8484
* @deprecated in favour of
8585
* {@link FeignBlockingLoadBalancerClient#FeignBlockingLoadBalancerClient(Client, LoadBalancerClient, LoadBalancerClientFactory, List)}
8686
*/
87-
@Deprecated
87+
@Deprecated(forRemoval = true)
8888
public FeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient,
8989
LoadBalancerClientFactory loadBalancerClientFactory) {
9090
this.delegate = delegate;

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/RetryableFeignBlockingLoadBalancerClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public class RetryableFeignBlockingLoadBalancerClient implements Client {
9090
* @deprecated in favour of
9191
* {@link RetryableFeignBlockingLoadBalancerClient#RetryableFeignBlockingLoadBalancerClient(Client, LoadBalancerClient, LoadBalancedRetryFactory, LoadBalancerClientFactory, List)}
9292
*/
93-
@Deprecated
93+
@Deprecated(forRemoval = true)
9494
public RetryableFeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient,
9595
LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerProperties properties,
9696
LoadBalancerClientFactory loadBalancerClientFactory) {
@@ -105,7 +105,7 @@ public RetryableFeignBlockingLoadBalancerClient(Client delegate, LoadBalancerCli
105105
* @deprecated in favour of
106106
* {@link RetryableFeignBlockingLoadBalancerClient#RetryableFeignBlockingLoadBalancerClient(Client, LoadBalancerClient, LoadBalancedRetryFactory, LoadBalancerClientFactory, List)}
107107
*/
108-
@Deprecated
108+
@Deprecated(forRemoval = true)
109109
public RetryableFeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient,
110110
LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerClientFactory loadBalancerClientFactory) {
111111
this.delegate = delegate;

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringDecoder.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,12 @@ public HttpStatusCode getStatusCode() {
8787
return HttpStatusCode.valueOf(response.status());
8888
}
8989

90-
@Deprecated
9190
/**
9291
* This method used to override a method from ClientHttpResponse interface but was
93-
* removed in Spring Framework 6.2 so we should remove it as well.
92+
* removed in Spring Framework 6.2, so we should remove it as well.
93+
* @deprecated in favour of {@link SpringDecoder.FeignResponseAdapter#getStatusCode()}
9494
*/
95+
@Deprecated(forRemoval = true)
9596
public int getRawStatusCode() {
9697
return response.status();
9798
}

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringMvcContract.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public SpringMvcContract(List<AnnotatedParameterProcessor> annotatedParameterPro
141141
* @deprecated in favour of
142142
* {@link SpringMvcContract#SpringMvcContract(List, ConversionService, FeignClientProperties)}
143143
*/
144-
@Deprecated
144+
@Deprecated(forRemoval = true)
145145
public SpringMvcContract(List<AnnotatedParameterProcessor> annotatedParameterProcessors,
146146
ConversionService conversionService, boolean decodeSlash) {
147147
this(annotatedParameterProcessors, conversionService, decodeSlash, false);
@@ -158,7 +158,7 @@ public SpringMvcContract(List<AnnotatedParameterProcessor> annotatedParameterPro
158158
* @deprecated in favour of
159159
* {@link SpringMvcContract#SpringMvcContract(List, ConversionService, FeignClientProperties)}
160160
*/
161-
@Deprecated
161+
@Deprecated(forRemoval = true)
162162
public SpringMvcContract(List<AnnotatedParameterProcessor> annotatedParameterProcessors,
163163
ConversionService conversionService, boolean decodeSlash, boolean removeTrailingSlash) {
164164
Assert.notNull(annotatedParameterProcessors, "Parameter processors can not be null.");

0 commit comments

Comments
 (0)