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

add /hosts/appName and renamed misspelled bootstrapyml

Browse Source
This commit is contained in:
Spencer Gibb
2014-12-08 23:16:35 -07:00
parent 2545a0151b
commit 56f1a365fc
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-netflix-sidecar/src/main/java/org/springframework/cloud/netflix/sidecar/SidecarController.java
View File

@@ -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<ServiceInstance> hosts(@PathVariable("appName") String appName) {
return hosts2(appName);
}
@RequestMapping("/hosts")
public List<ServiceInstance> hosts(@RequestParam("appName") String appName) {
public List<ServiceInstance> hosts2(@RequestParam("appName") String appName) {
List<ServiceInstance> instances = discovery.getInstances(appName);
return instances;
}
@@ -38,7 +44,7 @@ public class SidecarController {
return "<head><title>Sidecar</title></head><body>\n" +
"<a href='/ping'>ping</a><br/>\n" +
"<a href='/health'>health</a><br/>\n" +
"<a href='/hosts?appName="+appName+"'>hosts?appName="+appName+"</a><br/>\n" +
"<a href='/hosts/"+appName+"'>hosts/"+appName+"</a><br/>\n" +
"</body>";
}
}

3
spring-cloud-netflix-sidecar/src/test/resources/application.yml
View File

@@ -15,6 +15,9 @@ eureka:
serviceUrl:
defaultZone: http://user:password@localhost:8761/eureka/
ribbon:
ServerListRefreshInterval: 5000
endpoints:
refresh:
enabled: true

7
spring-cloud-netflix-sidecar/src/test/resources/bootstrap.yml Normal file
View File

@@ -0,0 +1,7 @@
spring:
#application:
# name: sideCarTest
cloud:
config:
username: user
password: password