From 41968c725fbe4f7956c39ee59b62ab6a5d6957c5 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Thu, 11 Jul 2019 00:33:00 -0700 Subject: [PATCH] Remove unused Slf4j annotations and imports --- .../java/net/runelite/http/service/config/ConfigService.java | 2 -- .../java/net/runelite/http/service/hiscore/HiscoreService.java | 2 -- .../java/net/runelite/http/service/worlds/WorldController.java | 2 -- .../net/runelite/http/service/config/ConfigControllerTest.java | 2 -- .../http/service/loottracker/LootTrackerControllerTest.java | 2 -- .../src/main/java/net/runelite/client/RuneLiteModule.java | 2 -- .../main/java/net/runelite/client/chat/ChatCommandManager.java | 2 -- .../src/main/java/net/runelite/client/game/SpriteManager.java | 2 -- .../net/runelite/client/game/chatbox/ChatboxTextMenuInput.java | 2 -- .../src/main/java/net/runelite/client/plugins/gpu/GLUtil.java | 2 -- .../client/plugins/grandexchange/GrandExchangeSearchPanel.java | 2 -- .../java/net/runelite/client/plugins/mining/MiningPlugin.java | 2 -- .../client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java | 2 -- .../client/plugins/objectindicators/ObjectIndicatorsPlugin.java | 2 -- .../java/net/runelite/client/plugins/party/PartyPlugin.java | 2 -- .../client/plugins/timetracking/farming/FarmingTabPanel.java | 2 -- .../runelite/client/plugins/worldhopper/WorldSwitcherPanel.java | 2 -- .../java/net/runelite/client/plugins/xptracker/XpPanel.java | 2 -- .../runelite/client/util/ExecutorServiceExceptionLogger.java | 2 -- 19 files changed, 38 deletions(-) diff --git a/http-service/src/main/java/net/runelite/http/service/config/ConfigService.java b/http-service/src/main/java/net/runelite/http/service/config/ConfigService.java index f18169938a..9fa47ec98c 100644 --- a/http-service/src/main/java/net/runelite/http/service/config/ConfigService.java +++ b/http-service/src/main/java/net/runelite/http/service/config/ConfigService.java @@ -41,7 +41,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import javax.annotation.Nullable; -import lombok.extern.slf4j.Slf4j; import net.runelite.http.api.RuneLiteAPI; import net.runelite.http.api.config.ConfigEntry; import net.runelite.http.api.config.Configuration; @@ -50,7 +49,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service -@Slf4j public class ConfigService { private final Gson GSON = RuneLiteAPI.GSON; diff --git a/http-service/src/main/java/net/runelite/http/service/hiscore/HiscoreService.java b/http-service/src/main/java/net/runelite/http/service/hiscore/HiscoreService.java index d212c142bb..cc565b4444 100644 --- a/http-service/src/main/java/net/runelite/http/service/hiscore/HiscoreService.java +++ b/http-service/src/main/java/net/runelite/http/service/hiscore/HiscoreService.java @@ -31,7 +31,6 @@ import com.google.common.cache.LoadingCache; import java.io.IOException; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import lombok.extern.slf4j.Slf4j; import net.runelite.http.api.hiscore.HiscoreClient; import net.runelite.http.api.hiscore.HiscoreEndpoint; import net.runelite.http.api.hiscore.HiscoreResult; @@ -39,7 +38,6 @@ import okhttp3.HttpUrl; import org.springframework.stereotype.Service; @Service -@Slf4j public class HiscoreService { private final HiscoreClient hiscoreClient = new HiscoreClient(); diff --git a/http-service/src/main/java/net/runelite/http/service/worlds/WorldController.java b/http-service/src/main/java/net/runelite/http/service/worlds/WorldController.java index 51769e181c..537e252b96 100644 --- a/http-service/src/main/java/net/runelite/http/service/worlds/WorldController.java +++ b/http-service/src/main/java/net/runelite/http/service/worlds/WorldController.java @@ -26,7 +26,6 @@ package net.runelite.http.service.worlds; import java.io.IOException; import java.util.concurrent.TimeUnit; -import lombok.extern.slf4j.Slf4j; import net.runelite.http.api.worlds.WorldResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.CacheControl; @@ -38,7 +37,6 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/worlds") -@Slf4j public class WorldController { @Autowired diff --git a/http-service/src/test/java/net/runelite/http/service/config/ConfigControllerTest.java b/http-service/src/test/java/net/runelite/http/service/config/ConfigControllerTest.java index b91029bec2..88657ca04c 100644 --- a/http-service/src/test/java/net/runelite/http/service/config/ConfigControllerTest.java +++ b/http-service/src/test/java/net/runelite/http/service/config/ConfigControllerTest.java @@ -27,7 +27,6 @@ package net.runelite.http.service.config; import java.io.IOException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import lombok.extern.slf4j.Slf4j; import net.runelite.http.service.account.AuthFilter; import net.runelite.http.service.account.beans.SessionEntry; import org.junit.Before; @@ -51,7 +50,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @RunWith(SpringRunner.class) @WebMvcTest(ConfigController.class) -@Slf4j @ActiveProfiles("test") public class ConfigControllerTest { diff --git a/http-service/src/test/java/net/runelite/http/service/loottracker/LootTrackerControllerTest.java b/http-service/src/test/java/net/runelite/http/service/loottracker/LootTrackerControllerTest.java index 9151838016..3c80dd72d4 100644 --- a/http-service/src/test/java/net/runelite/http/service/loottracker/LootTrackerControllerTest.java +++ b/http-service/src/test/java/net/runelite/http/service/loottracker/LootTrackerControllerTest.java @@ -29,7 +29,6 @@ import java.time.Instant; import java.util.Collections; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import lombok.extern.slf4j.Slf4j; import net.runelite.http.api.RuneLiteAPI; import net.runelite.http.api.loottracker.GameItem; import net.runelite.http.api.loottracker.LootRecord; @@ -57,7 +56,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @RunWith(SpringRunner.class) @WebMvcTest(LootTrackerController.class) -@Slf4j @ActiveProfiles("test") public class LootTrackerControllerTest { diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java b/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java index af5e7e2631..7ce80f8a1e 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java @@ -32,7 +32,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import javax.annotation.Nullable; import javax.inject.Singleton; -import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.hooks.Callbacks; import net.runelite.client.account.SessionManager; @@ -55,7 +54,6 @@ import okhttp3.OkHttpClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Slf4j public class RuneLiteModule extends AbstractModule { private final ClientUpdateCheckMode updateCheckMode; diff --git a/runelite-client/src/main/java/net/runelite/client/chat/ChatCommandManager.java b/runelite-client/src/main/java/net/runelite/client/chat/ChatCommandManager.java index b1aa9b3ac2..f930992d08 100644 --- a/runelite-client/src/main/java/net/runelite/client/chat/ChatCommandManager.java +++ b/runelite-client/src/main/java/net/runelite/client/chat/ChatCommandManager.java @@ -31,7 +31,6 @@ import java.util.function.BiConsumer; import java.util.function.BiPredicate; import javax.inject.Inject; import javax.inject.Singleton; -import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.events.ChatMessage; @@ -42,7 +41,6 @@ import net.runelite.client.events.ChatboxInput; import net.runelite.client.events.PrivateMessageInput; @Singleton -@Slf4j public class ChatCommandManager implements ChatboxInputListener { private final Map commands = new HashMap<>(); diff --git a/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java b/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java index f177377818..b2fd496d31 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java @@ -37,14 +37,12 @@ import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JLabel; import javax.swing.SwingUtilities; -import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.SpritePixels; import net.runelite.client.callback.ClientThread; import net.runelite.client.util.ImageUtil; -@Slf4j @Singleton public class SpriteManager { diff --git a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextMenuInput.java b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextMenuInput.java index 51e5e7dfde..94f3c10dcc 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextMenuInput.java +++ b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextMenuInput.java @@ -31,7 +31,6 @@ import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.Getter; -import lombok.extern.slf4j.Slf4j; import net.runelite.api.FontID; import net.runelite.api.widgets.WidgetType; import net.runelite.api.widgets.JavaScriptCallback; @@ -41,7 +40,6 @@ import net.runelite.api.widgets.WidgetSizeMode; import net.runelite.api.widgets.WidgetTextAlignment; import net.runelite.client.input.KeyListener; -@Slf4j public class ChatboxTextMenuInput extends ChatboxInput implements KeyListener { @Data diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GLUtil.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GLUtil.java index fd6094aea7..af5d5ea018 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GLUtil.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GLUtil.java @@ -27,9 +27,7 @@ package net.runelite.client.plugins.gpu; import com.jogamp.opengl.GL4; import java.io.InputStream; import java.util.Scanner; -import lombok.extern.slf4j.Slf4j; -@Slf4j class GLUtil { private static final int ERR_LEN = 1024; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeSearchPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeSearchPanel.java index bae1c45648..5ad9032cb4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeSearchPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeSearchPanel.java @@ -41,7 +41,6 @@ import javax.swing.JScrollPane; import javax.swing.SwingUtilities; import javax.swing.border.EmptyBorder; import lombok.Setter; -import lombok.extern.slf4j.Slf4j; import net.runelite.api.ItemComposition; import net.runelite.client.callback.ClientThread; import net.runelite.client.game.AsyncBufferedImage; @@ -55,7 +54,6 @@ import net.runelite.http.api.item.ItemPrice; * This panel holds the search section of the Grand Exchange Plugin. * It should display a search bar and either item results or a error panel. */ -@Slf4j class GrandExchangeSearchPanel extends JPanel { private static final String ERROR_PANEL = "ERROR_PANEL"; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java index 0c526222c3..a401a5ca66 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java @@ -30,7 +30,6 @@ import java.util.List; import javax.inject.Inject; import lombok.AccessLevel; import lombok.Getter; -import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.GameObject; import net.runelite.api.GameState; @@ -54,7 +53,6 @@ import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.ui.overlay.OverlayManager; -@Slf4j @PluginDescriptor( name = "Mining", description = "Show ore respawn timers", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java index f81d1482a8..1f07645999 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java @@ -38,7 +38,6 @@ import java.util.Arrays; import java.util.List; import javax.inject.Inject; import lombok.Getter; -import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.Constants; import net.runelite.api.ItemID; @@ -62,7 +61,6 @@ import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.client.ui.overlay.infobox.InfoBoxManager; import net.runelite.client.util.WildcardMatcher; -@Slf4j @PluginDescriptor( name = "NPC Aggression Timer", description = "Highlights the unaggressive area of NPCs nearby and timer until it becomes active", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java index 05fd84d0d8..28a1ca85b1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java @@ -40,7 +40,6 @@ import java.util.Set; import javax.inject.Inject; import lombok.AccessLevel; import lombok.Getter; -import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import static net.runelite.api.Constants.REGION_SIZE; import net.runelite.api.DecorativeObject; @@ -69,7 +68,6 @@ import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.ui.overlay.OverlayManager; -@Slf4j @PluginDescriptor( name = "Object Markers", description = "Enable marking of objects using the Shift key", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java index 2d7bddc3a6..b70057e97b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java @@ -39,7 +39,6 @@ import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Named; import lombok.Getter; -import lombok.extern.slf4j.Slf4j; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; import net.runelite.api.GameState; @@ -86,7 +85,6 @@ import net.runelite.http.api.ws.messages.party.UserSync; name = "Party", description = "Shows useful information about current party" ) -@Slf4j public class PartyPlugin extends Plugin implements KeyListener { @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTabPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTabPanel.java index 2c262111e2..fa6852082d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTabPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTabPanel.java @@ -34,7 +34,6 @@ import java.util.List; import java.util.Set; import javax.swing.JLabel; import javax.swing.border.EmptyBorder; -import lombok.extern.slf4j.Slf4j; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.timetracking.TabContentPanel; import net.runelite.client.plugins.timetracking.TimeTrackingConfig; @@ -42,7 +41,6 @@ import net.runelite.client.plugins.timetracking.TimeablePanel; import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.FontManager; -@Slf4j public class FarmingTabPanel extends TabContentPanel { private final FarmingTracker farmingTracker; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java index 937a9e74d2..a531dabaf4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java @@ -39,14 +39,12 @@ import javax.swing.JPanel; import javax.swing.SwingUtilities; import lombok.AccessLevel; import lombok.Setter; -import lombok.extern.slf4j.Slf4j; import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.DynamicGridLayout; import net.runelite.client.ui.PluginPanel; import net.runelite.http.api.worlds.World; import net.runelite.http.api.worlds.WorldType; -@Slf4j class WorldSwitcherPanel extends PluginPanel { private static final Color ODD_ROW = new Color(44, 44, 44); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpPanel.java index c7bf7c3876..87c272c842 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpPanel.java @@ -37,7 +37,6 @@ import javax.swing.JPanel; import javax.swing.JPopupMenu; import javax.swing.SwingUtilities; import javax.swing.border.EmptyBorder; -import lombok.extern.slf4j.Slf4j; import net.runelite.api.Actor; import net.runelite.api.Client; import net.runelite.api.Skill; @@ -49,7 +48,6 @@ import net.runelite.client.ui.components.PluginErrorPanel; import net.runelite.client.util.LinkBrowser; import okhttp3.HttpUrl; -@Slf4j class XpPanel extends PluginPanel { private final Map infoBoxes = new HashMap<>(); diff --git a/runelite-client/src/main/java/net/runelite/client/util/ExecutorServiceExceptionLogger.java b/runelite-client/src/main/java/net/runelite/client/util/ExecutorServiceExceptionLogger.java index af5f13c89f..fe8902d663 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/ExecutorServiceExceptionLogger.java +++ b/runelite-client/src/main/java/net/runelite/client/util/ExecutorServiceExceptionLogger.java @@ -34,12 +34,10 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; /** * Wrapper for ${@link ScheduledExecutorService} that will log all uncaught exceptions as warning to console */ -@Slf4j @RequiredArgsConstructor public class ExecutorServiceExceptionLogger implements ScheduledExecutorService {