skip getPlan for SQL conversions

Author: David Hasani

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt

@@ -451,11 +451,12 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
     private suspend fun handleJobResumedFromHil(
         jobId: JobId,
         session: CodeModernizerSession,
-        transformationType: CodeTransformType,
+        transformType: CodeTransformType,
     ): CodeModernizerJobCompletedResult = session.pollUntilJobCompletion(
+        transformType,
         jobId
     ) { new, plan ->
-        codeModernizerBottomWindowPanelManager.handleJobTransition(new, plan, session.sessionContext.sourceJavaVersion, transformationType)
+        codeModernizerBottomWindowPanelManager.handleJobTransition(new, plan, session.sessionContext.sourceJavaVersion, transformType)
     }
 
     private suspend fun handleJobStarted(jobId: JobId, session: CodeModernizerSession): CodeModernizerJobCompletedResult {
@@ -466,10 +467,10 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
             codeModernizerBottomWindowPanelManager.setJobRunningUI()
         }
 
-        val transformationType = if (session.sessionContext.sqlMetadataZip != null) CodeTransformType.SQL_CONVERSION else CodeTransformType.LANGUAGE_UPGRADE
+        val transformType = if (session.sessionContext.sqlMetadataZip != null) CodeTransformType.SQL_CONVERSION else CodeTransformType.LANGUAGE_UPGRADE
 
-        return session.pollUntilJobCompletion(jobId) { new, plan ->
-            codeModernizerBottomWindowPanelManager.handleJobTransition(new, plan, session.sessionContext.sourceJavaVersion, transformationType)
+        return session.pollUntilJobCompletion(transformType, jobId) { new, plan ->
+            codeModernizerBottomWindowPanelManager.handleJobTransition(new, plan, session.sessionContext.sourceJavaVersion, transformType)
         }
     }
 

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerSession.kt

@@ -32,6 +32,7 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModerni
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerSessionContext
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerStartJobResult
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeTransformHilDownloadArtifact
+import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeTransformType
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.DownloadArtifactResult
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.JobId
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.MavenCopyCommandsResult
@@ -319,11 +320,6 @@ class CodeModernizerSession(
         return clientAdaptor.getCodeModernizationJob(jobId.id).transformationJob()
     }
 
-    fun getTransformPlanDetails(jobId: JobId): TransformationPlan {
-        LOG.info { "Getting transform plan details." }
-        return clientAdaptor.getCodeModernizationPlan(jobId).transformationPlan()
-    }
-
     /**
      * This will resume the job, i.e. it will resume the main job loop kicked of by [createModernizationJob]
      */
@@ -413,6 +409,7 @@ class CodeModernizerSession(
     }
 
     suspend fun pollUntilJobCompletion(
+        transformType: CodeTransformType,
         jobId: JobId,
         jobTransitionHandler: (currentStatus: TransformationStatus, migrationPlan: TransformationPlan?) -> Unit,
     ): CodeModernizerJobCompletedResult {
@@ -427,6 +424,7 @@ class CodeModernizerSession(
             var passedStart = false
 
             val result = jobId.pollTransformationStatusAndPlan(
+                transformType,
                 succeedOn = setOf(
                     TransformationStatus.COMPLETED,
                     TransformationStatus.PAUSED,
@@ -459,7 +457,7 @@ class CodeModernizerSession(
                 }
 
                 // Open the transformation plan detail panel once transformation plan is available (no plan for SQL conversions)
-                if (sessionContext.sqlMetadataZip == null && state.transformationPlan != null && !isTransformationPlanEditorOpened) {
+                if (transformType != CodeTransformType.SQL_CONVERSION && state.transformationPlan != null && !isTransformationPlanEditorOpened) {
                     tryOpenTransformationPlanEditor()
                     isTransformationPlanEditorOpened = true
                 }

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformApiUtils.kt

@@ -23,6 +23,7 @@ import software.aws.toolkits.core.utils.Waiters.waitUntil
 import software.aws.toolkits.jetbrains.services.codemodernizer.CodeTransformTelemetryManager
 import software.aws.toolkits.jetbrains.services.codemodernizer.client.GumbyClient
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.BILLING_RATE
+import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeTransformType
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.JobId
 import software.aws.toolkits.resources.message
 import java.time.Duration
@@ -40,6 +41,7 @@ data class PollingResult(
  * Wrapper around [waitUntil] that polls the API DescribeMigrationJob to check the migration job status.
  */
 suspend fun JobId.pollTransformationStatusAndPlan(
+    transformType: CodeTransformType,
     succeedOn: Set<TransformationStatus>,
     failOn: Set<TransformationStatus>,
     clientAdaptor: GumbyClient,
@@ -85,7 +87,7 @@ suspend fun JobId.pollTransformationStatusAndPlan(
                 transformationResponse = clientAdaptor.getCodeModernizationJob(this.id)
                 val newStatus = transformationResponse?.transformationJob()?.status() ?: throw RuntimeException("Unable to get job status")
                 var newPlan: TransformationPlan? = null
-                if (newStatus in STATES_WHERE_PLAN_EXIST) {
+                if (newStatus in STATES_WHERE_PLAN_EXIST && transformType != CodeTransformType.SQL_CONVERSION) { // no plan for SQL conversions
                     delay(sleepDurationMillis)
                     newPlan = clientAdaptor.getCodeModernizationPlan(this).transformationPlan()
                 }

plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties

@@ -756,7 +756,7 @@ codemodernizer.toolwindow.problems_window_not_found=Unable to display Code Trans
 codemodernizer.toolwindow.progress.building=Build uploaded code in secure build environment
 codemodernizer.toolwindow.progress.parent=Transformation progress
 codemodernizer.toolwindow.progress.planning=Generate transformation plan
-codemodernizer.toolwindow.progress.transforming=Transform your code to Java 17 using transformation plan
+codemodernizer.toolwindow.progress.transforming=Transform your code
 codemodernizer.toolwindow.progress.uploading=Uploading your code
 codemodernizer.toolwindow.scan_display=Transformation details
 codemodernizer.toolwindow.scan_in_progress=Amazon Q is scanning the project files and getting ready to start the job. To start the job, Amazon Q needs to upload the project artifacts. Once that's done, Q can start the transformation job. The estimated time for this operation ranges from a few seconds to several minutes.
@@ -765,7 +765,7 @@ codemodernizer.toolwindow.scan_in_progress.building=Amazon Q is building your co
 codemodernizer.toolwindow.scan_in_progress.failed=The step failed, fetching additional details...
 codemodernizer.toolwindow.scan_in_progress.planning=Amazon Q is analyzing your code in order to generate a transformation plan.
 codemodernizer.toolwindow.scan_in_progress.stopping=Stopping the job...
-codemodernizer.toolwindow.scan_in_progress.transforming=Amazon Q is transforming your code. Details will appear soon.
+codemodernizer.toolwindow.scan_in_progress.transforming=Amazon Q is transforming your code.
 codemodernizer.toolwindow.stop_scan=Stop job
 codemodernizer.toolwindow.table.header.date=Date
 codemodernizer.toolwindow.table.header.job_id=Job Id