Merge pull request #487 from Netflix/2.4.x-use-eureka-client

Change LegacyEurekaClientProvider to use DiscoveryManager::getEurekaC…

Author: asibross

ribbon-eureka/src/main/java/com/netflix/niws/loadbalancer/LegacyEurekaClientProvider.java

@@ -15,7 +15,7 @@ class LegacyEurekaClientProvider implements Provider<EurekaClient> {
     @Override
     public synchronized EurekaClient get() {
         if (eurekaClient == null) {
-            eurekaClient = DiscoveryManager.getInstance().getDiscoveryClient();
+            eurekaClient = DiscoveryManager.getInstance().getEurekaClient();
         }
 
         return eurekaClient;

ribbon-eureka/src/test/java/com/netflix/niws/loadbalancer/DiscoveryEnabledLoadBalancerSupportsPortOverrideTest.java

@@ -78,7 +78,7 @@ public void setupMock(){
         DiscoveryManager mockedDiscoveryManager = createMock(DiscoveryManager.class);
 
         expect(DiscoveryManager.getInstance()).andReturn(mockedDiscoveryManager).anyTimes();
-        expect(mockedDiscoveryManager.getDiscoveryClient()).andReturn(mockedDiscoveryClient).anyTimes();
+        expect(mockedDiscoveryManager.getEurekaClient()).andReturn(mockedDiscoveryClient).anyTimes();
 
         expect(mockedDiscoveryClient.getInstancesByVipAddress("dummy", false, "region")).andReturn(dummyII).anyTimes();
         expect(mockedDiscoveryClient.getInstancesByVipAddress("secureDummy", true, "region")).andReturn(secureDummyII).anyTimes();

ribbon-eureka/src/test/java/com/netflix/niws/loadbalancer/DiscoveryEnabledLoadBalancerSupportsUseIpAddrTest.java

@@ -76,7 +76,7 @@ public void setupMock(){
         DiscoveryManager mockedDiscoveryManager = createMock(DiscoveryManager.class);
 
         expect(DiscoveryManager.getInstance()).andReturn(mockedDiscoveryManager).anyTimes();
-        expect(mockedDiscoveryManager.getDiscoveryClient()).andReturn(mockedDiscoveryClient).anyTimes();
+        expect(mockedDiscoveryManager.getEurekaClient()).andReturn(mockedDiscoveryClient).anyTimes();
 
         expect(mockedDiscoveryClient.getInstancesByVipAddress("dummy", false, "region")).andReturn(servers).anyTimes();
 

ribbon-eureka/src/test/java/com/netflix/niws/loadbalancer/LBBuilderTest.java

@@ -69,7 +69,7 @@ public void setupMock(){
         DiscoveryManager mockedDiscoveryManager = createMock(DiscoveryManager.class);
 
         expect(DiscoveryManager.getInstance()).andReturn(mockedDiscoveryManager).anyTimes();
-        expect(mockedDiscoveryManager.getDiscoveryClient()).andReturn(mockedDiscoveryClient).anyTimes();
+        expect(mockedDiscoveryManager.getEurekaClient()).andReturn(mockedDiscoveryClient).anyTimes();
 
         expect(mockedDiscoveryClient.getInstancesByVipAddress("dummy:7001", false, null)).andReturn(instances).anyTimes();
 

ribbon-test/src/main/java/com/netflix/ribbon/testutils/MockedDiscoveryServerListTest.java

@@ -74,7 +74,7 @@ public void setupMock(){
 
         expect(mockedDiscoveryClient.getEurekaClientConfig()).andReturn(new DefaultEurekaClientConfig()).anyTimes();
         expect(DiscoveryManager.getInstance()).andReturn(mockedDiscoveryManager).anyTimes();
-        expect(mockedDiscoveryManager.getDiscoveryClient()).andReturn(mockedDiscoveryClient).anyTimes();
+        expect(mockedDiscoveryManager.getEurekaClient()).andReturn(mockedDiscoveryClient).anyTimes();
 
         expect(mockedDiscoveryClient.getInstancesByVipAddress(getVipAddress(), false, null)).andReturn(instances).anyTimes();