Moving RetryableOperation to separate class.

Author: ashishrp-aws

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererZipUploadManager.kt

@@ -20,7 +20,7 @@ import software.amazon.awssdk.utils.IoUtils
 import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.jetbrains.core.AwsClientManager
-import software.aws.toolkits.jetbrains.services.amazonq.clients.RetryableOperation
+import software.aws.toolkits.jetbrains.services.amazonq.RetryableOperation
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.CodeWhispererCodeScanSession.Companion.APPLICATION_ZIP
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.CodeWhispererCodeScanSession.Companion.AWS_KMS
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.CodeWhispererCodeScanSession.Companion.CONTENT_MD5

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/RetryableOperation.kt

@@ -0,0 +1,53 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.amazonq
+
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.runBlocking
+import software.amazon.awssdk.core.exception.RetryableException
+import kotlin.random.Random
+
+class RetryableOperation<T> {
+    private var attempts = 0
+    private var currentDelay = INITIAL_DELAY
+
+    private fun getJitteredDelay(): Long {
+        currentDelay = (currentDelay * 2).coerceAtMost(MAX_BACKOFF)
+        return (currentDelay * (0.5 + Random.nextDouble(0.5))).toLong()
+    }
+
+    fun execute(
+        operation: () -> T,
+        isRetryable: (Exception) -> Boolean = { it is RetryableException },
+        errorHandler: ((Exception, Int) -> Nothing),
+    ): T = runBlocking {
+        executeSuspend(operation, isRetryable, errorHandler)
+    }
+
+    suspend fun executeSuspend(
+        operation: suspend () -> T,
+        isRetryable: (Exception) -> Boolean = { it is RetryableException },
+        errorHandler: (suspend (Exception, Int) -> Nothing),
+    ): T {
+        while (attempts < MAX_RETRY_ATTEMPTS) {
+            try {
+                return operation()
+            } catch (e: Exception) {
+                attempts++
+                if (attempts >= MAX_RETRY_ATTEMPTS || !isRetryable(e)) {
+                    errorHandler.invoke(e, attempts)
+                }
+                delay(getJitteredDelay())
+            }
+        }
+
+        throw RuntimeException("Unexpected state after $attempts attempts")
+    }
+
+    companion object {
+        private const val INITIAL_DELAY = 100L
+        private const val MAX_BACKOFF = 10000L
+        private const val MAX_RETRY_ATTEMPTS = 3
+    }
+}

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/clients/AmazonQStreamingClient.kt

@@ -6,9 +6,7 @@ package software.aws.toolkits.jetbrains.services.amazonq.clients
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.future.await
-import software.amazon.awssdk.core.exception.RetryableException
 import software.amazon.awssdk.core.exception.SdkException
 import software.amazon.awssdk.services.codewhispererstreaming.CodeWhispererStreamingAsyncClient
 import software.amazon.awssdk.services.codewhispererstreaming.model.ExportContext
@@ -21,11 +19,11 @@ import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.core.awsClient
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection
+import software.aws.toolkits.jetbrains.services.amazonq.RetryableOperation
 import java.time.Instant
 import java.util.concurrent.TimeoutException
 import java.util.concurrent.atomic.AtomicReference
 import javax.naming.ServiceUnavailableException
-import kotlin.random.Random
 
 @Service(Service.Level.PROJECT)
 class AmazonQStreamingClient(private val project: Project) {
@@ -115,60 +113,3 @@ class AmazonQStreamingClient(private val project: Project) {
         fun getInstance(project: Project) = project.service<AmazonQStreamingClient>()
     }
 }
-
-class RetryableOperation<T> {
-    private var attempts = 0
-    private var currentDelay = INITIAL_DELAY
-
-    private fun getJitteredDelay(): Long {
-        currentDelay = (currentDelay * 2).coerceAtMost(MAX_BACKOFF)
-        return (currentDelay * (0.5 + Random.nextDouble(0.5))).toLong()
-    }
-
-    fun execute(
-        operation: () -> T,
-        isRetryable: (Exception) -> Boolean = { it is RetryableException },
-        errorHandler: ((Exception, Int) -> Nothing)? = null,
-    ): T {
-        while (attempts < MAX_RETRY_ATTEMPTS) {
-            try {
-                return operation()
-            } catch (e: Exception) {
-                attempts++
-                if (attempts >= MAX_RETRY_ATTEMPTS || !isRetryable(e)) {
-                    errorHandler?.invoke(e, attempts) ?: throw e
-                }
-
-                Thread.sleep(getJitteredDelay())
-            }
-        }
-
-        throw RuntimeException("Unexpected state after $attempts attempts")
-    }
-
-    suspend fun executeSuspend(
-        operation: suspend () -> T,
-        isRetryable: (Exception) -> Boolean = { it is RetryableException },
-        errorHandler: (suspend (Exception, Int) -> Nothing)? = null,
-    ): T {
-        while (attempts < MAX_RETRY_ATTEMPTS) {
-            try {
-                return operation()
-            } catch (e: Exception) {
-                attempts++
-                if (attempts >= MAX_RETRY_ATTEMPTS || !isRetryable(e)) {
-                    errorHandler?.invoke(e, attempts) ?: throw e
-                }
-                delay(getJitteredDelay())
-            }
-        }
-
-        throw RuntimeException("Unexpected state after $attempts attempts")
-    }
-
-    companion object {
-        private const val INITIAL_DELAY = 100L
-        private const val MAX_BACKOFF = 10000L
-        private const val MAX_RETRY_ATTEMPTS = 3
-    }
-}