Merge pull request #3 from BarathArivazhagan/dev

fixed hystrix issue

Author: BarathArivazhagan

config-server/src/main/java/com/barath/app/EurekaConfigServerApplication.java renamed to config-server/src/main/java/com/barath/app/ConfigServerApplication.java

@@ -6,9 +6,9 @@
 
 @SpringBootApplication
 @EnableConfigServer
-public class EurekaConfigServerApplication {
+public class ConfigServerApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(EurekaConfigServerApplication.class, args);
+		SpringApplication.run(ConfigServerApplication.class, args);
 	}
 }

config-server/src/main/resources/application.yml

@@ -4,7 +4,7 @@ server:
 
 spring:
   application:
-    name: eureka-config-server
+    name: config-server
   profiles:
     active: native
   cloud:

config-server/src/test/java/com/barath/app/EurekaConfigServerApplicationTests.java renamed to config-server/src/test/java/com/barath/app/ConfigServerApplicationTests.java

@@ -7,7 +7,7 @@
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-public class EurekaConfigServerApplicationTests {
+public class ConfigServerApplicationTests {
 
 	@Test
 	public void contextLoads() {

eureka-client-app1/src/main/java/com/barath/app/Application.java

@@ -34,7 +34,7 @@ public String welcome(){
 		return "HELLO FROM EUREKA CLIENT 1";
 	}
 
-	@GetMapping("/callClient2")
+	@GetMapping("/invoke/client2")
 	public String invokeClient2App(){
 		logger.info("invoke eureka client app2");
 		return client2.welcome();

eureka-client-app1/src/main/java/com/barath/app/Client2.java

@@ -10,12 +10,3 @@ public interface Client2 {
 	@GetMapping("/")
 	public String welcome();
 }
-class Client2Fallback implements Client2 {
-
-	@Override
-	public String welcome() {
-		
-		return "Something went wrong, wait for sometime";
-	}
-   
-}

eureka-client-app1/src/main/java/com/barath/app/Client2Fallback.java

@@ -0,0 +1,14 @@
+package com.barath.app;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class Client2Fallback implements Client2 {
+
+	@Override
+	public String welcome() {
+		
+		return "Something went wrong, wait for sometime";
+	}
+   
+}

eureka-client-app2/src/main/java/com/barath/app/Application.java

@@ -29,10 +29,5 @@ public String welcome(){
 		return "<b>HELLO FROM EUREKA CLIENT 2</b>";
 	}
 
-	@GetMapping("/callClient1")
-	public String invokeClient1App(){
-		
-		logger.info("invoke eureka client app1");
-		return "HELLO FROM EUREKA CLIENT 1";
-	}
+	
 }

eureka-server/src/main/resources/application.yml

@@ -9,6 +9,7 @@ spring:
 eureka:
   instance:
     hostname: localhost
+    
   client:
     fetch-registry: false
     register-with-eureka: false

zuul-proxy/src/main/resources/application.yml

@@ -18,7 +18,7 @@ zuul:
     CLIENT1:
       service-id: eureka-client-app1
       path: /app1/*
-      strip-prefix: true
+      strip-prefix: false
     CLIENT2:
       service-id: eureka-client-app2
       path: /app2/*