From 56f1a365fc8206a68da96e5256d90cd68cc50b51 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Mon, 8 Dec 2014 23:16:35 -0700 Subject: [PATCH] add /hosts/appName and renamed misspelled bootstrapyml --- .../cloud/netflix/sidecar/SidecarController.java | 10 ++++++++-- .../src/test/resources/application.yml | 3 +++ .../src/test/resources/bootstrap.yml | 7 +++++++ 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 spring-cloud-netflix-sidecar/src/test/resources/bootstrap.yml diff --git a/spring-cloud-netflix-sidecar/src/main/java/org/springframework/cloud/netflix/sidecar/SidecarController.java b/spring-cloud-netflix-sidecar/src/main/java/org/springframework/cloud/netflix/sidecar/SidecarController.java index 52d59f5a..a4b32804 100644 --- a/spring-cloud-netflix-sidecar/src/main/java/org/springframework/cloud/netflix/sidecar/SidecarController.java +++ b/spring-cloud-netflix-sidecar/src/main/java/org/springframework/cloud/netflix/sidecar/SidecarController.java @@ -4,6 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @@ -27,8 +28,13 @@ public class SidecarController { return "OK"; } + @RequestMapping("/hosts/{appName}") + public List hosts(@PathVariable("appName") String appName) { + return hosts2(appName); + } + @RequestMapping("/hosts") - public List hosts(@RequestParam("appName") String appName) { + public List hosts2(@RequestParam("appName") String appName) { List instances = discovery.getInstances(appName); return instances; } @@ -38,7 +44,7 @@ public class SidecarController { return "Sidecar\n" + "ping
\n" + "health
\n" + - "hosts?appName="+appName+"
\n" + + "hosts/"+appName+"
\n" + ""; } } diff --git a/spring-cloud-netflix-sidecar/src/test/resources/application.yml b/spring-cloud-netflix-sidecar/src/test/resources/application.yml index 11796983..f1c88635 100644 --- a/spring-cloud-netflix-sidecar/src/test/resources/application.yml +++ b/spring-cloud-netflix-sidecar/src/test/resources/application.yml @@ -15,6 +15,9 @@ eureka: serviceUrl: defaultZone: http://user:password@localhost:8761/eureka/ +ribbon: + ServerListRefreshInterval: 5000 + endpoints: refresh: enabled: true diff --git a/spring-cloud-netflix-sidecar/src/test/resources/bootstrap.yml b/spring-cloud-netflix-sidecar/src/test/resources/bootstrap.yml new file mode 100644 index 00000000..bbd58928 --- /dev/null +++ b/spring-cloud-netflix-sidecar/src/test/resources/bootstrap.yml @@ -0,0 +1,7 @@ +spring: + #application: + # name: sideCarTest + cloud: + config: + username: user + password: password