From 25f370abfe12c9de92c75fb04eeacc3d8bdc3036 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Wed, 2 Mar 2016 10:37:41 -0700 Subject: [PATCH] Move o.s.c.util to o.s.c.commons.util --- .../ZookeeperDiscoveryClientConfiguration.java | 2 +- .../zookeeper/discovery/ZookeeperServiceDiscovery.java | 2 +- .../discovery/CustomZookeeperServiceDiscovery.groovy | 5 ++--- .../zookeeper/sample/SampleZookeeperApplication.java | 10 +++++++++- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClientConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClientConfiguration.java index a693058a..01b61aaa 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClientConfiguration.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClientConfiguration.java @@ -25,7 +25,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.cloud.util.InetUtils; +import org.springframework.cloud.commons.util.InetUtils; import org.springframework.cloud.zookeeper.discovery.dependency.ZookeeperDependencies; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceDiscovery.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceDiscovery.java index 9d6511b5..656ee3ff 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceDiscovery.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceDiscovery.java @@ -28,7 +28,7 @@ import org.apache.curator.x.discovery.UriSpec; import org.apache.curator.x.discovery.details.InstanceSerializer; import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Value; -import org.springframework.cloud.util.InetUtils; +import org.springframework.cloud.commons.util.InetUtils; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; diff --git a/spring-cloud-zookeeper-discovery/src/test/groovy/org/springframework/cloud/zookeeper/discovery/CustomZookeeperServiceDiscovery.groovy b/spring-cloud-zookeeper-discovery/src/test/groovy/org/springframework/cloud/zookeeper/discovery/CustomZookeeperServiceDiscovery.groovy index a4936d85..ef990c25 100644 --- a/spring-cloud-zookeeper-discovery/src/test/groovy/org/springframework/cloud/zookeeper/discovery/CustomZookeeperServiceDiscovery.groovy +++ b/spring-cloud-zookeeper-discovery/src/test/groovy/org/springframework/cloud/zookeeper/discovery/CustomZookeeperServiceDiscovery.groovy @@ -1,14 +1,13 @@ package org.springframework.cloud.zookeeper.discovery -import org.springframework.cloud.util.InetUtils -import org.springframework.cloud.util.InetUtilsProperties - import javax.annotation.PreDestroy import org.apache.curator.framework.CuratorFramework import org.apache.curator.x.discovery.ServiceDiscoveryBuilder import org.apache.curator.x.discovery.ServiceInstance import org.apache.curator.x.discovery.UriSpec +import org.springframework.cloud.commons.util.InetUtils +import org.springframework.cloud.commons.util.InetUtilsProperties class CustomZookeeperServiceDiscovery extends ZookeeperServiceDiscovery { diff --git a/spring-cloud-zookeeper-sample/src/main/java/org/springframework/cloud/zookeeper/sample/SampleZookeeperApplication.java b/spring-cloud-zookeeper-sample/src/main/java/org/springframework/cloud/zookeeper/sample/SampleZookeeperApplication.java index 233194f1..72950b1a 100644 --- a/spring-cloud-zookeeper-sample/src/main/java/org/springframework/cloud/zookeeper/sample/SampleZookeeperApplication.java +++ b/spring-cloud-zookeeper-sample/src/main/java/org/springframework/cloud/zookeeper/sample/SampleZookeeperApplication.java @@ -33,6 +33,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.client.RestTemplate; /** * @author Spencer Gibb @@ -82,10 +83,17 @@ public class SampleZookeeperApplication { @FeignClient("testZookeeperApp") interface AppClient { - @RequestMapping(value = "/hi", method = RequestMethod.GET) + @RequestMapping(path = "/hi", method = RequestMethod.GET) String hi(); } + @Autowired + RestTemplate rest; + + public String rt() { + return rest.getForObject("http://"+appName+"/hi", String.class); + } + public static void main(String[] args) { SpringApplication.run(SampleZookeeperApplication.class, args); }