Refactor shared CodeTransform util functions. (#4255)

aws · Apr 9, 2024 · 71c6d99 · 71c6d99
1 parent 15c4aaa
commit 71c6d99
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 32 deletions.
diff --git a/...nity/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindow.kt b/...nity/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindow.kt
@@ -23,7 +23,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.webview.BrowserConnector
 import software.aws.toolkits.jetbrains.services.amazonq.webview.FqnWebviewAdapter
 import software.aws.toolkits.jetbrains.services.amazonq.webview.theme.EditorThemeAdapter
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.auth.isFeatureDevAvailable
-import software.aws.toolkits.jetbrains.services.codemodernizer.auth.isCodeTransformAvailable
+import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isCodeTransformAvailable
 import javax.swing.JComponent
 
 class AmazonQToolWindow @NonInjectable constructor(

diff --git a/...community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevApp.kt b/...community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevApp.kt
@@ -16,7 +16,7 @@ import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.controller.Fea
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.AuthenticationUpdateMessage
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.IncomingFeatureDevMessage
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.storage.ChatSessionStorage
-import software.aws.toolkits.jetbrains.services.codemodernizer.auth.isCodeTransformAvailable
+import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isCodeTransformAvailable
 
 class FeatureDevApp : AmazonQApp {
 

diff --git a/...rc/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/clients/FeatureDevClient.kt b/...rc/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/clients/FeatureDevClient.kt
@@ -35,7 +35,7 @@ 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.clients.AmazonQStreamingClient
-import software.aws.toolkits.jetbrains.services.codemodernizer.calculateTotalLatency
+import software.aws.toolkits.jetbrains.services.codemodernizer.utils.calculateTotalLatency
 import java.time.Instant
 import software.amazon.awssdk.services.codewhispererruntime.model.ChatTriggerType as SyncChatTriggerType
 

diff --git a/...nity/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt b/...nity/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt
@@ -28,7 +28,6 @@ import software.aws.toolkits.core.utils.info
 import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.core.coroutines.projectCoroutineScope
 import software.aws.toolkits.jetbrains.core.explorer.refreshCwQTree
-import software.aws.toolkits.jetbrains.services.codemodernizer.auth.isCodeTransformAvailable
 import software.aws.toolkits.jetbrains.services.codemodernizer.client.GumbyClient
 import software.aws.toolkits.jetbrains.services.codemodernizer.commands.CodeTransformMessageListener
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerException
@@ -54,6 +53,7 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getModuleOr
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getSupportedBuildFilesWithSupportedJdk
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getSupportedJavaMappings
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getSupportedModules
+import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isCodeTransformAvailable
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isGradleProject
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.openTroubleshootingGuideNotificationAction
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.tryGetJdk

diff --git a/.../software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerStartupActivity.kt b/.../software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerStartupActivity.kt
@@ -5,7 +5,7 @@ package software.aws.toolkits.jetbrains.services.codemodernizer
 
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.startup.StartupActivity
-import software.aws.toolkits.jetbrains.services.codemodernizer.auth.isCodeTransformAvailable
+import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isCodeTransformAvailable
 
 class CodeModernizerStartupActivity : StartupActivity.DumbAware {
 

diff --git a/...unity/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformChatApp.kt b/...unity/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformChatApp.kt
@@ -14,7 +14,6 @@ import software.aws.toolkits.jetbrains.services.amazonq.apps.AmazonQAppInitConte
 import software.aws.toolkits.jetbrains.services.amazonq.auth.AuthController
 import software.aws.toolkits.jetbrains.services.amazonq.messages.AmazonQMessage
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.auth.isFeatureDevAvailable
-import software.aws.toolkits.jetbrains.services.codemodernizer.auth.isCodeTransformAvailable
 import software.aws.toolkits.jetbrains.services.codemodernizer.commands.CodeTransformActionMessage
 import software.aws.toolkits.jetbrains.services.codemodernizer.commands.CodeTransformMessageListener
 import software.aws.toolkits.jetbrains.services.codemodernizer.controller.CodeTransformChatController
@@ -23,6 +22,7 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.messages.Authenti
 import software.aws.toolkits.jetbrains.services.codemodernizer.messages.CODE_TRANSFORM_TAB_NAME
 import software.aws.toolkits.jetbrains.services.codemodernizer.messages.IncomingCodeTransformMessage
 import software.aws.toolkits.jetbrains.services.codemodernizer.session.ChatSessionStorage
+import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isCodeTransformAvailable
 
 private enum class CodeTransformMessageTypes(val type: String) {
     TabCreated("new-tab-was-created"),

diff --git a/.../toolkits/jetbrains/services/codemodernizer/CodeTransformProjectStartupSettingListener.kt b/.../toolkits/jetbrains/services/codemodernizer/CodeTransformProjectStartupSettingListener.kt
@@ -9,8 +9,8 @@ import com.intellij.openapi.wm.ex.ToolWindowManagerListener
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnection
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManagerListener
 import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenProviderListener
-import software.aws.toolkits.jetbrains.services.codemodernizer.auth.isCodeTransformAvailable
 import software.aws.toolkits.jetbrains.services.codemodernizer.panels.managers.CodeModernizerBottomWindowPanelManager
+import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isCodeTransformAvailable
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererActivationChangedListener
 
 class CodeTransformProjectStartupSettingListener(private val project: Project) :

diff --git a/...y/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformUtils.kt b/...y/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformUtils.kt
@@ -14,7 +14,6 @@ import software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection
 import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenProvider
 import software.aws.toolkits.jetbrains.utils.actions.OpenBrowserAction
 import software.aws.toolkits.resources.message
-import java.time.Instant
 
 val STATES_WHERE_PLAN_EXIST = setOf(
     TransformationStatus.PLANNED,
@@ -51,8 +50,6 @@ const val TROUBLESHOOTING_URL_MAVEN_COMMANDS =
 const val TROUBLESHOOTING_URL_PREREQUISITES =
     "https://docs.aws.amazon.com/amazonq/latest/aws-builder-use-ug/code-transformation.html#prerequisites"
 
-fun calculateTotalLatency(startTime: Instant, endTime: Instant) = (endTime.toEpochMilli() - startTime.toEpochMilli()).toInt()
-
 fun refreshToken(project: Project) {
     val connection = ToolkitConnectionManager.getInstance(project).activeConnectionForFeature(QConnection.getInstance())
     val provider = (connection?.getConnectionSettings() as TokenConnectionSettings).tokenProvider.delegate as BearerTokenProvider

diff --git a/...ware/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformValidationUtils.kt b/...ware/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformValidationUtils.kt
@@ -3,16 +3,10 @@
 
 package software.aws.toolkits.jetbrains.services.codemodernizer.utils
 
-import com.intellij.openapi.application.ApplicationInfo
 import com.intellij.openapi.project.Project
 import org.jetbrains.idea.maven.project.MavenProjectsManager
 import org.jetbrains.plugins.gradle.settings.GradleSettings
 
-fun isIntellij(): Boolean {
-    val productCode = ApplicationInfo.getInstance().build.productCode
-    return productCode == "IC" || productCode == "IU"
-}
-
 fun isGradleProject(project: Project) = !GradleSettings.getInstance(project).linkedProjectsSettings.isEmpty()
 
 fun getJavaVersionFromProjectSetting(project: Project): String? = project.tryGetJdk()?.toString()

diff --git a/...munity/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformUtils2.kt b/...munity/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformUtils2.kt
diff --git a/...modernizer/auth/CodeTransformAuthUtils.kt → ...ernizer/utils/CodeTransformSharedUtils.kt b/...modernizer/auth/CodeTransformAuthUtils.kt → ...ernizer/utils/CodeTransformSharedUtils.kt
@@ -1,14 +1,22 @@
 // Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package software.aws.toolkits.jetbrains.services.codemodernizer.auth
+package software.aws.toolkits.jetbrains.services.codemodernizer.utils
 
+import com.intellij.openapi.application.ApplicationInfo
 import com.intellij.openapi.project.Project
 import software.aws.toolkits.jetbrains.core.gettingstarted.editor.ActiveConnection
 import software.aws.toolkits.jetbrains.core.gettingstarted.editor.ActiveConnectionType
 import software.aws.toolkits.jetbrains.core.gettingstarted.editor.BearerTokenFeatureSet
 import software.aws.toolkits.jetbrains.core.gettingstarted.editor.checkBearerConnectionValidity
-import software.aws.toolkits.jetbrains.services.codemodernizer.isIntellij
+import java.time.Instant
+
+fun calculateTotalLatency(startTime: Instant, endTime: Instant) = (endTime.toEpochMilli() - startTime.toEpochMilli()).toInt()
+
+fun isIntellij(): Boolean {
+    val productCode = ApplicationInfo.getInstance().build.productCode
+    return productCode == "IC" || productCode == "IU"
+}
 
 fun isCodeTransformAvailable(project: Project): Boolean {
     if (!isIntellij()) return false