From 0de3d12965838bbe5ca3a3ad17aadb1adb081831 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 21 Jul 2016 10:52:43 -0400 Subject: [PATCH] ore robust hystrix test --- hystrix/src/main/java/demo/HystrixApplication.java | 4 ++-- hystrix/src/main/java/demo/MyService.java | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/hystrix/src/main/java/demo/HystrixApplication.java b/hystrix/src/main/java/demo/HystrixApplication.java index 633a692..859015c 100644 --- a/hystrix/src/main/java/demo/HystrixApplication.java +++ b/hystrix/src/main/java/demo/HystrixApplication.java @@ -34,9 +34,9 @@ public class HystrixApplication { @RequestMapping("/fail") public String fail(@RequestHeader(name = "X-No-Fail", required = false) String noFail) { if (noFail != null) { - return this.myService.ok(); + return this.myService.fail(false); } - return this.myService.fail(); + return this.myService.fail(true); } public static void main(String[] args) { diff --git a/hystrix/src/main/java/demo/MyService.java b/hystrix/src/main/java/demo/MyService.java index ad995e3..642a416 100644 --- a/hystrix/src/main/java/demo/MyService.java +++ b/hystrix/src/main/java/demo/MyService.java @@ -13,11 +13,15 @@ public class MyService { } @HystrixCommand(fallbackMethod = "fallback") - public String fail() { - throw new RuntimeException("fail now"); + public String fail(boolean throwSomething) { + if(throwSomething) + throw new RuntimeException("fail now"); + else + return ""; + } - public String fallback() { + public String fallback(boolean throwSomething) { return "from the fallback"; } }