From 39a2407b71f3ad1b888e923e17babfcfae831641 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Sat, 9 May 2020 21:16:32 -0700 Subject: [PATCH] examine: Move price lookups off executor Historically price lookup was done by sending a web request on price lookups, which required calls to be done on an executor. As of a1ae397e11, client prices are loaded periodically and cached, thus no longer imposing any thread requirement on price lookup. --- .../net/runelite/client/plugins/examine/ExaminePlugin.java | 6 +----- .../runelite/client/plugins/examine/ExaminePluginTest.java | 5 ----- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java index d414d6fba0..aafba1f4c1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java @@ -29,7 +29,6 @@ import com.google.common.cache.CacheBuilder; import java.time.Instant; import java.util.ArrayDeque; import java.util.Deque; -import java.util.concurrent.ScheduledExecutorService; import java.util.regex.Pattern; import javax.inject.Inject; import lombok.extern.slf4j.Slf4j; @@ -92,9 +91,6 @@ public class ExaminePlugin extends Plugin @Inject private ChatMessageManager chatMessageManager; - @Inject - private ScheduledExecutorService executor; - @Subscribe public void onGameStateChanged(GameStateChanged event) { @@ -219,7 +215,7 @@ public class ExaminePlugin extends Plugin if (itemComposition != null) { final int id = itemManager.canonicalize(itemComposition.getId()); - executor.submit(() -> getItemPrice(id, itemComposition, itemQuantity)); + getItemPrice(id, itemComposition, itemQuantity); } } else diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/examine/ExaminePluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/examine/ExaminePluginTest.java index dccf97258a..312543cf94 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/examine/ExaminePluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/examine/ExaminePluginTest.java @@ -27,7 +27,6 @@ package net.runelite.client.plugins.examine; import com.google.inject.Guice; import com.google.inject.testing.fieldbinder.Bind; import com.google.inject.testing.fieldbinder.BoundFieldModule; -import java.util.concurrent.ScheduledExecutorService; import javax.inject.Inject; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; @@ -73,10 +72,6 @@ public class ExaminePluginTest @Bind ItemManager itemManager; - @Mock - @Bind - ScheduledExecutorService scheduledExecutorService; - @Before public void before() {