From 49a441fe034dc17d5e245d6317c0c3571f34cffb Mon Sep 17 00:00:00 2001
From: Colin McDonald <cmcdonald.main@gmail.com>
Date: Sat, 25 Jun 2016 19:09:51 -0400
Subject: [PATCH] Change server heartbeat's players section from an array to a
 dict

---
 .../apiv3/route/servers/POSTServersHeartbeat.java | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/net/frozenorb/apiv3/route/servers/POSTServersHeartbeat.java b/src/main/java/net/frozenorb/apiv3/route/servers/POSTServersHeartbeat.java
index b42a9e1..135e3df 100644
--- a/src/main/java/net/frozenorb/apiv3/route/servers/POSTServersHeartbeat.java
+++ b/src/main/java/net/frozenorb/apiv3/route/servers/POSTServersHeartbeat.java
@@ -38,7 +38,7 @@ public final class POSTServersHeartbeat implements Handler<RoutingContext> {
         Server actorServer = ((ServerActor) actor).getServer();
         ServerGroup actorServerGroup = ServerGroup.findById(actorServer.getServerGroup());
         JsonObject requestBody = ctx.getBodyAsJson();
-        Map<UUID, String> playerNames = extractPlayerNames(requestBody.getJsonArray("players"));
+        Map<UUID, String> playerNames = extractPlayerNames(requestBody.getJsonObject("players"));
 
         CompositeFuture.all(
                 createInfoResponse(actorServer, requestBody.getDouble("lastTps"), playerNames),
@@ -156,18 +156,17 @@ public final class POSTServersHeartbeat implements Handler<RoutingContext> {
         return callback;
     }
 
-    private Map<UUID, String> extractPlayerNames(JsonArray players) {
+    private Map<UUID, String> extractPlayerNames(JsonObject players) {
         Map<UUID, String> result = new HashMap<>();
 
-        for (Object player : players) {
-            JsonObject playerJson = (JsonObject) player;
-            UUID uuid = UUID.fromString(playerJson.getString("uuid"));
-            String username = playerJson.getString("username");
+        players.forEach((entry) -> {
+            UUID uuid = UUID.fromString(entry.getKey());
+            JsonObject data = (JsonObject) entry.getValue();
 
             if (UuidUtils.isAcceptableUuid(uuid)) {
-                result.put(uuid, username);
+                result.put(uuid, data.getString("username"));
             }
-        }
+        });
 
         return result;
     }