Update SNAPSHOT to 4.0.2

Changes conditional on missing class to impl.
Rather than jakarta.ws.rs.client.ClientRequestFilter, use jakarta.ws.rs.client.ClientRequestFilter Also exclude jersey-client rather than jaxrs api See gh-4176 Fixes gh-4177
2026-09-18 08:09:07 +00:00 · 2023-05-24 19:23:20 +00:00 · 2023-05-23 11:23:20 -04:00 · 2023-05-22 12:59:36 -04:00 · 2023-03-28 15:25:13 +00:00 · 2023-03-28 15:25:13 +00:00
73 changed files with 891 additions and 550 deletions
@@ -0,0 +1 @@
+17
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.0.2</version>
 	</parent>
 	<artifactId>spring-cloud-netflix-docs</artifactId>
 	<packaging>jar</packaging>
@@ -2,7 +2,7 @@
 |Name | Default | Description

 |eureka.client.eureka-connection-idle-timeout-seconds | `+++30+++` | Indicates how much time (in seconds) that the HTTP connections to eureka server can stay idle before it can be closed. In the AWS environment, it is recommended that the values is 30 seconds or less, since the firewall cleans up the connection information after a few mins leaving the connection hanging in limbo.
-|eureka.client.eureka-server-connect-timeout-seconds | `+++5+++` | Indicates how long to wait (in seconds) before a connection to eureka server needs to timeout. Note that the connections in the client are pooled by org.apache.http.client.HttpClient and this setting affects the actual connection creation and also the wait time to get the connection from the pool.
+|eureka.client.eureka-server-connect-timeout-seconds | `+++5+++` | Indicates how long to wait (in seconds) before a connection to eureka server needs to timeout. Note that the connections in the client are pooled by {@link HttpClient} and this setting affects the actual connection creation and also the wait time to get the connection from the pool.
 |eureka.client.eureka-server-d-n-s-name |  | Gets the DNS name to be queried to get the list of eureka servers.This information is not required if the contract returns the service urls by implementing serviceUrls. The DNS mechanism is used when useDnsForFetchingServiceUrls is set to true and the eureka client expects the DNS to configured a certain way so that it can fetch changing eureka servers dynamically. The changes are effective at runtime.
 |eureka.client.eureka-server-port |  | Gets the port to be used to construct the service url to contact eureka server when the list of eureka servers come from the DNS.This information is not required if the contract returns the service urls eurekaServerServiceUrls(String). The DNS mechanism is used when useDnsForFetchingServiceUrls is set to true and the eureka client expects the DNS to configured a certain way so that it can fetch changing eureka servers dynamically. The changes are effective at runtime.
 |eureka.client.eureka-server-read-timeout-seconds | `+++8+++` | Indicates how long to wait (in seconds) before a read from eureka server needs to timeout.
@@ -112,6 +112,19 @@ NOTE: Because of a limitation in Eureka, it is not possible to support per-serve

 If you want to customize the RestTemplate used by the Eureka HTTP Client you may want to create a bean of `EurekaClientHttpRequestFactorySupplier` and provide your own logic for generating a `ClientHttpRequestFactory` instance.

+All default timeout-related properties for RestTemplate used by the Eureka HTTP Client are set to 3 minutes (in keeping with Apache HC5 default `RequestConfig` and `SocketConfig`). Therefore, to specify the timeout values, you must specify the value directly with the properties in `eureka.client.rest-template-timeout`. (All timeout properties are in milliseconds.)
+
+.application.yml
+[source,yaml]
+----
+eureka:
+  client:
+    rest-template-timeout:
+      connect-timeout: 5000
+      connect-request-timeout: 8000
+      socket-timeout: 10000
+----
+
 === Status Page and Health Indicator

 The status page and health indicators for a Eureka instance default to `/info` and `/health` respectively, which are the default locations of useful endpoints in a Spring Boot Actuator application.
@@ -366,6 +379,12 @@ it can use the domain name from the server hostname as a proxy for the zone.
 If there is no other source of zone data, then a guess is made, based on the client configuration (as opposed to the instance configuration).
 We take `eureka.client.availabilityZones`, which is a map from region name to a list of zones, and pull out the first zone for the instance's own region (that is, the `eureka.client.region`, which defaults to "us-east-1", for compatibility with native Netflix).

+=== AOT and Native Image Support
+
+Spring Cloud Netflix Eureka Client integration supports Spring AOT transformations and native images, however, only with refresh mode disabled.
+
+WARNING: If you want to run Eureka Client in AOT or native image modes, make sure to set `spring.cloud.refresh.enabled` to `false`
+
 [[spring-cloud-eureka-server]]
 == Service Discovery: Eureka Server

@@ -591,6 +610,10 @@ when running a Eureka server you must include these dependencies in your POM or
 </dependency>
 ----

+=== AOT and Native Image Support
+
+Spring Cloud Netflix Eureka Server does not support Spring AOT transformations or native images.
+
 == Configuration properties

 To see the list of all Spring Cloud Netflix related configuration properties please check link:appendix.html[the Appendix page].
@@ -3,14 +3,14 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-netflix</artifactId>
-	<version>4.0.0-SNAPSHOT</version>
+	<version>4.0.2</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Netflix</name>
 	<description>Spring Cloud Netflix</description>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.0.3</version>
 		<relativePath />
 	</parent>
 	<scm>
@@ -21,8 +21,8 @@
 	</scm>
 	<properties>
 		<bintray.package>netflix</bintray.package>
-		<spring-cloud-commons.version>4.0.0-SNAPSHOT</spring-cloud-commons.version>
-		<spring-cloud-config.version>4.0.0-SNAPSHOT</spring-cloud-config.version>
+		<spring-cloud-commons.version>4.0.3</spring-cloud-commons.version>
+		<spring-cloud-config.version>4.0.3</spring-cloud-config.version>

 		<!-- Sonar -->
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -165,23 +165,6 @@
 						<enabled>false</enabled>
 					</snapshots>
 				</repository>
-				<!-- FIXME: 4.0 -->
-				<repository>
-					<id>netflix-snapshots</id>
-					<name>Netflix Snapshots</name>
-					<url>https://artifactory-oss.prod.netflix.net/artifactory/maven-oss-snapshots</url>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-				</repository>
-				<repository>
-					<id>netflix-candidates</id>
-					<name>Netflix Candidates</name>
-					<url>https://artifactory-oss.prod.netflix.net/artifactory/maven-oss-candidates</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</repository>
 			</repositories>
 			<pluginRepositories>
 				<pluginRepository>
@@ -5,16 +5,16 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.0.3</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-netflix-dependencies</artifactId>
-	<version>4.0.0-SNAPSHOT</version>
+	<version>4.0.2</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-netflix-dependencies</name>
 	<description>Spring Cloud Netflix Dependencies</description>
 	<properties>
-		<eureka.version>2.0.0-rc.3</eureka.version>
+		<eureka.version>2.0.0</eureka.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -67,6 +67,10 @@
 						<groupId>com.google.code.findbugs</groupId>
 						<artifactId>annotations</artifactId>
 					</exclusion>
+					<exclusion>
+						<groupId>org.glassfish.jersey.core</groupId>
+						<artifactId>jersey-client</artifactId>
+					</exclusion>
 				</exclusions>
 			</dependency>
 			<dependency>
@@ -120,7 +124,6 @@
 			<dependency>
 				<groupId>com.netflix.eureka</groupId>
 				<artifactId>eureka-client-jersey3</artifactId>
-				<!-- FIXME: 4.0 -->
 				<version>${eureka.version}</version>
 				<exclusions>
 					<exclusion>
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.0.2</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-netflix-eureka-client-tls-tests</artifactId>
@@ -120,6 +120,12 @@
 					</excludes>
 				</configuration>
 			</plugin>
+			<plugin>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project>
@@ -28,9 +28,9 @@ import org.springframework.context.ConfigurableApplicationContext;

 public class AppRunner implements AutoCloseable {

-	private Class<?> appClass;
+	private final Class<?> appClass;

-	private Map<String, String> props;
+	private final Map<String, String> props;

 	private ConfigurableApplicationContext app;

@@ -56,6 +56,7 @@ abstract class BaseCertTest {
 	protected BaseCertTest() {
 	}

+	@SuppressWarnings("rawtypes")
 	static EurekaServerRunner startEurekaServer(Class config) {
 		EurekaServerRunner server = new EurekaServerRunner(config);
 		server.enableTls();
@@ -70,6 +71,7 @@ abstract class BaseCertTest {
 		server.stop();
 	}

+	@SuppressWarnings("rawtypes")
 	static EurekaClientRunner startService(EurekaServerRunner server, Class config) {
 		EurekaClientRunner service = new EurekaClientRunner(config, server, "testservice");
 		enableTlsClient(service);
@@ -153,9 +155,7 @@ abstract class BaseCertTest {
 		EurekaClientRunner client = createEurekaClient();
 		enableTlsClient(client);
 		client.setKeyStore(clientCert, WRONG_PASSWORD, WRONG_PASSWORD);
-		Assertions.assertThrows(BeanCreationException.class, () -> {
-			client.start();
-		});
+		Assertions.assertThrows(BeanCreationException.class, client::start);
 	}

 	@Test
@@ -163,9 +163,7 @@ abstract class BaseCertTest {
 		EurekaClientRunner client = createEurekaClient();
 		enableTlsClient(client);
 		client.setKeyStore(new File("nonExistFile"));
-		Assertions.assertThrows(BeanCreationException.class, () -> {
-			client.start();
-		});
+		Assertions.assertThrows(BeanCreationException.class, client::start);
 	}

 	@Test
@@ -183,7 +181,7 @@ abstract class BaseCertTest {
 	}

 	private static File saveCert(KeyAndCert keyCert) throws Exception {
-		return saveKeyStore(keyCert.subject(), () -> keyCert.storeCert());
+		return saveKeyStore(keyCert.subject(), keyCert::storeCert);
 	}

 	private static File saveKeyStore(String prefix, KeyStoreSupplier func) throws Exception {
@@ -72,13 +72,13 @@ public class EurekaClientRunner extends AppRunner {
 	}

 	public void waitServiceViaEureka(int seconds) {
-		assertInSeconds(() -> foundServiceViaEureka(), seconds);
+		assertInSeconds(this::foundServiceViaEureka, seconds);
 	}

 	private void assertInSeconds(BooleanSupplier assertion, int seconds) {
 		long start = System.currentTimeMillis();
 		long limit = 1000L * seconds;
-		long duration = 0;
+		long duration;

 		do {
 			if (assertion.getAsBoolean()) {
@@ -98,8 +98,9 @@ public class EurekaClientRunner extends AppRunner {
 		return !discovery.getServices().isEmpty();
 	}

+	@SuppressWarnings("unchecked")
 	public AbstractDiscoveryClientOptionalArgs<Void> discoveryClientOptionalArgs() {
-		return this.getBean(AbstractDiscoveryClientOptionalArgs.class);
+		return getBean(AbstractDiscoveryClientOptionalArgs.class);
 	}

 }
@@ -22,8 +22,11 @@ import org.junit.jupiter.api.BeforeAll;

 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.cloud.netflix.eureka.http.RestTemplateDiscoveryClientOptionalArgs;
 import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;

+import static org.assertj.core.api.Assertions.assertThat;
+
 public class EurekaClientTest extends BaseCertTest {

 	private static final Log log = LogFactory.getLog(EurekaClientTest.class);
@@ -36,10 +39,7 @@ public class EurekaClientTest extends BaseCertTest {
 	public static void setupAll() {
 		server = startEurekaServer(EurekaClientTest.TestEurekaServer.class);
 		service = startService(server, EurekaClientTest.TestApp.class);
-		// Will use Jersey
-		// FIXME: 4.0
-		// assertThat(service.discoveryClientOptionalArgs())
-		// .isInstanceOf(DiscoveryClient.DiscoveryClientOptionalArgs.class);
+		assertThat(service.discoveryClientOptionalArgs()).isInstanceOf(RestTemplateDiscoveryClientOptionalArgs.class);
 		log.info("Successfully asserted that Jersey will be used");
 		waitForRegistration(() -> new EurekaClientTest().createEurekaClient());
 	}
@@ -25,9 +25,9 @@ import java.security.cert.X509Certificate;

 public class KeyAndCert {

-	private KeyPair keyPair;
+	private final KeyPair keyPair;

-	private X509Certificate certificate;
+	private final X509Certificate certificate;

 	public KeyAndCert(KeyPair keyPair, X509Certificate certificate) {
 		this.keyPair = keyPair;
@@ -51,7 +51,7 @@ public class KeyAndCert {
 	}

 	public String subject() {
-		String dn = certificate.getSubjectDN().getName();
+		String dn = certificate.getSubjectX500Principal().getName();
 		int index = dn.indexOf('=');
 		return dn.substring(index + 1);
 	}
@@ -56,9 +56,7 @@ public class KeyTool {

 	public KeyAndCert signCertificate(KeyPair keyPair, String subject, KeyAndCert signer) throws Exception {
 		X509Certificate certificate = createCert(keyPair.getPublic(), signer.privateKey(), signer.subject(), subject);
-		KeyAndCert result = new KeyAndCert(keyPair, certificate);
-
-		return result;
+		return new KeyAndCert(keyPair, certificate);
 	}

 	public KeyPair createKeyPair() throws Exception {
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.0.2</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-netflix-eureka-client</artifactId>
@@ -14,7 +15,7 @@
 	<description>Spring Cloud Netflix Eureka Client</description>
 	<properties>
 		<!-- Why do I need this now? -->
-		<maven.javadoc.failOnError>false</maven.javadoc.failOnError>		
+		<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -67,6 +68,10 @@
 			<artifactId>spring-boot-autoconfigure-processor</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents.client5</groupId>
+			<artifactId>httpclient5</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-security</artifactId>
@@ -28,6 +28,7 @@ import com.netflix.discovery.DiscoveryClient;
 import com.netflix.discovery.EurekaClientConfig;
 import com.netflix.discovery.shared.transport.EurekaHttpClient;
 import com.netflix.discovery.shared.transport.EurekaHttpResponse;
+import com.netflix.discovery.shared.transport.jersey.TransportClientFactories;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

@@ -48,22 +49,23 @@ public class CloudEurekaClient extends DiscoveryClient {

 	private final AtomicLong cacheRefreshedCount = new AtomicLong(0);

-	private ApplicationEventPublisher publisher;
+	private final ApplicationEventPublisher publisher;

-	private Field eurekaTransportField;
+	private final Field eurekaTransportField;

-	private ApplicationInfoManager applicationInfoManager;
+	private final ApplicationInfoManager applicationInfoManager;

-	private AtomicReference<EurekaHttpClient> eurekaHttpClient = new AtomicReference<>();
+	private final AtomicReference<EurekaHttpClient> eurekaHttpClient = new AtomicReference<>();

 	public CloudEurekaClient(ApplicationInfoManager applicationInfoManager, EurekaClientConfig config,
-			ApplicationEventPublisher publisher) {
-		this(applicationInfoManager, config, null, publisher);
+			TransportClientFactories transportClientFactories, ApplicationEventPublisher publisher) {
+		this(applicationInfoManager, config, transportClientFactories, null, publisher);
 	}

 	public CloudEurekaClient(ApplicationInfoManager applicationInfoManager, EurekaClientConfig config,
-			AbstractDiscoveryClientOptionalArgs<?> args, ApplicationEventPublisher publisher) {
-		super(applicationInfoManager, config, args);
+			TransportClientFactories transportClientFactories, AbstractDiscoveryClientOptionalArgs<?> args,
+			ApplicationEventPublisher publisher) {
+		super(applicationInfoManager, config, transportClientFactories, args);
 		this.applicationInfoManager = applicationInfoManager;
 		this.publisher = publisher;
 		this.eurekaTransportField = ReflectionUtils.findField(DiscoveryClient.class, "eurekaTransport");
@@ -1,42 +0,0 @@
-/*
- * Copyright 2013-2022 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.eureka;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Convenience annotation for clients to enable Eureka discovery configuration
- * (specifically). Use this (optionally) in case you want discovery and know for sure that
- * it is Eureka you want. All it does is turn on discovery and let the autoconfiguration
- * find the eureka classes if they are available (i.e. you need Eureka on the classpath as
- * well).
- *
- * @author Dave Syer
- * @author Spencer Gibb
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Inherited
-public @interface EnableEurekaClient {
-
-}
@@ -24,14 +24,36 @@ import java.lang.annotation.Target;
 import java.util.Map;

 import com.netflix.appinfo.ApplicationInfoManager;
+import com.netflix.appinfo.DataCenterInfo;
 import com.netflix.appinfo.EurekaInstanceConfig;
 import com.netflix.appinfo.HealthCheckHandler;
 import com.netflix.appinfo.InstanceInfo;
+import com.netflix.appinfo.LeaseInfo;
+import com.netflix.appinfo.MyDataCenterInfo;
 import com.netflix.discovery.AbstractDiscoveryClientOptionalArgs;
+import com.netflix.discovery.DiscoveryClient;
 import com.netflix.discovery.EurekaClient;
 import com.netflix.discovery.EurekaClientConfig;
+import com.netflix.discovery.TimedSupervisorTask;
+import com.netflix.discovery.converters.jackson.DataCenterTypeInfoResolver;
+import com.netflix.discovery.converters.jackson.builder.ApplicationsJacksonBuilder;
+import com.netflix.discovery.converters.jackson.mixin.InstanceInfoJsonMixIn;
+import com.netflix.discovery.shared.Application;
+import com.netflix.discovery.shared.Applications;
+import com.netflix.discovery.shared.resolver.AsyncResolver;
+import com.netflix.discovery.shared.resolver.DefaultEndpoint;
+import com.netflix.discovery.shared.resolver.EurekaEndpoint;
+import com.netflix.discovery.shared.transport.EurekaHttpResponse;
+import com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator;
+import com.netflix.discovery.shared.transport.decorator.RetryableEurekaHttpClient;
+import com.netflix.discovery.shared.transport.decorator.SessionedEurekaHttpClient;
+import com.netflix.discovery.shared.transport.jersey.TransportClientFactories;

 import org.springframework.aop.support.AopUtils;
+import org.springframework.aot.hint.MemberCategory;
+import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.aot.hint.RuntimeHintsRegistrar;
+import org.springframework.aot.hint.TypeReference;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
@@ -67,6 +89,7 @@ import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;

 import static org.springframework.cloud.commons.util.IdUtils.getDefaultInstanceId;
@@ -93,7 +116,7 @@ import static org.springframework.cloud.commons.util.IdUtils.getDefaultInstanceI
 		"org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationAutoConfiguration" })
 public class EurekaClientAutoConfiguration {

-	private ConfigurableEnvironment env;
+	private final ConfigurableEnvironment env;

 	public EurekaClientAutoConfiguration(ConfigurableEnvironment env) {
 		this.env = env;
@@ -239,8 +262,9 @@ public class EurekaClientAutoConfiguration {

 		@Bean(destroyMethod = "shutdown")
 		@ConditionalOnMissingBean(value = EurekaClient.class, search = SearchStrategy.CURRENT)
-		public EurekaClient eurekaClient(ApplicationInfoManager manager, EurekaClientConfig config) {
-			return new CloudEurekaClient(manager, config, this.optionalArgs, this.context);
+		public EurekaClient eurekaClient(ApplicationInfoManager manager, EurekaClientConfig config,
+				TransportClientFactories<?> transportClientFactories) {
+			return new CloudEurekaClient(manager, config, transportClientFactories, this.optionalArgs, this.context);
 		}

 		@Bean
@@ -277,7 +301,8 @@ public class EurekaClientAutoConfiguration {
 		@org.springframework.cloud.context.config.annotation.RefreshScope
 		@Lazy
 		public EurekaClient eurekaClient(ApplicationInfoManager manager, EurekaClientConfig config,
-				EurekaInstanceConfig instance, @Autowired(required = false) HealthCheckHandler healthCheckHandler) {
+				EurekaInstanceConfig instance, TransportClientFactories<?> transportClientFactories,
+				@Autowired(required = false) HealthCheckHandler healthCheckHandler) {
 			// If we use the proxy of the ApplicationInfoManager we could run into a
 			// problem
 			// when shutdown is called on the CloudEurekaClient where the
@@ -292,8 +317,8 @@ public class EurekaClientAutoConfiguration {
 			else {
 				appManager = manager;
 			}
-			CloudEurekaClient cloudEurekaClient = new CloudEurekaClient(appManager, config, this.optionalArgs,
-					this.context);
+			CloudEurekaClient cloudEurekaClient = new CloudEurekaClient(appManager, config, transportClientFactories,
+					this.optionalArgs, this.context);
 			cloudEurekaClient.registerHealthCheck(healthCheckHandler);
 			return cloudEurekaClient;
 		}
@@ -376,3 +401,84 @@ public class EurekaClientAutoConfiguration {
 	}

 }
+
+// Remove after adding hints to GraalVM reachability metadata repo
+class EurekaClientHints implements RuntimeHintsRegistrar {
+
+	@Override
+	public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
+		if (!ClassUtils.isPresent("com.netflix.discovery.DiscoveryClient", classLoader)) {
+			return;
+		}
+		hints.reflection().registerType(TypeReference.of(DiscoveryClient.class),
+				hint -> hint.withMembers(MemberCategory.DECLARED_FIELDS, MemberCategory.INTROSPECT_DECLARED_METHODS))
+				.registerType(TypeReference.of(EurekaEndpoint.class),
+						hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_METHODS))
+				.registerType(TypeReference.of(DefaultEndpoint.class),
+						hint -> hint.withMembers(MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_DECLARED_METHODS,
+								MemberCategory.INVOKE_DECLARED_CONSTRUCTORS))
+				.registerType(TypeReference.of(EurekaHttpClientDecorator.class),
+						hint -> hint.withMembers(MemberCategory.DECLARED_FIELDS,
+								MemberCategory.INTROSPECT_DECLARED_METHODS))
+				.registerType(TypeReference.of(EurekaHttpResponse.class),
+						hint -> hint.withMembers(MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_DECLARED_METHODS,
+								MemberCategory.INVOKE_DECLARED_CONSTRUCTORS))
+				.registerType(TypeReference.of(EurekaHttpClientDecorator.RequestExecutor.class),
+						hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_METHODS))
+				.registerType(TypeReference.of(ApplicationInfoManager.class),
+						hint -> hint.withMembers(MemberCategory.INTROSPECT_DECLARED_METHODS))
+				.registerType(TypeReference.of(InstanceInfo.class),
+						hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_METHODS, MemberCategory.DECLARED_FIELDS,
+								MemberCategory.INVOKE_DECLARED_CONSTRUCTORS))
+				.registerType(TypeReference.of(InstanceInfo.ActionType.class),
+						hint -> hint.withMembers(MemberCategory.INTROSPECT_DECLARED_METHODS,
+								MemberCategory.DECLARED_FIELDS))
+				.registerType(TypeReference.of(InstanceInfo.PortWrapper.class),
+						hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_METHODS,
+								MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.DECLARED_FIELDS))
+				.registerType(TypeReference.of(LeaseInfo.class),
+						hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_METHODS,
+								MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.DECLARED_FIELDS))
+				.registerType(TypeReference.of(MyDataCenterInfo.class),
+						hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_METHODS,
+								MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.DECLARED_FIELDS))
+				.registerType(TypeReference.of(DataCenterInfo.class),
+						hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_METHODS,
+								MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.DECLARED_FIELDS))
+				.registerType(TypeReference.of(DataCenterInfo.Name.class),
+						hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_METHODS,
+								MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.DECLARED_FIELDS))
+				.registerType(TypeReference.of(EurekaClient.class),
+						hint -> hint.withMembers(MemberCategory.INVOKE_PUBLIC_METHODS))
+				.registerType(TypeReference.of(TimedSupervisorTask.class),
+						hint -> hint.withMembers(MemberCategory.INTROSPECT_DECLARED_METHODS,
+								MemberCategory.DECLARED_FIELDS))
+				.registerType(TypeReference.of(DataCenterTypeInfoResolver.class),
+						hint -> hint.withMembers(MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS))
+				.registerType(TypeReference.of(ApplicationsJacksonBuilder.class),
+						hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_METHODS,
+								MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.DECLARED_FIELDS))
+				.registerType(TypeReference.of(InstanceInfoJsonMixIn.class),
+						hint -> hint.withMembers(MemberCategory.INTROSPECT_DECLARED_METHODS,
+								MemberCategory.DECLARED_FIELDS))
+				.registerType(TypeReference.of(Application.class),
+						hint -> hint.withMembers(MemberCategory.INTROSPECT_DECLARED_METHODS,
+								MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.DECLARED_FIELDS))
+				.registerType(TypeReference.of(Applications.class),
+						hint -> hint.withMembers(MemberCategory.INTROSPECT_DECLARED_METHODS,
+								MemberCategory.DECLARED_FIELDS))
+				.registerType(TypeReference.of(AsyncResolver.class),
+						hint -> hint.withMembers(MemberCategory.INTROSPECT_DECLARED_METHODS,
+								MemberCategory.DECLARED_FIELDS))
+				.registerType(TypeReference.of(RetryableEurekaHttpClient.class),
+						hint -> hint.withMembers(MemberCategory.INTROSPECT_DECLARED_METHODS,
+								MemberCategory.DECLARED_FIELDS))
+				.registerType(TypeReference.of(SessionedEurekaHttpClient.class),
+						hint -> hint.withMembers(MemberCategory.INTROSPECT_DECLARED_METHODS,
+								MemberCategory.DECLARED_FIELDS))
+				.registerType(TypeReference.of(EurekaServiceInstance.class),
+						hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_METHODS,
+								MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.DECLARED_FIELDS));
+	}
+
+}
@@ -25,6 +25,7 @@ import java.util.Objects;
 import com.netflix.appinfo.EurekaAccept;
 import com.netflix.discovery.EurekaClientConfig;
 import com.netflix.discovery.shared.transport.EurekaTransportConfig;
+import org.apache.hc.client5.http.classic.HttpClient;

 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -126,14 +127,14 @@ public class EurekaClientConfigBean implements EurekaClientConfig, Ordered {
 	/**
 	 * Indicates how long to wait (in seconds) before a connection to eureka server needs
 	 * to timeout. Note that the connections in the client are pooled by
-	 * org.apache.http.client.HttpClient and this setting affects the actual connection
-	 * creation and also the wait time to get the connection from the pool.
+	 * {@link HttpClient} and this setting affects the actual connection creation and also
+	 * the wait time to get the connection from the pool.
 	 */
 	private int eurekaServerConnectTimeoutSeconds = 5;

 	/**
 	 * Gets the name of the implementation which implements BackupRegistry to fetch the
-	 * registry information as a fall back option for only the first time when the eureka
+	 * registry information as a fallback option for only the first time when the eureka
 	 * client starts.
 	 *
 	 * This may be needed for applications which needs additional resiliency for registry
@@ -472,7 +473,7 @@ public class EurekaClientConfigBean implements EurekaClientConfig, Ordered {
 		if (serviceUrls == null || serviceUrls.isEmpty()) {
 			serviceUrls = this.serviceUrl.get(DEFAULT_ZONE);
 		}
-		if (!StringUtils.isEmpty(serviceUrls)) {
+		if (StringUtils.hasText(serviceUrls)) {
 			final String[] serviceUrlsSplit = StringUtils.commaDelimitedListToStringArray(serviceUrls);
 			List<String> eurekaServiceUrls = new ArrayList<>(serviceUrlsSplit.length);
 			for (String eurekaServiceUrl : serviceUrlsSplit) {
@@ -67,7 +67,7 @@ import org.springframework.util.Assert;
 public class EurekaHealthCheckHandler
 		implements HealthCheckHandler, ApplicationContextAware, InitializingBean, Ordered, Lifecycle {

-	private static final Map<Status, InstanceInfo.InstanceStatus> STATUS_MAPPING = new HashMap<Status, InstanceInfo.InstanceStatus>() {
+	private static final Map<Status, InstanceInfo.InstanceStatus> STATUS_MAPPING = new HashMap<>() {
 		{
 			put(Status.UNKNOWN, InstanceStatus.UNKNOWN);
 			put(Status.OUT_OF_SERVICE, InstanceStatus.DOWN);
@@ -76,18 +76,18 @@ public class EurekaHealthCheckHandler
 		}
 	};

-	private StatusAggregator statusAggregator;
+	private final StatusAggregator statusAggregator;

 	private ApplicationContext applicationContext;

-	private Map<String, HealthContributor> healthContributors = new HashMap<>();
+	private final Map<String, HealthContributor> healthContributors = new HashMap<>();

 	/**
 	 * {@code true} until the context is stopped.
 	 */
 	private boolean running = true;

-	private Map<String, ReactiveHealthContributor> reactiveHealthContributors = new HashMap<>();
+	private final Map<String, ReactiveHealthContributor> reactiveHealthContributors = new HashMap<>();

 	public EurekaHealthCheckHandler(StatusAggregator statusAggregator) {
 		this.statusAggregator = statusAggregator;
@@ -110,8 +110,7 @@ public class EurekaHealthCheckHandler
 		for (Map.Entry<String, HealthContributor> entry : healthContributors.entrySet()) {
 			// ignore EurekaHealthIndicator and flatten the rest of the composite
 			// otherwise there is a never ending cycle of down. See gh-643
-			if (entry.getValue() instanceof DiscoveryCompositeHealthContributor) {
-				DiscoveryCompositeHealthContributor indicator = (DiscoveryCompositeHealthContributor) entry.getValue();
+			if (entry.getValue() instanceof DiscoveryCompositeHealthContributor indicator) {
 				indicator.getIndicators().forEach((name, discoveryHealthIndicator) -> {
 					if (!(discoveryHealthIndicator instanceof EurekaHealthIndicator)) {
 						this.healthContributors.put(name, (HealthIndicator) discoveryHealthIndicator::health);
@@ -92,7 +92,7 @@ public class EurekaHealthIndicator implements DiscoveryHealthIndicator {
 		if (AopUtils.isAopProxy(eurekaClient)) {
 			discoveryClient = ProxyUtils.getTargetObject(eurekaClient);
 		}
-		else if (DiscoveryClient.class.isInstance(eurekaClient)) {
+		else if (eurekaClient instanceof DiscoveryClient) {
 			discoveryClient = (DiscoveryClient) eurekaClient;
 		}
 		return discoveryClient;
@@ -25,6 +25,7 @@ import com.netflix.appinfo.DataCenterInfo;
 import com.netflix.appinfo.InstanceInfo.InstanceStatus;
 import com.netflix.appinfo.MyDataCenterInfo;

+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.cloud.commons.util.InetUtils;
 import org.springframework.cloud.commons.util.InetUtils.HostInfo;
@@ -285,6 +286,7 @@ public class EurekaInstanceConfigBean implements CloudEurekaInstanceConfig, Envi
 	private EurekaInstanceConfigBean() {
 	}

+	@Autowired
 	public EurekaInstanceConfigBean(InetUtils inetUtils) {
 		this.inetUtils = inetUtils;
 		this.hostInfo = this.inetUtils.findFirstNonLoopbackHostInfo();
@@ -605,7 +607,7 @@ public class EurekaInstanceConfigBean implements CloudEurekaInstanceConfig, Envi
 				leaseExpirationDurationInSeconds, virtualHostName, instanceId, secureVirtualHostName, aSGName,
 				metadataMap, dataCenterInfo, ipAddress, statusPageUrlPath, statusPageUrl, homePageUrlPath, homePageUrl,
 				healthCheckUrlPath, healthCheckUrl, secureHealthCheckUrl, namespace, hostname, preferIpAddress,
-				initialStatus, defaultAddressResolutionOrder, environment);
+				initialStatus, Arrays.hashCode(defaultAddressResolutionOrder), environment);
 	}

 	@Override
@@ -39,7 +39,7 @@ import static com.netflix.appinfo.InstanceInfo.PortType.SECURE;
 */
 public class EurekaServiceInstance implements ServiceInstance {

-	private InstanceInfo instance;
+	private final InstanceInfo instance;

 	public EurekaServiceInstance(InstanceInfo instance) {
 		Assert.notNull(instance, "Service instance required");
@@ -1,39 +0,0 @@
-/*
- * Copyright 2013-2022 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.eureka;
-
-/**
- * @author Dave Syer
- */
-// FIXME: 4.0
-public class MutableDiscoveryClientOptionalArgs {
-
-} /*
-	 * extends DiscoveryClientOptionalArgs {
-	 *
-	 * private Collection<ClientFilter> additionalFilters;
-	 *
-	 * @Override public void setAdditionalFilters(Collection<ClientFilter>
-	 * additionalFilters) { additionalFilters = new LinkedHashSet<>(additionalFilters);
-	 * this.additionalFilters = additionalFilters;
-	 * super.setAdditionalFilters(additionalFilters); }
-	 *
-	 * public Collection<ClientFilter> getAdditionalFilters() { return
-	 * this.additionalFilters; }
-	 *
-	 * }
-	 */
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2013-2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.eureka;
+
+import java.util.Objects;
+
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.core5.http.io.SocketConfig;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.cloud.netflix.eureka.http.RestTemplateEurekaHttpClient;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * Properties for configuring timeouts used in {@link RestTemplate} required by
+ * {@link RestTemplateEurekaHttpClient}.
+ *
+ * @author Jiwon Jeon
+ * @since 3.1.6
+ */
+@ConfigurationProperties("eureka.client.rest-template-timeout")
+public class RestTemplateTimeoutProperties {
+
+	/**
+	 * Default values are set to 180000, in keeping with {@link RequestConfig} and
+	 * {@link SocketConfig} defaults.
+	 */
+	private int connectTimeout = 3 * 60 * 1000;
+
+	private int connectRequestTimeout = 3 * 60 * 1000;
+
+	private int socketTimeout = 3 * 60 * 1000;
+
+	public int getConnectTimeout() {
+		return connectTimeout;
+	}
+
+	public int getConnectRequestTimeout() {
+		return connectRequestTimeout;
+	}
+
+	public int getSocketTimeout() {
+		return socketTimeout;
+	}
+
+	public void setConnectTimeout(int connectTimeout) {
+		this.connectTimeout = connectTimeout;
+	}
+
+	public void setConnectRequestTimeout(int connectRequestTimeout) {
+		this.connectRequestTimeout = connectRequestTimeout;
+	}
+
+	public void setSocketTimeout(int socketTimeout) {
+		this.socketTimeout = socketTimeout;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+
+		RestTemplateTimeoutProperties that = (RestTemplateTimeoutProperties) o;
+
+		return connectTimeout == that.connectTimeout && connectRequestTimeout == that.connectRequestTimeout
+				&& socketTimeout == that.socketTimeout;
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(connectTimeout, connectRequestTimeout, socketTimeout);
+	}
+
+	@Override
+	public String toString() {
+		return "RestTemplateTimeoutProperties{" + ", connectTimeout=" + connectTimeout + ", connectRequestTimeout="
+				+ connectRequestTimeout + ", socketTimeout=" + socketTimeout + '}';
+	}
+
+}
@@ -20,23 +20,29 @@ import java.io.IOException;
 import java.security.GeneralSecurityException;

 import com.netflix.discovery.AbstractDiscoveryClientOptionalArgs;
+import com.netflix.discovery.shared.transport.jersey.TransportClientFactories;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.SearchStrategy;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.configuration.SSLContextFactory;
 import org.springframework.cloud.configuration.TlsProperties;
+import org.springframework.cloud.netflix.eureka.RestTemplateTimeoutProperties;
 import org.springframework.cloud.netflix.eureka.http.DefaultEurekaClientHttpRequestFactorySupplier;
 import org.springframework.cloud.netflix.eureka.http.EurekaClientHttpRequestFactorySupplier;
 import org.springframework.cloud.netflix.eureka.http.RestTemplateDiscoveryClientOptionalArgs;
+import org.springframework.cloud.netflix.eureka.http.RestTemplateTransportClientFactories;
 import org.springframework.cloud.netflix.eureka.http.WebClientDiscoveryClientOptionalArgs;
+import org.springframework.cloud.netflix.eureka.http.WebClientTransportClientFactories;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -45,6 +51,7 @@ import org.springframework.web.reactive.function.client.WebClient;
 * @author Daniel Lavoie
 */
@Configuration(proxyBeanMethods = false)
+@EnableConfigurationProperties(RestTemplateTimeoutProperties.class)
 public class DiscoveryClientOptionalArgsConfiguration {

 	protected static final Log logger = LogFactory.getLog(DiscoveryClientOptionalArgsConfiguration.class);
@@ -57,7 +64,7 @@ public class DiscoveryClientOptionalArgsConfiguration {

 	@Bean
 	@ConditionalOnClass(name = "org.springframework.web.client.RestTemplate")
-	@ConditionalOnMissingClass("com.sun.jersey.api.client.filter.ClientFilter")
+	@ConditionalOnMissingClass("org.glassfish.jersey.client.JerseyClient")
 	@ConditionalOnMissingBean(value = { AbstractDiscoveryClientOptionalArgs.class }, search = SearchStrategy.CURRENT)
 	@ConditionalOnProperty(prefix = "eureka.client", name = "webclient.enabled", matchIfMissing = true,
 			havingValue = "false")
@@ -72,26 +79,23 @@ public class DiscoveryClientOptionalArgsConfiguration {
 	}

 	@Bean
-	@ConditionalOnMissingBean
 	@ConditionalOnClass(name = "org.springframework.web.client.RestTemplate")
-	EurekaClientHttpRequestFactorySupplier defaultEurekaClientHttpRequestFactorySupplier() {
-		return new DefaultEurekaClientHttpRequestFactorySupplier();
+	@ConditionalOnMissingClass("org.glassfish.jersey.client.JerseyClient")
+	@ConditionalOnMissingBean(value = { TransportClientFactories.class }, search = SearchStrategy.CURRENT)
+	@ConditionalOnProperty(prefix = "eureka.client", name = "webclient.enabled", matchIfMissing = true,
+			havingValue = "false")
+	public RestTemplateTransportClientFactories restTemplateTransportClientFactories(
+			RestTemplateDiscoveryClientOptionalArgs optionalArgs) {
+		return new RestTemplateTransportClientFactories(optionalArgs);
 	}

-	// FIXME: 4.0
-	/*
-	 * @Bean
-	 *
-	 * @ConditionalOnClass(name = "com.sun.jersey.api.client.filter.ClientFilter")
-	 *
-	 * @ConditionalOnMissingBean(value = AbstractDiscoveryClientOptionalArgs.class, search
-	 * = SearchStrategy.CURRENT) public MutableDiscoveryClientOptionalArgs
-	 * discoveryClientOptionalArgs(TlsProperties tlsProperties) throws
-	 * GeneralSecurityException, IOException {
-	 * logger.info("Eureka HTTP Client uses Jersey"); MutableDiscoveryClientOptionalArgs
-	 * result = new MutableDiscoveryClientOptionalArgs(); setupTLS(result, tlsProperties);
-	 * return result; }
-	 */
+	@Bean
+	@ConditionalOnMissingBean
+	@ConditionalOnClass(name = "org.springframework.web.client.RestTemplate")
+	EurekaClientHttpRequestFactorySupplier defaultEurekaClientHttpRequestFactorySupplier(
+			RestTemplateTimeoutProperties restTemplateTimeoutProperties) {
+		return new DefaultEurekaClientHttpRequestFactorySupplier(restTemplateTimeoutProperties);
+	}

 	private static void setupTLS(AbstractDiscoveryClientOptionalArgs<?> args, TlsProperties properties)
 			throws GeneralSecurityException, IOException {
@@ -101,7 +105,20 @@ public class DiscoveryClientOptionalArgsConfiguration {
 		}
 	}

-	@ConditionalOnMissingClass("com.sun.jersey.api.client.filter.ClientFilter")
+	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnClass(name = "org.glassfish.jersey.client.JerseyClient")
+	@ConditionalOnBean(value = AbstractDiscoveryClientOptionalArgs.class, search = SearchStrategy.CURRENT)
+	static class DiscoveryClientOptionalArgsTlsConfiguration {
+
+		DiscoveryClientOptionalArgsTlsConfiguration(TlsProperties tlsProperties,
+				AbstractDiscoveryClientOptionalArgs optionalArgs) throws GeneralSecurityException, IOException {
+			logger.info("Eureka HTTP Client uses Jersey");
+			setupTLS(optionalArgs, tlsProperties);
+		}
+
+	}
+
+	@ConditionalOnMissingClass("org.glassfish.jersey.client.JerseyClient")
 	@ConditionalOnClass(name = "org.springframework.web.reactive.function.client.WebClient")
 	@ConditionalOnProperty(prefix = "eureka.client", name = "webclient.enabled", havingValue = "true")
 	protected static class WebClientConfiguration {
@@ -122,10 +139,17 @@ public class DiscoveryClientOptionalArgsConfiguration {
 			return result;
 		}

+		@Bean
+		@ConditionalOnMissingBean(value = TransportClientFactories.class, search = SearchStrategy.CURRENT)
+		public WebClientTransportClientFactories webClientTransportClientFactories(
+				ObjectProvider<WebClient.Builder> builder) {
+			return new WebClientTransportClientFactories(builder::getIfAvailable);
+		}
+
 	}

 	@Configuration
-	@ConditionalOnMissingClass({ "com.sun.jersey.api.client.filter.ClientFilter",
+	@ConditionalOnMissingClass({ "org.glassfish.jersey.client.JerseyClient",
 			"org.springframework.web.reactive.function.client.WebClient" })
 	@ConditionalOnProperty(prefix = "eureka.client", name = "webclient.enabled", havingValue = "true")
 	protected static class WebClientNotFoundConfiguration {
@@ -16,13 +16,22 @@

 package org.springframework.cloud.netflix.eureka.http;

+import java.util.concurrent.TimeUnit;
+
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;

-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.client.HttpClients;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
+import org.apache.hc.client5.http.io.HttpClientConnectionManager;
+import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactoryBuilder;
+import org.apache.hc.core5.http.io.SocketConfig;
+import org.apache.hc.core5.util.Timeout;

+import org.springframework.cloud.netflix.eureka.RestTemplateTimeoutProperties;
 import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.lang.Nullable;
@@ -32,23 +41,71 @@ import org.springframework.lang.Nullable;
 * {@link HttpClients}.
 *
 * @author Marcin Grzejszczak
+ * @author Olga Maciaszek-Sharma
+ * @author Jiwon Jeon
 * @since 3.0.0
 */
 public class DefaultEurekaClientHttpRequestFactorySupplier implements EurekaClientHttpRequestFactorySupplier {

+	private final RestTemplateTimeoutProperties restTemplateTimeoutProperties;
+
+	/**
+	 * @deprecated in favour of
+	 * {@link DefaultEurekaClientHttpRequestFactorySupplier#DefaultEurekaClientHttpRequestFactorySupplier(RestTemplateTimeoutProperties)}
+	 */
+	@Deprecated
+	public DefaultEurekaClientHttpRequestFactorySupplier() {
+		this.restTemplateTimeoutProperties = new RestTemplateTimeoutProperties();
+	}
+
+	public DefaultEurekaClientHttpRequestFactorySupplier(RestTemplateTimeoutProperties restTemplateTimeoutProperties) {
+		this.restTemplateTimeoutProperties = restTemplateTimeoutProperties;
+	}
+
 	@Override
 	public ClientHttpRequestFactory get(SSLContext sslContext, @Nullable HostnameVerifier hostnameVerifier) {
-		HttpClientBuilder httpClientBuilder = HttpClients.custom();
-		if (sslContext != null) {
-			httpClientBuilder = httpClientBuilder.setSSLContext(sslContext);
+		HttpClientBuilder httpClientBuilder = HttpClientBuilder.create();
+		if (sslContext != null || hostnameVerifier != null || restTemplateTimeoutProperties != null) {
+			httpClientBuilder.setConnectionManager(
+					buildConnectionManager(sslContext, hostnameVerifier, restTemplateTimeoutProperties));
 		}
-		if (hostnameVerifier != null) {
-			httpClientBuilder = httpClientBuilder.setSSLHostnameVerifier(hostnameVerifier);
+		if (restTemplateTimeoutProperties != null) {
+			httpClientBuilder.setDefaultRequestConfig(buildRequestConfig());
 		}
+
 		CloseableHttpClient httpClient = httpClientBuilder.build();
 		HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory();
 		requestFactory.setHttpClient(httpClient);
 		return requestFactory;
 	}

+	private HttpClientConnectionManager buildConnectionManager(SSLContext sslContext, HostnameVerifier hostnameVerifier,
+			RestTemplateTimeoutProperties restTemplateTimeoutProperties) {
+		PoolingHttpClientConnectionManagerBuilder connectionManagerBuilder = PoolingHttpClientConnectionManagerBuilder
+				.create();
+		SSLConnectionSocketFactoryBuilder sslConnectionSocketFactoryBuilder = SSLConnectionSocketFactoryBuilder
+				.create();
+		if (sslContext != null) {
+			sslConnectionSocketFactoryBuilder.setSslContext(sslContext);
+		}
+		if (hostnameVerifier != null) {
+			sslConnectionSocketFactoryBuilder.setHostnameVerifier(hostnameVerifier);
+		}
+		connectionManagerBuilder.setSSLSocketFactory(sslConnectionSocketFactoryBuilder.build());
+		if (restTemplateTimeoutProperties != null) {
+			connectionManagerBuilder.setDefaultSocketConfig(SocketConfig.custom()
+					.setSoTimeout(Timeout.of(restTemplateTimeoutProperties.getSocketTimeout(), TimeUnit.MILLISECONDS))
+					.build());
+		}
+		return connectionManagerBuilder.build();
+	}
+
+	private RequestConfig buildRequestConfig() {
+		return RequestConfig.custom()
+				.setConnectTimeout(Timeout.of(restTemplateTimeoutProperties.getConnectTimeout(), TimeUnit.MILLISECONDS))
+				.setConnectionRequestTimeout(
+						Timeout.of(restTemplateTimeoutProperties.getConnectRequestTimeout(), TimeUnit.MILLISECONDS))
+				.build();
+	}
+
 }
@@ -28,16 +28,6 @@ public class RestTemplateDiscoveryClientOptionalArgs extends AbstractDiscoveryCl
 	public RestTemplateDiscoveryClientOptionalArgs(
 			EurekaClientHttpRequestFactorySupplier eurekaClientHttpRequestFactorySupplier) {
 		this.eurekaClientHttpRequestFactorySupplier = eurekaClientHttpRequestFactorySupplier;
-		setTransportClientFactories(new RestTemplateTransportClientFactories(this));
-	}
-
-	/**
-	 * @deprecated - use
-	 * {@link RestTemplateDiscoveryClientOptionalArgs#RestTemplateDiscoveryClientOptionalArgs(EurekaClientHttpRequestFactorySupplier)}
-	 */
-	@Deprecated
-	public RestTemplateDiscoveryClientOptionalArgs() {
-		this(new DefaultEurekaClientHttpRequestFactorySupplier());
 	}

 }
@@ -50,7 +50,7 @@ public class RestTemplateEurekaHttpClient implements EurekaHttpClient {

 	protected final Log logger = LogFactory.getLog(getClass());

-	private RestTemplate restTemplate;
+	private final RestTemplate restTemplate;

 	private String serviceUrl;

@@ -77,7 +77,7 @@ public class RestTemplateEurekaHttpClient implements EurekaHttpClient {
 		ResponseEntity<Void> response = restTemplate.exchange(urlPath, HttpMethod.POST, new HttpEntity<>(info, headers),
 				Void.class);

-		return anEurekaHttpResponse(response.getStatusCodeValue()).headers(headersOf(response)).build();
+		return anEurekaHttpResponse(response.getStatusCode().value()).headers(headersOf(response)).build();
 	}

 	@Override
@@ -86,7 +86,7 @@ public class RestTemplateEurekaHttpClient implements EurekaHttpClient {

 		ResponseEntity<Void> response = restTemplate.exchange(urlPath, HttpMethod.DELETE, null, Void.class);

-		return anEurekaHttpResponse(response.getStatusCodeValue()).headers(headersOf(response)).build();
+		return anEurekaHttpResponse(response.getStatusCode().value()).headers(headersOf(response)).build();
 	}

 	@Override
@@ -100,7 +100,7 @@ public class RestTemplateEurekaHttpClient implements EurekaHttpClient {
 				InstanceInfo.class);

 		EurekaHttpResponseBuilder<InstanceInfo> eurekaResponseBuilder = anEurekaHttpResponse(
-				response.getStatusCodeValue(), InstanceInfo.class).headers(headersOf(response));
+				response.getStatusCode().value(), InstanceInfo.class).headers(headersOf(response));

 		if (response.hasBody()) {
 			eurekaResponseBuilder.entity(response.getBody());
@@ -117,7 +117,7 @@ public class RestTemplateEurekaHttpClient implements EurekaHttpClient {

 		ResponseEntity<Void> response = restTemplate.exchange(urlPath, HttpMethod.PUT, null, Void.class);

-		return anEurekaHttpResponse(response.getStatusCodeValue()).headers(headersOf(response)).build();
+		return anEurekaHttpResponse(response.getStatusCode().value()).headers(headersOf(response)).build();
 	}

 	@Override
@@ -127,7 +127,7 @@ public class RestTemplateEurekaHttpClient implements EurekaHttpClient {

 		ResponseEntity<Void> response = restTemplate.exchange(urlPath, HttpMethod.DELETE, null, Void.class);

-		return anEurekaHttpResponse(response.getStatusCodeValue()).headers(headersOf(response)).build();
+		return anEurekaHttpResponse(response.getStatusCode().value()).headers(headersOf(response)).build();
 	}

 	@Override
@@ -145,7 +145,7 @@ public class RestTemplateEurekaHttpClient implements EurekaHttpClient {
 		ResponseEntity<EurekaApplications> response = restTemplate.exchange(url, HttpMethod.GET, null,
 				EurekaApplications.class);

-		return anEurekaHttpResponse(response.getStatusCodeValue(),
+		return anEurekaHttpResponse(response.getStatusCode().value(),
 				response.getStatusCode().value() == HttpStatus.OK.value() && response.hasBody()
 						? (Applications) response.getBody() : null).headers(headersOf(response)).build();
 	}
@@ -171,10 +171,10 @@ public class RestTemplateEurekaHttpClient implements EurekaHttpClient {

 		ResponseEntity<Application> response = restTemplate.exchange(urlPath, HttpMethod.GET, null, Application.class);

-		Application application = response.getStatusCodeValue() == HttpStatus.OK.value() && response.hasBody()
+		Application application = response.getStatusCode().value() == HttpStatus.OK.value() && response.hasBody()
 				? response.getBody() : null;

-		return anEurekaHttpResponse(response.getStatusCodeValue(), application).headers(headersOf(response)).build();
+		return anEurekaHttpResponse(response.getStatusCode().value(), application).headers(headersOf(response)).build();
 	}

 	@Override
@@ -193,8 +193,8 @@ public class RestTemplateEurekaHttpClient implements EurekaHttpClient {
 		ResponseEntity<InstanceInfo> response = restTemplate.exchange(urlPath, HttpMethod.GET, null,
 				InstanceInfo.class);

-		return anEurekaHttpResponse(response.getStatusCodeValue(),
-				response.getStatusCodeValue() == HttpStatus.OK.value() && response.hasBody() ? response.getBody()
+		return anEurekaHttpResponse(response.getStatusCode().value(),
+				response.getStatusCode().value() == HttpStatus.OK.value() && response.hasBody() ? response.getBody()
 						: null).headers(headersOf(response)).build();
 	}

@@ -16,6 +16,8 @@

 package org.springframework.cloud.netflix.eureka.http;

+import java.io.IOException;
+import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Optional;
@@ -27,7 +29,7 @@ import com.fasterxml.jackson.databind.BeanDescription;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.SerializationConfig;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.module.SimpleModule;
@@ -44,12 +46,16 @@ import com.netflix.discovery.shared.transport.TransportClientFactory;

 import org.springframework.cloud.configuration.SSLContextFactory;
 import org.springframework.cloud.configuration.TlsProperties;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.http.client.ClientHttpRequestFactory;
+import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.http.client.support.BasicAuthenticationInterceptor;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.client.DefaultResponseErrorHandler;
 import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.UriComponentsBuilder;

 /**
 * Provides the custom {@link RestTemplate} required by the
@@ -101,11 +107,20 @@ public class RestTemplateTransportClientFactory implements TransportClientFactor

 	@Override
 	public EurekaHttpClient newClient(EurekaEndpoint serviceUrl) {
-		return new RestTemplateEurekaHttpClient(restTemplate(serviceUrl.getServiceUrl()), serviceUrl.getServiceUrl());
+		return new RestTemplateEurekaHttpClient(restTemplate(serviceUrl.getServiceUrl()),
+				stripUserInfo(serviceUrl.getServiceUrl()));
+	}
+
+	// apache http client 5.2 fails with non-null userinfo
+	// basic auth added in restTemplate() below
+	private String stripUserInfo(String serviceUrl) {
+		return UriComponentsBuilder.fromUriString(serviceUrl).userInfo(null).toUriString();
 	}

 	private RestTemplate restTemplate(String serviceUrl) {
-		RestTemplate restTemplate = restTemplate();
+		ClientHttpRequestFactory requestFactory = this.eurekaClientHttpRequestFactorySupplier
+				.get(this.sslContext.orElse(null), this.hostnameVerifier.orElse(null));
+		RestTemplate restTemplate = new RestTemplate(requestFactory);

 		try {
 			URI serviceURI = new URI(serviceUrl);
@@ -124,13 +139,15 @@ public class RestTemplateTransportClientFactory implements TransportClientFactor
 		restTemplate.getMessageConverters().add(0, mappingJacksonHttpMessageConverter());
 		restTemplate.setErrorHandler(new ErrorHandler());

-		return restTemplate;
-	}
+		restTemplate.getInterceptors().add((request, body, execution) -> {
+			ClientHttpResponse response = execution.execute(request, body);
+			if (!response.getStatusCode().equals(HttpStatus.NOT_FOUND)) {
+				return response;
+			}
+			return new NotFoundHttpResponse(response);
+		});

-	private RestTemplate restTemplate() {
-		ClientHttpRequestFactory requestFactory = this.eurekaClientHttpRequestFactorySupplier
-				.get(this.sslContext.orElse(null), this.hostnameVerifier.orElse(null));
-		return new RestTemplate(requestFactory);
+		return restTemplate;
 	}

 	/**
@@ -139,17 +156,16 @@ public class RestTemplateTransportClientFactory implements TransportClientFactor
 	 * serialized or deserialized. Achived with
 	 * {@link SerializationFeature#WRAP_ROOT_VALUE} and
 	 * {@link DeserializationFeature#UNWRAP_ROOT_VALUE}.
-	 * {@link PropertyNamingStrategy.SnakeCaseStrategy} is applied to the underlying
+	 * {@link PropertyNamingStrategies.SnakeCaseStrategy} is applied to the underlying
 	 * {@link ObjectMapper}.
 	 * @return a {@link MappingJackson2HttpMessageConverter} object
 	 */
 	public MappingJackson2HttpMessageConverter mappingJacksonHttpMessageConverter() {
 		MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
-		converter.setObjectMapper(new ObjectMapper().setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE));
+		converter.setObjectMapper(new ObjectMapper().setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE));

 		SimpleModule jsonModule = new SimpleModule();
-		jsonModule.setSerializerModifier(createJsonSerializerModifier()); // keyFormatter,
-		// compact));
+		jsonModule.setSerializerModifier(createJsonSerializerModifier());
 		converter.getObjectMapper().registerModule(jsonModule);

 		converter.getObjectMapper().configure(SerializationFeature.WRAP_ROOT_VALUE, true);
@@ -157,34 +173,14 @@ public class RestTemplateTransportClientFactory implements TransportClientFactor
 		converter.getObjectMapper().addMixIn(Applications.class, ApplicationsJsonMixIn.class);
 		converter.getObjectMapper().addMixIn(InstanceInfo.class, InstanceInfoJsonMixIn.class);

-		// converter.getObjectMapper().addMixIn(DataCenterInfo.class,
-		// DataCenterInfoXmlMixIn.class);
-		// converter.getObjectMapper().addMixIn(InstanceInfo.PortWrapper.class,
-		// PortWrapperXmlMixIn.class);
-		// converter.getObjectMapper().addMixIn(Application.class,
-		// ApplicationXmlMixIn.class);
-		// converter.getObjectMapper().addMixIn(Applications.class,
-		// ApplicationsXmlMixIn.class);
-
 		return converter;
 	}

-	public static BeanSerializerModifier createJsonSerializerModifier() { // final
-		// KeyFormatter
-		// keyFormatter,
-		// final
-		// boolean
-		// compactMode)
-		// {
+	public static BeanSerializerModifier createJsonSerializerModifier() {
 		return new BeanSerializerModifier() {
 			@Override
 			public JsonSerializer<?> modifySerializer(SerializationConfig config, BeanDescription beanDesc,
 					JsonSerializer<?> serializer) {
-				/*
-				 * if (beanDesc.getBeanClass().isAssignableFrom(Applications.class)) {
-				 * return new ApplicationsJsonBeanSerializer((BeanSerializerBase)
-				 * serializer, keyFormatter); }
-				 */
 				if (beanDesc.getBeanClass().isAssignableFrom(InstanceInfo.class)) {
 					return new InstanceInfoJsonBeanSerializer((BeanSerializerBase) serializer, false);
 				}
@@ -197,6 +193,50 @@ public class RestTemplateTransportClientFactory implements TransportClientFactor
 	public void shutdown() {
 	}

+	/**
+	 * Response that ignores body, specifically for 404 errors.
+	 */
+	private static class NotFoundHttpResponse implements ClientHttpResponse {
+
+		private final ClientHttpResponse response;
+
+		NotFoundHttpResponse(ClientHttpResponse response) {
+			this.response = response;
+		}
+
+		@Override
+		public HttpStatusCode getStatusCode() throws IOException {
+			return response.getStatusCode();
+		}
+
+		@Override
+		public int getRawStatusCode() throws IOException {
+			return response.getRawStatusCode();
+		}
+
+		@Override
+		public String getStatusText() throws IOException {
+			return response.getStatusText();
+		}
+
+		@Override
+		public void close() {
+			response.close();
+		}
+
+		@Override
+		public InputStream getBody() throws IOException {
+			// ignore body on 404 for heartbeat, see gh-4145
+			return null;
+		}
+
+		@Override
+		public HttpHeaders getHeaders() {
+			return response.getHeaders();
+		}
+
+	}
+
 	class ErrorHandler extends DefaultResponseErrorHandler {

 		@Override
@@ -29,7 +29,6 @@ import org.springframework.web.reactive.function.client.WebClient;
 public class WebClientDiscoveryClientOptionalArgs extends AbstractDiscoveryClientOptionalArgs<Void> {

 	public WebClientDiscoveryClientOptionalArgs(Supplier<WebClient.Builder> builder) {
-		setTransportClientFactories(new WebClientTransportClientFactories(builder));
 	}

 }
@@ -16,8 +16,6 @@

 package org.springframework.cloud.netflix.eureka.http;

-import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;

 import com.netflix.appinfo.InstanceInfo;
@@ -28,12 +26,13 @@ import com.netflix.discovery.shared.transport.EurekaHttpClient;
 import com.netflix.discovery.shared.transport.EurekaHttpResponse;
 import com.netflix.discovery.shared.transport.EurekaHttpResponse.EurekaHttpResponseBuilder;
 import com.netflix.discovery.util.StringUtil;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import reactor.core.publisher.Mono;

 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.HttpStatusCode;
 import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.reactive.function.BodyInserters;
 import org.springframework.web.reactive.function.client.ClientResponse;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -46,8 +45,6 @@ import static com.netflix.discovery.shared.transport.EurekaHttpResponse.anEureka
 */
 public class WebClientEurekaHttpClient implements EurekaHttpClient {

-	protected final Log logger = LogFactory.getLog(getClass());
-
 	private WebClient webClient;

 	public WebClientEurekaHttpClient(WebClient webClient) {
@@ -56,16 +53,18 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient {

 	@Override
 	public EurekaHttpResponse<Void> register(InstanceInfo info) {
-		return webClient.post().uri("apps/" + info.getAppName(), Void.class).body(BodyInserters.fromValue(info))
+		return webClient.post().uri("apps/" + info.getAppName()).body(BodyInserters.fromValue(info))
 				.header(HttpHeaders.ACCEPT_ENCODING, "gzip")
-				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE).exchange()
-				.map(response -> eurekaHttpResponse(response)).block();
+				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE).retrieve()
+				.onStatus(HttpStatusCode::isError, this::ignoreError).toBodilessEntity().map(this::eurekaHttpResponse)
+				.block();
 	}

 	@Override
 	public EurekaHttpResponse<Void> cancel(String appName, String id) {
-		return webClient.delete().uri("apps/" + appName + '/' + id, Void.class).exchange()
-				.map(response -> eurekaHttpResponse(response)).block();
+		return webClient.delete().uri("apps/" + appName + '/' + id).retrieve()
+				.onStatus(HttpStatusCode::isError, this::ignoreError).toBodilessEntity().map(this::eurekaHttpResponse)
+				.block();
 	}

 	@Override
@@ -75,14 +74,15 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient {
 				+ "&lastDirtyTimestamp=" + info.getLastDirtyTimestamp().toString()
 				+ (overriddenStatus != null ? "&overriddenstatus=" + overriddenStatus.name() : "");

-		ClientResponse response = webClient.put().uri(urlPath, InstanceInfo.class)
+		ResponseEntity<InstanceInfo> response = webClient.put().uri(urlPath)
 				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
-				.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).exchange().block();
+				.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).retrieve()
+				.onStatus(HttpStatusCode::isError, this::ignoreError).toEntity(InstanceInfo.class).block();

 		EurekaHttpResponseBuilder<InstanceInfo> builder = anEurekaHttpResponse(statusCodeValueOf(response),
 				InstanceInfo.class).headers(headersOf(response));

-		InstanceInfo entity = response.toEntity(InstanceInfo.class).block().getBody();
+		InstanceInfo entity = response.getBody();

 		if (entity != null) {
 			builder.entity(entity);
@@ -98,9 +98,9 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient {
 		String urlPath = "apps/" + appName + '/' + id + "/status?value=" + newStatus.name() + "&lastDirtyTimestamp="
 				+ info.getLastDirtyTimestamp().toString();

-		return webClient.put().uri(urlPath, Void.class)
-				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE).exchange()
-				.map(response -> eurekaHttpResponse(response)).block();
+		return webClient.put().uri(urlPath).header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+				.retrieve().onStatus(HttpStatusCode::isError, this::ignoreError).toBodilessEntity()
+				.map(this::eurekaHttpResponse).block();
 	}

 	@Override
@@ -108,9 +108,9 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient {
 		String urlPath = "apps/" + appName + '/' + id + "/status?lastDirtyTimestamp="
 				+ info.getLastDirtyTimestamp().toString();

-		return webClient.delete().uri(urlPath, Void.class)
-				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE).exchange()
-				.map(response -> eurekaHttpResponse(response)).block();
+		return webClient.delete().uri(urlPath).header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+				.retrieve().onStatus(HttpStatusCode::isError, this::ignoreError).toBodilessEntity()
+				.map(this::eurekaHttpResponse).block();
 	}

 	@Override
@@ -125,13 +125,14 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient {
 			url = url + (urlPath.contains("?") ? "&" : "?") + "regions=" + StringUtil.join(regions);
 		}

-		ClientResponse response = webClient.get().uri(url, Applications.class)
+		ResponseEntity<Applications> response = webClient.get().uri(url)
 				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
-				.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).exchange().block();
+				.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).retrieve()
+				.onStatus(HttpStatusCode::isError, this::ignoreError).toEntity(Applications.class).block();

 		int statusCode = statusCodeValueOf(response);

-		Applications body = response.toEntity(Applications.class).block().getBody();
+		Applications body = response.getBody();

 		return anEurekaHttpResponse(statusCode, statusCode == HttpStatus.OK.value() && body != null ? body : null)
 				.headers(headersOf(response)).build();
@@ -155,11 +156,12 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient {
 	@Override
 	public EurekaHttpResponse<Application> getApplication(String appName) {

-		ClientResponse response = webClient.get().uri("apps/" + appName, Application.class)
-				.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).exchange().block();
+		ResponseEntity<Application> response = webClient.get().uri("apps/" + appName)
+				.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).retrieve()
+				.onStatus(HttpStatusCode::isError, this::ignoreError).toEntity(Application.class).block();

 		int statusCode = statusCodeValueOf(response);
-		Application body = response.toEntity(Application.class).block().getBody();
+		Application body = response.getBody();

 		Application application = statusCode == HttpStatus.OK.value() && body != null ? body : null;

@@ -177,11 +179,12 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient {
 	}

 	private EurekaHttpResponse<InstanceInfo> getInstanceInternal(String urlPath) {
-		ClientResponse response = webClient.get().uri(urlPath, InstanceInfo.class)
-				.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).exchange().block();
+		ResponseEntity<InstanceInfo> response = webClient.get().uri(urlPath)
+				.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).retrieve()
+				.onStatus(HttpStatusCode::isError, this::ignoreError).toEntity(InstanceInfo.class).block();

 		int statusCode = statusCodeValueOf(response);
-		InstanceInfo body = response.toEntity(InstanceInfo.class).block().getBody();
+		InstanceInfo body = response.getBody();

 		return anEurekaHttpResponse(statusCode, statusCode == HttpStatus.OK.value() && body != null ? body : null)
 				.headers(headersOf(response)).build();
@@ -196,26 +199,19 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient {
 		return this.webClient;
 	}

-	private static Map<String, String> headersOf(ClientResponse response) {
-		ClientResponse.Headers httpHeaders = response.headers();
-		if (httpHeaders == null) {
-			return Collections.emptyMap();
-		}
-		HttpHeaders asHeaders = httpHeaders.asHttpHeaders();
-		if (asHeaders == null) {
-			return Collections.emptyMap();
-		}
-		Map<String, String> headers = new HashMap<>();
-		asHeaders.entrySet().stream()
-				.forEach(entry -> entry.getValue().stream().forEach(v -> headers.put(entry.getKey(), v)));
-		return headers;
+	private Mono<? extends Throwable> ignoreError(ClientResponse response) {
+		return Mono.empty();
 	}

-	private int statusCodeValueOf(ClientResponse response) {
-		return response.statusCode().value();
+	private static Map<String, String> headersOf(ResponseEntity<?> response) {
+		return response.getHeaders().toSingleValueMap();
 	}

-	private EurekaHttpResponse<Void> eurekaHttpResponse(ClientResponse response) {
+	private int statusCodeValueOf(ResponseEntity<?> response) {
+		return response.getStatusCode().value();
+	}
+
+	private EurekaHttpResponse<Void> eurekaHttpResponse(ResponseEntity<?> response) {
 		return anEurekaHttpResponse(statusCodeValueOf(response)).headers(headersOf(response)).build();
 	}

@@ -24,7 +24,7 @@ import com.fasterxml.jackson.databind.BeanDescription;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.SerializationConfig;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.module.SimpleModule;
@@ -38,6 +38,7 @@ import com.netflix.discovery.shared.Applications;
 import com.netflix.discovery.shared.resolver.EurekaEndpoint;
 import com.netflix.discovery.shared.transport.EurekaHttpClient;
 import com.netflix.discovery.shared.transport.TransportClientFactory;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;

 import org.springframework.http.HttpStatus;
@@ -122,13 +123,13 @@ public class WebClientTransportClientFactory implements TransportClientFactory {
 	 * 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 PropertyNamingStrategies.SnakeCaseStrategy} is applied to the underlying
 	 * {@link ObjectMapper}.
 	 * @return a {@link ObjectMapper} object
 	 */
 	private ObjectMapper objectMapper() {
 		ObjectMapper objectMapper = new ObjectMapper();
-		objectMapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
+		objectMapper.setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE);

 		SimpleModule jsonModule = new SimpleModule();
 		jsonModule.setSerializerModifier(createJsonSerializerModifier());
@@ -147,10 +148,16 @@ public class WebClientTransportClientFactory implements TransportClientFactory {
 		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();
+				ClientResponse newResponse = clientResponse.mutate().statusCode(HttpStatus.OK).build();
 				newResponse.body((clientHttpResponse, context) -> clientHttpResponse.getBody());
 				return Mono.just(newResponse);
 			}
+			if (clientResponse.statusCode().equals(HttpStatus.NOT_FOUND)) {
+				ClientResponse newResponse = clientResponse.mutate().statusCode(clientResponse.statusCode())
+						// ignore body on 404 for heartbeat, see gh-4145
+						.body(Flux.empty()).build();
+				return Mono.just(newResponse);
+			}
 			return Mono.just(clientResponse);
 		});
 	}
@@ -65,11 +65,11 @@ public class EurekaLoadBalancerClientConfiguration {

 	@PostConstruct
 	public void postprocess() {
-		if (!StringUtils.isEmpty(zoneConfig.getZone())) {
+		if (StringUtils.hasText(zoneConfig.getZone())) {
 			return;
 		}
 		String zone = getZoneFromEureka();
-		if (!StringUtils.isEmpty(zone)) {
+		if (StringUtils.hasText(zone)) {
 			if (LOG.isDebugEnabled()) {
 				LOG.debug("Setting the value of '" + LOADBALANCER_ZONE + "' to " + zone);
 			}
@@ -85,7 +85,7 @@ public class EurekaLoadBalancerClientConfiguration {
 		}
 		else {
 			zone = eurekaConfig == null ? null : eurekaConfig.getMetadataMap().get("zone");
-			if (StringUtils.isEmpty(zone) && clientConfig != null) {
+			if (!StringUtils.hasText(zone) && clientConfig != null) {
 				String[] zones = clientConfig.getAvailabilityZones(clientConfig.getRegion());
 				// Pick the first one from the regions we want to connect to
 				zone = zones != null && zones.length > 0 ? zones[0] : null;
@@ -44,17 +44,17 @@ public class EurekaAutoServiceRegistration

 	private static final Log log = LogFactory.getLog(EurekaAutoServiceRegistration.class);

-	private AtomicBoolean running = new AtomicBoolean(false);
+	private final AtomicBoolean running = new AtomicBoolean(false);

-	private int order = 0;
+	private final int order = 0;

-	private AtomicInteger port = new AtomicInteger(0);
+	private final AtomicInteger port = new AtomicInteger(0);

-	private ApplicationContext context;
+	private final ApplicationContext context;

-	private EurekaServiceRegistry serviceRegistry;
+	private final EurekaServiceRegistry serviceRegistry;

-	private EurekaRegistration registration;
+	private final EurekaRegistration registration;

 	public EurekaAutoServiceRegistration(ApplicationContext context, EurekaServiceRegistry serviceRegistry,
 			EurekaRegistration registration) {
@@ -25,6 +25,7 @@ import com.netflix.appinfo.HealthCheckHandler;
 import com.netflix.appinfo.InstanceInfo;
 import com.netflix.discovery.EurekaClient;
 import com.netflix.discovery.EurekaClientConfig;
+import com.netflix.discovery.shared.transport.jersey.TransportClientFactories;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

@@ -181,6 +182,8 @@ public class EurekaRegistration implements Registration {

 		private ApplicationEventPublisher publisher;

+		private TransportClientFactories<?> transportClientFactories;
+
 		Builder(CloudEurekaInstanceConfig instanceConfig) {
 			this.instanceConfig = instanceConfig;
 		}
@@ -200,6 +203,11 @@ public class EurekaRegistration implements Registration {
 			return this;
 		}

+		public Builder with(TransportClientFactories<?> transportClientFactories) {
+			this.transportClientFactories = transportClientFactories;
+			return this;
+		}
+
 		public Builder with(EurekaClientConfig clientConfig, ApplicationEventPublisher publisher) {
 			this.clientConfig = clientConfig;
 			this.publisher = publisher;
@@ -216,9 +224,11 @@ public class EurekaRegistration implements Registration {
 			if (this.eurekaClient == null) {
 				Assert.notNull(this.clientConfig, "if eurekaClient is null, EurekaClientConfig may not be null");
 				Assert.notNull(this.publisher, "if eurekaClient is null, ApplicationEventPublisher may not be null");
+				Assert.notNull(this.transportClientFactories,
+						"if eurekaClient is null, TransportClientFactories may not be null");

 				this.eurekaClient = new CloudEurekaClient(this.applicationInfoManager, this.clientConfig,
-						this.publisher);
+						this.transportClientFactories, this.publisher);
 			}
 			return new EurekaRegistration(instanceConfig, eurekaClient, applicationInfoManager, healthCheckHandler);
 		}
@@ -86,6 +86,7 @@ public class EurekaServiceRegistry implements ServiceRegistry<EurekaRegistration
 		registration.getEurekaClient().setStatus(newStatus, info);
 	}

+	@SuppressWarnings("unchecked")
 	@Override
 	public Object getStatus(EurekaRegistration registration) {
 		String appname = registration.getApplicationInfoManager().getInfo().getAppName();
@@ -23,6 +23,13 @@
      "name": "eureka.client.webclient.enabled",
      "description": "Enables the use of WebClient for Eureka HTTP Client.",
      "type": "java.lang.Boolean"
+    },
+    {
+      "defaultValue": 1,
+      "name": "eureka.instance.metadata-map.weight",
+      "description": "The weight of service instance for weighted load balancing.",
+      "type": "java.lang.Integer",
+      "sourceType": "org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean"
    }
  ]
 }
@@ -0,0 +1,2 @@
+org.springframework.aot.hint.RuntimeHintsRegistrar=\
+org.springframework.cloud.netflix.eureka.EurekaClientHints
@@ -26,7 +26,9 @@ import com.netflix.appinfo.HealthCheckHandler;
 import com.netflix.discovery.AbstractDiscoveryClientOptionalArgs;
 import com.netflix.discovery.EurekaClient;
 import com.netflix.discovery.EurekaClientConfig;
+import com.netflix.discovery.shared.transport.jersey.TransportClientFactories;
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;

@@ -73,7 +75,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.fail;
 */
 class EurekaClientAutoConfigurationTests {

-	private AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
+	private final AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();

 	@AfterEach
 	void after() {
@@ -94,7 +96,7 @@ class EurekaClientAutoConfigurationTests {
 	}

 	@Test
-	void shouldSetManagementPortInMetadataMapIfEqualToServerPort() throws Exception {
+	void shouldSetManagementPortInMetadataMapIfEqualToServerPort() {
 		TestPropertyValues.of("server.port=8989").applyTo(this.context);
 		setupContext(RefreshAutoConfiguration.class);

@@ -104,7 +106,7 @@ class EurekaClientAutoConfigurationTests {
 	}

 	@Test
-	void shouldNotSetManagementAndJmxPortsInMetadataMap() throws Exception {
+	void shouldNotSetManagementAndJmxPortsInMetadataMap() {
 		TestPropertyValues.of("server.port=8989", "management.server.port=0").applyTo(this.context);
 		setupContext(RefreshAutoConfiguration.class);

@@ -115,7 +117,7 @@ class EurekaClientAutoConfigurationTests {
 	}

 	@Test
-	void shouldSetManagementAndJmxPortsInMetadataMap() throws Exception {
+	void shouldSetManagementAndJmxPortsInMetadataMap() {
 		TestPropertyValues.of("management.server.port=9999", "com.sun.management.jmxremote.port=6789")
 				.applyTo(this.context);
 		setupContext(RefreshAutoConfiguration.class);
@@ -126,7 +128,7 @@ class EurekaClientAutoConfigurationTests {
 	}

 	@Test
-	void shouldNotResetManagementAndJmxPortsInMetadataMap() throws Exception {
+	void shouldNotResetManagementAndJmxPortsInMetadataMap() {
 		TestPropertyValues.of("management.server.port=9999", "eureka.instance.metadata-map.jmx.port=9898",
 				"eureka.instance.metadata-map.management.port=7878").applyTo(this.context);
 		setupContext(RefreshAutoConfiguration.class);
@@ -201,7 +203,7 @@ class EurekaClientAutoConfigurationTests {
 	}

 	@Test
-	void statusPageUrl_and_healthCheckUrl_do_not_contain_server_context_path() throws Exception {
+	void statusPageUrl_and_healthCheckUrl_do_not_contain_server_context_path() {
 		TestPropertyValues.of("server.port=8989", "management.server.port=9999", "server.contextPath=/service")
 				.applyTo(this.context);

@@ -214,7 +216,7 @@ class EurekaClientAutoConfigurationTests {
 	}

 	@Test
-	void statusPageUrl_and_healthCheckUrl_contain_management_context_path() throws Exception {
+	void statusPageUrl_and_healthCheckUrl_contain_management_context_path() {
 		TestPropertyValues.of("server.port=8989", "management.server.servlet.context-path=/management")
 				.applyTo(this.context);

@@ -227,7 +229,7 @@ class EurekaClientAutoConfigurationTests {
 	}

 	@Test
-	void statusPageUrl_and_healthCheckUrl_contain_management_context_path_random_port() throws Exception {
+	void statusPageUrl_and_healthCheckUrl_contain_management_context_path_random_port() {
 		TestPropertyValues.of("server.port=0", "management.server.servlet.context-path=/management")
 				.applyTo(this.context);

@@ -286,7 +288,7 @@ class EurekaClientAutoConfigurationTests {
 	}

 	@Test
-	void statusPageUrl_and_healthCheckUrl_contain_management_base_path() throws Exception {
+	void statusPageUrl_and_healthCheckUrl_contain_management_base_path() {
 		TestPropertyValues.of("server.port=8989", "management.server.base-path=/management").applyTo(this.context);

 		setupContext(RefreshAutoConfiguration.class);
@@ -298,7 +300,7 @@ class EurekaClientAutoConfigurationTests {
 	}

 	@Test
-	void statusPageUrl_and_healthCheckUrl_contain_management_base_path_random_port() throws Exception {
+	void statusPageUrl_and_healthCheckUrl_contain_management_base_path_random_port() {
 		TestPropertyValues.of("server.port=0", "management.server.base-path=/management").applyTo(this.context);

 		setupContext(RefreshAutoConfiguration.class);
@@ -500,17 +502,17 @@ class EurekaClientAutoConfigurationTests {
 	}

 	@Test
+	@Disabled
 	void basicAuth() {
 		TestPropertyValues
 				.of("server.port=8989", "eureka.client.serviceUrl.defaultZone=https://user:foo@example.com:80/eureka")
 				.applyTo(this.context);
-		setupContext(MockClientConfiguration.class);
-		// ApacheHttpClient4 http = this.context.getBean(ApacheHttpClient4.class);
+		// FIXME: ApacheHttpClient4 http = this.context.getBean(ApacheHttpClient4.class);
 		// Mockito.verify(http).addFilter(Matchers.any(HTTPBasicAuthFilter.class));
 	}

 	@Test
-	void testDefaultAppName() throws Exception {
+	void testDefaultAppName() {
 		setupContext();
 		assertThat(getInstanceConfig().getAppname()).isEqualTo("unknown");
 		assertThat(getInstanceConfig().getVirtualHostName()).isEqualTo("unknown");
@@ -518,7 +520,7 @@ class EurekaClientAutoConfigurationTests {
 	}

 	@Test
-	void testAppName() throws Exception {
+	void testAppName() {
 		TestPropertyValues.of("spring.application.name=mytest").applyTo(this.context);
 		setupContext();
 		assertThat(getInstanceConfig().getAppname()).isEqualTo("mytest");
@@ -527,7 +529,7 @@ class EurekaClientAutoConfigurationTests {
 	}

 	@Test
-	void testAppNameUpper() throws Exception {
+	void testAppNameUpper() {
 		addSystemEnvironment(this.context.getEnvironment(), "SPRING_APPLICATION_NAME=mytestupper");
 		setupContext();
 		assertThat(getInstanceConfig().getAppname()).isEqualTo("mytestupper");
@@ -569,7 +571,7 @@ class EurekaClientAutoConfigurationTests {
 	}

 	@Test
-	void testInstanceNamePreferred() throws Exception {
+	void testInstanceNamePreferred() {
 		addSystemEnvironment(this.context.getEnvironment(), "SPRING_APPLICATION_NAME=mytestspringappname");
 		TestPropertyValues.of("eureka.instance.appname=mytesteurekaappname").applyTo(this.context);
 		setupContext();
@@ -615,6 +617,7 @@ class EurekaClientAutoConfigurationTests {
 				});
 	}

+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	private void assertBeanNotPresent(Class beanClass) {
 		try {
 			context.getBean(beanClass);
@@ -670,8 +673,9 @@ class EurekaClientAutoConfigurationTests {
 		@Bean(destroyMethod = "shutdown")
 		@ConditionalOnMissingBean(value = EurekaClient.class, search = SearchStrategy.CURRENT)
 		public EurekaClient eurekaClient(ApplicationInfoManager manager, EurekaClientConfig config,
-				ApplicationContext context, AbstractDiscoveryClientOptionalArgs optionalArgs) {
-			return new CloudEurekaClient(manager, config, optionalArgs, context) {
+				TransportClientFactories<?> transportClientFactories, ApplicationContext context,
+				AbstractDiscoveryClientOptionalArgs optionalArgs) {
+			return new CloudEurekaClient(manager, config, transportClientFactories, optionalArgs, context) {
 				@Override
 				public synchronized void shutdown() {
 					CountDownLatch latch = countDownLatch();
@@ -685,21 +689,6 @@ class EurekaClientAutoConfigurationTests {

 	}

-	@Configuration(proxyBeanMethods = false)
-	protected static class MockClientConfiguration {
-
-		// FIXME: 4.0
-		/*
-		 * @Bean public EurekaJerseyClient jerseyClient() { EurekaJerseyClient mock =
-		 * Mockito.mock(EurekaJerseyClient.class);
-		 * Mockito.when(mock.getClient()).thenReturn(apacheClient()); return mock; }
-		 *
-		 * @Bean public ApacheHttpClient4 apacheClient() { return
-		 * Mockito.mock(ApacheHttpClient4.class); }
-		 */
-
-	}
-
 	@Configuration(proxyBeanMethods = false)
 	@EnableConfigurationProperties(AutoServiceRegistrationProperties.class)
 	public static class AutoServiceRegistrationConfiguration {
@@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 */
 class EurekaClientConfigBeanTests {

-	private AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
+	private final AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();

 	@AfterEach
 	void init() {
@@ -67,7 +67,7 @@ class EurekaClientConfigBeanTests {
 	void serviceUrlWithCompositePropertySource() {
 		CompositePropertySource source = new CompositePropertySource("composite");
 		this.context.getEnvironment().getPropertySources().addFirst(source);
-		source.addPropertySource(new MapPropertySource("config", Collections.<String, Object>singletonMap(
+		source.addPropertySource(new MapPropertySource("config", Collections.singletonMap(
 				"eureka.client.serviceUrl.defaultZone",
 				"https://example.com,https://example2.com, https://www.hugedomains.com/domain_profile.cfm?d=example3&e=com")));
 		this.context.register(PropertyPlaceholderAutoConfiguration.class, TestConfiguration.class);
@@ -321,7 +321,7 @@ class EurekaHealthCheckHandlerTests {
 		@Override
 		public Iterator<NamedContributor<HealthContributor>> iterator() {
 			Iterator<Map.Entry<String, HealthContributor>> iterator = contributorMap.entrySet().iterator();
-			return new Iterator<NamedContributor<HealthContributor>>() {
+			return new Iterator<>() {

 				@Override
 				public boolean hasNext() {
@@ -18,11 +18,9 @@ package org.springframework.cloud.netflix.eureka;

 import com.netflix.appinfo.InstanceInfo.InstanceStatus;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

-import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -46,14 +44,14 @@ import static org.assertj.core.api.Assertions.assertThat;
 */
 class EurekaInstanceConfigBeanTests {

-	private AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
+	private final AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();

 	private String hostName;

 	private String ipAddress;

 	@BeforeEach
-	void init() throws Exception {
+	void init() {
 		try (InetUtils utils = new InetUtils(new InetUtilsProperties())) {
 			InetUtils.HostInfo hostInfo = utils.findFirstNonLoopbackHostInfo();
 			this.hostName = hostInfo.getHostname();
@@ -158,13 +156,6 @@ class EurekaInstanceConfigBeanTests {
 		assertThat(getInstanceConfig().getInitialStatus()).as("initialStatus wrong").isEqualTo(InstanceStatus.UP);
 	}

-	void testBadInitialStatus() {
-		TestPropertyValues.of("eureka.instance.initial-status:FOO").applyTo(this.context);
-		Assertions.assertThrows(BeanCreationException.class, () -> {
-			setupContext();
-		});
-	}
-
 	@Test
 	void testCustomInitialStatus() {
 		TestPropertyValues.of("eureka.instance.initial-status:STARTING").applyTo(this.context);
@@ -173,7 +164,7 @@ class EurekaInstanceConfigBeanTests {
 	}

 	@Test
-	void testPreferIpAddress() throws Exception {
+	void testPreferIpAddress() {
 		TestPropertyValues.of("eureka.instance.preferIpAddress:true").applyTo(this.context);
 		setupContext();
 		EurekaInstanceConfigBean instance = getInstanceConfig();
@@ -183,7 +174,7 @@ class EurekaInstanceConfigBeanTests {
 	}

 	@Test
-	void testDefaultVirtualHostName() throws Exception {
+	void testDefaultVirtualHostName() {
 		TestPropertyValues.of("spring.application.name:myapp").applyTo(this.context);
 		setupContext();
 		assertThat(getInstanceConfig().getVirtualHostName()).as("virtualHostName wrong").isEqualTo("myapp");
@@ -192,7 +183,7 @@ class EurekaInstanceConfigBeanTests {
 	}

 	@Test
-	void testCustomVirtualHostName() throws Exception {
+	void testCustomVirtualHostName() {
 		TestPropertyValues.of("spring.application.name:myapp", "eureka.instance.virtualHostName=myvirthost",
 				"eureka.instance.secureVirtualHostName=mysecurevirthost").applyTo(this.context);
 		setupContext();
@@ -203,7 +194,7 @@ class EurekaInstanceConfigBeanTests {
 	}

 	@Test
-	void testDefaultAppName() throws Exception {
+	void testDefaultAppName() {
 		setupContext();
 		assertThat(getInstanceConfig().getAppname()).as("default app name is wrong").isEqualTo("unknown");
 		assertThat(getInstanceConfig().getVirtualHostName()).as("default virtual hostname is wrong")
@@ -213,21 +204,21 @@ class EurekaInstanceConfigBeanTests {
 	}

 	@Test
-	void testCustomInstanceId() throws Exception {
+	void testCustomInstanceId() {
 		TestPropertyValues.of("eureka.instance.instanceId=myinstance").applyTo(this.context);
 		setupContext();
 		assertThat(getInstanceConfig().getInstanceId()).as("instance id is wrong").isEqualTo("myinstance");
 	}

 	@Test
-	void testCustomInstanceIdWithMetadata() throws Exception {
+	void testCustomInstanceIdWithMetadata() {
 		TestPropertyValues.of("eureka.instance.metadataMap.instanceId=myinstance").applyTo(this.context);
 		setupContext();
 		assertThat(getInstanceConfig().getInstanceId()).as("instance id is wrong").isEqualTo("myinstance");
 	}

 	@Test
-	void testDefaultInstanceId() throws Exception {
+	void testDefaultInstanceId() {
 		setupContext();
 		assertThat(getInstanceConfig().getInstanceId()).as("default instance id is wrong").isEqualTo(null);
 	}
@@ -16,8 +16,6 @@

 package org.springframework.cloud.netflix.eureka;

-import java.io.IOException;
-
 import com.netflix.appinfo.InstanceInfo;
 import org.junit.jupiter.api.Test;

@@ -34,10 +32,10 @@ import static org.assertj.core.api.Assertions.assertThat;

 class InstanceInfoFactoryTests {

-	private AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
+	private final AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();

 	@Test
-	void instanceIdIsHostNameByDefault() throws IOException {
+	void instanceIdIsHostNameByDefault() {
 		InstanceInfo instanceInfo = setupInstance();
 		try (InetUtils utils = new InetUtils(new InetUtilsProperties())) {
 			assertThat(instanceInfo.getId()).isEqualTo(utils.findFirstNonLoopbackHostInfo().getHostname());
@@ -45,7 +43,7 @@ class InstanceInfoFactoryTests {
 	}

 	@Test
-	void instanceIdIsIpWhenIpPreferred() throws Exception {
+	void instanceIdIsIpWhenIpPreferred() {
 		InstanceInfo instanceInfo = setupInstance("eureka.instance.preferIpAddress:true");
 		assertThat(instanceInfo.getId().matches("(\\d+\\.){3}\\d+")).isTrue();
 	}
@@ -21,6 +21,7 @@ import org.junit.jupiter.api.Test;

 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.cloud.commons.util.UtilAutoConfiguration;
 import org.springframework.cloud.config.server.config.ConfigServerProperties;
 import org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean;

@@ -35,16 +36,15 @@ class EurekaClientConfigServerAutoConfigurationTests {
 	@Test
 	void offByDefault() {
 		new ApplicationContextRunner()
-				.withConfiguration(AutoConfigurations.of(EurekaClientConfigServerAutoConfiguration.class)).run(c -> {
-					assertThat(c.getBeanNamesForType(EurekaInstanceConfigBean.class).length).isEqualTo(0);
-				});
+				.withConfiguration(AutoConfigurations.of(EurekaClientConfigServerAutoConfiguration.class))
+				.run(c -> assertThat(c.getBeanNamesForType(EurekaInstanceConfigBean.class).length).isEqualTo(0));
 	}

 	@Test
 	void onWhenRequested() {
 		new ApplicationContextRunner()
 				.withConfiguration(AutoConfigurations.of(EurekaClientConfigServerAutoConfiguration.class,
-						ConfigServerProperties.class, EurekaInstanceConfigBean.class))
+						UtilAutoConfiguration.class, ConfigServerProperties.class, EurekaInstanceConfigBean.class))
 				.withPropertyValues("spring.cloud.config.server.prefix=/config").run(c -> {
 					assertThat(c.getBeanNamesForType(EurekaInstanceConfig.class).length).isEqualTo(1);
 					EurekaInstanceConfig instance = c.getBean(EurekaInstanceConfig.class);
@@ -56,7 +56,7 @@ class EurekaClientConfigServerAutoConfigurationTests {
 	void notOverridingMetamapSettings() {
 		new ApplicationContextRunner()
 				.withConfiguration(AutoConfigurations.of(EurekaClientConfigServerAutoConfiguration.class,
-						ConfigServerProperties.class, EurekaInstanceConfigBean.class))
+						UtilAutoConfiguration.class, ConfigServerProperties.class, EurekaInstanceConfigBean.class))
 				.withPropertyValues("spring.cloud.config.server.prefix=/config")
 				.withPropertyValues("eureka.instance.metadataMap.configPath=/differentpath").run(c -> {
 					assertThat(c.getBeanNamesForType(EurekaInstanceConfig.class).length).isEqualTo(1);
@@ -63,63 +63,50 @@ public class EurekaConfigServerBootstrapConfigurationTests {
 	public void offByDefault() {
 		new ApplicationContextRunner()
 				.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
-				.run(context -> {
-					assertEurekaBeansNotPresent(context);
-				});
+				.run(this::assertEurekaBeansNotPresent);
 	}

 	@Test
 	public void properBeansCreatedWhenDiscoveryEnabled() {
 		new ApplicationContextRunner()
 				.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
-				.withPropertyValues("spring.cloud.config.discovery.enabled=true").run(context -> {
-					assertEurekaBeansPresent(context);
-				});
+				.withPropertyValues("spring.cloud.config.discovery.enabled=true").run(this::assertEurekaBeansPresent);
 	}

 	@Test
 	public void beansNotCreatedWhenDiscoveryNotEnabled() {
 		new ApplicationContextRunner()
 				.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
-				.withPropertyValues("spring.cloud.config.discovery.enabled=false").run(context -> {
-					assertEurekaBeansNotPresent(context);
-				});
+				.withPropertyValues("spring.cloud.config.discovery.enabled=false")
+				.run(this::assertEurekaBeansNotPresent);
 	}

 	@Test
 	public void beansNotCreatedWhenDiscoveryDisabled() {
 		new ApplicationContextRunner()
 				.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
-				.withPropertyValues("spring.cloud.config.discovery.disabled").run(context -> {
-					assertEurekaBeansNotPresent(context);
-				});
+				.withPropertyValues("spring.cloud.config.discovery.disabled").run(this::assertEurekaBeansNotPresent);
 	}

 	@Test
 	public void beansNotCreatedWhenEurekaClientEnabled() {
 		new ApplicationContextRunner()
 				.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
-				.withPropertyValues("eureka.client.enabled=true").run(context -> {
-					assertEurekaBeansNotPresent(context);
-				});
+				.withPropertyValues("eureka.client.enabled=true").run(this::assertEurekaBeansNotPresent);
 	}

 	@Test
 	public void beansNotCreatedWhenEurekaClientNotEnabled() {
 		new ApplicationContextRunner()
 				.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
-				.withPropertyValues("eureka.client.enabled=false").run(context -> {
-					assertEurekaBeansNotPresent(context);
-				});
+				.withPropertyValues("eureka.client.enabled=false").run(this::assertEurekaBeansNotPresent);
 	}

 	@Test
 	public void beansNotCreatedWhenEurekaClientDisabled() {
 		new ApplicationContextRunner()
 				.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
-				.withPropertyValues("eureka.client.disabled").run(context -> {
-					assertEurekaBeansNotPresent(context);
-				});
+				.withPropertyValues("eureka.client.disabled").run(this::assertEurekaBeansNotPresent);
 	}

 	@Test
@@ -127,9 +114,7 @@ public class EurekaConfigServerBootstrapConfigurationTests {
 		new ApplicationContextRunner()
 				.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
 				.withPropertyValues("spring.cloud.config.discovery.enabled=true", "eureka.client.enabled=true")
-				.run(context -> {
-					assertEurekaBeansPresent(context);
-				});
+				.run(this::assertEurekaBeansPresent);
 	}

 	@Test
@@ -137,9 +122,7 @@ public class EurekaConfigServerBootstrapConfigurationTests {
 		new ApplicationContextRunner()
 				.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
 				.withPropertyValues("spring.cloud.config.discovery.enabled=true", "eureka.client.enabled=false")
-				.run(context -> {
-					assertEurekaBeansNotPresent(context);
-				});
+				.run(this::assertEurekaBeansNotPresent);
 	}

 	@Test
@@ -147,9 +130,7 @@ public class EurekaConfigServerBootstrapConfigurationTests {
 		new ApplicationContextRunner()
 				.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
 				.withPropertyValues("spring.cloud.config.discovery.enabled=false", "eureka.client.enabled=true")
-				.run(context -> {
-					assertEurekaBeansNotPresent(context);
-				});
+				.run(this::assertEurekaBeansNotPresent);
 	}

 	@Test
@@ -157,9 +138,7 @@ public class EurekaConfigServerBootstrapConfigurationTests {
 		new ApplicationContextRunner()
 				.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
 				.withPropertyValues("spring.cloud.config.discovery.enabled=false", "eureka.client.enabled=false")
-				.run(context -> {
-					assertEurekaBeansNotPresent(context);
-				});
+				.run(this::assertEurekaBeansNotPresent);
 	}

 	@Test
@@ -171,9 +150,8 @@ public class EurekaConfigServerBootstrapConfigurationTests {
 						"eureka.client.use-dns-for-fetching-service-urls=true",
 						"eureka.client.eureka-server-d-n-s-name=myeurekahost",
 						"eureka.client.eureka-server-u-r-l-context=eureka", "eureka.client.eureka-server-port=30000")
-				.run(context -> {
-					assertThat(output).contains("Cannot get cnames bound to the region:txt.us-east-1.myeurekahost");
-				});
+				.run(context -> assertThat(output)
+						.contains("Cannot get cnames bound to the region:txt.us-east-1.myeurekahost"));
 	}

 	@Test
@@ -24,9 +24,10 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.cloud.netflix.eureka.http.WebClientEurekaHttpClient;
+import org.springframework.context.annotation.Bean;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.reactive.function.client.ClientResponse;
@@ -61,20 +62,17 @@ class EurekaConfigServerBootstrapConfigurationWebClientIntegrationTests {
 	@SpringBootConfiguration
 	@EnableAutoConfiguration
 	@RestController
-	static class WebClientController extends WebSecurityConfigurerAdapter {
+	static class WebClientController {

 		@GetMapping("/")
 		public String hello() {
-			StringBuilder s = new StringBuilder();
-			for (int i = 0; i < 300000; i++) {
-				s.append(".");
-			}
-			return s.toString();
+			return ".".repeat(300000);
 		}

-		@Override
-		protected void configure(HttpSecurity http) throws Exception {
-			http.authorizeRequests().anyRequest().permitAll().and().csrf().disable();
+		@Bean
+		public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+			http.authorizeHttpRequests().anyRequest().permitAll().and().csrf().disable();
+			return http.build();
 		}

 	}
@@ -40,7 +40,6 @@ import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
 public class EurekaHttpClientsOptionalArgsConfigurationNoWebfluxTest {

 	@Test
-	@SuppressWarnings("unchecked")
 	public void contextFailsWithoutWebClient() {

 		ConfigurableApplicationContext ctx = null;
@@ -16,14 +16,17 @@

 package org.springframework.cloud.netflix.eureka.config;

-import org.junit.jupiter.api.Disabled;
+import com.netflix.discovery.AbstractDiscoveryClientOptionalArgs;
 import org.junit.jupiter.api.Test;

+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.cloud.netflix.eureka.sample.EurekaSampleApplication;
 import org.springframework.test.annotation.DirtiesContext;

+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
 * @author Daniel Lavoie
 */
@@ -31,13 +34,12 @@ import org.springframework.test.annotation.DirtiesContext;
@SpringBootTest(classes = EurekaSampleApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT)
 class JerseyOptionalArgsConfigurationTest {

-	// @Autowired
-	// private DiscoveryClientOptionalArgs optionalArgs;
+	@Autowired
+	private AbstractDiscoveryClientOptionalArgs optionalArgs;

 	@Test
-	@Disabled // FIXME: 4.0.0
 	void contextLoads() {
-		// assertThat(optionalArgs).isNotNull();
+		assertThat(optionalArgs).isNotNull();
 	}

 }
@@ -19,7 +19,7 @@ package org.springframework.cloud.netflix.eureka.http;
 import com.netflix.appinfo.InstanceInfo;
 import com.netflix.discovery.shared.Applications;
 import com.netflix.discovery.shared.transport.EurekaHttpClient;
-import org.junit.jupiter.api.Disabled;
+import com.netflix.discovery.shared.transport.EurekaHttpResponse;
 import org.junit.jupiter.api.Test;

 import org.springframework.http.HttpStatus;
@@ -29,7 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
 * @author Haytham Mohamed
 **/
-abstract class AbstractEurekaHttpClientTest {
+abstract class AbstractEurekaHttpClientTests {

 	protected EurekaHttpClient eurekaHttpClient;

@@ -49,8 +49,9 @@ abstract class AbstractEurekaHttpClientTest {

 	@Test
 	void testSendHeartBeat() {
-		assertThat(eurekaHttpClient.sendHeartBeat("test", "test", info, null).getStatusCode())
-				.isEqualTo(HttpStatus.OK.value());
+		EurekaHttpResponse<InstanceInfo> response = eurekaHttpClient.sendHeartBeat("test", "test", info, null);
+		assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK.value());
+		assertThat(response.getEntity()).isNotNull();
 	}

 	@Test
@@ -59,6 +60,12 @@ abstract class AbstractEurekaHttpClientTest {
 				.isEqualTo(HttpStatus.NOT_FOUND.value());
 	}

+	@Test
+	void testSendHeartBeatFourOFourWithBody() {
+		assertThat(eurekaHttpClient.sendHeartBeat("fourOFourWithBody", "test", info, null).getStatusCode())
+				.isEqualTo(HttpStatus.NOT_FOUND.value());
+	}
+
 	@Test
 	void testStatusUpdate() {
 		assertThat(eurekaHttpClient.statusUpdate("test", "test", InstanceInfo.InstanceStatus.UP, info).getStatusCode())
@@ -72,7 +79,6 @@ abstract class AbstractEurekaHttpClientTest {
 	}

 	@Test
-	@Disabled // FIXME: 4.0
 	void testGetApplications() {
 		Applications entity = eurekaHttpClient.getApplications().getEntity();
 		assertThat(entity).isNotNull();
@@ -35,16 +35,17 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.userdetails.User;
-import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
+import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
@@ -60,6 +61,7 @@ import static org.springframework.util.Assert.isTrue;
 */
@Configuration(proxyBeanMethods = false)
@RestController
+@RequestMapping("/eureka")
@SpringBootApplication
 public class EurekaServerMockApplication {

@@ -116,6 +118,11 @@ public class EurekaServerMockApplication {
 		if ("fourOFour".equals(appName)) {
 			return new ResponseEntity(HttpStatus.NOT_FOUND);
 		}
+		if ("fourOFourWithBody".equals(appName)) {
+			return new ResponseEntity(
+					"{ \"error\": \"Not Found\", \"message\": null, \"path\": \"/1\", \"requestId\": \"9e5d3244-1\", \"status\": 404, \"timestamp\": \"2023-03-04T03:31:20.810+00:00\" }",
+					HttpStatus.NOT_FOUND);
+		}
 		return new ResponseEntity<>(new InstanceInfo(null, null, null, null, null, null, null, null, null, null, null,
 				null, null, 0, null, null, null, null, null, null, null, new HashMap<>(), 0L, 0L, null, null),
 				HttpStatus.OK);
@@ -135,7 +142,7 @@ public class EurekaServerMockApplication {

 	}

-	@GetMapping({ "/apps", "/apps/delta", "/vips/{address}", "/svips/{address}" })
+	@GetMapping({ "/apps/", "/apps/delta", "/vips/{address}", "/svips/{address}" })
 	public Applications getApplications(@PathVariable(required = false) String address,
 			@RequestParam(required = false) String regions) {
 		Applications applications = new Applications();
@@ -155,23 +162,23 @@ public class EurekaServerMockApplication {

 	@Configuration(proxyBeanMethods = false)
 	@Order(Ordered.HIGHEST_PRECEDENCE)
-	protected static class TestSecurityConfiguration extends WebSecurityConfigurerAdapter {
+	protected static class TestSecurityConfiguration {

-		TestSecurityConfiguration() {
-			super(true);
+		@Bean
+		public InMemoryUserDetailsManager userDetailsService() {
+			UserDetails user = User.withDefaultPasswordEncoder().username("test").password("test").roles("USER")
+					.build();
+			return new InMemoryUserDetailsManager(user);
 		}

 		@Bean
-		public UserDetailsService userDetailsService() {
-			InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager();
-			manager.createUser(User.withUsername("test").password("{noop}test").roles("USER").build());
-			return manager;
-		}
-
-		@Override
-		protected void configure(HttpSecurity http) throws Exception {
-			// super.configure(http);
-			http.antMatcher("/apps/**").httpBasic();
+		public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+			// @formatter:off
+			http
+					.securityMatcher("/v2/apps/**")
+					.httpBasic();
+			// @formatter:on
+			return http.build();
 		}

 	}
@@ -32,14 +32,16 @@ import org.springframework.test.annotation.DirtiesContext;
 * @author Daniel Lavoie
 */
@SpringBootTest(classes = EurekaServerMockApplication.class,
-		properties = { "debug=true", "security.basic.enabled=true" }, webEnvironment = WebEnvironment.RANDOM_PORT)
+		properties = { "debug=true", "security.basic.enabled=true", "eureka.client.fetch-registry=false",
+				"eureka.client.register-with-eureka=false", "logging.level.org.springframework=INFO" },
+		webEnvironment = WebEnvironment.RANDOM_PORT)
@DirtiesContext
-class RestTemplateEurekaHttpClientTest extends AbstractEurekaHttpClientTest {
+class RestTemplateEurekaHttpClientTests extends AbstractEurekaHttpClientTests {

 	@Autowired
 	private InetUtils inetUtils;

-	@Value("http://${security.user.name}:${security.user.password}@localhost:${local.server.port}")
+	@Value("http://${security.user.name}:${security.user.password}@localhost:${local.server.port}/eureka")
 	private String serviceUrl;

 	@BeforeEach
@@ -33,15 +33,16 @@ import org.springframework.web.reactive.function.client.WebClient;
 * @author Daniel Lavoie
 */
@SpringBootTest(classes = EurekaServerMockApplication.class,
-		properties = { "debug=true", "security.basic.enabled=true", "eureka.client.webclient.enabled=true" },
+		properties = { "debug=true", "security.basic.enabled=true", "eureka.client.webclient.enabled=true",
+				"eureka.client.fetch-registry=false", "eureka.client.register-with-eureka=false" },
 		webEnvironment = WebEnvironment.RANDOM_PORT)
@DirtiesContext
-class WebClientEurekaHttpClientTest extends AbstractEurekaHttpClientTest {
+class WebClientEurekaHttpClientTests extends AbstractEurekaHttpClientTests {

 	@Autowired
 	private InetUtils inetUtils;

-	@Value("http://${security.user.name}:${security.user.password}@localhost:${local.server.port}")
+	@Value("http://${security.user.name}:${security.user.password}@localhost:${local.server.port}/eureka/")
 	private String serviceUrl;

 	@BeforeEach
@@ -35,16 +35,16 @@ import static org.assertj.core.api.Assertions.assertThat;
 */
 class EurekaLoadBalancerClientConfigurationTests {

-	private EurekaClientConfigBean eurekaClientConfig = new EurekaClientConfigBean();
+	private final EurekaClientConfigBean eurekaClientConfig = new EurekaClientConfigBean();

-	private EurekaInstanceConfigBean eurekaInstanceConfig = new EurekaInstanceConfigBean(
+	private final EurekaInstanceConfigBean eurekaInstanceConfig = new EurekaInstanceConfigBean(
 			new InetUtils(new InetUtilsProperties()));

-	private LoadBalancerZoneConfig zoneConfig = new LoadBalancerZoneConfig(null);
+	private final LoadBalancerZoneConfig zoneConfig = new LoadBalancerZoneConfig(null);

-	private EurekaLoadBalancerProperties eurekaLoadBalancerProperties = new EurekaLoadBalancerProperties();
+	private final EurekaLoadBalancerProperties eurekaLoadBalancerProperties = new EurekaLoadBalancerProperties();

-	private EurekaLoadBalancerClientConfiguration postprocessor = new EurekaLoadBalancerClientConfiguration(
+	private final EurekaLoadBalancerClientConfiguration postprocessor = new EurekaLoadBalancerClientConfiguration(
 			eurekaClientConfig, eurekaInstanceConfig, zoneConfig, eurekaLoadBalancerProperties);

 	@Test
@@ -33,7 +33,7 @@ class DefaultManagementMetadataProviderTest {
 	private final ManagementMetadataProvider provider = new DefaultManagementMetadataProvider();

 	@BeforeEach
-	void setUp() throws Exception {
+	void setUp() {
 		when(INSTANCE.getHostname()).thenReturn("host");
 		when(INSTANCE.getHealthCheckUrlPath()).thenReturn("health");
 		when(INSTANCE.getStatusPageUrlPath()).thenReturn("info");
@@ -41,7 +41,7 @@ class DefaultManagementMetadataProviderTest {
 	}

 	@Test
-	void serverPortIsRandomAndManagementPortIsNull() throws Exception {
+	void serverPortIsRandomAndManagementPortIsNull() {
 		int serverPort = 0;
 		String serverContextPath = "/";
 		String managementContextPath = null;
@@ -53,7 +53,7 @@ class DefaultManagementMetadataProviderTest {
 	}

 	@Test
-	void managementPortIsRandom() throws Exception {
+	void managementPortIsRandom() {
 		int serverPort = 0;
 		String serverContextPath = "/";
 		String managementContextPath = null;
@@ -65,7 +65,7 @@ class DefaultManagementMetadataProviderTest {
 	}

 	@Test
-	void serverPort() throws Exception {
+	void serverPort() {
 		int serverPort = 7777;
 		String serverContextPath = "/";
 		String managementContextPath = null;
@@ -80,7 +80,7 @@ class DefaultManagementMetadataProviderTest {
 	}

 	@Test
-	void serverPortManagementPort() throws Exception {
+	void serverPortManagementPort() {
 		int serverPort = 7777;
 		String serverContextPath = "/";
 		String managementContextPath = null;
@@ -95,7 +95,7 @@ class DefaultManagementMetadataProviderTest {
 	}

 	@Test
-	void serverPortManagementPortServerContextPath() throws Exception {
+	void serverPortManagementPortServerContextPath() {
 		int serverPort = 7777;
 		String serverContextPath = "/Server";
 		String managementContextPath = null;
@@ -110,7 +110,7 @@ class DefaultManagementMetadataProviderTest {
 	}

 	@Test
-	void serverPortManagementPortServerContextPathManagementContextPath() throws Exception {
+	void serverPortManagementPortServerContextPathManagementContextPath() {
 		int serverPort = 7777;
 		String serverContextPath = "/Server";
 		String managementContextPath = "/Management";
@@ -125,7 +125,7 @@ class DefaultManagementMetadataProviderTest {
 	}

 	@Test
-	void serverPortServerContextPathManagementContextPath() throws Exception {
+	void serverPortServerContextPathManagementContextPath() {
 		int serverPort = 7777;
 		String serverContextPath = "/Server";
 		String managementContextPath = "/Management";
@@ -140,7 +140,7 @@ class DefaultManagementMetadataProviderTest {
 	}

 	@Test
-	void serverPortManagementContextPath() throws Exception {
+	void serverPortManagementContextPath() {
 		int serverPort = 7777;
 		String serverContextPath = "/";
 		String managementContextPath = "/Management";
@@ -155,7 +155,7 @@ class DefaultManagementMetadataProviderTest {
 	}

 	@Test
-	void serverPortServerContextPath() throws Exception {
+	void serverPortServerContextPath() {
 		int serverPort = 7777;
 		String serverContextPath = "/Server";
 		String managementContextPath = null;
@@ -170,7 +170,7 @@ class DefaultManagementMetadataProviderTest {
 	}

 	@Test
-	void serverPortManagementPortManagementContextPath() throws Exception {
+	void serverPortManagementPortManagementContextPath() {
 		int serverPort = 7777;
 		String serverContextPath = "/";
 		String managementContextPath = "/Management";
@@ -186,7 +186,7 @@ class DefaultManagementMetadataProviderTest {
 	}

 	@Test
-	void setSecureHealthCheckUrl() throws Exception {
+	void setSecureHealthCheckUrl() {
 		int serverPort = 7777;
 		String serverContextPath = "/";
 		String managementContextPath = "/Management";
@@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 */
 class EurekaReactiveDiscoveryClientConfigurationTests {

-	private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
+	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 			.withConfiguration(AutoConfigurations.of(UtilAutoConfiguration.class,
 					ReactiveCommonsClientAutoConfiguration.class, EurekaClientAutoConfiguration.class,
 					DiscoveryClientOptionalArgsConfiguration.class, EurekaReactiveDiscoveryClientConfiguration.class));
@@ -18,7 +18,6 @@ package org.springframework.cloud.netflix.eureka.reactive;

 import com.netflix.appinfo.InstanceInfo;
 import com.netflix.discovery.EurekaClient;
-import com.netflix.discovery.EurekaClientConfig;
 import com.netflix.discovery.shared.Application;
 import com.netflix.discovery.shared.Applications;
 import org.junit.jupiter.api.Test;
@@ -47,9 +46,6 @@ class EurekaReactiveDiscoveryClientTests {
 	@Mock
 	private EurekaClient eurekaClient;

-	@Mock
-	private EurekaClientConfig clientConfig;
-
 	@InjectMocks
 	private EurekaReactiveDiscoveryClient client;

@@ -17,7 +17,6 @@
 package org.springframework.cloud.netflix.eureka.sample;

 import java.io.Closeable;
-import java.io.IOException;

 import com.netflix.appinfo.HealthCheckHandler;
 import com.netflix.appinfo.InstanceInfo;
@@ -103,7 +102,7 @@ public class EurekaSampleApplication implements ApplicationContextAware, Closeab
 	}

 	@Override
-	public void close() throws IOException {
+	public void close() {
 		deregister();
 	}

@@ -62,6 +62,7 @@ class EurekaServiceRegistryTests {
 		verifyNoInteractions(eurekaClient);
 	}

+	@SuppressWarnings("unchecked")
 	@Test
 	void eurekaClientGetStatus() {
 		EurekaServiceRegistry registry = new EurekaServiceRegistry();
@@ -98,6 +99,7 @@ class EurekaServiceRegistryTests {
 				OUT_OF_SERVICE.toString());
 	}

+	@SuppressWarnings("unchecked")
 	@Test
 	void eurekaClientGetStatusNoInstance() {
 		EurekaServiceRegistry registry = new EurekaServiceRegistry();
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.0.2</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-netflix-eureka-server</artifactId>
@@ -65,7 +65,7 @@ public class CloudJacksonJson extends LegacyJacksonJson {
 	}

 	@Override
-	public <T> String encode(T object) throws IOException {
+	public <T> String encode(T object) {
 		return this.codec.writeToString(object);
 	}

@@ -56,7 +56,7 @@ public class EurekaController {
 	@Value("${eureka.dashboard.path:/}")
 	private String dashboardPath = "";

-	private ApplicationInfoManager applicationInfoManager;
+	private final ApplicationInfoManager applicationInfoManager;

 	private final EurekaProperties eurekaProperties;

@@ -17,28 +17,41 @@
 package org.springframework.cloud.netflix.eureka.server;

 import java.io.IOException;
+import java.net.InetAddress;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.UnknownHostException;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.regex.Pattern;

 import com.netflix.appinfo.ApplicationInfoManager;
+import com.netflix.discovery.AbstractDiscoveryClientOptionalArgs;
 import com.netflix.discovery.EurekaClient;
 import com.netflix.discovery.EurekaClientConfig;
+import com.netflix.discovery.Jersey3DiscoveryClientOptionalArgs;
 import com.netflix.discovery.converters.EurekaJacksonCodec;
 import com.netflix.discovery.converters.wrappers.CodecWrapper;
 import com.netflix.discovery.converters.wrappers.CodecWrappers;
-import com.netflix.discovery.shared.transport.EurekaHttpClient;
 import com.netflix.discovery.shared.transport.jersey.TransportClientFactories;
+import com.netflix.discovery.shared.transport.jersey3.EurekaIdentityHeaderFilter;
+import com.netflix.discovery.shared.transport.jersey3.EurekaJersey3Client;
+import com.netflix.discovery.shared.transport.jersey3.EurekaJersey3ClientImpl;
 import com.netflix.discovery.shared.transport.jersey3.Jersey3TransportClientFactories;
 import com.netflix.eureka.DefaultEurekaServerContext;
 import com.netflix.eureka.EurekaServerConfig;
 import com.netflix.eureka.EurekaServerContext;
+import com.netflix.eureka.EurekaServerIdentity;
 import com.netflix.eureka.cluster.PeerEurekaNode;
 import com.netflix.eureka.cluster.PeerEurekaNodes;
 import com.netflix.eureka.registry.PeerAwareInstanceRegistry;
 import com.netflix.eureka.resources.DefaultServerCodecs;
 import com.netflix.eureka.resources.ServerCodecs;
+import com.netflix.eureka.transport.EurekaServerHttpClientFactory;
+import com.netflix.eureka.transport.Jersey3DynamicGZIPContentEncodingFilter;
+import com.netflix.eureka.transport.Jersey3EurekaServerHttpClientFactory;
 import com.netflix.eureka.transport.Jersey3ReplicationClient;
 import jakarta.servlet.Filter;
 import jakarta.servlet.FilterChain;
@@ -47,8 +60,12 @@ import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletRequestWrapper;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.ws.rs.Path;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientRequestFilter;
 import jakarta.ws.rs.core.Application;
 import jakarta.ws.rs.ext.Provider;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.glassfish.hk2.api.ServiceLocator;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.server.spi.Container;
@@ -71,7 +88,6 @@ import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.cloud.client.actuator.HasFeatures;
 import org.springframework.cloud.context.environment.EnvironmentChangeEvent;
 import org.springframework.cloud.netflix.eureka.EurekaConstants;
-import org.springframework.cloud.netflix.eureka.config.HostnameBasedUrlRandomizer;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
@@ -101,6 +117,8 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@PropertySource("classpath:/eureka/server.properties")
 public class EurekaServerAutoConfiguration implements WebMvcConfigurer {

+	private static final Log log = LogFactory.getLog(EurekaServerAutoConfiguration.class);
+
 	/**
 	 * List of packages containing Jersey resources required by the Eureka server.
 	 */
@@ -162,7 +180,6 @@ public class EurekaServerAutoConfiguration implements WebMvcConfigurer {
 		return codec == null ? CodecWrappers.getCodec(CodecWrappers.XStreamXml.class) : codec;
 	}

-	// FIXME: 4.0
 	@Bean
 	@ConditionalOnMissingBean
 	public ReplicationClientAdditionalFilters replicationClientAdditionalFilters() {
@@ -170,24 +187,31 @@ public class EurekaServerAutoConfiguration implements WebMvcConfigurer {
 	}

 	@Bean
+	@ConditionalOnMissingBean(TransportClientFactories.class)
 	public Jersey3TransportClientFactories jersey3TransportClientFactories() {
 		return Jersey3TransportClientFactories.getInstance();
 	}

+	@SuppressWarnings({ "rawtypes", "unchecked" })
 	@Bean
-	public EurekaHttpClient eurekaHttpClient(TransportClientFactories transportClientFactories, Environment env) {
-		return transportClientFactories
-				.newTransportClientFactory(this.eurekaClientConfig, Collections.emptyList(),
-						this.applicationInfoManager.getInfo())
-				.newClient(HostnameBasedUrlRandomizer.randomEndpoint(this.eurekaClientConfig, env));
+	@ConditionalOnMissingBean(EurekaServerHttpClientFactory.class)
+	public Jersey3EurekaServerHttpClientFactory jersey3EurekaServerHttpClientFactory() {
+		return new Jersey3EurekaServerHttpClientFactory();
+	}
+
+	@Bean
+	@ConditionalOnMissingBean(AbstractDiscoveryClientOptionalArgs.class)
+	public Jersey3DiscoveryClientOptionalArgs jersey3DiscoveryClientOptionalArgs() {
+		return new Jersey3DiscoveryClientOptionalArgs();
 	}

 	@Bean
 	public PeerAwareInstanceRegistry peerAwareInstanceRegistry(ServerCodecs serverCodecs,
-			EurekaHttpClient eurekaHttpClient) {
+			EurekaServerHttpClientFactory eurekaServerHttpClientFactory) {
 		this.eurekaClient.getApplications(); // force initialization
 		return new InstanceRegistry(this.eurekaServerConfig, this.eurekaClientConfig, serverCodecs, this.eurekaClient,
-				eurekaHttpClient, this.instanceRegistryProperties.getExpectedNumberOfClientsSendingRenews(),
+				eurekaServerHttpClientFactory,
+				this.instanceRegistryProperties.getExpectedNumberOfClientsSendingRenews(),
 				this.instanceRegistryProperties.getDefaultOpenForTrafficCount());
 	}

@@ -231,12 +255,15 @@ public class EurekaServerAutoConfiguration implements WebMvcConfigurer {
 	}

 	@Bean
-	public FilterRegistrationBean<?> eurekaVersionFilterRegistration(ServerProperties serverProperties) {
-		String contextPath = serverProperties.getServlet().getContextPath();
+	public FilterRegistrationBean<?> eurekaVersionFilterRegistration(ServerProperties serverProperties,
+			Environment env) {
+		final String contextPath = serverProperties.getServlet().getContextPath();
 		String regex = EurekaConstants.DEFAULT_PREFIX + STATIC_CONTENT_PATTERN;
 		if (StringUtils.hasText(contextPath)) {
 			regex = contextPath + regex;
 		}
+		String debugResponseHeader = env.getProperty("eureka.server.version.filter.debug.response-header");
+		boolean addDebugResponseHeader = StringUtils.hasText(debugResponseHeader);
 		Pattern staticPattern = Pattern.compile(regex);
 		FilterRegistrationBean<Filter> bean = new FilterRegistrationBean<>();
 		bean.setFilter(new OncePerRequestFilter() {
@@ -249,18 +276,29 @@ public class EurekaServerAutoConfiguration implements WebMvcConfigurer {
 						// don't forward static requests (images, js, etc...) to /v2
 						&& !staticPattern.matcher(requestURI).matches()) {

-					String updatedPath = EurekaConstants.DEFAULT_PREFIX + "/v2"
-							+ requestURI.substring(EurekaConstants.DEFAULT_PREFIX.length());
-
+					String prefix = EurekaConstants.DEFAULT_PREFIX;
+					if (StringUtils.hasText(contextPath)) {
+						prefix = contextPath + prefix;
+					}
+					String updatedPath = EurekaConstants.DEFAULT_PREFIX + "/v2" + requestURI.substring(prefix.length());
+					if (StringUtils.hasText(contextPath)) {
+						updatedPath = contextPath + updatedPath;
+					}
+					final String computedPath = updatedPath;
+					// only used if a special debug property is set, so in prod this is
+					// always skipped.
+					if (addDebugResponseHeader) {
+						response.addHeader(debugResponseHeader, computedPath);
+					}
 					HttpServletRequestWrapper wrapper = new HttpServletRequestWrapper(request) {
 						@Override
 						public String getRequestURI() {
-							return updatedPath;
+							return computedPath;
 						}

 						@Override
 						public String getServletPath() {
-							return updatedPath;
+							return computedPath;
 						}
 					};
 					req = wrapper;
@@ -337,7 +375,7 @@ public class EurekaServerAutoConfiguration implements WebMvcConfigurer {
 	@Bean
 	@ConditionalOnBean(name = "httpTraceFilter")
 	public FilterRegistrationBean<?> traceFilterRegistration(@Qualifier("httpTraceFilter") Filter filter) {
-		FilterRegistrationBean<Filter> bean = new FilterRegistrationBean<Filter>();
+		FilterRegistrationBean<Filter> bean = new FilterRegistrationBean<>();
 		bean.setFilter(filter);
 		bean.setOrder(Ordered.LOWEST_PRECEDENCE - 10);
 		return bean;
@@ -374,7 +412,7 @@ public class EurekaServerAutoConfiguration implements WebMvcConfigurer {
 	static class RefreshablePeerEurekaNodes extends PeerEurekaNodes
 			implements ApplicationListener<EnvironmentChangeEvent> {

-		private ReplicationClientAdditionalFilters replicationClientAdditionalFilters;
+		/* for testing */ ReplicationClientAdditionalFilters replicationClientAdditionalFilters;

 		RefreshablePeerEurekaNodes(final PeerAwareInstanceRegistry registry, final EurekaServerConfig serverConfig,
 				final EurekaClientConfig clientConfig, final ServerCodecs serverCodecs,
@@ -386,11 +424,8 @@ public class EurekaServerAutoConfiguration implements WebMvcConfigurer {

 		@Override
 		protected PeerEurekaNode createPeerEurekaNode(String peerEurekaNodeUrl) {
-			Jersey3ReplicationClient replicationClient = Jersey3ReplicationClient.createReplicationClient(serverConfig,
-					serverCodecs, peerEurekaNodeUrl);
-
-			// FIXME: 4.0
-			// this.replicationClientAdditionalFilters.getFilters().forEach(replicationClient::addReplicationClientFilter);
+			Jersey3ReplicationClient replicationClient = createReplicationClient(serverConfig, serverCodecs,
+					peerEurekaNodeUrl, this.replicationClientAdditionalFilters.getFilters());

 			String targetHost = hostFromUrl(peerEurekaNodeUrl);
 			if (targetHost == null) {
@@ -399,6 +434,64 @@ public class EurekaServerAutoConfiguration implements WebMvcConfigurer {
 			return new PeerEurekaNode(registry, targetHost, peerEurekaNodeUrl, replicationClient, serverConfig);
 		}

+		// FIXME: 4.0 update Jersey3ReplicationClient.createReplicationClient to handle
+		// additional filters
+		private static Jersey3ReplicationClient createReplicationClient(EurekaServerConfig config,
+				ServerCodecs serverCodecs, String serviceUrl, Collection<ClientRequestFilter> additionalFilters) {
+			String name = Jersey3ReplicationClient.class.getSimpleName() + ": " + serviceUrl + "apps/: ";
+
+			EurekaJersey3Client jerseyClient;
+			try {
+				String hostname;
+				try {
+					hostname = new URL(serviceUrl).getHost();
+				}
+				catch (MalformedURLException e) {
+					hostname = serviceUrl;
+				}
+
+				String jerseyClientName = "Discovery-PeerNodeClient-" + hostname;
+				EurekaJersey3ClientImpl.EurekaJersey3ClientBuilder clientBuilder = new EurekaJersey3ClientImpl.EurekaJersey3ClientBuilder()
+						.withClientName(jerseyClientName).withUserAgent("Java-EurekaClient-Replication")
+						.withEncoderWrapper(serverCodecs.getFullJsonCodec())
+						.withDecoderWrapper(serverCodecs.getFullJsonCodec())
+						.withConnectionTimeout(config.getPeerNodeConnectTimeoutMs())
+						.withReadTimeout(config.getPeerNodeReadTimeoutMs())
+						.withMaxConnectionsPerHost(config.getPeerNodeTotalConnectionsPerHost())
+						.withMaxTotalConnections(config.getPeerNodeTotalConnections())
+						.withConnectionIdleTimeout(config.getPeerNodeConnectionIdleTimeoutSeconds());
+
+				if (serviceUrl.startsWith("https://") && "true"
+						.equals(System.getProperty("com.netflix.eureka.shouldSSLConnectionsUseSystemSocketFactory"))) {
+					clientBuilder.withSystemSSLConfiguration();
+				}
+				jerseyClient = clientBuilder.build();
+			}
+			catch (Throwable e) {
+				throw new RuntimeException("Cannot Create new Replica Node :" + name, e);
+			}
+
+			String ip = null;
+			try {
+				ip = InetAddress.getLocalHost().getHostAddress();
+			}
+			catch (UnknownHostException e) {
+				log.warn("Cannot find localhost ip", e);
+			}
+
+			Client jerseyApacheClient = jerseyClient.getClient();
+			jerseyApacheClient.register(new Jersey3DynamicGZIPContentEncodingFilter(config));
+
+			for (ClientRequestFilter filter : additionalFilters) {
+				jerseyApacheClient.register(filter);
+			}
+
+			EurekaServerIdentity identity = new EurekaServerIdentity(ip);
+			jerseyApacheClient.register(new EurekaIdentityHeaderFilter(identity));
+
+			return new Jersey3ReplicationClient(jerseyClient, serviceUrl);
+		}
+
 		@Override
 		public void onApplicationEvent(final EnvironmentChangeEvent event) {
 			if (shouldUpdate(event.getKeys())) {
@@ -1049,11 +1049,11 @@ public class EurekaServerConfigBean implements EurekaServerConfig {
 				registrySyncRetryWaitMs, remoteRegionAppWhitelist, remoteRegionConnectTimeoutMs,
 				remoteRegionConnectionIdleTimeoutSeconds, remoteRegionFetchThreadPoolSize, remoteRegionReadTimeoutMs,
 				remoteRegionRegistryFetchInterval, remoteRegionTotalConnections, remoteRegionTotalConnectionsPerHost,
-				remoteRegionTrustStore, remoteRegionTrustStorePassword, remoteRegionUrls, remoteRegionUrlsWithName,
-				renewalPercentThreshold, renewalThresholdUpdateIntervalMs, responseCacheAutoExpirationInSeconds,
-				responseCacheUpdateIntervalMs, retentionTimeInMSInDeltaQueue, route53BindRebindRetries,
-				route53BindingRetryIntervalMs, route53DomainTTL, syncWhenTimestampDiffers, useReadOnlyResponseCache,
-				waitTimeInMsWhenSyncEmpty, xmlCodecName, initialCapacityOfResponseCache,
+				remoteRegionTrustStore, remoteRegionTrustStorePassword, Arrays.hashCode(remoteRegionUrls),
+				remoteRegionUrlsWithName, renewalPercentThreshold, renewalThresholdUpdateIntervalMs,
+				responseCacheAutoExpirationInSeconds, responseCacheUpdateIntervalMs, retentionTimeInMSInDeltaQueue,
+				route53BindRebindRetries, route53BindingRetryIntervalMs, route53DomainTTL, syncWhenTimestampDiffers,
+				useReadOnlyResponseCache, waitTimeInMsWhenSyncEmpty, xmlCodecName, initialCapacityOfResponseCache,
 				expectedClientRenewalIntervalSeconds, useAwsAsgApi, myUrl);
 	}

@@ -52,7 +52,7 @@ public class EurekaServerInitializerConfiguration implements ServletContextAware

 	private boolean running;

-	private int order = 1;
+	private final int order = 1;

 	@Override
 	public void setServletContext(ServletContext servletContext) {
@@ -21,11 +21,11 @@ import com.netflix.appinfo.InstanceInfo;
 import com.netflix.discovery.EurekaClient;
 import com.netflix.discovery.EurekaClientConfig;
 import com.netflix.discovery.shared.Application;
-import com.netflix.discovery.shared.transport.EurekaHttpClient;
 import com.netflix.eureka.EurekaServerConfig;
 import com.netflix.eureka.lease.Lease;
 import com.netflix.eureka.registry.PeerAwareInstanceRegistryImpl;
 import com.netflix.eureka.resources.ServerCodecs;
+import com.netflix.eureka.transport.EurekaServerHttpClientFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

@@ -46,12 +46,12 @@ public class InstanceRegistry extends PeerAwareInstanceRegistryImpl implements A

 	private ApplicationContext ctxt;

-	private int defaultOpenForTrafficCount;
+	private final int defaultOpenForTrafficCount;

 	public InstanceRegistry(EurekaServerConfig serverConfig, EurekaClientConfig clientConfig, ServerCodecs serverCodecs,
-			EurekaClient eurekaClient, EurekaHttpClient eurekaHttpClient, int expectedNumberOfClientsSendingRenews,
-			int defaultOpenForTrafficCount) {
-		super(serverConfig, clientConfig, serverCodecs, eurekaClient, eurekaHttpClient);
+			EurekaClient eurekaClient, EurekaServerHttpClientFactory eurekaServerHttpClientFactory,
+			int expectedNumberOfClientsSendingRenews, int defaultOpenForTrafficCount) {
+		super(serverConfig, clientConfig, serverCodecs, eurekaClient, eurekaServerHttpClientFactory);

 		this.expectedNumberOfClientsSendingRenews = expectedNumberOfClientsSendingRenews;
 		this.defaultOpenForTrafficCount = defaultOpenForTrafficCount;
@@ -19,21 +19,20 @@ package org.springframework.cloud.netflix.eureka.server;
 import java.util.Collection;
 import java.util.LinkedHashSet;

-// FIXME: 4.0
-//import com.sun.jersey.api.client.filter.ClientFilter;
+import jakarta.ws.rs.client.ClientRequestFilter;

 /**
 * @author Yuxin Bai
 */
 public class ReplicationClientAdditionalFilters {

-	private Collection<?> filters;
+	private final Collection<ClientRequestFilter> filters;

-	public ReplicationClientAdditionalFilters(Collection<?> filters) {
+	public ReplicationClientAdditionalFilters(Collection<ClientRequestFilter> filters) {
 		this.filters = new LinkedHashSet<>(filters);
 	}

-	public Collection<?> getFilters() {
+	public Collection<ClientRequestFilter> getFilters() {
 		return this.filters;
 	}

@@ -40,7 +40,8 @@ import static org.assertj.core.api.Assertions.assertThat;

@SpringBootTest(classes = Application.class, webEnvironment = WebEnvironment.RANDOM_PORT,
 		properties = { "spring.application.name=eureka", "server.servlet.context-path=/context",
-				"management.security.enabled=false", "management.endpoints.web.exposure.include=*" })
+				"management.security.enabled=false", "management.endpoints.web.exposure.include=*",
+				"eureka.server.version.filter.debug.response-header=X-Version-Filter-Computed-Path" })
 class ApplicationContextTests {

 	private static final String BASE_PATH = new WebEndpointProperties().getBasePath();
@@ -54,6 +55,8 @@ class ApplicationContextTests {
 		ResponseEntity<Map> entity = new TestRestTemplate()
 				.getForEntity("http://localhost:" + this.port + "/context/eureka/apps", Map.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
+		String computedPath = entity.getHeaders().getFirst("X-Version-Filter-Computed-Path");
+		assertThat(computedPath).isEqualTo("/context/eureka/v2/apps");
 	}

 	@Test
@@ -52,7 +52,7 @@ class EurekaControllerReplicasTests {

 	String totalNoAutoList = combinationNoAuthList1 + "," + combinationNoAuthList2;

-	String empty = new String();
+	String empty = "";

 	private ApplicationInfoManager original;

@@ -72,7 +72,7 @@ class EurekaControllerReplicasTests {
 	}

 	@Test
-	void testFilterReplicasNoAuth() throws Exception {
+	void testFilterReplicasNoAuth() {
 		Map<String, Object> model = new HashMap<>();
 		StatusInfo statusInfo = StatusInfo.Builder.newBuilder().add("registered-replicas", empty)
 				.add("available-replicas", noAuthList1).add("unavailable-replicas", noAuthList2)
@@ -90,7 +90,7 @@ class EurekaControllerReplicasTests {
 	}

 	@Test
-	void testFilterReplicasAuth() throws Exception {
+	void testFilterReplicasAuth() {
 		Map<String, Object> model = new HashMap<>();
 		StatusInfo statusInfo = StatusInfo.Builder.newBuilder().add("registered-replicas", authList2)
 				.add("available-replicas", authList1).add("unavailable-replicas", empty).withInstanceInfo(instanceInfo)
@@ -108,7 +108,7 @@ class EurekaControllerReplicasTests {
 	}

 	@Test
-	void testFilterReplicasAuthWithCombinationList() throws Exception {
+	void testFilterReplicasAuthWithCombinationList() {
 		Map<String, Object> model = new HashMap<>();
 		StatusInfo statusInfo = StatusInfo.Builder.newBuilder().add("registered-replicas", totalAutoList)
 				.add("available-replicas", combinationAuthList1).add("unavailable-replicas", combinationAuthList2)
@@ -93,7 +93,7 @@ class EurekaControllerTests {
 	}

 	@Test
-	void testStatus() throws Exception {
+	void testStatus() {
 		Map<String, Object> model = new HashMap<>();

 		EurekaController controller = new EurekaController(infoManager, new EurekaProperties());
@@ -71,7 +71,7 @@ class InstanceRegistryTests {
 	private TestEvents testEvents;

 	@Test
-	void testRegister() throws Exception {
+	void testRegister() {
 		// creating instance info
 		final LeaseInfo leaseInfo = getLeaseInfo();
 		final InstanceInfo instanceInfo = getInstanceInfo(APP_NAME, HOST_NAME, INSTANCE_ID, PORT, leaseInfo);
@@ -90,7 +90,7 @@ class InstanceRegistryTests {
 	}

 	@Test
-	void testDefaultLeaseDurationRegisterEvent() throws Exception {
+	void testDefaultLeaseDurationRegisterEvent() {
 		// creating instance info
 		final InstanceInfo instanceInfo = getInstanceInfo(APP_NAME, HOST_NAME, INSTANCE_ID, PORT, null);
 		// calling tested method
@@ -102,7 +102,7 @@ class InstanceRegistryTests {
 	}

 	@Test
-	void testInternalCancel() throws Exception {
+	void testInternalCancel() {
 		// calling tested method
 		instanceRegistry.internalCancel(APP_NAME, HOST_NAME, false);
 		// event of proper type is registered
@@ -118,7 +118,7 @@ class InstanceRegistryTests {
 	}

 	@Test
-	void testRenew() throws Exception {
+	void testRenew() {
 		// Creating two instances of the app
 		final InstanceInfo instanceInfo1 = getInstanceInfo(APP_NAME, HOST_NAME, INSTANCE_ID, PORT, null);
 		final InstanceInfo instanceInfo2 = getInstanceInfo(APP_NAME, HOST_NAME, "my-host-name:8009", 8009, null);
@@ -16,16 +16,20 @@

 package org.springframework.cloud.netflix.eureka.server;

+import java.io.IOException;
 import java.lang.reflect.Field;
+import java.util.Collections;

 import com.netflix.eureka.cluster.PeerEurekaNodes;
-import org.junit.jupiter.api.Disabled;
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.client.ClientRequestFilter;
 import org.junit.jupiter.api.Test;

 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.netflix.eureka.server.EurekaServerAutoConfiguration.RefreshablePeerEurekaNodes;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.util.ReflectionUtils;

@@ -34,7 +38,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
 * @author Yuxin Bai
 */
-@Disabled // FIXME: 4.0
@SpringBootTest(classes = RefreshablePeerEurekaNodesWithCustomFiltersTests.Application.class,
 		webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, value = { "spring.application.name=eureka",
 				"server.contextPath=/context", "management.security.enabled=false" })
@@ -47,16 +50,13 @@ class RefreshablePeerEurekaNodesWithCustomFiltersTests {
 	void testCustomPeerNodesShouldTakePrecedenceOverDefault() {
 		assertThat(peerEurekaNodes instanceof RefreshablePeerEurekaNodes)
 				.as("PeerEurekaNodes should be an instance of RefreshablePeerEurekaNodes").isTrue();
+		RefreshablePeerEurekaNodes refreshablePeerEurekaNodes = (RefreshablePeerEurekaNodes) peerEurekaNodes;

-		ReplicationClientAdditionalFilters filters = getField(RefreshablePeerEurekaNodes.class,
-				(RefreshablePeerEurekaNodes) peerEurekaNodes, "replicationClientAdditionalFilters");
-		// assertThat(filters.getFilters())
-		// .as("PeerEurekaNodes'should have only one filter set on
-		// replicationClientAdditionalFilters").hasSize(1);
-		// assertThat(filters.getFilters().iterator().next() instanceof
-		// Application.CustomClientFilter)
-		// .as("The type of the filter should be CustomClientFilter as user declared
-		// so").isTrue();
+		ReplicationClientAdditionalFilters filters = refreshablePeerEurekaNodes.replicationClientAdditionalFilters;
+		assertThat(filters.getFilters())
+				.as("PeerEurekaNodes'should have only one filter set on replicationClientAdditionalFilters").hasSize(1);
+		assertThat(filters.getFilters().iterator().next() instanceof Application.CustomClientFilter)
+				.as("The type of the filter should be CustomClientFilter as user declared so").isTrue();
 	}

 	private static <T, R> R getField(Class<T> clazz, T target, String fieldName) {
@@ -72,19 +72,19 @@ class RefreshablePeerEurekaNodesWithCustomFiltersTests {
 	@EnableEurekaServer
 	protected static class Application {

-		// FIXME: 4.0
-		/*
-		 * @Bean public ReplicationClientAdditionalFilters customFilters() { return new
-		 * ReplicationClientAdditionalFilters(Collections.singletonList(new
-		 * CustomClientFilter())); }
-		 *
-		 * protected class CustomClientFilter extends ClientFilter {
-		 *
-		 * @Override public ClientResponse handle(ClientRequest cr) throws
-		 * ClientHandlerException { return getNext().handle(cr); }
-		 *
-		 * }
-		 */
+		@Bean
+		public ReplicationClientAdditionalFilters customFilters() {
+			return new ReplicationClientAdditionalFilters(Collections.singletonList(new CustomClientFilter()));
+		}
+
+		protected class CustomClientFilter implements ClientRequestFilter {
+
+			@Override
+			public void filter(ClientRequestContext requestContext) throws IOException {
+				// noop
+			}
+
+		}

 	}

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.0.2</version>
 	</parent>
 	<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 	<name>Spring Cloud Starter Netflix Eureka Client</name>
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.0.2</version>
 	</parent>
 	<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
 	<name>Spring Cloud Starter Netflix Eureka Server</name>
Author	SHA1	Message	Date
buildmaster	2b564713ba	Update SNAPSHOT to 4.0.2	2023-05-24 19:23:20 +00:00
spencergibb	98f919c127	Changes conditional on missing class to impl. Rather than jakarta.ws.rs.client.ClientRequestFilter, use jakarta.ws.rs.client.ClientRequestFilter Also exclude jersey-client rather than jaxrs api See gh-4176 Fixes gh-4177	2023-05-23 11:23:20 -04:00
spencergibb	df9e581dc5	Changes conditional on missing class to jakarta.ws.rs.client.ClientRequestFilter Fixes gh-4176	2023-05-22 12:59:36 -04:00
buildmaster	ccb0f5c5a0	Bumping versions to 4.0.2-SNAPSHOT after release	2023-03-28 15:25:13 +00:00
buildmaster	c0725c534e	Going back to snapshots	2023-03-28 15:25:13 +00:00
buildmaster	ac4d92f58d	Update SNAPSHOT to 4.0.1	2023-03-28 15:23:26 +00:00
Olga Maciaszek-Sharma	5cc8194b53	Add hints for EurekaServiceInstance. Fixes gh-4139.	2023-03-07 13:36:37 +01:00
spencergibb	9cea0ebe23	Ignore response body in eureka client on 404 error. This allows heartbeats to proceed as normal. Fixes gh-4145	2023-03-04 00:18:13 -05:00
spencergibb	0dca49318c	Include contextPath in eurekaVersionFilter computed path Fixes gh-4154	2023-03-03 22:21:03 -05:00
spencergibb	fa07416bd8	Updates to new HttpStatusCode interface	2023-03-03 17:56:02 -05:00
spencergibb	06b41d5019	Merge branch '3.1.x'	2023-03-03 17:51:06 -05:00
spencergibb	147d50f2c2	Migrates from WebClient.exchange() to retrieve() retrieve() should clean up resources automatically while exchange() requires explicit handling that wasn't being done. Fixes gh-3862	2023-03-03 17:47:27 -05:00
spencergibb	ded713ecc1	Removes comments	2023-03-03 17:44:24 -05:00
buildmaster	890f1ef4d6	Bumping versions to 3.1.6-SNAPSHOT after release	2023-02-23 23:14:31 +00:00
buildmaster	25796a27f0	Going back to snapshots	2023-02-23 23:14:31 +00:00
buildmaster	327b126207	Update SNAPSHOT to 3.1.5	2023-02-23 23:12:59 +00:00
spencergibb	58c819c76b	Strips userinfo from serviceUrl. It is added to rest template via basic auth interceptor. Fixes breaking change in apache httpclient 5.2 which boot 3.1 manages.	2023-02-15 15:14:46 -05:00
spencergibb	f74977f663	skip deploy of test module	2023-02-15 14:32:46 -05:00
buildmaster	e6c8caeb0f	Bumping versions	2023-01-27 13:46:18 +00:00
spencergibb	5298970764	skip deploy of test module	2022-12-19 13:05:01 -05:00
buildmaster	4f3e472519	Bumping versions	2022-12-19 18:02:37 +00:00
buildmaster	ec87f1f750	Bumping versions	2022-12-16 13:46:14 +00:00
buildmaster	ef5817b0e6	Bumping versions to 4.0.1-SNAPSHOT after release	2022-12-15 20:59:01 +00:00
buildmaster	a77a09a01f	Going back to snapshots	2022-12-15 20:59:01 +00:00
buildmaster	1b1612aeba	Update SNAPSHOT to 4.0.0	2022-12-15 20:57:18 +00:00
spencergibb	2ada08039a	Updates to OptionalArgs and addtional client filters	2022-12-15 12:27:01 -05:00
spencergibb	ecdcfa4a2f	Upgrade eureka to 2.0.0 Fixes gh-4151	2022-12-14 20:02:22 -05:00
Ryan Baxter	a354b2a656	Moving to Eureka 2.0.0	2022-12-14 19:40:43 -05:00
Olga Maciaszek-Sharma	7335b773be	Adjust to changes in Apache HC5.	2022-12-13 13:21:00 +01:00
Olga Maciaszek-Sharma	6fef357742	Fix javadocs. Add deprecation.	2022-12-13 12:31:22 +01:00
G1	5844550f9a	feat: Adds RestTemplate default ConnectTimeout / ConnectRequestTimeout (#4148 )	2022-12-13 12:21:57 +01:00
buildmaster	23b594e5ec	Going back to snapshots	2022-12-01 18:15:14 +00:00
buildmaster	9f787e9a79	Update SNAPSHOT to 4.0.0-RC3	2022-12-01 18:13:53 +00:00
buildmaster	c44426f579	Bumping versions	2022-11-29 14:26:47 +00:00
buildmaster	bceb01b59e	Going back to snapshots	2022-11-17 17:53:52 +00:00
buildmaster	daa1959a02	Update SNAPSHOT to 4.0.0-RC2	2022-11-17 17:52:32 +00:00
spencergibb	d34bae53c0	Upgrade to 2.0.0-rc.4 Fixes gh-4136	2022-11-15 14:06:20 -05:00
Olga Maciaszek-Sharma	48b08d6fc9	Remove deprecations and unused code. Refactor (#4134 )	2022-11-07 16:44:21 +01:00
Olga Maciaszek-Sharma	a03a87636a	Document AOT and native image support. (#4132 )	2022-11-03 14:49:18 +01:00
jizhuozhi	9b4314b113	Add additional spring configuration metadata for predefined metadata-map keys (#4124 )	2022-11-02 12:39:36 +01:00
Olga Maciaszek-Sharma	0c483e1144	Fix Eureka Client hints.	2022-10-28 13:01:44 +02:00
buildmaster	cfdbda6e62	Going back to snapshots	2022-10-27 22:26:24 +00:00
buildmaster	3d43fa35a4	Update SNAPSHOT to 4.0.0-RC1	2022-10-27 22:24:55 +00:00
Olga Maciaszek-Sharma	c48f8f89cc	Temporarily add Eureka Client native hints. (#4129 )	2022-10-27 14:38:44 +02:00
spencergibb	315a3802d3	Updates /apps/ test for eureka http clients	2022-10-20 16:21:41 -04:00
spencergibb	d01496ab7e	formatting	2022-10-20 13:13:29 -04:00
spencergibb	f344c5807d	Updates for spring security changes	2022-10-20 13:06:51 -04:00
spencergibb	ab59e9a08a	Updates for config beans that are also autowired.	2022-10-19 15:20:01 -04:00
Olga Maciaszek-Sharma	5243e46018	Switch to Apache HC5 HttpClient. (#4126 )	2022-10-11 16:12:27 +02:00
buildmaster	b467a2f462	Going back to snapshots	2022-09-06 20:18:20 +00:00
buildmaster	97ee8144be	Update SNAPSHOT to 3.1.4	2022-09-06 20:16:46 +00:00
buildmaster	4ba8c4ae53	Bumping versions to 3.1.5-SNAPSHOT after release	2022-09-02 23:42:42 +00:00
buildmaster	695787a326	Going back to snapshots	2022-09-02 23:42:41 +00:00
buildmaster	e32db575b8	Update SNAPSHOT to 3.1.4	2022-09-02 23:40:48 +00:00