From 401d182fc6c8ef210aca063e4e180681979b54f9 Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Sat, 11 Jan 2025 19:16:46 -0500 Subject: [PATCH] [O] Use logger alias --- src/main/java/icu/samnyan/aqua/net/components/Email.kt | 5 ++--- src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDB.kt | 3 ++- src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbServer.kt | 3 ++- src/main/java/icu/samnyan/aqua/sega/allnet/AllNet.kt | 4 +--- src/main/java/icu/samnyan/aqua/sega/billing/Billing.kt | 5 ++--- .../aqua/sega/maimai2/handler/GetUserCharacterHandler.kt | 5 ++--- .../samnyan/aqua/sega/maimai2/handler/GetUserItemHandler.kt | 5 ++--- .../aqua/sega/maimai2/handler/UploadUserPhotoHandler.kt | 3 ++- .../aqua/sega/maimai2/handler/UploadUserPortraitHandler.kt | 5 ++--- 9 files changed, 17 insertions(+), 21 deletions(-) diff --git a/src/main/java/icu/samnyan/aqua/net/components/Email.kt b/src/main/java/icu/samnyan/aqua/net/components/Email.kt index 2b4863e6..0129dfa6 100644 --- a/src/main/java/icu/samnyan/aqua/net/components/Email.kt +++ b/src/main/java/icu/samnyan/aqua/net/components/Email.kt @@ -2,14 +2,13 @@ package icu.samnyan.aqua.net.components import ext.Bool import ext.Str +import ext.logger import icu.samnyan.aqua.net.db.AquaNetUser import icu.samnyan.aqua.net.db.EmailConfirmation import icu.samnyan.aqua.net.db.EmailConfirmationRepo import org.simplejavamail.api.mailer.Mailer import org.simplejavamail.email.EmailBuilder import org.simplejavamail.springsupport.SimpleJavaMailSpringSupport -import org.slf4j.Logger -import org.slf4j.LoggerFactory import org.springframework.boot.context.event.ApplicationStartedEvent import org.springframework.boot.context.properties.ConfigurationProperties import org.springframework.context.annotation.Configuration @@ -40,7 +39,7 @@ class EmailService( val props: EmailProperties, val confirmationRepo: EmailConfirmationRepo, ) { - val log: Logger = LoggerFactory.getLogger(EmailService::class.java) + val log = logger() val confirmTemplate: Str = this::class.java.getResource("/email/confirm.html")?.readText() ?: throw Exception("Email Template Not Found") diff --git a/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDB.kt b/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDB.kt index 216393cf..f9a2c5c1 100644 --- a/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDB.kt +++ b/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDB.kt @@ -1,5 +1,6 @@ package icu.samnyan.aqua.sega.aimedb +import ext.logger import ext.toHex import icu.samnyan.aqua.net.db.AquaUserServices import icu.samnyan.aqua.sega.allnet.AllNetProps @@ -28,7 +29,7 @@ class AimeDB( val us: AquaUserServices, val allNetProps: AllNetProps, ): ChannelInboundHandlerAdapter() { - val logger: Logger = LoggerFactory.getLogger(AimeDB::class.java) + val logger = logger() data class AimeBaseInfo(val gameId: String, val keychipId: String) diff --git a/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbServer.kt b/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbServer.kt index 59c82317..3368e4b3 100644 --- a/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbServer.kt +++ b/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbServer.kt @@ -1,5 +1,6 @@ package icu.samnyan.aqua.sega.aimedb +import ext.logger import io.netty.bootstrap.ServerBootstrap import io.netty.channel.ChannelInitializer import io.netty.channel.ChannelOption @@ -33,7 +34,7 @@ class AimeDbServer( val initializer: AimeDbServerInitializer, val props: AimeDbProps ) { - val logger: Logger = LoggerFactory.getLogger(AimeDbServer::class.java) + val logger = logger() fun start() { if (!props.enable) return logger.info("Aime DB is disabled.") diff --git a/src/main/java/icu/samnyan/aqua/sega/allnet/AllNet.kt b/src/main/java/icu/samnyan/aqua/sega/allnet/AllNet.kt index d02fd4be..1cd8c4b8 100644 --- a/src/main/java/icu/samnyan/aqua/sega/allnet/AllNet.kt +++ b/src/main/java/icu/samnyan/aqua/sega/allnet/AllNet.kt @@ -6,8 +6,6 @@ import icu.samnyan.aqua.sega.util.AllNetBillingDecoder.decodeAllNet import icu.samnyan.aqua.sega.util.AquaConst import jakarta.servlet.http.HttpServletRequest import jakarta.servlet.http.HttpServletResponse -import org.slf4j.Logger -import org.slf4j.LoggerFactory import org.springframework.boot.context.properties.ConfigurationProperties import org.springframework.context.annotation.Configuration import org.springframework.web.bind.annotation.PostMapping @@ -197,7 +195,7 @@ class AllNet( } companion object { - val logger: Logger = LoggerFactory.getLogger(AllNet::class.java) + val logger = logger() } } diff --git a/src/main/java/icu/samnyan/aqua/sega/billing/Billing.kt b/src/main/java/icu/samnyan/aqua/sega/billing/Billing.kt index be29b589..ddfc84b5 100644 --- a/src/main/java/icu/samnyan/aqua/sega/billing/Billing.kt +++ b/src/main/java/icu/samnyan/aqua/sega/billing/Billing.kt @@ -1,5 +1,6 @@ package icu.samnyan.aqua.sega.billing +import ext.logger import ext.toUrl import icu.samnyan.aqua.sega.util.AllNetBillingDecoder.decodeBilling import jakarta.annotation.PostConstruct @@ -8,8 +9,6 @@ import org.eclipse.jetty.http.HttpVersion import org.eclipse.jetty.server.* import org.eclipse.jetty.util.resource.URLResourceFactory import org.eclipse.jetty.util.ssl.SslContextFactory -import org.slf4j.Logger -import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Value import org.springframework.boot.context.properties.ConfigurationProperties import org.springframework.boot.web.embedded.jetty.JettyServerCustomizer @@ -44,7 +43,7 @@ class Billing( ) { lateinit var billingKey: PrivateKey - val logger: Logger = LoggerFactory.getLogger(Billing::class.java) + val logger = logger() @PostConstruct fun init() { diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserCharacterHandler.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserCharacterHandler.kt index a8fd9241..c2cb6843 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserCharacterHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserCharacterHandler.kt @@ -1,12 +1,11 @@ package icu.samnyan.aqua.sega.maimai2.handler +import ext.logger import icu.samnyan.aqua.net.games.mai2.Maimai2 import icu.samnyan.aqua.sega.general.BaseHandler import icu.samnyan.aqua.sega.general.dao.CardRepository import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2ItemKind -import org.slf4j.Logger -import org.slf4j.LoggerFactory import org.springframework.stereotype.Component import kotlin.jvm.optionals.getOrNull @@ -48,6 +47,6 @@ class GetUserCharacterHandler( } companion object { - val logger: Logger = LoggerFactory.getLogger(GetUserCharacterHandler::class.java) + val logger = logger() } } diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserItemHandler.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserItemHandler.kt index a71ccc1b..7fbe1505 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserItemHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserItemHandler.kt @@ -1,12 +1,11 @@ package icu.samnyan.aqua.sega.maimai2.handler +import ext.logger import icu.samnyan.aqua.net.games.mai2.Maimai2 import icu.samnyan.aqua.sega.general.BaseHandler import icu.samnyan.aqua.sega.general.dao.CardRepository import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2ItemKind -import org.slf4j.Logger -import org.slf4j.LoggerFactory import org.springframework.stereotype.Component import kotlin.jvm.optionals.getOrNull @@ -81,7 +80,7 @@ class GetUserItemHandler( } companion object { - val logger: Logger = LoggerFactory.getLogger(GetUserItemHandler::class.java) + val logger = logger() const val MULT = 10000000000L } } diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPhotoHandler.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPhotoHandler.kt index bdcfeb39..e55bc45f 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPhotoHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPhotoHandler.kt @@ -2,6 +2,7 @@ package icu.samnyan.aqua.sega.maimai2.handler import ext.div import ext.isoDateTime +import ext.logger import ext.path import icu.samnyan.aqua.sega.general.BaseHandler import icu.samnyan.aqua.sega.maimai2.model.request.UploadUserPhoto @@ -47,6 +48,6 @@ class UploadUserPhotoHandler(private val mapper: BasicMapper) : } companion object { - private val logger: Logger = LoggerFactory.getLogger(UploadUserPhotoHandler::class.java) + private val logger = logger() } } diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPortraitHandler.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPortraitHandler.kt index 803fe06a..4df81ff6 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPortraitHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPortraitHandler.kt @@ -1,13 +1,12 @@ package icu.samnyan.aqua.sega.maimai2.handler import ext.div +import ext.logger import ext.path import icu.samnyan.aqua.net.utils.PathProps import icu.samnyan.aqua.sega.general.BaseHandler import icu.samnyan.aqua.sega.maimai2.model.request.UploadUserPortrait import icu.samnyan.aqua.sega.util.jackson.BasicMapper -import org.slf4j.Logger -import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Value import org.springframework.stereotype.Component import java.io.IOException @@ -70,6 +69,6 @@ class UploadUserPortraitHandler( } companion object { - private val logger: Logger = LoggerFactory.getLogger(UploadUserPortraitHandler::class.java) + private val logger = logger() } }