Fix test again

Author: sandtechnology

src/main/java/org/maxgamer/quickshop/QuickShop.java

@@ -28,7 +28,6 @@
 import lombok.Getter;
 import lombok.Setter;
 import me.minebuilders.clearlag.listeners.ItemMergeListener;
-import okhttp3.OkHttpClient;
 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
@@ -798,16 +797,7 @@ public final void onDisable() {
         Util.debugLog("Unregistering plugin services...");
         getServer().getServicesManager().unregisterAll(this);
         Util.debugLog("Shutdown okhttp client...");
-        try {
-            OkHttpClient client = HttpUtil.getClientInstance();
-            client.dispatcher().executorService().shutdown();
-            client.connectionPool().evictAll();
-            okhttp3.Cache cache = client.cache();
-            if (cache != null) {
-                cache.close();
-            }
-        } catch (Throwable ignored) {
-        }
+        HttpUtil.shutdown();
         Util.debugLog("Cleanup...");
         Util.debugLog("All shutdown work is finished.");
 

src/main/java/org/maxgamer/quickshop/util/HttpUtil.java

@@ -37,16 +37,18 @@ public class HttpUtil {
     protected static final com.google.common.cache.Cache<String, String> requestCachePool = CacheBuilder.newBuilder()
             .expireAfterWrite(7, TimeUnit.DAYS)
             .build();
-    private static final OkHttpClient client = new OkHttpClient.Builder()
-            .cache(new Cache(getCacheFolder(), 50L * 1024L * 1024L)).build();
+    private static final File cacheFolder = Util.getCacheFolder();
+    private static OkHttpClient client = new OkHttpClient.Builder().cache(new Cache(cacheFolder, 50L * 1024L * 1024L)).build();
 
+    private static volatile boolean shutdown = false;
 
     @Deprecated
     public static HttpUtil create() {
         return new HttpUtil();
     }
 
     public static Response makeGet(@NotNull String url) throws IOException {
+        checkIfNeedToRecreateClient();
         return client.newCall(new Request.Builder().get().url(url).build()).execute();
     }
 
@@ -74,6 +76,7 @@ public static String createGet(@NotNull String url) {
 
     @Nullable
     public static String createGet(@NotNull String url, boolean flushCache) {
+        checkIfNeedToRecreateClient();
         String cache;
         if (!flushCache) {
             cache = requestCachePool.getIfPresent(url);
@@ -99,23 +102,43 @@ public static String createGet(@NotNull String url, boolean flushCache) {
 
     @NotNull
     public static Response makePost(@NotNull String url, @NotNull RequestBody body) throws IOException {
+        checkIfNeedToRecreateClient();
         return client.newCall(new Request.Builder().post(body).url(url).build()).execute();
     }
 
-    @NotNull
-    private static File getCacheFolder() {
-        File file = new File(Util.getCacheFolder(), "okhttp_tmp");
-        file.mkdirs();
-        return file;
-    }
 
     public static OkHttpClient getClientInstance() {
+        checkIfNeedToRecreateClient();
         return client;
     }
 
+    private static void checkIfNeedToRecreateClient() {
+        if (shutdown) {
+            shutdown = false;
+            client = new OkHttpClient.Builder().cache(new Cache(cacheFolder, 50L * 1024L * 1024L)).build();
+            new RuntimeException("Quickshop HTTPUtil: OkHttpClient is rebuilding, it should not happened outside the testing!").printStackTrace();
+        }
+    }
+
+    public static void shutdown() {
+        try {
+            if (!shutdown) {
+                shutdown = true;
+                client.dispatcher().executorService().shutdown();
+                client.connectionPool().evictAll();
+                okhttp3.Cache cache = client.cache();
+                if (cache != null) {
+                    cache.close();
+                }
+            }
+        } catch (Throwable ignored) {
+        }
+    }
+
     @Deprecated
     @NotNull
     public OkHttpClient getClient() {
+        checkIfNeedToRecreateClient();
         return client;
     }
 }