Adds TransportClientFactories as required parameter to DiscoveryClient.

Removes deprecated DiscoveryClient constructors.

eureka-client/src/main/java/com/netflix/discovery/AbstractDiscoveryClientOptionalArgs.java

@@ -31,8 +31,6 @@ public abstract class AbstractDiscoveryClientOptionalArgs<T> {
 
     TransportClientFactory transportClientFactory;
 
-    TransportClientFactories transportClientFactories;
-
     private Set<EurekaEventListener> eventListeners;
 
     private Optional<SSLContext> sslContext = Optional.empty();
@@ -82,16 +80,6 @@ public void setAdditionalFilters(Collection<T> additionalFilters) {
         this.additionalFilters = additionalFilters;
     }
 
-    public TransportClientFactories getTransportClientFactories() {
-        return transportClientFactories;
-    }
-
-    // @Inject
-    public void setTransportClientFactories(TransportClientFactories transportClientFactories) {
-        this.transportClientFactories = transportClientFactories;
-    }
-
-
     public TransportClientFactory getTransportClientFactory() {
         return transportClientFactory;
     }

eureka-client/src/main/java/com/netflix/discovery/DiscoveryClient.java

@@ -186,12 +186,16 @@ public class DiscoveryClient implements EurekaClient {
     protected final EurekaClientConfig clientConfig;
     protected final EurekaTransportConfig transportConfig;
 
+    @SuppressWarnings("rawtypes")
+    protected final TransportClientFactories transportClientFactories;
+
     private final long initTimestampMs;
     private final int initRegistrySize;
 
     private final Stats stats = new Stats();
 
     private static final class EurekaTransport {
+        @SuppressWarnings("rawtypes")
         private ClosableResolver bootstrapResolver;
         private TransportClientFactory transportClientFactory;
 
@@ -228,34 +232,19 @@ void shutdown() {
         }
     }
 
-    /**
-     * Assumes applicationInfoManager is already initialized
-     *
-     * @deprecated use constructor that takes ApplicationInfoManager instead of InstanceInfo directly
-     */
-    @Deprecated
-    public DiscoveryClient(InstanceInfo myInfo, EurekaClientConfig config) {
-        this(myInfo, config, null);
-    }
-
-    /**
-     * @deprecated use constructor that takes ApplicationInfoManager instead of InstanceInfo directly
-     */
-    @Deprecated
-    public DiscoveryClient(InstanceInfo myInfo, EurekaClientConfig config, AbstractDiscoveryClientOptionalArgs args) {
-        this(ApplicationInfoManager.getInstance(), config, args);
-    }
-
-    public DiscoveryClient(ApplicationInfoManager applicationInfoManager, EurekaClientConfig config) {
-        this(applicationInfoManager, config, null);
+    @SuppressWarnings("rawtypes")
+    public DiscoveryClient(ApplicationInfoManager applicationInfoManager, EurekaClientConfig config, TransportClientFactories transportClientFactories) {
+        this(applicationInfoManager, config, transportClientFactories, null);
     }
 
-    public DiscoveryClient(ApplicationInfoManager applicationInfoManager, final EurekaClientConfig config, AbstractDiscoveryClientOptionalArgs args) {
-        this(applicationInfoManager, config, args, ResolverUtils::randomize);
+    @SuppressWarnings("rawtypes")
+    public DiscoveryClient(ApplicationInfoManager applicationInfoManager, final EurekaClientConfig config, TransportClientFactories transportClientFactories, AbstractDiscoveryClientOptionalArgs args) {
+        this(applicationInfoManager, config, transportClientFactories, args, ResolverUtils::randomize);
     }
 
-    public DiscoveryClient(ApplicationInfoManager applicationInfoManager, final EurekaClientConfig config, AbstractDiscoveryClientOptionalArgs args, EndpointRandomizer randomizer) {
-        this(applicationInfoManager, config, args, new Provider<BackupRegistry>() {
+    @SuppressWarnings("rawtypes")
+    public DiscoveryClient(ApplicationInfoManager applicationInfoManager, final EurekaClientConfig config, TransportClientFactories transportClientFactories, AbstractDiscoveryClientOptionalArgs args, EndpointRandomizer randomizer) {
+        this(applicationInfoManager, config, transportClientFactories, args, new Provider<BackupRegistry>() {
             private volatile BackupRegistry backupRegistryInstance;
 
             @Override
@@ -286,17 +275,8 @@ public synchronized BackupRegistry get() {
         }, randomizer);
     }
 
-    /**
-     * @deprecated Use {@link #DiscoveryClient(ApplicationInfoManager, EurekaClientConfig, AbstractDiscoveryClientOptionalArgs, Provider<BackupRegistry>, EndpointRandomizer)}
-     */
-    @Deprecated
-    DiscoveryClient(ApplicationInfoManager applicationInfoManager, EurekaClientConfig config, AbstractDiscoveryClientOptionalArgs args,
-                    Provider<BackupRegistry> backupRegistryProvider) {
-        this(applicationInfoManager, config, args, backupRegistryProvider, ResolverUtils::randomize);
-    }
-
     @Inject
-    DiscoveryClient(ApplicationInfoManager applicationInfoManager, EurekaClientConfig config, AbstractDiscoveryClientOptionalArgs args,
+    DiscoveryClient(ApplicationInfoManager applicationInfoManager, EurekaClientConfig config, TransportClientFactories transportClientFactories, AbstractDiscoveryClientOptionalArgs args,
                     Provider<BackupRegistry> backupRegistryProvider, EndpointRandomizer endpointRandomizer) {
         if (args != null) {
             this.healthCheckHandlerProvider = args.healthCheckHandlerProvider;
@@ -308,7 +288,7 @@ public synchronized BackupRegistry get() {
             this.healthCheckHandlerProvider = null;
             this.preRegistrationHandler = null;
         }
-
+        this.transportClientFactories = transportClientFactories;
         this.applicationInfoManager = applicationInfoManager;
         InstanceInfo myInfo = applicationInfoManager.getInfo();
 
@@ -468,6 +448,7 @@ public synchronized BackupRegistry get() {
                 initTimestampMs, initRegistrySize);
     }
 
+    @SuppressWarnings("unchecked")
     private void scheduleServerEndpointTask(EurekaTransport eurekaTransport,
                                             AbstractDiscoveryClientOptionalArgs args) {
 
@@ -476,13 +457,6 @@ private void scheduleServerEndpointTask(EurekaTransport eurekaTransport,
                 ? Collections.emptyList()
                 : args.additionalFilters;
 
-        @SuppressWarnings("rawtypes")
-        // Ignore the raw types warnings since the client filter interface changed between jersey 1/2
-        TransportClientFactories transportClientFactories = null;
-        if (args != null && args.getTransportClientFactories() != null) {
-            transportClientFactories = args.getTransportClientFactories();
-        }
-
         if (transportClientFactories == null) {
             throw new IllegalArgumentException("transportClientFactories may not be null");
         }

eureka-client/src/main/java/com/netflix/discovery/DiscoveryManager.java

@@ -18,8 +18,8 @@
 
 import com.netflix.appinfo.ApplicationInfoManager;
 import com.netflix.appinfo.EurekaInstanceConfig;
-import com.netflix.appinfo.InstanceInfo;
 import com.netflix.discovery.shared.LookupService;
+import com.netflix.discovery.shared.transport.jersey.TransportClientFactories;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -80,20 +80,14 @@ public void setEurekaInstanceConfig(EurekaInstanceConfig eurekaInstanceConfig) {
      * @param eurekaConfig the eureka client configuration of the instance.
      */
     public void initComponent(EurekaInstanceConfig config,
-                              EurekaClientConfig eurekaConfig, AbstractDiscoveryClientOptionalArgs args) {
+                              EurekaClientConfig eurekaConfig, TransportClientFactories transportClientFactories, AbstractDiscoveryClientOptionalArgs args) {
         this.eurekaInstanceConfig = config;
         this.eurekaClientConfig = eurekaConfig;
         if (ApplicationInfoManager.getInstance().getInfo() == null) {
             // Initialize application info
             ApplicationInfoManager.getInstance().initComponent(config);
         }
-        InstanceInfo info = ApplicationInfoManager.getInstance().getInfo();
-        discoveryClient = new DiscoveryClient(info, eurekaConfig, args);
-    }
-
-    public void initComponent(EurekaInstanceConfig config,
-                              EurekaClientConfig eurekaConfig) {
-        initComponent(config, eurekaConfig, null);
+        discoveryClient = new DiscoveryClient(ApplicationInfoManager.getInstance(), eurekaConfig, transportClientFactories, args);
     }
 
     /**

eureka-client/src/test/java/com/netflix/discovery/BackUpRegistryTest.java

@@ -69,12 +69,11 @@ public Name getName() {
 
         backupRegistry = new MockBackupRegistry();
         setupBackupMock();
-        Jersey3DiscoveryClientOptionalArgs args = new Jersey3DiscoveryClientOptionalArgs();
-        args.setTransportClientFactories(Jersey3TransportClientFactories.getInstance());
         client = new DiscoveryClient(
                 applicationInfoManager,
                 new DefaultEurekaClientConfig(),
-                args,
+                Jersey3TransportClientFactories.getInstance(),
+                null,
                 () -> backupRegistry,
                 ResolverUtils::randomize
         );

eureka-client/src/test/java/com/netflix/discovery/DiscoveryClientDisableRegistryTest.java

@@ -7,6 +7,7 @@
 import com.netflix.appinfo.InstanceInfo;
 import com.netflix.appinfo.MyDataCenterInstanceConfig;
 import com.netflix.config.ConfigurationManager;
+import com.netflix.discovery.shared.transport.jersey3.Jersey3TransportClientFactories;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -42,7 +43,7 @@ public Name getName() {
         });
 
         ApplicationInfoManager applicationInfoManager = new ApplicationInfoManager(new MyDataCenterInstanceConfig(), builder.build());
-        client = new DiscoveryClient(applicationInfoManager, new DefaultEurekaClientConfig());
+        client = new DiscoveryClient(applicationInfoManager, new DefaultEurekaClientConfig(), Jersey3TransportClientFactories.getInstance());
     }
 
     @Test

eureka-client/src/test/java/com/netflix/discovery/DiscoveryClientRegisterUpdateTest.java

@@ -145,7 +145,6 @@ public void testDoNotUnregisterOnShutdown() throws Exception {
 
     private Jersey3DiscoveryClientOptionalArgs getOptionalArgs() {
         Jersey3DiscoveryClientOptionalArgs optionalArgs = new Jersey3DiscoveryClientOptionalArgs();
-        optionalArgs.setTransportClientFactories(Jersey3TransportClientFactories.getInstance());
         return optionalArgs;
     }
 
@@ -171,7 +170,7 @@ private static <T> T getLast(List<T> list) {
     private static class TestClient extends DiscoveryClient {
 
         public TestClient(ApplicationInfoManager applicationInfoManager, EurekaClientConfig config, AbstractDiscoveryClientOptionalArgs optionalArgs) {
-            super(applicationInfoManager, config, optionalArgs);
+            super(applicationInfoManager, config, Jersey3TransportClientFactories.getInstance(), optionalArgs);
         }
 
         @Override

eureka-core-jersey3/src/main/java/com/netflix/eureka/Jersey3EurekaBootStrap.java

@@ -5,6 +5,7 @@
 import com.netflix.discovery.DiscoveryClient;
 import com.netflix.discovery.EurekaClientConfig;
 import com.netflix.discovery.Jersey3DiscoveryClientOptionalArgs;
+import com.netflix.discovery.shared.transport.jersey.TransportClientFactories;
 import com.netflix.discovery.shared.transport.jersey3.Jersey3TransportClientFactories;
 import com.netflix.eureka.cluster.Jersey3PeerEurekaNodes;
 import com.netflix.eureka.cluster.PeerEurekaNodes;
@@ -44,10 +45,14 @@ protected PeerEurekaNodes getPeerEurekaNodes(PeerAwareInstanceRegistry registry,
     @Override
     protected AbstractDiscoveryClientOptionalArgs<?> getDiscoveryClientOptionalArgs() {
         Jersey3DiscoveryClientOptionalArgs jersey3DiscoveryClientOptionalArgs = new Jersey3DiscoveryClientOptionalArgs();
-        jersey3DiscoveryClientOptionalArgs.setTransportClientFactories(Jersey3TransportClientFactories.getInstance());
         return jersey3DiscoveryClientOptionalArgs;
     }
 
+    @Override
+    protected TransportClientFactories getTransportClientFactories() {
+        return Jersey3TransportClientFactories.getInstance();
+    }
+
     @Override
     protected EurekaServerHttpClientFactory getEurekaServerHttpClientFactory() {
         return new Jersey3EurekaServerHttpClientFactory();

eureka-core/src/main/java/com/netflix/eureka/EurekaBootStrap.java

@@ -17,6 +17,7 @@
 package com.netflix.eureka;
 
 import com.netflix.discovery.AbstractDiscoveryClientOptionalArgs;
+import com.netflix.discovery.shared.transport.jersey.TransportClientFactories;
 import com.netflix.eureka.transport.EurekaServerHttpClientFactory;
 import jakarta.servlet.ServletContext;
 import jakarta.servlet.ServletContextEvent;
@@ -168,7 +169,8 @@ protected void initEurekaServerContext() throws Exception {
                     instanceConfig, new EurekaConfigBasedInstanceInfoProvider(instanceConfig).get());
 
             EurekaClientConfig eurekaClientConfig = new DefaultEurekaClientConfig();
-            eurekaClient = new DiscoveryClient(applicationInfoManager, eurekaClientConfig, getDiscoveryClientOptionalArgs());
+            eurekaClient = new DiscoveryClient(applicationInfoManager, eurekaClientConfig, getTransportClientFactories(),
+                    getDiscoveryClientOptionalArgs());
         } else {
             applicationInfoManager = eurekaClient.getApplicationInfoManager();
         }
@@ -227,6 +229,8 @@ protected AbstractDiscoveryClientOptionalArgs<?> getDiscoveryClientOptionalArgs(
         return null;
     }
 
+    protected abstract TransportClientFactories getTransportClientFactories();
+
     protected abstract EurekaServerHttpClientFactory getEurekaServerHttpClientFactory();
 
     protected abstract PeerEurekaNodes getPeerEurekaNodes(PeerAwareInstanceRegistry registry, EurekaServerConfig eurekaServerConfig, EurekaClientConfig eurekaClientConfig, ServerCodecs serverCodecs, ApplicationInfoManager applicationInfoManager);

eureka-examples/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'application'
 
 dependencies {
-    implementation project(':eureka-client')
+    implementation project(':eureka-client-jersey3')
     implementation files('conf')
     implementation 'jakarta.inject:jakarta.inject-api:2.0.1'
 

eureka-examples/src/main/java/com/netflix/eureka/ExampleEurekaClient.java

@@ -33,6 +33,7 @@
 import com.netflix.discovery.DiscoveryClient;
 import com.netflix.discovery.EurekaClient;
 import com.netflix.discovery.EurekaClientConfig;
+import com.netflix.discovery.shared.transport.jersey3.Jersey3TransportClientFactories;
 
 /**
  * Sample Eureka client that discovers the example service using Eureka and sends requests.
@@ -57,7 +58,7 @@ private static synchronized ApplicationInfoManager initializeApplicationInfoMana
 
     private static synchronized EurekaClient initializeEurekaClient(ApplicationInfoManager applicationInfoManager, EurekaClientConfig clientConfig) {
         if (eurekaClient == null) {
-            eurekaClient = new DiscoveryClient(applicationInfoManager, clientConfig);
+            eurekaClient = new DiscoveryClient(applicationInfoManager, clientConfig, Jersey3TransportClientFactories.getInstance());
         }
 
         return eurekaClient;

eureka-examples/src/main/java/com/netflix/eureka/ExampleEurekaService.java

@@ -27,6 +27,7 @@
 import com.netflix.config.DynamicPropertyFactory;
 import com.netflix.discovery.DefaultEurekaClientConfig;
 import com.netflix.discovery.EurekaClientConfig;
+import com.netflix.discovery.shared.transport.jersey3.Jersey3TransportClientFactories;
 
 /**
  * Sample Eureka service that registers with Eureka to receive and process requests.
@@ -49,7 +50,7 @@ private static synchronized ApplicationInfoManager initializeApplicationInfoMana
 
     private static synchronized EurekaClient initializeEurekaClient(ApplicationInfoManager applicationInfoManager, EurekaClientConfig clientConfig) {
         if (eurekaClient == null) {
-            eurekaClient = new DiscoveryClient(applicationInfoManager, clientConfig);
+            eurekaClient = new DiscoveryClient(applicationInfoManager, clientConfig, Jersey3TransportClientFactories.getInstance());
         }
 
         return eurekaClient;

eureka-test-utils/src/main/java/com/netflix/discovery/junit/resource/DiscoveryClientResource.java

@@ -98,10 +98,10 @@ public EurekaClient getClient() {
                 EurekaClientConfig clientConfig = createEurekaClientConfig();
 
                 Jersey3DiscoveryClientOptionalArgs args = new Jersey3DiscoveryClientOptionalArgs();
-                args.setTransportClientFactories(new Jersey3TransportClientFactories());                eventBus = new EventBusImpl();
+                eventBus = new EventBusImpl();
                 args.setEventBus(eventBus);
 
-                client = new DiscoveryClient(applicationInfoManager, clientConfig, args);
+                client = new DiscoveryClient(applicationInfoManager, clientConfig, Jersey3TransportClientFactories.getInstance(), args);
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
@@ -253,9 +253,7 @@ public static EurekaClient setupDiscoveryClient(InstanceInfo clientInstanceInfo)
         ApplicationInfoManager applicationInfoManager = new ApplicationInfoManager(new MyDataCenterInstanceConfig(), clientInstanceInfo);
 
         DiscoveryManager.getInstance().setEurekaClientConfig(config);
-        Jersey3DiscoveryClientOptionalArgs args = new Jersey3DiscoveryClientOptionalArgs();
-        args.setTransportClientFactories(new Jersey3TransportClientFactories());
-        EurekaClient client = new DiscoveryClient(applicationInfoManager, config, args);
+        EurekaClient client = new DiscoveryClient(applicationInfoManager, config, Jersey3TransportClientFactories.getInstance());
         return client;
     }
 
@@ -265,10 +263,8 @@ public static EurekaClient setupInjector(InstanceInfo clientInstanceInfo) {
         DefaultEurekaClientConfig config = new DefaultEurekaClientConfig();
         // setup config in advance, used in initialize converter
         DiscoveryManager.getInstance().setEurekaClientConfig(config);
-        Jersey3DiscoveryClientOptionalArgs args = new Jersey3DiscoveryClientOptionalArgs();
-        args.setTransportClientFactories(new Jersey3TransportClientFactories());
-        EurekaClient client = new DiscoveryClient(clientInstanceInfo, config, args);
-        ApplicationInfoManager.getInstance().initComponent(new MyDataCenterInstanceConfig());
+        ApplicationInfoManager applicationInfoManager1 = new ApplicationInfoManager(new MyDataCenterInstanceConfig(), clientInstanceInfo);
+        EurekaClient client = new DiscoveryClient(applicationInfoManager1, config, Jersey3TransportClientFactories.getInstance());
         return client;
     }
 

eureka-tests/src/test/java/com/netflix/eureka/AbstractTester.java

@@ -103,9 +103,7 @@ public void setUp() throws Exception {
         InstanceInfo instanceInfo = builder.build();
         ApplicationInfoManager applicationInfoManager = new ApplicationInfoManager(new MyDataCenterInstanceConfig(), instanceInfo);
 
-        Jersey3DiscoveryClientOptionalArgs args = new Jersey3DiscoveryClientOptionalArgs();
-        args.setTransportClientFactories(new Jersey3TransportClientFactories());
-        client = new DiscoveryClient(applicationInfoManager, clientConfig, args);
+        client = new DiscoveryClient(applicationInfoManager, clientConfig, Jersey3TransportClientFactories.getInstance());
 
         ServerCodecs serverCodecs = new DefaultServerCodecs(serverConfig);
         EurekaServerHttpClientFactory eurekaServerHttpClientFactory = new Jersey3EurekaServerHttpClientFactory();