Merge pull request #359 from LossyDragon/logger-and-annotations

Logger and annotations

Author: LossyDragon

src/main/java/in/dragonbra/javasteam/networking/steam3/WebSocketConnection.kt

@@ -34,7 +34,7 @@ class WebSocketConnection :
     CoroutineScope {
 
     companion object {
-        private val logger = LogManager.getLogger(WebSocketConnection::class.java)
+        private val logger = LogManager.getLogger<WebSocketConnection>()
     }
 
     private val job: Job = SupervisorJob()

src/main/java/in/dragonbra/javasteam/steam/authentication/AuthSession.kt

@@ -39,7 +39,7 @@ open class AuthSession(
 ) {
 
     companion object {
-        private val logger = LogManager.getLogger(AuthSession::class.java)
+        private val logger = LogManager.getLogger<AuthSession>()
     }
 
     init {

src/main/java/in/dragonbra/javasteam/steam/cdn/Client.kt

@@ -38,7 +38,7 @@ class Client(steamClient: SteamClient) : Closeable {
 
     companion object {
 
-        private val logger: Logger = LogManager.getLogger(Client::class.java)
+        private val logger: Logger = LogManager.getLogger<Client>()
 
         /**
          * Default timeout to use when making requests

src/main/java/in/dragonbra/javasteam/steam/cdn/ClientPool.kt

@@ -39,7 +39,7 @@ class ClientPool(internal val steamClient: SteamClient, private val appId: Int,
 
     private val monitorJob: Job
 
-    private val logger: Logger = LogManager.getLogger(ClientPool::class.java)
+    private val logger: Logger = LogManager.getLogger<ClientPool>()
 
     init {
         monitorJob = parentScope.launch { connectionPoolMonitor().await() }

src/main/java/in/dragonbra/javasteam/steam/discovery/FileServerListProvider.kt

@@ -20,6 +20,10 @@ import java.time.Instant
  */
 class FileServerListProvider(val file: Path) : IServerListProvider {
 
+    companion object {
+        private val logger: Logger = LogManager.getLogger<FileServerListProvider>()
+    }
+
     /**
      * Instantiates a [FileServerListProvider] object.
      * @param file the file that will store the servers
@@ -102,8 +106,4 @@ class FileServerListProvider(val file: Path) : IServerListProvider {
             logger.error("Failed to write servers to file ${file.fileName}", e)
         }
     }
-
-    companion object {
-        private val logger: Logger = LogManager.getLogger(FileServerListProvider::class.java)
-    }
 }

src/main/java/in/dragonbra/javasteam/steam/discovery/ServerRecord.kt

@@ -54,7 +54,8 @@ class ServerRecord private constructor(
     override fun hashCode(): Int = endpoint.hashCode() xor protocolTypes.hashCode()
 
     companion object {
-        private val logger = LogManager.getLogger(ServerRecord::class.java)
+
+        private val logger = LogManager.getLogger<ServerRecord>()
 
         /**
          * Creates a server record for a given endpoint.

src/main/java/in/dragonbra/javasteam/steam/discovery/SmartCMServerList.kt

@@ -18,7 +18,8 @@ import java.util.EnumSet
 class SmartCMServerList(private val configuration: SteamConfiguration) {
 
     companion object {
-        private val logger: Logger = LogManager.getLogger(SmartCMServerList::class.java)
+
+        private val logger: Logger = LogManager.getLogger<SmartCMServerList>()
 
         /**
          * The default fallback Websockets server to attempt connecting to if fetching server list through other means fails.

src/main/java/in/dragonbra/javasteam/steam/handlers/steamapps/PICSProductInfo.kt

@@ -19,7 +19,7 @@ import java.util.*
 class PICSProductInfo : CallbackMsg {
 
     companion object {
-        private val logger = LogManager.getLogger(PICSProductInfo::class.java)
+        private val logger = LogManager.getLogger<PICSProductInfo>()
     }
 
     /**

src/main/java/in/dragonbra/javasteam/steam/handlers/steamapps/SteamApps.kt

@@ -38,6 +38,7 @@ import `in`.dragonbra.javasteam.steam.steamclient.callbackmgr.CallbackMsg
 import `in`.dragonbra.javasteam.types.AsyncJobMultiple
 import `in`.dragonbra.javasteam.types.AsyncJobSingle
 import `in`.dragonbra.javasteam.types.GameID
+import `in`.dragonbra.javasteam.util.JavaSteamAddition
 import `in`.dragonbra.javasteam.util.NetHelpers
 import io.ktor.client.request.request
 
@@ -345,7 +346,7 @@ class SteamApps : ClientMsgHandler() {
      * @param gameId Holds information pertaining to the app being launched
      * @param usageEvent The type of launch occurring
      */
-    // JavaSteam Addition
+    @JavaSteamAddition
     fun sendClientAppUsageEvent(
         gameId: GameID,
         usageEvent: EAppUsageEvent,
@@ -365,7 +366,7 @@ class SteamApps : ClientMsgHandler() {
      * @param gamesPlayed The list of the different game processes
      * @param clientOsType The OS type of the client launching the games
      */
-    // JavaSteam Addition
+    @JavaSteamAddition
     @Suppress("DuplicatedCode", "unused")
     @JvmOverloads
     fun notifyGamesPlayed(

src/main/java/in/dragonbra/javasteam/steam/handlers/steamapps/callback/GuestPassListCallback.kt

@@ -15,7 +15,7 @@ import java.io.IOException
 class GuestPassListCallback(packetMsg: IPacketMsg) : CallbackMsg() {
 
     companion object {
-        private val logger = LogManager.getLogger(GuestPassListCallback::class.java)
+        private val logger = LogManager.getLogger<GuestPassListCallback>()
     }
 
     /**