diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/sample/EurekaSampleApplication.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/sample/EurekaSampleApplication.java index c9f2a181..fbf931fe 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/sample/EurekaSampleApplication.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/sample/EurekaSampleApplication.java @@ -16,9 +16,11 @@ package org.springframework.cloud.netflix.eureka.sample; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.metrics.repository.InMemoryMetricRepository; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.cloud.client.discovery.DiscoveryClient; import org.springframework.cloud.netflix.eureka.EnableEurekaClient; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -36,6 +38,9 @@ import com.netflix.appinfo.InstanceInfo; @EnableEurekaClient public class EurekaSampleApplication { + @Autowired + DiscoveryClient discoveryClient; + @Bean public InMemoryMetricRepository inMemoryMetricRepository() { return new InMemoryMetricRepository(); @@ -54,7 +59,7 @@ public class EurekaSampleApplication { @RequestMapping("/") public String home() { - return "Hello world"; + return "Hello world "+discoveryClient.getLocalServiceInstance().getUri(); } public static void main(String[] args) { diff --git a/spring-cloud-netflix-sidecar/src/test/java/org/springframework/cloud/netflix/sidecar/SidecarApplication.java b/spring-cloud-netflix-sidecar/src/test/java/org/springframework/cloud/netflix/sidecar/SidecarApplication.java index ca0d73ba..63fe5129 100644 --- a/spring-cloud-netflix-sidecar/src/test/java/org/springframework/cloud/netflix/sidecar/SidecarApplication.java +++ b/spring-cloud-netflix-sidecar/src/test/java/org/springframework/cloud/netflix/sidecar/SidecarApplication.java @@ -17,23 +17,14 @@ package org.springframework.cloud.netflix.sidecar; import org.springframework.boot.SpringApplication; -import org.springframework.boot.actuate.metrics.repository.InMemoryMetricRepository; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.context.annotation.Bean; import org.springframework.web.bind.annotation.RestController; @SpringBootApplication @EnableSidecar -@EnableDiscoveryClient @RestController public class SidecarApplication { - @Bean - public InMemoryMetricRepository inMemoryMetricRepository() { - return new InMemoryMetricRepository(); - } - public static void main(String[] args) { SpringApplication.run(SidecarApplication.class, args); }