Refactor: use jetbrains logger

fioan89 · fioan89 · commit 0a3faba4c56a · 2022-06-14T22:37:14.000+03:00
diff --git a/src/main/kotlin/com/coder/gateway/CoderGatewayConnectionProvider.kt b/src/main/kotlin/com/coder/gateway/CoderGatewayConnectionProvider.kt
@@ -4,6 +4,7 @@ import com.coder.gateway.models.RecentWorkspaceConnection
 import com.coder.gateway.services.CoderRecentWorkspaceConnectionsService
 import com.coder.gateway.views.CoderGatewayConnectionComponent
 import com.intellij.openapi.components.service
+import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.rd.util.launchUnderBackgroundProgress
 import com.intellij.remote.AuthType
 import com.intellij.remote.RemoteCredentialsHolder
@@ -22,7 +23,6 @@ import kotlinx.coroutines.launch
 import java.time.Duration
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
-import java.util.logging.Logger
 import javax.swing.JComponent
 
 class CoderGatewayConnectionProvider : GatewayConnectionProvider {
@@ -40,7 +40,7 @@ class CoderGatewayConnectionProvider : GatewayConnectionProvider {
         if (coderWorkspaceHostname != null && projectPath != null) {
             val connection = CoderConnectionMetadata(coderWorkspaceHostname)
             if (connection in connections) {
-                logger.warning("There is already a connection started on ${connection.workspaceHostname}")
+                logger.warn("There is already a connection started on ${connection.workspaceHostname}")
                 return null
             }
             val clientLifetime = LifetimeDefinition()
@@ -114,7 +114,7 @@ class CoderGatewayConnectionProvider : GatewayConnectionProvider {
     }
 
     companion object {
-        val logger = Logger.getLogger(CoderGatewayConnectionProvider::class.java.simpleName)
+        val logger = Logger.getInstance(CoderGatewayConnectionProvider::class.java.simpleName)
     }
 }
 
diff --git a/src/main/kotlin/com/coder/gateway/sdk/CoderCLIDownloader.kt b/src/main/kotlin/com/coder/gateway/sdk/CoderCLIDownloader.kt
@@ -1,11 +1,11 @@
 package com.coder.gateway.sdk
 
+import com.intellij.openapi.diagnostic.Logger
 import java.io.InputStream
 import java.net.URL
 import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.StandardCopyOption
-import java.util.logging.Logger
 
 class CoderCLIDownloader {
 
@@ -19,6 +19,6 @@ class CoderCLIDownloader {
     }
 
     companion object {
-        val logger = Logger.getLogger(CoderCLIDownloader::class.java.simpleName)
+        val logger = Logger.getInstance(CoderCLIDownloader::class.java.simpleName)
     }
 }
diff --git a/src/main/kotlin/com/coder/gateway/sdk/CoderCLIManager.kt b/src/main/kotlin/com/coder/gateway/sdk/CoderCLIManager.kt
@@ -1,8 +1,8 @@
 package com.coder.gateway.sdk
 
+import com.intellij.openapi.diagnostic.Logger
 import java.net.URL
 import java.nio.file.Path
-import java.util.logging.Logger
 
 class CoderCLIManager(private val url: URL) {
     private val coderCLIDownloader = CoderCLIDownloader()
@@ -41,6 +41,6 @@ class CoderCLIManager(private val url: URL) {
     }
 
     companion object {
-        val logger = Logger.getLogger(CoderCLIManager::class.java.simpleName)
+        val logger = Logger.getInstance(CoderCLIManager::class.java.simpleName)
     }
 }
diff --git a/src/main/kotlin/com/coder/gateway/views/steps/CoderAuthStepView.kt b/src/main/kotlin/com/coder/gateway/views/steps/CoderAuthStepView.kt
@@ -15,6 +15,7 @@ import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.ModalityState
 import com.intellij.openapi.application.invokeAndWaitIfNeeded
+import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.progress.ProgressIndicator
 import com.intellij.openapi.progress.ProgressManager
 import com.intellij.openapi.progress.Task
@@ -35,7 +36,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
 import org.zeroturnaround.exec.ProcessExecutor
 import java.awt.Dimension
-import java.util.logging.Logger
 
 class CoderAuthStepView : CoderWorkspacesWizardStep, Disposable {
     private val cs = CoroutineScope(Dispatchers.Main)
@@ -147,6 +147,6 @@ class CoderAuthStepView : CoderWorkspacesWizardStep, Disposable {
     }
 
     companion object {
-        val logger = Logger.getLogger(CoderAuthStepView::class.java.simpleName)
+        val logger = Logger.getInstance(CoderAuthStepView::class.java.simpleName)
     }
 }
diff --git a/src/main/kotlin/com/coder/gateway/views/steps/CoderLocateRemoteProjectStepView.kt b/src/main/kotlin/com/coder/gateway/views/steps/CoderLocateRemoteProjectStepView.kt
@@ -8,6 +8,7 @@ import com.coder.gateway.views.LazyBrowserLink
 import com.intellij.ide.IdeBundle
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.ui.ComboBox
 import com.intellij.openapi.wm.impl.welcomeScreen.WelcomeScreenUIManager
 import com.intellij.remote.AuthType
@@ -34,7 +35,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.awt.Component
 import java.awt.FlowLayout
-import java.util.logging.Logger
 import javax.swing.ComboBoxModel
 import javax.swing.DefaultComboBoxModel
 import javax.swing.JLabel
@@ -102,7 +102,7 @@ class CoderLocateRemoteProjectStepView : CoderWorkspacesWizardStep, Disposable {
         wizard = wizardModel
         val selectedWorkspace = wizardModel.selectedWorkspace
         if (selectedWorkspace == null) {
-            logger.warning("No workspace was selected. Please go back to the previous step and select a Coder Workspace")
+            logger.warn("No workspace was selected. Please go back to the previous step and select a Coder Workspace")
             return
         }
 
@@ -125,7 +125,7 @@ class CoderLocateRemoteProjectStepView : CoderWorkspacesWizardStep, Disposable {
                 .map { ide -> IdeWithStatus(ide.product, ide.buildNumber, IdeStatus.DOWNLOAD, ide.downloadLink, ide.presentableVersion) }
 
             if (idesWithStatus.isNullOrEmpty()) {
-                logger.warning("Could not resolve any IDE for workspace ${selectedWorkspace.name}, probably $workspaceOS is not supported by Gateway")
+                logger.warn("Could not resolve any IDE for workspace ${selectedWorkspace.name}, probably $workspaceOS is not supported by Gateway")
             } else {
                 cbIDE.remove(spinner)
                 ideComboBoxModel.addAll(idesWithStatus)
@@ -157,7 +157,7 @@ class CoderLocateRemoteProjectStepView : CoderWorkspacesWizardStep, Disposable {
     }
 
     companion object {
-        val logger = Logger.getLogger(CoderLocateRemoteProjectStepView::class.java.simpleName)
+        val logger = Logger.getInstance(CoderLocateRemoteProjectStepView::class.java.simpleName)
     }
 
     private class IDEComboBox(model: ComboBoxModel<IdeWithStatus>) : ComboBox<IdeWithStatus>(model) {
diff --git a/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt b/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt
@@ -21,7 +21,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import java.util.logging.Logger
 
 class CoderWorkspacesStepView : CoderWorkspacesWizardStep, Disposable {
     private val cs = CoroutineScope(Dispatchers.Main)
@@ -78,8 +77,4 @@ class CoderWorkspacesStepView : CoderWorkspacesWizardStep, Disposable {
     override fun dispose() {
 
     }
-
-    companion object {
-        val logger = Logger.getLogger(CoderWorkspacesStepView::class.java.simpleName)
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`package com.coder.gateway.sdk`
`2`	`2`
	`3`	`+import com.intellij.openapi.diagnostic.Logger`
`3`	`4`	`import java.io.InputStream`
`4`	`5`	`import java.net.URL`
`5`	`6`	`import java.nio.file.Files`
`6`	`7`	`import java.nio.file.Path`
`7`	`8`	`import java.nio.file.StandardCopyOption`
`8`		`-import java.util.logging.Logger`
`9`	`9`
`10`	`10`	`class CoderCLIDownloader {`
`11`	`11`
`@@ -19,6 +19,6 @@ class CoderCLIDownloader {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`companion object {`
`22`		`- val logger = Logger.getLogger(CoderCLIDownloader::class.java.simpleName)`
	`22`	`+ val logger = Logger.getInstance(CoderCLIDownloader::class.java.simpleName)`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package com.coder.gateway.sdk`
`2`	`2`
	`3`	`+import com.intellij.openapi.diagnostic.Logger`
`3`	`4`	`import java.net.URL`
`4`	`5`	`import java.nio.file.Path`
`5`		`-import java.util.logging.Logger`
`6`	`6`
`7`	`7`	`class CoderCLIManager(private val url: URL) {`
`8`	`8`	`private val coderCLIDownloader = CoderCLIDownloader()`
`@@ -41,6 +41,6 @@ class CoderCLIManager(private val url: URL) {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`companion object {`
`44`		`- val logger = Logger.getLogger(CoderCLIManager::class.java.simpleName)`
	`44`	`+ val logger = Logger.getInstance(CoderCLIManager::class.java.simpleName)`
`45`	`45`	`}`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ import kotlinx.coroutines.CoroutineScope`
`21`	`21`	`import kotlinx.coroutines.Dispatchers`
`22`	`22`	`import kotlinx.coroutines.launch`
`23`	`23`	`import kotlinx.coroutines.withContext`
`24`		`-import java.util.logging.Logger`
`25`	`24`
`26`	`25`	`class CoderWorkspacesStepView : CoderWorkspacesWizardStep, Disposable {`
`27`	`26`	`private val cs = CoroutineScope(Dispatchers.Main)`
`@@ -78,8 +77,4 @@ class CoderWorkspacesStepView : CoderWorkspacesWizardStep, Disposable {`
`78`	`77`	`override fun dispose() {`
`79`	`78`
`80`	`79`	`}`
`81`		`-`
`82`		`- companion object {`
`83`		`- val logger = Logger.getLogger(CoderWorkspacesStepView::class.java.simpleName)`
`84`		`- }`
`85`	`80`	`}`