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

Update docs and tests for /eureka path

Browse Source
This commit is contained in:
Dave Syer
2014-10-23 06:56:53 -07:00
parent 5055b46e24
commit df0d44d153
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/src/main/asciidoc/spring-cloud-netflix.adoc
View File

@@ -41,7 +41,7 @@ public class Application {
eureka:
client:
serviceUrl:
defaultZone: http://localhost:8080/v2/
defaultZone: http://localhost:8761/eureka/api/
```
The default application name, virtual host and non-secure port are taken from the `Environment` is
@@ -89,7 +89,7 @@ public class Application {
```
The server has a home page with a UI, and HTTP API endpoints per the
normal Eureka functionality under `/v2/*`.
normal Eureka functionality under `/eureka/api/*`.
Eureka background reading: see https://github.com/cfregly/fluxcapacitor/wiki/NetflixOSS-FAQ#eureka-service-discovery-load-balancer[flux capacitor] and https://groups.google.com/forum/?fromgroups#!topic/eureka_netflix/g3p2r7gHnN0[google group discussion].

4
spring-cloud-netflix-eureka-server/java/eurekademo/ApplicationTests.java
View File

@@ -27,14 +27,14 @@ public class ApplicationTests {
@Test
public void catalogLoads() {
@SuppressWarnings("rawtypes")
ResponseEntity<Map> entity = new TestRestTemplate().getForEntity("http://localhost:" + port + "/v2/apps", Map.class);
ResponseEntity<Map> entity = new TestRestTemplate().getForEntity("http://localhost:" + port + "/eureka/api/apps", Map.class);
assertEquals(HttpStatus.OK, entity.getStatusCode());
}
@Test
public void adminLoads() {
@SuppressWarnings("rawtypes")
ResponseEntity<Map> entity = new TestRestTemplate().getForEntity("http://localhost:" + port + "/admin/env", Map.class);
ResponseEntity<Map> entity = new TestRestTemplate().getForEntity("http://localhost:" + port + "/env", Map.class);
assertEquals(HttpStatus.OK, entity.getStatusCode());
}

6
spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationTests.java
View File

@@ -22,7 +22,7 @@ import org.springframework.test.context.web.WebAppConfiguration;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = Application.class)
@WebAppConfiguration
@IntegrationTest({ "server.port=0", "spring.application.name=eureka", "management.contextPath=/admin", "spring.jmx.enabled=true" })
@IntegrationTest({ "server.port=0", "spring.application.name=eureka", "spring.jmx.enabled=true" })
public class ApplicationTests {
@Value("${local.server.port}")
@@ -43,7 +43,7 @@ public class ApplicationTests {
public void catalogLoads() {
@SuppressWarnings("rawtypes")
ResponseEntity<Map> entity = new TestRestTemplate().getForEntity(
"http://localhost:" + port + "/v2/apps", Map.class);
"http://localhost:" + port + "/eureka/api/apps", Map.class);
assertEquals(HttpStatus.OK, entity.getStatusCode());
}
@@ -51,7 +51,7 @@ public class ApplicationTests {
public void adminLoads() {
@SuppressWarnings("rawtypes")
ResponseEntity<Map> entity = new TestRestTemplate().getForEntity(
"http://localhost:" + port + "/admin/env", Map.class);
"http://localhost:" + port + "/env", Map.class);
assertEquals(HttpStatus.OK, entity.getStatusCode());
}

4
spring-cloud-netflix-zuul/src/main/resources/application.yml
View File

@@ -40,8 +40,8 @@ eureka:
availabilityZones: default
#serviceUrl:
#default: http://localhost:8080/eureka/v2/
#defaultZone: http://localhost:8080/eureka/v2/
#default: http://localhost:8761/eureka/api/
#defaultZone: http://localhost:8761/eureka/api/
instance:
#Virtual host name by which the clients identifies this service