Deprecated HystrixConfigurationJsonStream in favor of compositional s…

…erialization
rwilliams-r7 · Jun 22, 2016 · bf924aa · bf924aa
1 parent f1bb9c9
commit bf924aa
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 15 deletions.
diff --git a/...main/java/com/netflix/hystrix/contrib/requests/stream/HystrixRequestEventsSseServlet.java b/...main/java/com/netflix/hystrix/contrib/requests/stream/HystrixRequestEventsSseServlet.java
@@ -26,6 +26,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
+ * Servlet that writes SSE JSON every time a request is made
  */
 public class HystrixRequestEventsSseServlet extends HystrixSampleSseServlet {
 

diff --git a/...ream/src/main/java/com/netflix/hystrix/contrib/sample/stream/HystrixConfigSseServlet.java b/...ream/src/main/java/com/netflix/hystrix/contrib/sample/stream/HystrixConfigSseServlet.java
@@ -19,12 +19,10 @@
 import com.netflix.config.DynamicPropertyFactory;
 import com.netflix.hystrix.config.HystrixConfiguration;
 import com.netflix.hystrix.config.HystrixConfigurationStream;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.netflix.hystrix.metric.serial.SerialHystrixConfiguration;
 import rx.Observable;
 import rx.functions.Func1;
 
-import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -51,7 +49,6 @@
 public class HystrixConfigSseServlet extends HystrixSampleSseServlet {
 
     private static final long serialVersionUID = -3599771169762858235L;
-    private static final Logger logger = LoggerFactory.getLogger(HystrixConfigSseServlet.class);
 
     /* used to track number of connections and throttle */
     private static AtomicInteger concurrentConnections = new AtomicInteger(0);
@@ -65,12 +62,7 @@ public HystrixConfigSseServlet() {
         super(sampleStream.map(new Func1<HystrixConfiguration, String>() {
             @Override
             public String call(HystrixConfiguration hystrixConfiguration) {
-                try {
-                    return HystrixConfigurationJsonStream.convertToString(hystrixConfiguration);
-                } catch (IOException ioe) {
-                    logger.error("IOException creating JSON from HystrixUtilization", ioe);
-                    return "<IOException> : " + ioe.getMessage();
-                }
+                return SerialHystrixConfiguration.toJsonString(hystrixConfiguration);
             }
         }), pausePollerThreadDelayInMs);
     }

diff --git a/...c/main/java/com/netflix/hystrix/contrib/sample/stream/HystrixConfigurationJsonStream.java b/...c/main/java/com/netflix/hystrix/contrib/sample/stream/HystrixConfigurationJsonStream.java
@@ -25,6 +25,7 @@
 import com.netflix.hystrix.config.HystrixConfiguration;
 import com.netflix.hystrix.config.HystrixConfigurationStream;
 import com.netflix.hystrix.config.HystrixThreadPoolConfiguration;
+import com.netflix.hystrix.metric.HystrixRequestEventsStream;
 import rx.Observable;
 import rx.functions.Func1;
 
@@ -40,7 +41,9 @@
  * <li> Consumer of your choice that wants control over where to embed this stream
  * </ul>
  *
+ * @deprecated Instead, prefer mapping your preferred serialization on top of {@link HystrixConfigurationStream#observe()}.
  */
+@Deprecated //since 1.5.4
 public class HystrixConfigurationJsonStream {
 
     private static final JsonFactory jsonFactory = new JsonFactory();

diff --git a/...ta-stream/src/main/java/com/netflix/hystrix/metric/serial/SerialHystrixConfiguration.java b/...ta-stream/src/main/java/com/netflix/hystrix/metric/serial/SerialHystrixConfiguration.java
@@ -32,6 +32,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.StringWriter;
 import java.nio.ByteBuffer;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -46,8 +47,34 @@ public static byte[] toBytes(HystrixConfiguration config) {
 
         try {
             ByteArrayOutputStream bos = new ByteArrayOutputStream();
-            JsonGenerator json = cborFactory.createGenerator(bos);
+            JsonGenerator cbor = cborFactory.createGenerator(bos);
 
+            serializeConfiguration(config, cbor);
+
+            retVal = bos.toByteArray();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        return retVal;
+    }
+
+    public static String toJsonString(HystrixConfiguration config) {
+        StringWriter jsonString = new StringWriter();
+
+        try {
+            JsonGenerator json = jsonFactory.createGenerator(jsonString);
+
+            serializeConfiguration(config, json);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        return jsonString.getBuffer().toString();
+    }
+
+    private static void serializeConfiguration(HystrixConfiguration config, JsonGenerator json) {
+        try {
             json.writeStartObject();
             json.writeStringField("type", "HystrixConfig");
             json.writeObjectFieldStart("commands");
@@ -76,14 +103,10 @@ public static byte[] toBytes(HystrixConfiguration config) {
             json.writeEndObject();
             json.writeEndObject();
             json.close();
-
-
-            retVal = bos.toByteArray();
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
 
-        return retVal;
     }
 
     public static HystrixConfiguration fromByteBuffer(ByteBuffer bb) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,6 +26,7 @@ @@
     import java.util.concurrent.atomic.AtomicInteger;
     /**
+     * Servlet that writes SSE JSON every time a request is made
      */
     public class HystrixRequestEventsSseServlet extends HystrixSampleSseServlet {
@@ Expand Down @@