Tweak the caching

Author: Ghost-chu

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

@@ -21,11 +21,14 @@
 
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheStats;
+import lombok.AllArgsConstructor;
+import lombok.Data;
 import org.bukkit.Location;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.maxgamer.quickshop.api.shop.Shop;
+import org.maxgamer.quickshop.shop.SimpleShopManager;
 
 import java.util.concurrent.TimeUnit;
 
@@ -36,11 +39,10 @@
  */
 public class Cache {
     private final QuickShop plugin;
-    private final com.google.common.cache.Cache<Location, Shop> accessCaching = CacheBuilder
+    private final com.google.common.cache.Cache<Location, BoxedShop> accessCaching = CacheBuilder
             .newBuilder()
-            .initialCapacity(1000)
+            .initialCapacity(5000)
             .expireAfterAccess(120, TimeUnit.MINUTES)
-            .weakValues()
             .recordStats()
             .build();
 
@@ -56,24 +58,22 @@ public Cache(QuickShop plugin) {
     /**
      * Gets shop from plugin caching
      *
-     * @param location        The shop location that you want to get
-     * @param includeAttached Include attached shops
+     * @param location The shop location that you want to get
+     * @param attached Does search for attached
      * @return The shop, null for no shops found in caching and memory
      */
     @Nullable
-    public Shop getCaching(@NotNull Location location, boolean includeAttached) {
-        Shop shop = accessCaching.getIfPresent(location);
-        if (shop == null) {
-            if (includeAttached) {
-                shop = plugin.getShopManager().getShopIncludeAttached(location, false);
+    public Shop find(@NotNull Location location, boolean attached) {
+        BoxedShop boxedShop = accessCaching.getIfPresent(location);
+        if (boxedShop == null) {
+            if (attached) {
+                boxedShop = new BoxedShop(((SimpleShopManager) plugin.getShopManager()).findShopIncludeAttached(location, false));
             } else {
-                shop = plugin.getShopManager().getShop(location);
+                boxedShop = new BoxedShop(plugin.getShopManager().getShop(location));
             }
         }
-        if (shop != null) {
-            setCache(location, shop);
-        }
-        return shop;
+        setCache(location, boxedShop.getShop());
+        return boxedShop.getShop();
     }
 
     /**
@@ -83,10 +83,20 @@ public Shop getCaching(@NotNull Location location, boolean includeAttached) {
      * @param shop     null for invalidate and Shop object for update
      */
     public void setCache(@NotNull Location location, @Nullable Shop shop) {
-        if (shop == null) {
-            accessCaching.invalidate(location);
-            return;
+        accessCaching.put(location, new BoxedShop(shop));
+    }
+
+    public void invalidate(@NotNull Location location) {
+        accessCaching.invalidate(location);
+    }
+
+    @AllArgsConstructor
+    @Data
+    static class BoxedShop {
+        private Shop shop;
+
+        public boolean isPresent() {
+            return shop != null;
         }
-        accessCaching.put(location, shop);
     }
 }

src/main/java/org/maxgamer/quickshop/listener/AbstractProtectionListener.java

@@ -1,5 +1,5 @@
 /*
- * This file is a part of project QuickShop, the name is ProtectionListenerBase.java
+ * This file is a part of project QuickShop, the name is AbstractProtectionListener.java
  *  Copyright (C) PotatoCraft Studio and contributors
  *
  *  This program is free software: you can redistribute it and/or modify it
@@ -52,7 +52,7 @@ public QuickShop getPlugin() {
     @Nullable
     public Shop getShopRedstone(@NotNull Location location, boolean includeAttached) {
         if (cache != null) {
-            return cache.getCaching(location, includeAttached);
+            return cache.find(location, includeAttached);
         } else {
             if (includeAttached) {
                 return plugin.getShopManager().getShopIncludeAttached(location);

src/main/java/org/maxgamer/quickshop/listener/BlockListener.java

@@ -169,36 +169,25 @@ private Shop getShopNextTo(@NotNull Location loc) {
     @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
     public void onInventoryMove(InventoryMoveItemEvent event) {
         if (!this.update_sign_when_inventory_moving) {
-            Util.debugLog("Sign update was disabled");
             return;
         }
-
         Location destination = event.getDestination().getLocation();
         Location source = event.getSource().getLocation();
         Shop destShop = null;
         Shop sourceShop = null;
         if (destination != null) {
             destination = Util.getBlockLocation(destination);
-            Util.debugLog("Destination found: " + destination);
-            destShop = getShopPlayer(destination, true);
+            destShop = getShopRedstone(destination, true);
         }
         if (source != null) {
             source = Util.getBlockLocation(source);
-            Util.debugLog("Source found: " + destination);
-            sourceShop = getShopPlayer(source, true);
+            sourceShop = getShopRedstone(source, true);
         }
-
         if (destShop != null) {
-            Util.debugLog("Destination shop found: " + destShop);
             super.getPlugin().getSignUpdateWatcher().scheduleSignUpdate(destShop);
-        } else {
-            Util.debugLog("Destination shop not found.");
         }
         if (sourceShop != null) {
-            Util.debugLog("Source shop found: " + sourceShop);
             super.getPlugin().getSignUpdateWatcher().scheduleSignUpdate(sourceShop);
-        } else {
-            Util.debugLog("Source shop not found.");
         }
     }
 

src/main/java/org/maxgamer/quickshop/shop/SimpleShopManager.java

@@ -417,7 +417,12 @@ public void createShop(@NotNull Shop shop, @NotNull Info info) {
             Util.debugLog("Location is null.");
             return null;
         }
-        return getShopIncludeAttached_Fast(loc, false, useCache);
+        if (useCache) {
+            if (plugin.getShopCache() != null) {
+                return plugin.getShopCache().find(loc, true);
+            }
+        }
+        return findShopIncludeAttached(loc, false);
     }
 
     @Override
@@ -1439,8 +1444,8 @@ private void actionTrade(@NotNull Player p, Info info, @NotNull String message)
         }
     }
 
-    private @Nullable Shop getShopIncludeAttached_Fast(
-            @NotNull Location loc, boolean fromAttach, boolean writeCache) {
+    @Nullable
+    public Shop findShopIncludeAttached(@NotNull Location loc, boolean fromAttach) {
         Shop shop = getShop(loc);
 
         // failed, get attached shop
@@ -1455,7 +1460,7 @@ private void actionTrade(@NotNull Player p, Info info, @NotNull String message)
                 if (Util.isWallSign(currentBlock.getType())) {
                     final Block attached = Util.getAttached(currentBlock);
                     if (attached != null) {
-                        shop = this.getShopIncludeAttached_Fast(attached.getLocation(), true, writeCache);
+                        shop = this.findShopIncludeAttached(attached.getLocation(), true);
                     }
                 } else {
                     // optimize for performance
@@ -1471,7 +1476,7 @@ private void actionTrade(@NotNull Player p, Info info, @NotNull String message)
             }
         }
         // add cache if using
-        if (plugin.getShopCache() != null && writeCache) {
+        if (plugin.getShopCache() != null) {
             plugin.getShopCache().setCache(loc, shop);
         }
         return shop;