Throwable does not need to be nullable

code-asher · code-asher · commit 88c329719de8 · 2023-05-01T13:45:39.000-08:00
If there is no cause we use the existing exception so this will never be
null.
diff --git a/src/main/kotlin/com/coder/gateway/CoderGatewayConnectionProvider.kt b/src/main/kotlin/com/coder/gateway/CoderGatewayConnectionProvider.kt
@@ -47,12 +47,12 @@ class CoderGatewayConnectionProvider : GatewayConnectionProvider {
                 },
                 update = { _, e, remaining, ->
                     if (remaining != null) {
-                        indicator.text2 = e?.message ?: CoderGatewayBundle.message("gateway.connector.no-details")
+                        indicator.text2 = e.message ?: CoderGatewayBundle.message("gateway.connector.no-details")
                         indicator.text = CoderGatewayBundle.message("gateway.connector.coder.connection.retry-error.text", remaining)
                     } else {
                         ApplicationManager.getApplication().invokeAndWait {
                             Messages.showMessageDialog(
-                                e?.message ?: CoderGatewayBundle.message("gateway.connector.no-details"),
+                                e.message ?: CoderGatewayBundle.message("gateway.connector.no-details"),
                                 CoderGatewayBundle.message("gateway.connector.coder.connection.error.text"),
                                 Messages.getErrorIcon())
                         }
diff --git a/src/main/kotlin/com/coder/gateway/sdk/Retry.kt b/src/main/kotlin/com/coder/gateway/sdk/Retry.kt
@@ -10,7 +10,7 @@ import java.util.concurrent.TimeUnit
 import kotlin.coroutines.cancellation.CancellationException
 import kotlin.math.min
 
-fun unwrap(ex: Exception): Throwable? {
+fun unwrap(ex: Exception): Throwable {
     var cause = ex.cause
     while(cause?.cause != null) {
         cause = cause.cause
@@ -37,8 +37,8 @@ suspend fun <T> suspendingRetryWithExponentialBackOff(
     backOffJitter: Double = 0.1,
     label: String,
     logger: Logger,
-    predicate: (e: Throwable?) -> Boolean,
-    update: (attempt: Int, e: Throwable?, remaining: String?) -> Unit,
+    predicate: (e: Throwable) -> Boolean,
+    update: (attempt: Int, e: Throwable, remaining: String?) -> Unit,
     action: suspend (attempt: Int) -> T?
 ): T? {
     val random = Random()
diff --git a/src/main/kotlin/com/coder/gateway/views/steps/CoderLocateRemoteProjectStepView.kt b/src/main/kotlin/com/coder/gateway/views/steps/CoderLocateRemoteProjectStepView.kt
@@ -199,7 +199,7 @@ class CoderLocateRemoteProjectStepView(private val setNextButtonEnabled: (Boolea
                 },
                 update = { _, e, remaining ->
                     cbIDEComment.foreground = UIUtil.getErrorForeground()
-                    cbIDEComment.text = e?.message ?: CoderGatewayBundle.message("gateway.connector.no-details")
+                    cbIDEComment.text = e.message ?: CoderGatewayBundle.message("gateway.connector.no-details")
                     cbIDE.renderer =
                         if (remaining != null) IDECellRenderer(CoderGatewayBundle.message("gateway.connector.view.coder.remoteproject.retry-error.text", remaining))
                         else IDECellRenderer(CoderGatewayBundle.message("gateway.connector.view.coder.remoteproject.error.text"), UIUtil.getBalloonErrorIcon())
