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 e9afbc2e8..26d9024b5 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 @@ -19,7 +19,6 @@ import java.io.IOException; import java.net.URI; import java.nio.charset.StandardCharsets; -import java.util.Collections; import java.util.List; import java.util.Set; @@ -67,32 +66,6 @@ public class FeignBlockingLoadBalancerClient implements Client { private final List transformers; - /** - * @deprecated in favour of - * {@link FeignBlockingLoadBalancerClient#FeignBlockingLoadBalancerClient(Client, LoadBalancerClient, LoadBalancerClientFactory, List)} - */ - @Deprecated(forRemoval = true) - public FeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient, - LoadBalancerProperties properties, LoadBalancerClientFactory loadBalancerClientFactory) { - this.delegate = delegate; - this.loadBalancerClient = loadBalancerClient; - this.loadBalancerClientFactory = loadBalancerClientFactory; - this.transformers = Collections.emptyList(); - } - - /** - * @deprecated in favour of - * {@link FeignBlockingLoadBalancerClient#FeignBlockingLoadBalancerClient(Client, LoadBalancerClient, LoadBalancerClientFactory, List)} - */ - @Deprecated(forRemoval = true) - public FeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient, - LoadBalancerClientFactory loadBalancerClientFactory) { - this.delegate = delegate; - this.loadBalancerClient = loadBalancerClient; - this.loadBalancerClientFactory = loadBalancerClientFactory; - this.transformers = Collections.emptyList(); - } - public FeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient, LoadBalancerClientFactory loadBalancerClientFactory, List transformers) { 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 c9b4533e0..b531f383e 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 @@ -20,7 +20,6 @@ import java.net.URI; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -86,35 +85,6 @@ public class RetryableFeignBlockingLoadBalancerClient implements Client { private final List transformers; - /** - * @deprecated in favour of - * {@link RetryableFeignBlockingLoadBalancerClient#RetryableFeignBlockingLoadBalancerClient(Client, LoadBalancerClient, LoadBalancedRetryFactory, LoadBalancerClientFactory, List)} - */ - @Deprecated(forRemoval = true) - public RetryableFeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient, - LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerProperties properties, - LoadBalancerClientFactory loadBalancerClientFactory) { - this.delegate = delegate; - this.loadBalancerClient = loadBalancerClient; - this.loadBalancedRetryFactory = loadBalancedRetryFactory; - this.loadBalancerClientFactory = loadBalancerClientFactory; - this.transformers = Collections.emptyList(); - } - - /** - * @deprecated in favour of - * {@link RetryableFeignBlockingLoadBalancerClient#RetryableFeignBlockingLoadBalancerClient(Client, LoadBalancerClient, LoadBalancedRetryFactory, LoadBalancerClientFactory, List)} - */ - @Deprecated(forRemoval = true) - public RetryableFeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient, - LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerClientFactory loadBalancerClientFactory) { - this.delegate = delegate; - this.loadBalancerClient = loadBalancerClient; - this.loadBalancedRetryFactory = loadBalancedRetryFactory; - this.loadBalancerClientFactory = loadBalancerClientFactory; - this.transformers = Collections.emptyList(); - } - public RetryableFeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient, LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerClientFactory loadBalancerClientFactory, List transformers) { 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 0ed8a5891..5a1025251 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,17 +87,6 @@ public HttpStatusCode getStatusCode() { return HttpStatusCode.valueOf(response.status()); } - /** - * 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. - * @deprecated in favour of - * {@link SpringDecoder.FeignResponseAdapter#getStatusCode()} - */ - @Deprecated(forRemoval = true) - public int getRawStatusCode() { - return response.status(); - } - @Override public String getStatusText() { return response.reason(); 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 113067bb6..ec6de07ee 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 @@ -131,39 +131,11 @@ public SpringMvcContract(List annotatedParameterPro public SpringMvcContract(List annotatedParameterProcessors, ConversionService conversionService) { - this(annotatedParameterProcessors, conversionService, true); + this(annotatedParameterProcessors, conversionService, null); } - /** - * Creates a {@link SpringMvcContract} based on annotatedParameterProcessors, - * conversionService and decodeSlash value. - * @param annotatedParameterProcessors list of {@link AnnotatedParameterProcessor} - * objects used to resolve parameters - * @param conversionService {@link ConversionService} used for type conversion - * @param decodeSlash indicates whether slashes should be decoded - * @deprecated in favour of - * {@link SpringMvcContract#SpringMvcContract(List, ConversionService, FeignClientProperties)} - */ - @Deprecated(forRemoval = true) public SpringMvcContract(List annotatedParameterProcessors, - ConversionService conversionService, boolean decodeSlash) { - this(annotatedParameterProcessors, conversionService, decodeSlash, false); - } - - /** - * Creates a {@link SpringMvcContract} based on annotatedParameterProcessors, - * conversionService and decodeSlash value. - * @param annotatedParameterProcessors list of {@link AnnotatedParameterProcessor} - * objects used to resolve parameters - * @param conversionService {@link ConversionService} used for type conversion - * @param decodeSlash indicates whether slashes should be decoded - * @param removeTrailingSlash indicates whether trailing slashes should be removed - * @deprecated in favour of - * {@link SpringMvcContract#SpringMvcContract(List, ConversionService, FeignClientProperties)} - */ - @Deprecated(forRemoval = true) - public SpringMvcContract(List annotatedParameterProcessors, - ConversionService conversionService, boolean decodeSlash, boolean removeTrailingSlash) { + ConversionService conversionService, FeignClientProperties feignClientProperties) { Assert.notNull(annotatedParameterProcessors, "Parameter processors can not be null."); Assert.notNull(conversionService, "ConversionService can not be null."); @@ -173,15 +145,8 @@ public SpringMvcContract(List annotatedParameterPro annotatedArgumentProcessors = toAnnotatedArgumentProcessorMap(processors); this.conversionService = conversionService; convertingExpanderFactory = new ConvertingExpanderFactory(conversionService); - this.decodeSlash = decodeSlash; - this.removeTrailingSlash = removeTrailingSlash; - } - - public SpringMvcContract(List annotatedParameterProcessors, - ConversionService conversionService, FeignClientProperties feignClientProperties) { - this(annotatedParameterProcessors, conversionService, - feignClientProperties == null || feignClientProperties.isDecodeSlash(), - feignClientProperties != null && feignClientProperties.isRemoveTrailingSlash()); + this.decodeSlash = feignClientProperties == null || feignClientProperties.isDecodeSlash(); + this.removeTrailingSlash = feignClientProperties != null && feignClientProperties.isRemoveTrailingSlash(); } private static TypeDescriptor createTypeDescriptor(Method method, int paramIndex) { diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringMvcContractTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringMvcContractTests.java index 73e42baf2..f339ed59e 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringMvcContractTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringMvcContractTests.java @@ -156,7 +156,9 @@ void testProcessAnnotationOnMethod_Simple_RegexPathVariable() throws Exception { @Test void testProcessAnnotationOnMethod_Simple_SlashEncoded() throws Exception { - contract = new SpringMvcContract(Collections.emptyList(), getConversionService(), false); + FeignClientProperties properties = new FeignClientProperties(); + properties.setDecodeSlash(false); + contract = new SpringMvcContract(Collections.emptyList(), getConversionService(), properties); Method method = TestTemplate_Simple.class.getDeclaredMethod("getTest", String.class); MethodMetadata data = contract.parseAndValidateMetadata(method.getDeclaringClass(), method); @@ -479,7 +481,9 @@ void testProcessAnnotations_Advanced3() throws Exception { @Test void testProcessAnnotations_Advanced3_DecodeSlashFlagNotModified() throws Exception { - contract = new SpringMvcContract(Collections.emptyList(), getConversionService(), false); + FeignClientProperties properties = new FeignClientProperties(); + properties.setDecodeSlash(false); + contract = new SpringMvcContract(Collections.emptyList(), getConversionService(), properties); Method method = TestTemplate_Simple.class.getDeclaredMethod("getTest"); MethodMetadata data = contract.parseAndValidateMetadata(method.getDeclaringClass(), method);