Merge pull request #37 from benjchristensen/json-implementation

Migrate metrics stream from org.json.JSONObject to Jackson
Netflix · Dec 5, 2012 · 493cd97 · 493cd97
2 parents 3376075 + 6d5813e
commit 493cd97
Show file tree

Hide file tree

Showing 9 changed files with 139 additions and 1,164 deletions.
diff --git a/hystrix-contrib/hystrix-metrics-event-stream/build.gradle b/hystrix-contrib/hystrix-metrics-event-stream/build.gradle
@@ -2,5 +2,5 @@
     dependencies {
         compile project(':hystrix-core')
         compile 'javax.servlet:javax.servlet-api:3.0.1'
-        compile 'org.json:json:20090211'
+        compile 'org.codehaus.jackson:jackson-core-asl:1.5.0'
     }
diff --git a/...m/src/main/java/com/netflix/hystrix/contrib/metrics/eventstream/HystrixMetricsPoller.java b/...m/src/main/java/com/netflix/hystrix/contrib/metrics/eventstream/HystrixMetricsPoller.java
diff --git a/hystrix-contrib/hystrix-servo-stream/build.gradle b/hystrix-contrib/hystrix-servo-stream/build.gradle
diff --git a/.../main/java/com/netflix/hystrix/contrib/servostream/HystrixEventStreamMetricsObserver.java b/.../main/java/com/netflix/hystrix/contrib/servostream/HystrixEventStreamMetricsObserver.java
diff --git a/...am/src/main/java/com/netflix/hystrix/contrib/servostream/HystrixMetricsStreamServlet.java b/...am/src/main/java/com/netflix/hystrix/contrib/servostream/HystrixMetricsStreamServlet.java
diff --git a/...ervo-stream/src/main/java/com/netflix/hystrix/contrib/servostream/HystrixServoPoller.java b/...ervo-stream/src/main/java/com/netflix/hystrix/contrib/servostream/HystrixServoPoller.java