diff --git a/src/main/java/net/lamgc/cgj/bot/BotAdminCommandProcess.java b/src/main/java/net/lamgc/cgj/bot/BotAdminCommandProcess.java index 25f3357..a06d208 100644 --- a/src/main/java/net/lamgc/cgj/bot/BotAdminCommandProcess.java +++ b/src/main/java/net/lamgc/cgj/bot/BotAdminCommandProcess.java @@ -21,7 +21,7 @@ import java.util.*; public class BotAdminCommandProcess { - private final static Logger log = LoggerFactory.getLogger(BotAdminCommandProcess.class.getName()); + private final static Logger log = LoggerFactory.getLogger(BotAdminCommandProcess.class); private final static File pushListFile = new File(BotGlobal.getGlobal().getDataStoreDir(), "pushList.json"); diff --git a/src/main/java/net/lamgc/cgj/bot/RandomIntervalSendTimer.java b/src/main/java/net/lamgc/cgj/bot/RandomIntervalSendTimer.java index 8f1fcd7..fafd01d 100644 --- a/src/main/java/net/lamgc/cgj/bot/RandomIntervalSendTimer.java +++ b/src/main/java/net/lamgc/cgj/bot/RandomIntervalSendTimer.java @@ -14,7 +14,7 @@ import java.util.concurrent.atomic.AtomicBoolean; public class RandomIntervalSendTimer extends TimerTask { private final static Timer timer = new Timer("Thread-RIST", true); - private final static Logger log = LoggerFactory.getLogger(RandomIntervalSendTimer.class.getName()); + private final static Logger log = LoggerFactory.getLogger(RandomIntervalSendTimer.class); private final static Map timerMap = new HashMap<>(); private final long timerId; @@ -22,7 +22,7 @@ public class RandomIntervalSendTimer extends TimerTask { private final AutoSender sender; private final long time; private final int floatTime; - private AtomicBoolean loop = new AtomicBoolean(); + private final AtomicBoolean loop = new AtomicBoolean(); private final AtomicBoolean start = new AtomicBoolean(); private final String hashId = Integer.toHexString(this.hashCode()); diff --git a/src/main/java/net/lamgc/cgj/bot/SettingProperties.java b/src/main/java/net/lamgc/cgj/bot/SettingProperties.java index 59e2319..1520959 100644 --- a/src/main/java/net/lamgc/cgj/bot/SettingProperties.java +++ b/src/main/java/net/lamgc/cgj/bot/SettingProperties.java @@ -11,7 +11,7 @@ import java.util.*; public final class SettingProperties { - private final static Logger log = LoggerFactory.getLogger(SettingProperties.class.getName()); + private final static Logger log = LoggerFactory.getLogger(SettingProperties.class); private final static File globalPropFile = new File(getPropertiesDir(), "global.properties"); private final static Properties globalProp = new Properties(); diff --git a/src/main/java/net/lamgc/cgj/bot/cache/ImageCacheStore.java b/src/main/java/net/lamgc/cgj/bot/cache/ImageCacheStore.java index 2d696a3..e3363c2 100644 --- a/src/main/java/net/lamgc/cgj/bot/cache/ImageCacheStore.java +++ b/src/main/java/net/lamgc/cgj/bot/cache/ImageCacheStore.java @@ -17,7 +17,7 @@ import java.util.concurrent.locks.ReentrantLock; public final class ImageCacheStore { - private final static Logger log = LoggerFactory.getLogger(ImageCacheStore.class.getName()); + private final static Logger log = LoggerFactory.getLogger(ImageCacheStore.class); private final static Map cacheMap = new Hashtable<>(); diff --git a/src/main/java/net/lamgc/cgj/bot/event/BotEventHandler.java b/src/main/java/net/lamgc/cgj/bot/event/BotEventHandler.java index 1ecaab2..c1ffbf5 100644 --- a/src/main/java/net/lamgc/cgj/bot/event/BotEventHandler.java +++ b/src/main/java/net/lamgc/cgj/bot/event/BotEventHandler.java @@ -38,7 +38,7 @@ public class BotEventHandler implements EventHandler { private final ArgumentsRunner processRunner; private final ArgumentsRunner adminRunner; - private final static Logger log = LoggerFactory.getLogger(BotEventHandler.class.getName()); + private final static Logger log = LoggerFactory.getLogger(BotEventHandler.class); private final static Map muteStateMap = new Hashtable<>(); diff --git a/src/main/java/net/lamgc/cgj/bot/framework/coolq/CQPluginMain.java b/src/main/java/net/lamgc/cgj/bot/framework/coolq/CQPluginMain.java index d334a4a..2073387 100644 --- a/src/main/java/net/lamgc/cgj/bot/framework/coolq/CQPluginMain.java +++ b/src/main/java/net/lamgc/cgj/bot/framework/coolq/CQPluginMain.java @@ -20,7 +20,7 @@ public class CQPluginMain extends CQPlugin implements EventHandler { // TODO(LamGC, 2020.04.21): SpringCQ无法适配MessageSenderBuilder // MessageSenderBuilder.setCurrentMessageSenderFactory(new SpringCQMessageSenderFactory()); ApplicationBoot.initialBot(); - LoggerFactory.getLogger(CQPluginMain.class.getName()) + LoggerFactory.getLogger(CQPluginMain.class) .info("BotEventHandler.COMMAND_PREFIX = {}", BotEventHandler.COMMAND_PREFIX); } diff --git a/src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiMain.java b/src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiMain.java index b7a55f2..f673533 100644 --- a/src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiMain.java +++ b/src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiMain.java @@ -22,7 +22,7 @@ import java.util.Properties; public class MiraiMain implements Closeable { - private final Logger log = LoggerFactory.getLogger(MiraiMain.class.getName()); + private final Logger log = LoggerFactory.getLogger(MiraiMain.class); private Bot bot; diff --git a/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageSender.java b/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageSender.java index 33f7d3c..46a5273 100644 --- a/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageSender.java +++ b/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageSender.java @@ -26,7 +26,7 @@ public class MiraiMessageSender implements MessageSender { private final Contact member; private final MessageSource source; - private final static Logger log = LoggerFactory.getLogger(MiraiMessageSender.class.getName()); + private final static Logger log = LoggerFactory.getLogger(MiraiMessageSender.class); private final static CacheStore imageIdCache = new HotDataCacheStore<>( new StringRedisCacheStore(BotGlobal.getGlobal().getRedisServer(), "mirai.imageId"), new LocalHashCacheStore<>(), diff --git a/src/main/java/net/lamgc/cgj/pixiv/PixivDownload.java b/src/main/java/net/lamgc/cgj/pixiv/PixivDownload.java index 8846d5a..c9b6626 100644 --- a/src/main/java/net/lamgc/cgj/pixiv/PixivDownload.java +++ b/src/main/java/net/lamgc/cgj/pixiv/PixivDownload.java @@ -33,7 +33,7 @@ import java.util.function.BiConsumer; public class PixivDownload { - private final static Logger log = LoggerFactory.getLogger(PixivDownload.class.getName()); + private final static Logger log = LoggerFactory.getLogger(PixivDownload.class); private final HttpClient httpClient; diff --git a/src/main/java/net/lamgc/cgj/proxy/PixivAccessProxyServer.java b/src/main/java/net/lamgc/cgj/proxy/PixivAccessProxyServer.java index 535e640..2e9d533 100644 --- a/src/main/java/net/lamgc/cgj/proxy/PixivAccessProxyServer.java +++ b/src/main/java/net/lamgc/cgj/proxy/PixivAccessProxyServer.java @@ -27,7 +27,7 @@ import java.util.List; */ public class PixivAccessProxyServer { - private final Logger log = LoggerFactory.getLogger(PixivAccessProxyServer.class.getName()); + private final Logger log = LoggerFactory.getLogger(PixivAccessProxyServer.class); private final HttpProxyServer proxyServer; diff --git a/src/test/java/net/lamgc/cgj/pixiv/PixivDownloadTest.java b/src/test/java/net/lamgc/cgj/pixiv/PixivDownloadTest.java index 8842474..eb37785 100644 --- a/src/test/java/net/lamgc/cgj/pixiv/PixivDownloadTest.java +++ b/src/test/java/net/lamgc/cgj/pixiv/PixivDownloadTest.java @@ -31,9 +31,9 @@ public class PixivDownloadTest { private static CookieStore cookieStore; - private final static Logger log = LoggerFactory.getLogger(PixivDownloadTest.class.getName()); + private final static Logger log = LoggerFactory.getLogger(PixivDownloadTest.class); - private static HttpHost proxy = new HttpHost("127.0.0.1", 1001); + private static final HttpHost proxy = new HttpHost("127.0.0.1", 1001); @BeforeClass public static void before() throws IOException, ClassNotFoundException {