Minor changes after review

atheedom · atheedom · commit e4f2bed4fd3b · 2016-08-16T08:10:45.000+01:00
diff --git a/hystrix/src/main/java/com/baeldung/hystrix/HystrixController.java b/hystrix/src/main/java/com/baeldung/hystrix/HystrixController.java
@@ -10,8 +10,13 @@ public class HystrixController {
     @Autowired
     private SpringExistingClient client;
 
-    @RequestMapping("/")
-    public String index() throws InterruptedException{
-        return client.invokeRemoteService();
+    @RequestMapping("/withHystrix")
+    public String withHystrix() throws InterruptedException{
+        return client.invokeRemoteServiceWithHystrix();
+    }
+
+    @RequestMapping("/withOutHystrix")
+    public String withOutHystrix() throws InterruptedException{
+        return client.invokeRemoteServiceWithOutHystrix();
     }
 }
diff --git a/hystrix/src/main/java/com/baeldung/hystrix/SpringExistingClient.java b/hystrix/src/main/java/com/baeldung/hystrix/SpringExistingClient.java
@@ -10,8 +10,11 @@ public class SpringExistingClient {
     private int remoteServiceDelay;
 
     @HystrixCircuitBreaker
-    public String invokeRemoteService() throws InterruptedException{
+    public String invokeRemoteServiceWithHystrix() throws InterruptedException{
         return new RemoteServiceTestSimulator(remoteServiceDelay).execute();
     }
 
+    public String invokeRemoteServiceWithOutHystrix() throws InterruptedException{
+        return new RemoteServiceTestSimulator(remoteServiceDelay).execute();
+    }
 }
diff --git a/hystrix/src/test/java/com/baeldung/hystrix/SpringAndHystrixIntegrationTest.java b/hystrix/src/test/java/com/baeldung/hystrix/SpringAndHystrixIntegrationTest.java
@@ -23,10 +23,14 @@ public class SpringAndHystrixIntegrationTest {
     public final ExpectedException exception = ExpectedException.none();
 
     @Test
-    public void givenTimeOutOf15000_whenExistingClientCalled_thenExpectHystrixRuntimeException() throws InterruptedException {
+    public void givenTimeOutOf15000_whenClientCalledWithHystrix_thenExpectHystrixRuntimeException() throws InterruptedException {
         exception.expect(HystrixRuntimeException.class);
-        assertThat(hystrixController.index(), equalTo("Success"));
+        hystrixController.withHystrix();
     }
 
+    @Test
+    public void givenTimeOutOf15000_whenClientCalledWithOutHystrix_thenExpectSuccess() throws InterruptedException {
+        assertThat(hystrixController.withOutHystrix(), equalTo("Success"));
+    }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,11 @@ public class SpringExistingClient {`
`10`	`10`	`private int remoteServiceDelay;`
`11`	`11`
`12`	`12`	`@HystrixCircuitBreaker`
`13`		`- public String invokeRemoteService() throws InterruptedException{`
	`13`	`+ public String invokeRemoteServiceWithHystrix() throws InterruptedException{`
`14`	`14`	`return new RemoteServiceTestSimulator(remoteServiceDelay).execute();`
`15`	`15`	`}`
`16`	`16`
	`17`	`+ public String invokeRemoteServiceWithOutHystrix() throws InterruptedException{`
	`18`	`+ return new RemoteServiceTestSimulator(remoteServiceDelay).execute();`
	`19`	`+ }`
`17`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,14 @@ public class SpringAndHystrixIntegrationTest {`
`23`	`23`	`public final ExpectedException exception = ExpectedException.none();`
`24`	`24`
`25`	`25`	`@Test`
`26`		`- public void givenTimeOutOf15000_whenExistingClientCalled_thenExpectHystrixRuntimeException() throws InterruptedException {`
	`26`	`+ public void givenTimeOutOf15000_whenClientCalledWithHystrix_thenExpectHystrixRuntimeException() throws InterruptedException {`
`27`	`27`	`exception.expect(HystrixRuntimeException.class);`
`28`		`- assertThat(hystrixController.index(), equalTo("Success"));`
	`28`	`+ hystrixController.withHystrix();`
`29`	`29`	`}`
`30`	`30`
	`31`	`+ @Test`
	`32`	`+ public void givenTimeOutOf15000_whenClientCalledWithOutHystrix_thenExpectSuccess() throws InterruptedException {`
	`33`	`+ assertThat(hystrixController.withOutHystrix(), equalTo("Success"));`
	`34`	`+ }`
`31`	`35`
`32`	`36`	`}`