Skip to content

S
spring-cloud-netflix
Commit e31f41c2 by Spencer Gibb
Options

Created StaticServerList and updated tests to use it.

parent aef6d2a3
Showing with 96 additions and 83 deletions
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/StaticServerList.java 0 → 100644
/*
* Copyright 2013-2015 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
*
* http://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.ribbon;
import com.netflix.loadbalancer.Server;
import com.netflix.loadbalancer.ServerList;
import java.util.Arrays;
import java.util.List;
/**
* @author Spencer Gibb
*/
public class StaticServerList<T extends Server> implements ServerList<T> {
private final List<T> servers;
public StaticServerList(T... servers) {
this.servers = Arrays.asList(servers);
}
@Override
public List<T> getInitialListOfServers() {
return servers;
}
@Override
public List<T> getUpdatedListOfServers() {
return servers;
}
}
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/ribbon/FeignRibbonClientRetryTests.java
...@@ -16,9 +16,12 @@ ...@@ -16,9 +16,12 @@
package org.springframework.cloud.netflix.feign.ribbon; package org.springframework.cloud.netflix.feign.ribbon;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Proxy; import java.lang.reflect.Proxy;
import java.util.Arrays;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
...@@ -36,6 +39,7 @@ import org.springframework.boot.test.SpringApplicationConfiguration; ...@@ -36,6 +39,7 @@ import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.cloud.netflix.feign.EnableFeignClients; import org.springframework.cloud.netflix.feign.EnableFeignClients;
import org.springframework.cloud.netflix.feign.FeignClient; import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.cloud.netflix.ribbon.RibbonClient; import org.springframework.cloud.netflix.ribbon.RibbonClient;
import org.springframework.cloud.netflix.ribbon.StaticServerList;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext;
...@@ -45,13 +49,8 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -45,13 +49,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.netflix.loadbalancer.BaseLoadBalancer;
import com.netflix.loadbalancer.ILoadBalancer;
import com.netflix.loadbalancer.Server; import com.netflix.loadbalancer.Server;
import com.netflix.loadbalancer.ServerList;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
/** /**
* @author Spencer Gibb * @author Spencer Gibb
...@@ -146,12 +145,10 @@ class LocalRibbonClientConfiguration { ...@@ -146,12 +145,10 @@ class LocalRibbonClientConfiguration {
private int port = 0; private int port = 0;
@Bean @Bean
public ILoadBalancer ribbonLoadBalancer() { public ServerList<Server> ribbonServerList() {
BaseLoadBalancer balancer = new BaseLoadBalancer(); return new StaticServerList<>(new Server("___mybadhost__", 10001),
balancer.setServersList(Arrays.asList(new Server("___mybadhost__", 10001),
new Server("___mybadhost2__", 10002), new Server("___mybadhost2__", 10002),
new Server("___mybadhost3__", 10003), new Server("localhost", this.port))); new Server("___mybadhost3__", 10003), new Server("localhost", this.port));
return balancer;
} }
} }
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/valid/FeignClientTests.java
...@@ -40,16 +40,16 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -40,16 +40,16 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.test.IntegrationTest;
import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.WebIntegrationTest;
import org.springframework.cloud.netflix.feign.EnableFeignClients; import org.springframework.cloud.netflix.feign.EnableFeignClients;
import org.springframework.cloud.netflix.feign.FeignClient; import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.cloud.netflix.ribbon.RibbonClient; import org.springframework.cloud.netflix.ribbon.RibbonClient;
import org.springframework.cloud.netflix.ribbon.StaticServerList;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.web.WebAppConfiguration;
import org.springframework.util.ReflectionUtils; import org.springframework.util.ReflectionUtils;
import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -57,9 +57,8 @@ import org.springframework.web.bind.annotation.RequestMethod; ...@@ -57,9 +57,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.netflix.loadbalancer.BaseLoadBalancer;
import com.netflix.loadbalancer.ILoadBalancer;
import com.netflix.loadbalancer.Server; import com.netflix.loadbalancer.Server;
import com.netflix.loadbalancer.ServerList;
import feign.Client; import feign.Client;
import feign.RequestInterceptor; import feign.RequestInterceptor;
...@@ -71,8 +70,7 @@ import feign.RequestTemplate; ...@@ -71,8 +70,7 @@ import feign.RequestTemplate;
*/ */
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = FeignClientTests.Application.class) @SpringApplicationConfiguration(classes = FeignClientTests.Application.class)
@WebAppConfiguration @WebIntegrationTest(randomPort = true, value = { "spring.application.name=feignclienttest",
@IntegrationTest({ "server.port=0", "spring.application.name=feignclienttest",
"feign.httpclient.enabled=false"}) "feign.httpclient.enabled=false"})
@DirtiesContext @DirtiesContext
public class FeignClientTests { public class FeignClientTests {
...@@ -262,10 +260,8 @@ class LocalRibbonClientConfiguration { ...@@ -262,10 +260,8 @@ class LocalRibbonClientConfiguration {
private int port = 0; private int port = 0;
@Bean @Bean
public ILoadBalancer ribbonLoadBalancer() { public ServerList<Server> ribbonServerList() {
BaseLoadBalancer balancer = new BaseLoadBalancer(); return new StaticServerList<>(new Server("localhost", this.port));
balancer.setServersList(Arrays.asList(new Server("localhost", this.port)));
return balancer;
} }
} }
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/valid/FeignHttpClientTests.java
...@@ -25,7 +25,6 @@ import static org.junit.Assert.assertNotNull; ...@@ -25,7 +25,6 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.Arrays;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
...@@ -42,6 +41,7 @@ import org.springframework.boot.test.SpringApplicationConfiguration; ...@@ -42,6 +41,7 @@ import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.cloud.netflix.feign.EnableFeignClients; import org.springframework.cloud.netflix.feign.EnableFeignClients;
import org.springframework.cloud.netflix.feign.FeignClient; import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.cloud.netflix.ribbon.RibbonClient; import org.springframework.cloud.netflix.ribbon.RibbonClient;
import org.springframework.cloud.netflix.ribbon.StaticServerList;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
...@@ -54,9 +54,8 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -54,9 +54,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.netflix.loadbalancer.BaseLoadBalancer;
import com.netflix.loadbalancer.ILoadBalancer;
import com.netflix.loadbalancer.Server; import com.netflix.loadbalancer.Server;
import com.netflix.loadbalancer.ServerList;
import feign.Client; import feign.Client;
...@@ -185,10 +184,8 @@ public class FeignHttpClientTests { ...@@ -185,10 +184,8 @@ public class FeignHttpClientTests {
private int port = 0; private int port = 0;
@Bean @Bean
public ILoadBalancer ribbonLoadBalancer() { public ServerList<Server> ribbonServerList() {
BaseLoadBalancer balancer = new BaseLoadBalancer(); return new StaticServerList<>(new Server("localhost", this.port));
balancer.setServersList(Arrays.asList(new Server("localhost", this.port)));
return balancer;
} }
} }
......
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientHttpRequestFactoryTests.java
...@@ -20,7 +20,6 @@ import static org.junit.Assert.assertEquals; ...@@ -20,7 +20,6 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import java.net.URI; import java.net.URI;
import java.util.Arrays;
import lombok.SneakyThrows; import lombok.SneakyThrows;
...@@ -47,9 +46,8 @@ import org.springframework.web.bind.annotation.RequestParam; ...@@ -47,9 +46,8 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import com.netflix.loadbalancer.BaseLoadBalancer;
import com.netflix.loadbalancer.ILoadBalancer;
import com.netflix.loadbalancer.Server; import com.netflix.loadbalancer.Server;
import com.netflix.loadbalancer.ServerList;
/** /**
* @author Spencer Gibb * @author Spencer Gibb
...@@ -170,10 +168,8 @@ class SimpleRibbonClientConfiguration { ...@@ -170,10 +168,8 @@ class SimpleRibbonClientConfiguration {
private int port = 0; private int port = 0;
@Bean @Bean
public ILoadBalancer ribbonLoadBalancer() { public ServerList<Server> ribbonServerList() {
BaseLoadBalancer balancer = new BaseLoadBalancer(); return new StaticServerList<>(new Server("localhost", this.port));
balancer.setServersList(Arrays.asList(new Server("localhost", port)));
return balancer;
} }
} }
\ No newline at end of file
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/FormZuulProxyApplicationTests.java
...@@ -16,9 +16,10 @@ ...@@ -16,9 +16,10 @@
package org.springframework.cloud.netflix.zuul; package org.springframework.cloud.netflix.zuul;
import static org.junit.Assert.assertEquals;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.Arrays;
import java.util.Map; import java.util.Map;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -35,6 +36,7 @@ import org.springframework.boot.test.SpringApplicationConfiguration; ...@@ -35,6 +36,7 @@ import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.TestRestTemplate; import org.springframework.boot.test.TestRestTemplate;
import org.springframework.cloud.netflix.ribbon.RibbonClient; import org.springframework.cloud.netflix.ribbon.RibbonClient;
import org.springframework.cloud.netflix.ribbon.RibbonClients; import org.springframework.cloud.netflix.ribbon.RibbonClients;
import org.springframework.cloud.netflix.ribbon.StaticServerList;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpEntity; import org.springframework.http.HttpEntity;
...@@ -55,13 +57,10 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -55,13 +57,10 @@ import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import com.netflix.appinfo.EurekaInstanceConfig; import com.netflix.appinfo.EurekaInstanceConfig;
import com.netflix.loadbalancer.BaseLoadBalancer;
import com.netflix.loadbalancer.ILoadBalancer;
import com.netflix.loadbalancer.Server; import com.netflix.loadbalancer.Server;
import com.netflix.loadbalancer.ServerList;
import com.netflix.zuul.ZuulFilter; import com.netflix.zuul.ZuulFilter;
import static org.junit.Assert.assertEquals;
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = FormZuulProxyApplication.class) @SpringApplicationConfiguration(classes = FormZuulProxyApplication.class)
@WebAppConfiguration @WebAppConfiguration
...@@ -227,12 +226,8 @@ class FormZuulProxyApplication { ...@@ -227,12 +226,8 @@ class FormZuulProxyApplication {
class FormRibbonClientConfiguration { class FormRibbonClientConfiguration {
@Bean @Bean
public ILoadBalancer ribbonLoadBalancer(EurekaInstanceConfig instance) { public ServerList<Server> ribbonServerList(EurekaInstanceConfig instance) {
BaseLoadBalancer balancer = new BaseLoadBalancer(); return new StaticServerList<>(new Server("localhost", instance.getNonSecurePort()));
balancer.setServersList(Arrays.asList(new Server("localhost", instance
.getNonSecurePort())));
// balancer.setServersList(Arrays.asList(new Server("localhost", 8000)));
return balancer;
} }
} }
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/FormZuulServletProxyApplicationTests.java
...@@ -16,9 +16,10 @@ ...@@ -16,9 +16,10 @@
package org.springframework.cloud.netflix.zuul; package org.springframework.cloud.netflix.zuul;
import static org.junit.Assert.assertEquals;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.Arrays;
import java.util.Map; import java.util.Map;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -35,6 +36,7 @@ import org.springframework.boot.test.SpringApplicationConfiguration; ...@@ -35,6 +36,7 @@ import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.TestRestTemplate; import org.springframework.boot.test.TestRestTemplate;
import org.springframework.cloud.netflix.ribbon.RibbonClient; import org.springframework.cloud.netflix.ribbon.RibbonClient;
import org.springframework.cloud.netflix.ribbon.RibbonClients; import org.springframework.cloud.netflix.ribbon.RibbonClients;
import org.springframework.cloud.netflix.ribbon.StaticServerList;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpEntity; import org.springframework.http.HttpEntity;
...@@ -55,13 +57,10 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -55,13 +57,10 @@ import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import com.netflix.appinfo.EurekaInstanceConfig; import com.netflix.appinfo.EurekaInstanceConfig;
import com.netflix.loadbalancer.BaseLoadBalancer;
import com.netflix.loadbalancer.ILoadBalancer;
import com.netflix.loadbalancer.Server; import com.netflix.loadbalancer.Server;
import com.netflix.loadbalancer.ServerList;
import com.netflix.zuul.ZuulFilter; import com.netflix.zuul.ZuulFilter;
import static org.junit.Assert.assertEquals;
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = FormZuulServletProxyApplication.class) @SpringApplicationConfiguration(classes = FormZuulServletProxyApplication.class)
@WebAppConfiguration @WebAppConfiguration
...@@ -226,12 +225,8 @@ class FormZuulServletProxyApplication { ...@@ -226,12 +225,8 @@ class FormZuulServletProxyApplication {
class ServletFormRibbonClientConfiguration { class ServletFormRibbonClientConfiguration {
@Bean @Bean
public ILoadBalancer ribbonLoadBalancer(EurekaInstanceConfig instance) { public ServerList<Server> ribbonServerList(EurekaInstanceConfig instance) {
BaseLoadBalancer balancer = new BaseLoadBalancer(); return new StaticServerList<>(new Server("localhost", instance.getNonSecurePort()));
balancer.setServersList(Arrays.asList(new Server("localhost", instance
.getNonSecurePort())));
// balancer.setServersList(Arrays.asList(new Server("localhost", 8000)));
return balancer;
} }
} }
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/RetryableZuulProxyApplicationTests.java
...@@ -2,8 +2,6 @@ package org.springframework.cloud.netflix.zuul; ...@@ -2,8 +2,6 @@ package org.springframework.cloud.netflix.zuul;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import java.util.Arrays;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -14,6 +12,7 @@ import org.springframework.boot.test.IntegrationTest; ...@@ -14,6 +12,7 @@ import org.springframework.boot.test.IntegrationTest;
import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.TestRestTemplate; import org.springframework.boot.test.TestRestTemplate;
import org.springframework.cloud.netflix.ribbon.RibbonClient; import org.springframework.cloud.netflix.ribbon.RibbonClient;
import org.springframework.cloud.netflix.ribbon.StaticServerList;
import org.springframework.cloud.netflix.zuul.filters.ProxyRouteLocator; import org.springframework.cloud.netflix.zuul.filters.ProxyRouteLocator;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
...@@ -34,9 +33,8 @@ import org.springframework.web.bind.annotation.RequestMethod; ...@@ -34,9 +33,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.netflix.appinfo.EurekaInstanceConfig; import com.netflix.appinfo.EurekaInstanceConfig;
import com.netflix.loadbalancer.BaseLoadBalancer;
import com.netflix.loadbalancer.ILoadBalancer;
import com.netflix.loadbalancer.Server; import com.netflix.loadbalancer.Server;
import com.netflix.loadbalancer.ServerList;
import com.netflix.zuul.ZuulFilter; import com.netflix.zuul.ZuulFilter;
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
...@@ -121,13 +119,11 @@ class RetryableZuulProxyApplication { ...@@ -121,13 +119,11 @@ class RetryableZuulProxyApplication {
//Load balancer with fixed server list for "simple" pointing to localhost //Load balancer with fixed server list for "simple" pointing to localhost
@Configuration @Configuration
class RetryableRibbonClientConfiguration { class RetryableRibbonClientConfiguration {
@Bean @Bean
public ILoadBalancer ribbonLoadBalancer(EurekaInstanceConfig instance) { public ServerList<Server> ribbonServerList(EurekaInstanceConfig instance) {
BaseLoadBalancer balancer = new BaseLoadBalancer(); return new StaticServerList<>(
balancer.setServersList(Arrays.asList( new Server("localhost", instance.getNonSecurePort()),
new Server("localhost", instance.getNonSecurePort()), new Server("failed-localhost", instance.getNonSecurePort())
new Server("failed-localhost", instance.getNonSecurePort()) );
)); }
return balancer;
}
} }
\ No newline at end of file
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/SampleZuulProxyApplicationTests.java
...@@ -36,6 +36,7 @@ import org.springframework.boot.test.TestRestTemplate; ...@@ -36,6 +36,7 @@ import org.springframework.boot.test.TestRestTemplate;
import org.springframework.cloud.netflix.ribbon.RibbonClient; import org.springframework.cloud.netflix.ribbon.RibbonClient;
import org.springframework.cloud.netflix.ribbon.RibbonClients; import org.springframework.cloud.netflix.ribbon.RibbonClients;
import org.springframework.cloud.netflix.ribbon.SpringClientFactory; import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
import org.springframework.cloud.netflix.ribbon.StaticServerList;
import org.springframework.cloud.netflix.zuul.filters.ProxyRouteLocator; import org.springframework.cloud.netflix.zuul.filters.ProxyRouteLocator;
import org.springframework.cloud.netflix.zuul.filters.ZuulProperties.ZuulRoute; import org.springframework.cloud.netflix.zuul.filters.ZuulProperties.ZuulRoute;
import org.springframework.cloud.netflix.zuul.filters.route.RestClientRibbonCommandFactory; import org.springframework.cloud.netflix.zuul.filters.route.RestClientRibbonCommandFactory;
...@@ -58,9 +59,8 @@ import org.springframework.web.bind.annotation.RequestParam; ...@@ -58,9 +59,8 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.netflix.appinfo.EurekaInstanceConfig; import com.netflix.appinfo.EurekaInstanceConfig;
import com.netflix.loadbalancer.BaseLoadBalancer;
import com.netflix.loadbalancer.ILoadBalancer;
import com.netflix.loadbalancer.Server; import com.netflix.loadbalancer.Server;
import com.netflix.loadbalancer.ServerList;
import com.netflix.zuul.ZuulFilter; import com.netflix.zuul.ZuulFilter;
import com.netflix.zuul.context.RequestContext; import com.netflix.zuul.context.RequestContext;
...@@ -299,11 +299,8 @@ class SampleZuulProxyApplication { ...@@ -299,11 +299,8 @@ class SampleZuulProxyApplication {
class SimpleRibbonClientConfiguration { class SimpleRibbonClientConfiguration {
@Bean @Bean
public ILoadBalancer ribbonLoadBalancer(EurekaInstanceConfig instance) { public ServerList<Server> ribbonServerList(EurekaInstanceConfig instance) {
BaseLoadBalancer balancer = new BaseLoadBalancer(); return new StaticServerList<>(new Server("localhost", instance.getNonSecurePort()));
balancer.setServersList(Arrays.asList(new Server("localhost", instance
.getNonSecurePort())));
return balancer;
} }
} }
...@@ -312,11 +309,8 @@ class SimpleRibbonClientConfiguration { ...@@ -312,11 +309,8 @@ class SimpleRibbonClientConfiguration {
class AnotherRibbonClientConfiguration { class AnotherRibbonClientConfiguration {
@Bean @Bean
public ILoadBalancer ribbonLoadBalancer(EurekaInstanceConfig instance) { public ServerList<Server> ribbonServerList(EurekaInstanceConfig instance) {
BaseLoadBalancer balancer = new BaseLoadBalancer(); return new StaticServerList<>(new Server("localhost", instance.getNonSecurePort()));
balancer.setServersList(Arrays.asList(new Server("localhost", instance
.getNonSecurePort())));
return balancer;
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment