reorganize and do proper resource cleanup

minecrafter · Mar 8, 2016 · 88e0aa6 · 88e0aa6
1 parent 3fa9b31
commit 88e0aa6
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/src/main/java/com/imaginarycode/minecraft/redisbungee/DataManager.java b/src/main/java/com/imaginarycode/minecraft/redisbungee/DataManager.java
@@ -35,7 +35,6 @@
  */
 public class DataManager implements Listener {
     private final RedisBungee plugin;
-    // TODO: Add cleanup for this.
     private final Cache<UUID, String> serverCache = createCache();
     private final Cache<UUID, String> proxyCache = createCache();
     private final Cache<UUID, InetAddress> ipCache = createCache();
@@ -46,6 +45,7 @@ public DataManager(RedisBungee plugin) {
     }
 
     private static <K, V> Cache<K, V> createCache() {
+        // TODO: Allow customization via cache specification, ala ServerListPlus
         return CacheBuilder.newBuilder()
                 .maximumSize(1000)
                 .expireAfterWrite(1, TimeUnit.HOURS)

diff --git a/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java b/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java
@@ -7,6 +7,9 @@
 import com.google.gson.Gson;
 import com.imaginarycode.minecraft.redisbungee.events.PubSubMessageEvent;
 import com.imaginarycode.minecraft.redisbungee.util.*;
+import com.imaginarycode.minecraft.redisbungee.util.uuid.NameFetcher;
+import com.imaginarycode.minecraft.redisbungee.util.uuid.UUIDFetcher;
+import com.imaginarycode.minecraft.redisbungee.util.uuid.UUIDTranslator;
 import com.squareup.okhttp.Dispatcher;
 import com.squareup.okhttp.OkHttpClient;
 import lombok.AccessLevel;

diff --git a/...necraft/redisbungee/util/NameFetcher.java → ...ft/redisbungee/util/uuid/NameFetcher.java b/...necraft/redisbungee/util/NameFetcher.java → ...ft/redisbungee/util/uuid/NameFetcher.java
@@ -1,9 +1,10 @@
-package com.imaginarycode.minecraft.redisbungee.util;
+package com.imaginarycode.minecraft.redisbungee.util.uuid;
 
 import com.google.gson.reflect.TypeToken;
 import com.imaginarycode.minecraft.redisbungee.RedisBungee;
 import com.squareup.okhttp.OkHttpClient;
 import com.squareup.okhttp.Request;
+import com.squareup.okhttp.ResponseBody;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -22,7 +23,9 @@ public class NameFetcher {
     public static List<String> nameHistoryFromUuid(UUID uuid) throws IOException {
         String url = "https://api.mojang.com/user/profiles/" + uuid.toString().replace("-", "") + "/names";
         Request request = new Request.Builder().url(url).get().build();
-        String response = httpClient.newCall(request).execute().body().string();
+        ResponseBody body = httpClient.newCall(request).execute().body();
+        String response = body.string();
+        body.close();
 
         Type listType = new TypeToken<List<Name>>() {
         }.getType();

diff --git a/...necraft/redisbungee/util/UUIDFetcher.java → ...ft/redisbungee/util/uuid/UUIDFetcher.java b/...necraft/redisbungee/util/UUIDFetcher.java → ...ft/redisbungee/util/uuid/UUIDFetcher.java
@@ -1,11 +1,8 @@
-package com.imaginarycode.minecraft.redisbungee.util;
+package com.imaginarycode.minecraft.redisbungee.util.uuid;
 
 import com.google.common.collect.ImmutableList;
 import com.imaginarycode.minecraft.redisbungee.RedisBungee;
-import com.squareup.okhttp.MediaType;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.RequestBody;
+import com.squareup.okhttp.*;
 import lombok.Setter;
 
 import java.util.HashMap;
@@ -44,7 +41,9 @@ public Map<String, UUID> call() throws Exception {
         for (int i = 0; i < requests; i++) {
             String body = RedisBungee.getGson().toJson(names.subList(i * 100, Math.min((i + 1) * 100, names.size())));
             Request request = new Request.Builder().url(PROFILE_URL).post(RequestBody.create(JSON, body)).build();
-            String response = httpClient.newCall(request).execute().body().string();
+            ResponseBody responseBody = httpClient.newCall(request).execute().body();
+            String response = responseBody.string();
+            responseBody.close();
             Profile[] array = RedisBungee.getGson().fromJson(response, Profile[].class);
             for (Profile profile : array) {
                 UUID uuid = UUIDFetcher.getUUID(profile.id);

diff --git a/...raft/redisbungee/util/UUIDTranslator.java → ...redisbungee/util/uuid/UUIDTranslator.java b/...raft/redisbungee/util/UUIDTranslator.java → ...redisbungee/util/uuid/UUIDTranslator.java
@@ -1,4 +1,4 @@
-package com.imaginarycode.minecraft.redisbungee.util;
+package com.imaginarycode.minecraft.redisbungee.util.uuid;
 
 import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableMap;

diff --git a/src/test/java/com/imaginarycode/minecraft/redisbungee/test/UUIDNameTest.java b/src/test/java/com/imaginarycode/minecraft/redisbungee/test/UUIDNameTest.java
@@ -1,7 +1,7 @@
 package com.imaginarycode.minecraft.redisbungee.test;
 
-import com.imaginarycode.minecraft.redisbungee.util.NameFetcher;
-import com.imaginarycode.minecraft.redisbungee.util.UUIDFetcher;
+import com.imaginarycode.minecraft.redisbungee.util.uuid.NameFetcher;
+import com.imaginarycode.minecraft.redisbungee.util.uuid.UUIDFetcher;
 import com.squareup.okhttp.OkHttpClient;
 import org.junit.Test;