improve insightserver encoding

Author: jochen-testingbot

src/main/java/com/testingbot/tunnel/InsightServer.java

@@ -32,9 +32,12 @@ public static class JsonServlet extends HttpServlet {
         @Override
         protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
             resp.setContentType("application/json");
+            resp.setCharacterEncoding("UTF-8");
             resp.setStatus(HttpServletResponse.SC_OK);
-            resp.getWriter().println("{\"version\":\"" + App.VERSION + "\", \"uptime\":\"" + (System.currentTimeMillis() - Statistics.getStartTime()) + "\","
-                + "\"numberOfRequests\":\"" + Statistics.getNumberOfRequests() + "\", \"bytesTransferred\":" + Statistics.getBytesTransferred() + "}");
+            resp.getWriter().println("{\"version\":" + App.VERSION
+                + ",\"uptime\":" + (System.currentTimeMillis() - Statistics.getStartTime())
+                + ",\"numberOfRequests\":" + Statistics.getNumberOfRequests()
+                + ",\"bytesTransferred\":" + Statistics.getBytesTransferred() + "}");
         }
     }
 }

src/test/java/com/testingbot/tunnel/InsightServerTest.java

@@ -12,6 +12,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.lang.reflect.Field;
+import java.util.concurrent.atomic.AtomicLong;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -113,7 +114,7 @@ void metricsEndpoint_shouldReturnCorrectVersion() throws Exception {
                 JsonNode json = objectMapper.readTree(body);
 
                 // Then: Version should match App.VERSION
-                assertThat(json.get("version").asText()).isEqualTo(App.VERSION.toString());
+                assertThat(json.get("version").floatValue()).isEqualTo(App.VERSION);
                 return null;
             });
         }
@@ -137,7 +138,7 @@ void metricsEndpoint_shouldReturnUptime() throws Exception {
                 JsonNode json = objectMapper.readTree(body);
 
                 // Then: Uptime should be greater than 5000ms
-                long uptime = Long.parseLong(json.get("uptime").asText());
+                long uptime = json.get("uptime").asLong();
                 assertThat(uptime).isGreaterThanOrEqualTo(5000);
                 return null;
             });
@@ -164,7 +165,7 @@ void metricsEndpoint_shouldReturnNumberOfRequests() throws Exception {
                 JsonNode json = objectMapper.readTree(body);
 
                 // Then: Should return correct request count
-                assertThat(json.get("numberOfRequests").asText()).isEqualTo("3");
+                assertThat(json.get("numberOfRequests").asLong()).isEqualTo(3);
                 return null;
             });
         }
@@ -220,14 +221,14 @@ void metricsEndpoint_shouldHandleMultipleRequests() throws Exception {
     private void resetStatistics() throws Exception {
         Field requestsField = Statistics.class.getDeclaredField("numberOfRequests");
         requestsField.setAccessible(true);
-        requestsField.setLong(null, 0);
+        ((AtomicLong) requestsField.get(null)).set(0);
 
         Field bytesField = Statistics.class.getDeclaredField("bytesTransferred");
         bytesField.setAccessible(true);
-        bytesField.setLong(null, 0);
+        ((AtomicLong) bytesField.get(null)).set(0);
 
         Field startTimeField = Statistics.class.getDeclaredField("startTime");
         startTimeField.setAccessible(true);
-        startTimeField.setLong(null, 0);
+        ((AtomicLong) startTimeField.get(null)).set(0);
     }
 }