From f99f61d89bf96b9a986b34b687d699b68d05ac72 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Wed, 2 Mar 2016 10:28:31 -0700 Subject: [PATCH] Move o.s.c.util to o.s.c.commons.util --- .../ConsulDiscoveryClientConfiguration.java | 6 +++--- .../consul/discovery/ConsulDiscoveryProperties.java | 2 +- .../consul/discovery/ConsulServerListTests.java | 13 +++++++------ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfiguration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfiguration.java index ba582f11..dce7699b 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfiguration.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfiguration.java @@ -16,18 +16,18 @@ package org.springframework.cloud.consul.discovery; -import com.ecwid.consul.v1.ConsulClient; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.web.ServerProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.cloud.commons.util.InetUtils; import org.springframework.cloud.consul.ConditionalOnConsulEnabled; -import org.springframework.cloud.util.InetUtils; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import com.ecwid.consul.v1.ConsulClient; + /** * @author Spencer Gibb */ diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java index 987fcb1d..cf2e621f 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java @@ -24,7 +24,7 @@ import java.util.Map; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.cloud.util.InetUtils; +import org.springframework.cloud.commons.util.InetUtils; import lombok.AccessLevel; import lombok.Data; diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerListTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerListTests.java index a87fdf55..8014689d 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerListTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerListTests.java @@ -20,16 +20,17 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; +import org.junit.Test; +import org.springframework.cloud.commons.util.InetUtils; +import org.springframework.cloud.commons.util.InetUtilsProperties; + import com.ecwid.consul.v1.ConsulClient; import com.ecwid.consul.v1.agent.model.NewService; import com.netflix.client.config.DefaultClientConfigImpl; -import org.junit.Test; -import org.springframework.cloud.util.InetUtils; -import org.springframework.cloud.util.InetUtilsProperties; - -import static org.junit.Assert.*; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertThat; /** * @author Spencer Gibb