refactor

Author: David Hasani

packages/core/src/amazonqGumby/chat/controller/controller.ts

@@ -190,6 +190,28 @@ export class GumbyController {
     }
 
     private async transformInitiated(message: any) {
+        // if previous transformation was already running, show correct message to user
+        switch (this.sessionStorage.getSession().conversationState) {
+            case ConversationState.JOB_SUBMITTED:
+                this.messenger.sendAsyncEventProgress(
+                    message.tabID,
+                    true,
+                    undefined,
+                    GumbyNamedMessages.JOB_SUBMISSION_STATUS_MESSAGE
+                )
+                this.messenger.sendJobSubmittedMessage(message.tabID)
+                return
+            case ConversationState.COMPILING:
+                this.messenger.sendAsyncEventProgress(
+                    message.tabID,
+                    true,
+                    undefined,
+                    GumbyNamedMessages.COMPILATION_PROGRESS_MESSAGE
+                )
+                this.messenger.sendCompilationInProgress(message.tabID)
+                return
+        }
+
         // Start /transform chat flow
         CodeTransformTelemetryState.instance.setSessionId()
 
@@ -199,7 +221,7 @@ export class GumbyController {
         this.messenger.sendUpdatePlaceholder(message.tabID, "Enter 'language upgrade' or 'SQL conversion'")
     }
 
-    private async beginOrResumeTransformation(message: any) {
+    private async beginTransformation(message: any) {
         await telemetry.codeTransform_initiateTransform.run(async () => {
             const authType = await getAuthType()
             telemetry.record({
@@ -213,35 +235,13 @@ export class GumbyController {
                 this.messenger.sendAuthNeededExceptionMessage(authState, message.tabID)
                 throw new NoAuthError()
             }
-
-            // if previous transformation was already running
-            switch (this.sessionStorage.getSession().conversationState) {
-                case ConversationState.JOB_SUBMITTED:
-                    this.messenger.sendAsyncEventProgress(
-                        message.tabID,
-                        true,
-                        undefined,
-                        GumbyNamedMessages.JOB_SUBMISSION_STATUS_MESSAGE
-                    )
-                    this.messenger.sendJobSubmittedMessage(message.tabID)
-                    return
-                case ConversationState.COMPILING:
-                    this.messenger.sendAsyncEventProgress(
-                        message.tabID,
-                        true,
-                        undefined,
-                        GumbyNamedMessages.COMPILATION_PROGRESS_MESSAGE
-                    )
-                    this.messenger.sendCompilationInProgress(message.tabID)
-                    return
-            }
             this.messenger.sendTransformationIntroduction(message.tabID)
         })
     }
 
     private async handleLanguageUpgrade(message: any) {
         try {
-            await this.beginOrResumeTransformation(message)
+            await this.beginTransformation(message)
             const validProjects = await this.validateLanguageUpgradeProjectsWithReplyOnError(message)
             if (validProjects.length > 0) {
                 this.sessionStorage.getSession().updateCandidateProjects(validProjects)
@@ -254,7 +254,7 @@ export class GumbyController {
 
     private async handleSQLConversion(message: any) {
         try {
-            await this.beginOrResumeTransformation(message)
+            await this.beginTransformation(message)
             const validProjects = await this.validateSQLConversionProjectsWithReplyOnError(message)
             if (validProjects.length > 0) {
                 this.sessionStorage.getSession().updateCandidateProjects(validProjects)
@@ -458,10 +458,7 @@ export class GumbyController {
         })
     }
 
-    private async prepareLanguageUpgradeProjectForSubmission(message: {
-        pathToJavaHome: string
-        tabID: string
-    }): Promise<void> {
+    private async prepareLanguageUpgradeProjectForSubmission(message: { pathToJavaHome: string; tabID: string }) {
         if (message.pathToJavaHome) {
             transformByQState.setJavaHome(message.pathToJavaHome)
             getLogger().info(

packages/core/src/amazonqGumby/telemetry/codeTransformTelemetry.ts

@@ -40,54 +40,4 @@ export const JDKToTelemetryValue = (
     }
 }
 
-/**
- * @description We want the output of our Java versions found
- * that are not supported to match IntelliJ output. IntelliJ
- * can read the version easily and for VSCode we must exec
- * the javap -v command.
- */
-export const javapOutputToTelemetryValue = (javapCommandLineOutput: string) => {
-    switch (javapCommandLineOutput) {
-        case '49':
-            return 'JDK_1_5'
-        case '50':
-            return 'JDK_1_6'
-        case '51':
-            return 'JDK_1_7'
-        case '52':
-            return 'JDK_1_8'
-        case '53':
-            return 'JDK_1_9'
-        case '54':
-            return 'JDK_10'
-        case '55':
-            return 'JDK_11'
-        case '56':
-            return 'JDK_12'
-        case '57':
-            return 'JDK_13'
-        case '58':
-            return 'JDK_14'
-        case '59':
-            return 'JDK_15'
-        case '60':
-            return 'JDK_16'
-        case '61':
-            return 'JDK_17'
-        case '62':
-            return 'JDK_18'
-        case '63':
-            return 'JDK_19'
-        case '64':
-            return 'JDK_20'
-        case '65':
-            return 'JDK_21'
-        case '66':
-            return 'JDK_22'
-        default:
-            // If nothing found. Output the number and lookup the java 'major version' numbers online
-            return javapCommandLineOutput
-    }
-}
-
 export const calculateTotalLatency = (startTime: number): number => globals.clock.Date.now() - startTime

packages/core/src/codewhisperer/models/constants.ts

@@ -682,7 +682,7 @@ export const chooseTargetVersionFormTitle = 'Choose the target code version'
 export const skipUnitTestsFormTitle = 'Choose to skip unit tests'
 
 export const skipUnitTestsFormMessage =
-    'I will build your project using `mvn test` by default. If you would like me to build your project without running unit tests, I will use `mvn test-compile`.'
+    'I will build your project using `mvn clean test` by default. If you would like me to build your project without running unit tests, I will use `mvn clean test-compile`.'
 
 export const runUnitTestsMessage = 'Run unit tests'