SpringCloud/spring-cloud-netflix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migrates deprecations

Browse Source
This commit is contained in:
Spencer Gibb
2020-01-17 17:58:31 -05:00
parent af919cac66
commit 3455489f47
31 changed files with 77 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-netflix-archaius/src/main/java/org/springframework/cloud/netflix/archaius/ArchaiusAutoConfiguration.java
View File

@@ -41,7 +41,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint;
import org.springframework.boot.actuate.health.Health;
import org.springframework.boot.autoconfigure.AutoConfigureOrder;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -202,7 +202,7 @@ public class ArchaiusAutoConfiguration {
protected static class ArchaiusEndpointConfiguration {
@Bean
@ConditionalOnEnabledEndpoint
@ConditionalOnAvailableEndpoint
protected ArchaiusEndpoint archaiusEndpoint() {
return new ArchaiusEndpoint();
}

4
spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/RestTemplateTransportClientFactory.java
View File

@@ -39,7 +39,7 @@ import com.netflix.discovery.shared.transport.EurekaHttpClient;
import com.netflix.discovery.shared.transport.TransportClientFactory;
import org.springframework.http.HttpStatus;
import org.springframework.http.client.support.BasicAuthorizationInterceptor;
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;
@@ -66,7 +66,7 @@ public class RestTemplateTransportClientFactory implements TransportClientFactor
if (serviceURI.getUserInfo() != null) {
String[] credentials = serviceURI.getUserInfo().split(":");
if (credentials.length == 2) {
restTemplate.getInterceptors().add(new BasicAuthorizationInterceptor(
restTemplate.getInterceptors().add(new BasicAuthenticationInterceptor(
credentials[0], credentials[1]));
}
}

4
spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/serviceregistry/EurekaServiceRegistryTests.java
View File

@@ -34,7 +34,7 @@ import static com.netflix.appinfo.InstanceInfo.InstanceStatus.OUT_OF_SERVICE;
import static com.netflix.appinfo.InstanceInfo.InstanceStatus.UNKNOWN;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.when;
/**
@@ -62,7 +62,7 @@ public class EurekaServiceRegistryTests {
registry.deregister(registration);
verifyZeroInteractions(eurekaClient);
verifyNoInteractions(eurekaClient);
}
@Test

4
spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/RefreshablePeerEurekaNodesTests.java
View File

@@ -47,7 +47,7 @@ import org.springframework.http.ResponseEntity;
import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Matchers.anyListOf;
import static org.mockito.ArgumentMatchers.anyList;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
@@ -179,7 +179,7 @@ public class RefreshablePeerEurekaNodesTests {
mock.onApplicationEvent(new EnvironmentChangeEvent(
Collections.singleton("some.irrelevant.property")));
verify(mock, never()).updatePeerEurekaNodes(anyListOf(String.class));
verify(mock, never()).updatePeerEurekaNodes(anyList());
}
@Test

8
spring-cloud-netflix-hystrix-stream/src/test/java/org/springframework/cloud/netflix/hystrix/stream/HystrixStreamTaskTests.java
View File

@@ -26,7 +26,7 @@ import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.cloud.client.serviceregistry.Registration;
@@ -35,9 +35,9 @@ import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.then;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoInteractions;
/**
* @author Marcin Grzejszczak
@@ -67,7 +67,7 @@ public class HystrixStreamTaskTests {
public void should_not_send_metrics_when_they_are_empty() throws Exception {
this.hystrixStreamTask.sendMetrics();
verifyZeroInteractions(this.outboundChannel);
verifyNoInteractions(this.outboundChannel);
}
@Test

12
spring-cloud-netflix-hystrix/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixAutoConfiguration.java
View File

@@ -26,9 +26,9 @@ import org.reactivestreams.Publisher;
import rx.Observable;
import rx.RxReactiveStreams;
import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint;
import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
import org.springframework.boot.actuate.autoconfigure.health.HealthIndicatorAutoConfiguration;
import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
import org.springframework.boot.actuate.health.HealthIndicator;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -52,8 +52,8 @@ import static org.springframework.boot.autoconfigure.condition.ConditionalOnWebA
*/
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass({ Hystrix.class, HealthIndicator.class,
HealthIndicatorAutoConfiguration.class })
@AutoConfigureAfter({ HealthIndicatorAutoConfiguration.class })
HealthContributorAutoConfiguration.class })
@AutoConfigureAfter({ HealthContributorAutoConfiguration.class })
public class HystrixAutoConfiguration {
@Bean
@@ -87,7 +87,7 @@ public class HystrixAutoConfiguration {
protected static class HystrixServletAutoConfiguration {
@Bean
@ConditionalOnEnabledEndpoint
@ConditionalOnAvailableEndpoint
public HystrixStreamEndpoint hystrixStreamEndpoint(HystrixProperties properties) {
return new HystrixStreamEndpoint(properties.getConfig());
}
@@ -108,7 +108,7 @@ public class HystrixAutoConfiguration {
protected static class HystrixWebfluxManagementContextConfiguration {
@Bean
@ConditionalOnEnabledEndpoint
@ConditionalOnAvailableEndpoint
public HystrixWebfluxEndpoint hystrixWebfluxController() {
Observable<String> serializedDashboardData = HystrixDashboardStream
.getInstance().observe()

2
spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/ribbon/apache/HttpClientStatusCodeExceptionTest.java
View File

@@ -31,7 +31,7 @@ import org.apache.http.message.BasicStatusLine;
import org.apache.http.util.EntityUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.doReturn;

2
spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpStatusCodeExceptionTest.java
View File

@@ -26,7 +26,7 @@ import okhttp3.Response;
import okhttp3.ResponseBody;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
import static org.assertj.core.api.Assertions.assertThat;

1
spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java
View File

@@ -182,6 +182,7 @@ public class RibbonAutoConfiguration {
}
@SuppressWarnings("deprecation")
@ConditionalOnClass(AsyncRestTemplate.class)
static class AsyncRestTemplatePresent {

2
spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/SpringClientFactory.java
View File

@@ -102,7 +102,7 @@ public class SpringClientFactory extends NamedContextFactory<RibbonClientSpecifi
}
if (result == null) {
result = BeanUtils.instantiate(clazz);
result = BeanUtils.instantiateClass(clazz);
if (result instanceof IClientConfigAware) {
((IClientConfigAware) result).initWithNiwsConfig(config);

16
spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorOverridesRetryTests.java
View File

@@ -38,7 +38,8 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.util.Assert;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Tyler Van Gorder
@@ -59,12 +60,13 @@ public class RibbonClientPreprocessorOverridesRetryTests {
public void customRetryIsConfigured() throws Exception {
RibbonLoadBalancerContext context = (RibbonLoadBalancerContext) this.factory
.getLoadBalancerContext("customRetry");
Assert.isInstanceOf(RetryRibbonConfiguration.CustomRetryHandler.class,
context.getRetryHandler());
Assert.isTrue(context.getRetryHandler().getMaxRetriesOnSameServer() == 0);
Assert.isTrue(context.getRetryHandler().getMaxRetriesOnNextServer() == 1);
Assert.isTrue(context.getRetryHandler()
.isCircuitTrippingException(new UnknownHostException("Unknown Host")));
assertThat(context.getRetryHandler())
.isInstanceOf(RetryRibbonConfiguration.CustomRetryHandler.class);
assertThat(context.getRetryHandler().getMaxRetriesOnSameServer()).isEqualTo(0);
assertThat(context.getRetryHandler().getMaxRetriesOnNextServer()).isEqualTo(1);
assertThat(context.getRetryHandler()
.isCircuitTrippingException(new UnknownHostException("Unknown Host")))
.isTrue();
}
@Configuration(proxyBeanMethods = false)

2
spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonInterceptorTests.java
View File

@@ -40,8 +40,8 @@ import org.springframework.util.ReflectionUtils;
import org.springframework.web.util.UriComponentsBuilder;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.BDDMockito.given;
import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.verify;
/**

12
spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonLoadBalancedRetryFactoryTests.java
View File

@@ -42,12 +42,11 @@ import org.springframework.http.HttpMethod;
import org.springframework.http.HttpRequest;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.BDDMockito.given;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
@@ -331,8 +330,7 @@ public class RibbonLoadBalancedRetryFactoryTests {
protected RibbonLoadBalancerClient getRibbonLoadBalancerClient(
RibbonServer ribbonServer) {
given(this.loadBalancer.getName()).willReturn(ribbonServer.getServiceId());
given(this.loadBalancer.chooseServer(anyObject()))
.willReturn(ribbonServer.getServer());
given(this.loadBalancer.chooseServer(any())).willReturn(ribbonServer.getServer());
given(this.loadBalancer.getLoadBalancerStats())
.willReturn(this.loadBalancerStats);
given(this.loadBalancerStats.getSingleServerStat(ribbonServer.getServer()))

11
spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonLoadBalancerClientTests.java
View File

@@ -40,12 +40,12 @@ import org.springframework.web.util.DefaultUriBuilderFactory;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyDouble;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.same;
import static org.mockito.BDDMockito.given;
import static org.mockito.Matchers.anyDouble;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -327,8 +327,7 @@ public class RibbonLoadBalancerClientTests {
protected RibbonLoadBalancerClient getRibbonLoadBalancerClient(
RibbonServer ribbonServer) {
given(this.loadBalancer.getName()).willReturn(ribbonServer.getServiceId());
given(this.loadBalancer.chooseServer(anyObject()))
.willReturn(ribbonServer.getServer());
given(this.loadBalancer.chooseServer(any())).willReturn(ribbonServer.getServer());
given(this.loadBalancer.getLoadBalancerStats())
.willReturn(this.loadBalancerStats);
given(this.loadBalancerStats.getSingleServerStat(ribbonServer.getServer()))

6
spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/apache/RibbonLoadBalancingHttpClientTests.java
View File

@@ -79,10 +79,10 @@ import org.springframework.util.LinkedMultiValueMap;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.BDDMockito.given;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.argThat;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doThrow;

4
spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/SpringRetryEnabledOkHttpClientTests.java
View File

@@ -52,8 +52,8 @@ import org.springframework.test.util.ReflectionTestUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;

4
spring-cloud-netflix-turbine-stream/src/test/java/org/springframework/cloud/netflix/turbine/stream/HystrixStreamAggregatorTests.java
View File

@@ -23,7 +23,7 @@ import org.junit.Rule;
import org.junit.Test;
import rx.subjects.PublishSubject;
import org.springframework.boot.test.rule.OutputCapture;
import org.springframework.boot.test.system.OutputCaptureRule;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.containsString;
@@ -39,7 +39,7 @@ public class HystrixStreamAggregatorTests {
this.publisher);
@Rule
public OutputCapture output = new OutputCapture();
public OutputCaptureRule output = new OutputCaptureRule();
private static String PAYLOAD = "{\"origin\":{\"host\":\"dsyer\",\"port\":-1,"
+ "\"serviceId\":\"application\",\"id\":\"application\"},\"data\":{\"type\":"

6
spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulProxyAutoConfiguration.java
View File

@@ -23,7 +23,7 @@ import com.netflix.zuul.filters.FilterRegistry;
import org.apache.http.impl.client.CloseableHttpClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint;
import org.springframework.boot.actuate.health.Health;
import org.springframework.boot.actuate.trace.http.HttpTraceRepository;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -156,12 +156,12 @@ public class ZuulProxyAutoConfiguration extends ZuulServerAutoConfiguration {
private HttpTraceRepository traces;
@Bean
@ConditionalOnEnabledEndpoint
@ConditionalOnAvailableEndpoint
public RoutesEndpoint routesEndpoint(RouteLocator routeLocator) {
return new RoutesEndpoint(routeLocator);
}
@ConditionalOnEnabledEndpoint
@ConditionalOnAvailableEndpoint
@Bean
public FiltersEndpoint filtersEndpoint() {
FilterRegistry filterRegistry = FilterRegistry.instance();

3
spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/ContextPathZuulProxyApplicationTests.java
View File

@@ -50,7 +50,8 @@ import static org.assertj.core.api.Assertions.assertThat;
@SpringBootTest(
classes = ContextPathZuulProxyApplicationTests.ContextPathZuulProxyApplication.class,
webEnvironment = WebEnvironment.RANDOM_PORT,
value = { "server.servlet.contextPath: /app" })
value = { "server.servlet.contextPath: /app",
"management.endpoints.web.exposure.include=*" })
@DirtiesContext
public class ContextPathZuulProxyApplicationTests {

3
spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/FiltersEndpointTests.java
View File

@@ -39,7 +39,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
* Tests for Filters endpoint
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(webEnvironment = RANDOM_PORT)
@SpringBootTest(webEnvironment = RANDOM_PORT,
properties = "management.endpoints.web.exposure.include=*")
@DirtiesContext
public class FiltersEndpointTests {

3
spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/RetryableZuulProxyApplicationTests.java
View File

@@ -63,7 +63,8 @@ import static org.springframework.cloud.netflix.zuul.filters.support.FilterConst
"zuul.routes[simplerzpat].retryable: true",
"zuul.routes[simplerzpat].serviceId: simplerzpat",
"ribbon.OkToRetryOnAllOperations: true",
"simplerzpat.ribbon.retryableStatusCodes: 404" })
"simplerzpat.ribbon.retryableStatusCodes: 404",
"management.endpoints.web.exposure.include=*" })
@DirtiesContext
public class RetryableZuulProxyApplicationTests {

3
spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/SimpleZuulProxyApplicationTests.java
View File

@@ -54,7 +54,8 @@ import static org.assertj.core.api.Assertions.assertThat;
@SpringBootTest(
classes = SimpleZuulProxyApplicationTests.SimpleZuulProxyApplication.class,
webEnvironment = WebEnvironment.RANDOM_PORT,
value = { "zuul.forceOriginalQueryStringEncoding: true" })
value = { "zuul.forceOriginalQueryStringEncoding: true",
"management.endpoints.web.exposure.include=*" })
@DirtiesContext
public class SimpleZuulProxyApplicationTests {

3
spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/CustomHostRoutingFilterTests.java
View File

@@ -71,7 +71,8 @@ import static org.assertj.core.api.Assertions.assertThat;
@SpringBootTest(
classes = CustomHostRoutingFilterTests.SampleCustomZuulProxyApplication.class,
webEnvironment = WebEnvironment.RANDOM_PORT,
properties = { "server.servlet.context-path: /app" })
properties = { "server.servlet.context-path: /app",
"management.endpoints.web.exposure.include=*" })
@DirtiesContext
public class CustomHostRoutingFilterTests {

4
spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/SimpleRouteLocatorTests.java
View File

@@ -24,7 +24,7 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.springframework.boot.test.rule.OutputCapture;
import org.springframework.boot.test.system.OutputCaptureRule;
import org.springframework.cloud.netflix.zuul.filters.ZuulProperties.ZuulRoute;
import static org.assertj.core.api.Assertions.assertThat;
@@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.containsString;
public class SimpleRouteLocatorTests {
@Rule
public OutputCapture output = new OutputCapture();
public OutputCaptureRule output = new OutputCaptureRule();
private ZuulProperties properties;

3
spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/discovery/PatternServiceRouteMapperIntegrationTests.java
View File

@@ -63,7 +63,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(webEnvironment = RANDOM_PORT,
properties = { "spring.application.name=regex-test-application",
"spring.jmx.enabled=false", "eureka.client.enabled=false" })
"spring.jmx.enabled=false", "eureka.client.enabled=false",
"management.endpoints.web.exposure.include=*" })
@DirtiesContext
public class PatternServiceRouteMapperIntegrationTests {

4
spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/apache/HttpClientRibbonCommandFactoryTest.java
View File

@@ -34,8 +34,8 @@ import org.springframework.cloud.netflix.zuul.filters.ZuulProperties;
import org.springframework.cloud.netflix.zuul.filters.route.FallbackProvider;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;

3
spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/apache/HttpClientRibbonCommandIntegrationTests.java
View File

@@ -80,7 +80,8 @@ import static org.springframework.http.HttpHeaders.SET_COOKIE;
"zuul.routes.another: /another/twolevel/**",
"zuul.routes.simple: /simple/**", "zuul.routes.singleton.id: singleton",
"zuul.routes.singleton.path: /singleton/**",
"zuul.routes.singleton.sensitiveHeaders: " })
"zuul.routes.singleton.sensitiveHeaders: ",
"management.endpoints.web.exposure.include=*" })
@DirtiesContext
public class HttpClientRibbonCommandIntegrationTests extends ZuulProxyTestBase {

4
spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/okhttp/OkHttpRibbonCommandFactoryTest.java
View File

@@ -34,8 +34,8 @@ import org.springframework.cloud.netflix.zuul.filters.ZuulProperties;
import org.springframework.cloud.netflix.zuul.filters.route.FallbackProvider;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;

3
spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/okhttp/OkHttpRibbonCommandIntegrationTests.java
View File

@@ -63,7 +63,8 @@ import static org.assertj.core.api.Assertions.assertThat;
webEnvironment = WebEnvironment.RANDOM_PORT,
value = { "zuul.routes.other: /test/**=http://localhost:7777/local",
"zuul.routes.another: /another/twolevel/**",
"zuul.routes.simple: /simple/**" })
"zuul.routes.simple: /simple/**",
"management.endpoints.web.exposure.include=*" })
@DirtiesContext
public class OkHttpRibbonCommandIntegrationTests extends ZuulProxyTestBase {

4
spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/restclient/RestClientRibbonCommandIntegrationTests.java
View File

@@ -92,8 +92,8 @@ import static org.assertj.core.api.Assertions.assertThat;
"zuul.routes.simple: /simple/**", "zuul.routes.badhost: /badhost/**",
"zuul.ignored-headers: X-Header", "zuul.routes.rnd: /rnd/**",
"rnd.ribbon.listOfServers: ${random.value}",
"zuul.remove-semicolon-content: false",
"ribbon.restclient.enabled=true" })
"zuul.remove-semicolon-content: false", "ribbon.restclient.enabled=true",
"management.endpoints.web.exposure.include=*" })
@DirtiesContext
public class RestClientRibbonCommandIntegrationTests extends ZuulProxyTestBase {

2
spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/test/ZuulApacheHttpClientConfigurationTests.java
View File

@@ -51,7 +51,7 @@ import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.ReflectionUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.mockingDetails;