From ffd0c372e75619ac0c8e9fdbab1d1ae6f0c9ccdc Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Fri, 11 Oct 2024 15:19:50 +0200 Subject: [PATCH] Update deprecations. --- .../loadbalancer/FeignBlockingLoadBalancerClient.java | 6 +++--- .../RetryableFeignBlockingLoadBalancerClient.java | 4 ++-- .../cloud/openfeign/support/SpringDecoder.java | 5 +++-- .../cloud/openfeign/support/SpringMvcContract.java | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/FeignBlockingLoadBalancerClient.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/FeignBlockingLoadBalancerClient.java index 7744bf5b..0728d90e 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/FeignBlockingLoadBalancerClient.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/FeignBlockingLoadBalancerClient.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2022 the original author or authors. + * Copyright 2013-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. @@ -71,7 +71,7 @@ public class FeignBlockingLoadBalancerClient implements Client { * @deprecated in favour of * {@link FeignBlockingLoadBalancerClient#FeignBlockingLoadBalancerClient(Client, LoadBalancerClient, LoadBalancerClientFactory, List)} */ - @Deprecated + @Deprecated(forRemoval = true) public FeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient, LoadBalancerProperties properties, LoadBalancerClientFactory loadBalancerClientFactory) { this.delegate = delegate; @@ -84,7 +84,7 @@ public class FeignBlockingLoadBalancerClient implements Client { * @deprecated in favour of * {@link FeignBlockingLoadBalancerClient#FeignBlockingLoadBalancerClient(Client, LoadBalancerClient, LoadBalancerClientFactory, List)} */ - @Deprecated + @Deprecated(forRemoval = true) public FeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient, LoadBalancerClientFactory loadBalancerClientFactory) { this.delegate = delegate; diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/RetryableFeignBlockingLoadBalancerClient.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/RetryableFeignBlockingLoadBalancerClient.java index 3f1cb02c..0b17f7e4 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/RetryableFeignBlockingLoadBalancerClient.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/RetryableFeignBlockingLoadBalancerClient.java @@ -90,7 +90,7 @@ public class RetryableFeignBlockingLoadBalancerClient implements Client { * @deprecated in favour of * {@link RetryableFeignBlockingLoadBalancerClient#RetryableFeignBlockingLoadBalancerClient(Client, LoadBalancerClient, LoadBalancedRetryFactory, LoadBalancerClientFactory, List)} */ - @Deprecated + @Deprecated(forRemoval = true) public RetryableFeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient, LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerProperties properties, LoadBalancerClientFactory loadBalancerClientFactory) { @@ -105,7 +105,7 @@ public class RetryableFeignBlockingLoadBalancerClient implements Client { * @deprecated in favour of * {@link RetryableFeignBlockingLoadBalancerClient#RetryableFeignBlockingLoadBalancerClient(Client, LoadBalancerClient, LoadBalancedRetryFactory, LoadBalancerClientFactory, List)} */ - @Deprecated + @Deprecated(forRemoval = true) public RetryableFeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient, LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerClientFactory loadBalancerClientFactory) { this.delegate = delegate; diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringDecoder.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringDecoder.java index 807377e0..33151b47 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringDecoder.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringDecoder.java @@ -87,11 +87,12 @@ public class SpringDecoder implements Decoder { return HttpStatusCode.valueOf(response.status()); } - @Deprecated /** * This method used to override a method from ClientHttpResponse interface but was - * removed in Spring Framework 6.2 so we should remove it as well. + * removed in Spring Framework 6.2, so we should remove it as well. + * @deprecated in favour of {@link SpringDecoder.FeignResponseAdapter#getStatusCode()} */ + @Deprecated(forRemoval = true) public int getRawStatusCode() { return response.status(); } diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringMvcContract.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringMvcContract.java index f5474e18..6dbbdd1c 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringMvcContract.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringMvcContract.java @@ -141,7 +141,7 @@ public class SpringMvcContract extends Contract.BaseContract implements Resource * @deprecated in favour of * {@link SpringMvcContract#SpringMvcContract(List, ConversionService, FeignClientProperties)} */ - @Deprecated + @Deprecated(forRemoval = true) public SpringMvcContract(List annotatedParameterProcessors, ConversionService conversionService, boolean decodeSlash) { this(annotatedParameterProcessors, conversionService, decodeSlash, false); @@ -158,7 +158,7 @@ public class SpringMvcContract extends Contract.BaseContract implements Resource * @deprecated in favour of * {@link SpringMvcContract#SpringMvcContract(List, ConversionService, FeignClientProperties)} */ - @Deprecated + @Deprecated(forRemoval = true) public SpringMvcContract(List annotatedParameterProcessors, ConversionService conversionService, boolean decodeSlash, boolean removeTrailingSlash) { Assert.notNull(annotatedParameterProcessors, "Parameter processors can not be null.");