From 4debd04bd710815a7f1e8948ad261242d66d71f4 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Wed, 22 Jan 2020 11:15:13 -0500 Subject: [PATCH] Replaces some deprecations --- .../cloud/zookeeper/ZookeeperServerListTests.java | 2 +- ...overyClientConfigServiceAutoConfigurationTests.java | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/ZookeeperServerListTests.java b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/ZookeeperServerListTests.java index 63ad7d8c..5bbf98ba 100644 --- a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/ZookeeperServerListTests.java +++ b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/ZookeeperServerListTests.java @@ -30,8 +30,8 @@ import org.springframework.cloud.zookeeper.discovery.ZookeeperServer; import org.springframework.cloud.zookeeper.discovery.ZookeeperServerList; import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.springframework.cloud.zookeeper.support.StatusConstants.INSTANCE_STATUS_KEY; diff --git a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/configclient/DiscoveryClientConfigServiceAutoConfigurationTests.java b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/configclient/DiscoveryClientConfigServiceAutoConfigurationTests.java index 023ee116..f6ec9578 100644 --- a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/configclient/DiscoveryClientConfigServiceAutoConfigurationTests.java +++ b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/configclient/DiscoveryClientConfigServiceAutoConfigurationTests.java @@ -70,8 +70,9 @@ public class DiscoveryClientConfigServiceAutoConfigurationTests { "spring.cloud.zookeeper.discovery.instance-port:7001", "spring.cloud.zookeeper.discovery.instance-host:foo", "spring.cloud.config.discovery.service-id:configserver"); - assertThat(this.context.getBeanNamesForType( - ZookeeperConfigServerAutoConfiguration.class).length).isEqualTo(1); + assertThat(this.context + .getBeanNamesForType(ZookeeperConfigServerAutoConfiguration.class).length) + .isEqualTo(1); ZookeeperDiscoveryClient client = this.context.getParent() .getBean(ZookeeperDiscoveryClient.class); verify(client, atLeast(2)).getInstances("configserver"); @@ -105,8 +106,9 @@ public class DiscoveryClientConfigServiceAutoConfigurationTests { public ZookeeperDiscoveryClient zookeeperDiscoveryClient( ZookeeperDiscoveryProperties properties) { ZookeeperDiscoveryClient client = mock(ZookeeperDiscoveryClient.class); - ServiceInstance instance = new DefaultServiceInstance("configserver", - properties.getInstanceHost(), properties.getInstancePort(), false); + ServiceInstance instance = new DefaultServiceInstance("configserver1", + "configserver", properties.getInstanceHost(), + properties.getInstancePort(), false); given(client.getInstances("configserver")) .willReturn(Arrays.asList(instance)); return client;