diff --git a/pom.xml b/pom.xml index d797240169..992ce44633 100644 --- a/pom.xml +++ b/pom.xml @@ -85,6 +85,7 @@ spring-rest-angular-pagination spring-rest-docs spring-cloud-config + spring-cloud-eureka spring-security-basic-auth spring-security-custom-permission diff --git a/spring-cloud-eureka/spring-cloud-eureka-feign-client/pom.xml b/spring-cloud-eureka/spring-cloud-eureka-feign-client/pom.xml index 92108a084b..9e639c666a 100644 --- a/spring-cloud-eureka/spring-cloud-eureka-feign-client/pom.xml +++ b/spring-cloud-eureka/spring-cloud-eureka-feign-client/pom.xml @@ -7,7 +7,7 @@ 1.0.0-SNAPSHOT jar - Spring Cloud Eureka - Feign Client + Spring Cloud Eureka Feign Client Spring Cloud Eureka - Sample Feign Client diff --git a/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/FeignClientApplication.java b/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/FeignClientApplication.java index e4f47286b2..7beb51d1ac 100644 --- a/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/FeignClientApplication.java +++ b/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/FeignClientApplication.java @@ -1,12 +1,10 @@ package com.baeldung.spring.cloud.feign.client; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.netflix.eureka.EnableEurekaClient; import org.springframework.cloud.netflix.feign.EnableFeignClients; -import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; @@ -26,6 +24,6 @@ public class FeignClientApplication { @RequestMapping("/get-greeting") public String greeting(Model model) { model.addAttribute("greeting", greetingClient.greeting()); - return "show-greeting"; + return "greeting-view"; } } diff --git a/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/GreetingClient.java b/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/GreetingClient.java index 9cb5de26cc..6bd444b347 100644 --- a/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/GreetingClient.java +++ b/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/GreetingClient.java @@ -3,6 +3,6 @@ package com.baeldung.spring.cloud.feign.client; import com.baeldung.spring.cloud.eureka.client.GreetingController; import org.springframework.cloud.netflix.feign.FeignClient; -@FeignClient("spring-eureka-client") +@FeignClient("spring-cloud-eureka-client") public interface GreetingClient extends GreetingController { } diff --git a/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/templates/show-greeting.html b/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/templates/greeting-view.html similarity index 100% rename from spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/templates/show-greeting.html rename to spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/templates/greeting-view.html