Fix/insight-stream: update insight and stream (#4)

* fix/insight: update insight and stream

Author: dsun0720

src/main/java/co/featbit/server/InsightTypes.java

@@ -179,17 +179,17 @@ public JsonElement serialize(FlagEvent flagEvent, Type type, JsonSerializationCo
             JsonArray array1 = new JsonArray();
             for (FlagEventVariation variation : flagEvent.userVariations) {
                 JsonObject var = new JsonObject();
-                var.addProperty("featureFlagKeyName", variation.getFeatureFlagKeyName());
+                var.addProperty("featureFlagKey", variation.getFeatureFlagKeyName());
                 var.addProperty("sendToExperiment", variation.getVariation().isSendToExperiment());
                 var.addProperty("timestamp", Instant.now().toEpochMilli());
                 JsonObject v = new JsonObject();
-                v.addProperty("localId", variation.getVariation().getIndex());
-                v.addProperty("variationValue", variation.getVariation().getValue());
+                v.addProperty("id", variation.getVariation().getIndex());
+                v.addProperty("value", variation.getVariation().getValue());
                 v.addProperty("reason", variation.getVariation().getReason());
                 var.add("variation", v);
                 array1.add(var);
             }
-            json.add("userVariations", array1);
+            json.add("variations", array1);
             return json;
         }
     }
@@ -217,7 +217,7 @@ public JsonElement serialize(MetricEvent metricEvent, Type type, JsonSerializati
     private static JsonObject serializeUser(FBUser user) {
         JsonObject json = new JsonObject();
         JsonObject json1 = new JsonObject();
-        json1.addProperty("userName", user.getUserName());
+        json1.addProperty("name", user.getUserName());
         json1.addProperty("keyId", user.getKey());
         JsonArray array = new JsonArray();
         for (Map.Entry<String, String> keyItem : user.getCustom().entrySet()) {

src/main/java/co/featbit/server/Streaming.java

@@ -215,7 +215,7 @@ private Boolean processDateAsync(final DataModel.Data data) {
         return opOK;
     }
 
-    private final class DefaultWebSocketListener extends StreamingWebSocketListener {
+    final class DefaultWebSocketListener extends StreamingWebSocketListener {
         // this callback method may throw a JsonParseException
         // if received data is invalid
         @Override
@@ -293,8 +293,9 @@ public final void onFailure(@NotNull WebSocket webSocket, @NotNull Throwable t,
             boolean isReconn;
             String errorType;
             Class<? extends Throwable> tClass = t.getClass();
-            // runtime exception restart except JsonParseException
+            String message = String.format("%s : %s", tClass.getTypeName(), t.getMessage());
             if (t instanceof RuntimeException) {
+                // runtime exception restart except JsonParseException
                 isReconn = tClass != JsonParseException.class;
                 errorType = isReconn ? Status.RUNTIME_ERROR : Status.DATA_INVALID_ERROR;
             } else {
@@ -303,12 +304,12 @@ public final void onFailure(@NotNull WebSocket webSocket, @NotNull Throwable t,
                     errorType = Status.WEBSOCKET_ERROR;
                 } else if (t instanceof IOException) {
                     errorType = Status.NETWORK_ERROR;
-                    forceToUseMaxRetryDelay = true;
                 } else {
                     errorType = Status.UNKNOWN_ERROR;
+                    forceToUseMaxRetryDelay = true;
                 }
             }
-            Status.ErrorInfo errorInfo = Status.ErrorInfo.of(errorType, t.getMessage());
+            Status.ErrorInfo errorInfo = Status.ErrorInfo.of(errorType, message);
             if (isReconn) {
                 logger.warn("FFC JAVA SDK: streaming webSocket will reconnect because of {}", t.getMessage());
                 updater.updateStatus(Status.StateType.INTERRUPTED, errorInfo);

src/main/java/co/featbit/server/Utils.java

@@ -35,7 +35,7 @@
 public abstract class Utils {
 
     public static Iterable<Map.Entry<String, String>> defaultHeaders(String envSecret) {
-        return ImmutableMap.of("envSecret", envSecret,
+        return ImmutableMap.of("Authorization", envSecret,
                         "User-Agent", "fb-java-server-sdk",
                         "Content-Type", "application/json")
                 .entrySet();

src/main/java/co/featbit/server/exterior/BasicConfig.java

@@ -9,7 +9,7 @@ public final class BasicConfig {
 
     private static final String DEFAULT_STREAMING_PATH = "/streaming";
 
-    private static final String DEFAULT_EVENT_PATH = "/api/public/track";
+    private static final String DEFAULT_EVENT_PATH = "/api/public/insight/track";
 
     private final String envSecret;
     private final boolean offline;