From 5e61666f7ca04e048ad34204b2a642fa3c257c7b Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 9 Dec 2020 18:49:54 +0100 Subject: [PATCH] Remove deprecations. --- .../cloud/openfeign/FeignClient.java | 8 -------- .../openfeign/support/SpringMvcContract.java | 19 ------------------- .../invalid/FeignClientValidationTests.java | 2 +- .../ApacheHttpClientConfigurationTests.java | 2 +- 4 files changed, 2 insertions(+), 29 deletions(-) diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClient.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClient.java index e300bdc8..ad3265e6 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClient.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClient.java @@ -49,14 +49,6 @@ public @interface FeignClient { @AliasFor("name") String value() default ""; - /** - * The service id with optional protocol prefix. Synonym for {@link #value() value}. - * @deprecated use {@link #name() name} instead - * @return the service id with optional protocol prefix - */ - @Deprecated - String serviceId() default ""; - /** * This will be used as the bean name instead of name if present, but will not be used * as a service id. 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 1c6b7249..a3f2c8b5 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 @@ -401,25 +401,6 @@ public class SpringMvcContract extends Contract.BaseContract implements Resource return false; } - /** - * @deprecated Not used internally anymore. Will be removed in the future. - */ - @Deprecated - public static class ConvertingExpander implements Param.Expander { - - private final ConversionService conversionService; - - public ConvertingExpander(ConversionService conversionService) { - this.conversionService = conversionService; - } - - @Override - public String expand(Object value) { - return conversionService.convert(value, String.class); - } - - } - private static class ConvertingExpanderFactory { private final ConversionService conversionService; diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/invalid/FeignClientValidationTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/invalid/FeignClientValidationTests.java index ffea1421..12d155b3 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/invalid/FeignClientValidationTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/invalid/FeignClientValidationTests.java @@ -71,7 +71,7 @@ public class FeignClientValidationTests { @EnableFeignClients(clients = NameAndServiceIdConfiguration.Client.class) protected static class NameAndServiceIdConfiguration { - @FeignClient(name = "bar", serviceId = "foo") + @FeignClient(name = "bar") interface Client { @RequestMapping(method = RequestMethod.GET, value = "/") diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/test/ApacheHttpClientConfigurationTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/test/ApacheHttpClientConfigurationTests.java index 719670dc..37caafbb 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/test/ApacheHttpClientConfigurationTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/test/ApacheHttpClientConfigurationTests.java @@ -108,7 +108,7 @@ class ApacheHttpClientConfigurationTests { @EnableFeignClients(clients = { ApacheHttpClientConfigurationTestApp.FooClient.class }) static class ApacheHttpClientConfigurationTestApp { - @FeignClient(name = "foo", serviceId = "foo") + @FeignClient(name = "foo") interface FooClient { }