From b6ed99eb9b42c5bb5d8660f3af110b75915c2a24 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Thu, 10 Dec 2020 11:18:44 +0100 Subject: [PATCH] Remove deprecations. --- .../main/asciidoc/spring-cloud-netflix.adoc | 8 +-- .../netflix/eureka/EurekaDiscoveryClient.java | 6 -- .../EurekaDiscoveryClientConfiguration.java | 21 ------ .../WebClientDiscoveryClientOptionalArgs.java | 5 -- .../http/WebClientTransportClientFactory.java | 71 ++++++------------- .../EurekaClientAutoConfigurationTests.java | 1 - .../server/InstanceRegistryProperties.java | 12 ---- 7 files changed, 27 insertions(+), 97 deletions(-) diff --git a/docs/src/main/asciidoc/spring-cloud-netflix.adoc b/docs/src/main/asciidoc/spring-cloud-netflix.adoc index 8047e95e2..621112b2c 100755 --- a/docs/src/main/asciidoc/spring-cloud-netflix.adoc +++ b/docs/src/main/asciidoc/spring-cloud-netflix.adoc @@ -127,7 +127,7 @@ that management context path. This requirement was removed beginning in Edgware === Registering a Secure Application -If your app wants to be contacted over HTTPS, you can set two flags in the `EurekaInstanceConfig`: +If your app wants to be contacted over HTTPS, you can set two flags in the `EurekaInstanceConfigBean`: * `eureka.instance.[nonSecurePortEnabled]=[false]` * `eureka.instance.[securePortEnabled]=[true]` @@ -214,10 +214,10 @@ If the application is planned to be deployed to an AWS cloud, the Eureka instanc @Bean @Profile("!default") public EurekaInstanceConfigBean eurekaInstanceConfig(InetUtils inetUtils) { - EurekaInstanceConfigBean b = new EurekaInstanceConfigBean(inetUtils); + EurekaInstanceConfigBean bean = new EurekaInstanceConfigBean(inetUtils); AmazonInfo info = AmazonInfo.Builder.newBuilder().autoBuild("eureka"); - b.setDataCenterInfo(info); - return b; + bean.setDataCenterInfo(info); + return bean; } ---- diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClient.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClient.java index 594136dbf..21b22b89e 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClient.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClient.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import com.netflix.appinfo.EurekaInstanceConfig; import com.netflix.appinfo.InstanceInfo; import com.netflix.discovery.EurekaClient; import com.netflix.discovery.EurekaClientConfig; @@ -48,11 +47,6 @@ public class EurekaDiscoveryClient implements DiscoveryClient { private final EurekaClientConfig clientConfig; - @Deprecated - public EurekaDiscoveryClient(EurekaInstanceConfig config, EurekaClient eurekaClient) { - this(eurekaClient, eurekaClient.getEurekaClientConfig()); - } - public EurekaDiscoveryClient(EurekaClient eurekaClient, EurekaClientConfig clientConfig) { this.clientConfig = clientConfig; this.eurekaClient = eurekaClient; diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java index db6eed46d..2a398d9a0 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java @@ -51,17 +51,6 @@ import org.springframework.context.annotation.Configuration; @ConditionalOnBlockingDiscoveryEnabled public class EurekaDiscoveryClientConfiguration { - /** - * Deprecated in favor of auto configuration order. - * @return Marker bean - * @deprecated in favor of auto configuration order. - */ - @Deprecated - @Bean - public Marker eurekaDiscoverClientMarker() { - return new Marker(); - } - @Bean @ConditionalOnMissingBean public EurekaDiscoveryClient discoveryClient(EurekaClient client, EurekaClientConfig clientConfig) { @@ -83,16 +72,6 @@ public class EurekaDiscoveryClientConfiguration { } - /** - * Deprecated in favor of auto configuration order. - * - * @deprecated in favor of auto configuration order. - */ - @Deprecated - class Marker { - - } - @Configuration(proxyBeanMethods = false) @ConditionalOnClass(RefreshScopeRefreshedEvent.class) protected static class EurekaClientConfigurationRefresher diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/WebClientDiscoveryClientOptionalArgs.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/WebClientDiscoveryClientOptionalArgs.java index 393b80252..696b052c5 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/WebClientDiscoveryClientOptionalArgs.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/WebClientDiscoveryClientOptionalArgs.java @@ -28,11 +28,6 @@ import org.springframework.web.reactive.function.client.WebClient; */ public class WebClientDiscoveryClientOptionalArgs extends AbstractDiscoveryClientOptionalArgs { - @Deprecated - public WebClientDiscoveryClientOptionalArgs() { - this(WebClient::builder); - } - public WebClientDiscoveryClientOptionalArgs(Supplier builder) { setTransportClientFactories(new WebClientTransportClientFactories(builder)); } diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/WebClientTransportClientFactory.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/WebClientTransportClientFactory.java index 6d334be94..5a852b0fa 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/WebClientTransportClientFactory.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/WebClientTransportClientFactory.java @@ -45,7 +45,6 @@ import org.springframework.http.MediaType; import org.springframework.http.codec.ClientCodecConfigurer; import org.springframework.http.codec.json.Jackson2JsonDecoder; import org.springframework.http.codec.json.Jackson2JsonEncoder; -import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.web.reactive.function.client.ClientResponse; import org.springframework.web.reactive.function.client.ExchangeFilterFunction; import org.springframework.web.reactive.function.client.ExchangeFilterFunctions; @@ -63,11 +62,6 @@ public class WebClientTransportClientFactory implements TransportClientFactory { private final Supplier builderSupplier; - @Deprecated - public WebClientTransportClientFactory() { - this(WebClient::builder); - } - public WebClientTransportClientFactory(Supplier builderSupplier) { this.builderSupplier = builderSupplier; } @@ -99,6 +93,19 @@ public class WebClientTransportClientFactory implements TransportClientFactory { return builder.baseUrl(url); } + private static BeanSerializerModifier createJsonSerializerModifier() { + return new BeanSerializerModifier() { + @Override + public JsonSerializer modifySerializer(SerializationConfig config, BeanDescription beanDesc, + JsonSerializer serializer) { + if (beanDesc.getBeanClass().isAssignableFrom(InstanceInfo.class)) { + return new InstanceInfoJsonBeanSerializer((BeanSerializerBase) serializer, false); + } + return serializer; + } + }; + } + private void setCodecs(WebClient.Builder builder) { ObjectMapper objectMapper = objectMapper(); builder.codecs(configurer -> { @@ -109,37 +116,6 @@ public class WebClientTransportClientFactory implements TransportClientFactory { }); } - // Skip over 4xx http errors - private ExchangeFilterFunction http4XxErrorExchangeFilterFunction() { - return ExchangeFilterFunction.ofResponseProcessor(clientResponse -> { - // literally 400 pass the tests, not 4xxClientError - if (clientResponse.statusCode().value() == 400) { - ClientResponse newResponse = ClientResponse.from(clientResponse).statusCode(HttpStatus.OK).build(); - newResponse.body((clientHttpResponse, context) -> clientHttpResponse.getBody()); - return Mono.just(newResponse); - } - return Mono.just(clientResponse); - }); - } - - /** - * Provides the serialization configurations required by the Eureka Server. JSON - * content exchanged with eureka requires a root node matching the entity being - * serialized or deserialized. Achieved with - * {@link SerializationFeature#WRAP_ROOT_VALUE} and - * {@link DeserializationFeature#UNWRAP_ROOT_VALUE}. - * {@link PropertyNamingStrategy.SnakeCaseStrategy} is applied to the underlying - * {@link ObjectMapper}. - * @deprecated to be removed. - * @return a {@link MappingJackson2HttpMessageConverter} object - */ - @Deprecated - public MappingJackson2HttpMessageConverter mappingJacksonHttpMessageConverter() { - MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter(); - converter.setObjectMapper(objectMapper()); - return converter; - } - /** * Provides the serialization configurations required by the Eureka Server. JSON * content exchanged with eureka requires a root node matching the entity being @@ -166,18 +142,17 @@ public class WebClientTransportClientFactory implements TransportClientFactory { return objectMapper; } - @Deprecated // reduce visibility in future release - public static BeanSerializerModifier createJsonSerializerModifier() { - return new BeanSerializerModifier() { - @Override - public JsonSerializer modifySerializer(SerializationConfig config, BeanDescription beanDesc, - JsonSerializer serializer) { - if (beanDesc.getBeanClass().isAssignableFrom(InstanceInfo.class)) { - return new InstanceInfoJsonBeanSerializer((BeanSerializerBase) serializer, false); - } - return serializer; + // Skip over 4xx http errors + private ExchangeFilterFunction http4XxErrorExchangeFilterFunction() { + return ExchangeFilterFunction.ofResponseProcessor(clientResponse -> { + // literally 400 pass the tests, not 4xxClientError + if (clientResponse.statusCode().value() == 400) { + ClientResponse newResponse = ClientResponse.from(clientResponse).statusCode(HttpStatus.OK).build(); + newResponse.body((clientHttpResponse, context) -> clientHttpResponse.getBody()); + return Mono.just(newResponse); } - }; + return Mono.just(clientResponse); + }); } @Override diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java index 1b8575fd9..72c4a0a9e 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java @@ -526,7 +526,6 @@ public class EurekaClientAutoConfigurationTests { assertBeanNotPresent(DiscoveryClient.class); assertBeanNotPresent(EurekaServiceRegistry.class); assertBeanNotPresent(EurekaClient.class); - assertBeanNotPresent(EurekaDiscoveryClientConfiguration.Marker.class); } @Test diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/InstanceRegistryProperties.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/InstanceRegistryProperties.java index c5553a831..8056141ce 100644 --- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/InstanceRegistryProperties.java +++ b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/InstanceRegistryProperties.java @@ -18,7 +18,6 @@ package org.springframework.cloud.netflix.eureka.server; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.context.properties.DeprecatedConfigurationProperty; import static org.springframework.cloud.netflix.eureka.server.InstanceRegistryProperties.PREFIX; @@ -59,17 +58,6 @@ public class InstanceRegistryProperties { this.expectedNumberOfClientsSendingRenews = expectedNumberOfClientsSendingRenews; } - @DeprecatedConfigurationProperty(replacement = PREFIX + ".expected-number-of-clients-sending-renews") - @Deprecated - public int getExpectedNumberOfRenewsPerMin() { - return getExpectedNumberOfClientsSendingRenews(); - } - - @Deprecated - public void setExpectedNumberOfRenewsPerMin(int expectedNumberOfRenewsPerMin) { - setExpectedNumberOfClientsSendingRenews(expectedNumberOfRenewsPerMin); - } - public int getDefaultOpenForTrafficCount() { return defaultOpenForTrafficCount; }