use exact build command, not flag

Author: David Hasani

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

@@ -667,7 +667,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
             customerSelection.configurationFile,
             customerSelection.sourceJavaVersion,
             customerSelection.targetJavaVersion,
-            customerSelection.skipTestsFlag
+            customerSelection.customBuildCommand
         ),
     )
 

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

@@ -175,7 +175,7 @@ private fun getUserSkipTestsFlagSelectionFormattedMarkdown(skipTestsSelection: S
     // just for correct grammar
     var skipTestsText = skipTestsSelection
     if (skipTestsText == "Do not skip tests") skipTestsText = "not skip tests"
-    return "Got it! Amazon Q will ${skipTestsText.lowercase()} when building your project."
+    return "Ok, I will ${skipTestsText.lowercase()} when building your project."
 }
 
 private fun getUserHilSelectionMarkdown(dependencyName: String, currentVersion: String, selectedVersion: String): String = """

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

@@ -224,18 +224,17 @@ class CodeTransformChatController(
         // should never happen since at this point user has already selected a module with a build file
         if (configurationFile == null) throw RuntimeException("No build file selected")
         val sourceJdk = getSourceJdk(configurationFile!!)
-        val skipTestsFlag = when (message.skipTestsSelection) {
-            "Do not skip tests" -> ""
-            "Skip integration tests" -> "-DskipITs"
-            "Skip all tests" -> "-DskipTests"
-            else -> ""
+        val customBuildCommand = when (message.skipTestsSelection) {
+            "Skip integration tests" -> "test"
+            "Skip all tests" -> "test-compile"
+            else -> "verify"
         }
         codeTransformChatHelper.addNewMessage(buildUserSkipTestsFlagSelectionChatContent(message.skipTestsSelection))
         val selection = CustomerSelection(
             configurationFile!!,
             sourceJdk,
             JavaSdkVersion.JDK_17,
-            skipTestsFlag
+            customBuildCommand
         )
 
         // Publish metric to capture user selection before local build starts

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

@@ -53,7 +53,7 @@ data class CodeModernizerSessionContext(
     val configurationFile: VirtualFile,
     val sourceJavaVersion: JavaSdkVersion,
     val targetJavaVersion: JavaSdkVersion,
-    val skipTestsFlag: String,
+    val customBuildCommand: String,
 ) {
     private val mapper = jacksonObjectMapper()
     private val ignoredDependencyFileExtensions = setOf(INVALID_SUFFIX_SHA, INVALID_SUFFIX_REPOSITORIES)
@@ -201,7 +201,7 @@ data class CodeModernizerSessionContext(
                 val outputFile = createTemporaryZipFile { zip ->
                     // 1) Manifest file
                     val dependenciesRoot = if (depDirectory != null) "$ZIP_DEPENDENCIES_PATH/${depDirectory.name}" else null
-                    mapper.writeValueAsString(ZipManifest(dependenciesRoot = dependenciesRoot, skipTestsFlag = skipTestsFlag))
+                    mapper.writeValueAsString(ZipManifest(dependenciesRoot = dependenciesRoot, customBuildCommand = customBuildCommand))
                         .byteInputStream()
                         .use {
                             zip.putNextEntry(Path(MANIFEST_PATH).toString(), it)

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

@@ -10,5 +10,5 @@ data class CustomerSelection(
     val configurationFile: VirtualFile,
     val sourceJavaVersion: JavaSdkVersion,
     val targetJavaVersion: JavaSdkVersion,
-    val skipTestsFlag: String,
+    val customBuildCommand: String,
 )

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

@@ -16,5 +16,5 @@ data class ZipManifest(
     val version: String = UPLOAD_ZIP_MANIFEST_VERSION.toString(),
     val hilCapabilities: List<String> = listOf(HIL_1P_UPGRADE_CAPABILITY),
     val transformCapabilities: List<String> = listOf(EXPLAINABILITY_V1),
-    val skipTestsFlag: String = "",
+    val customBuildCommand: String = "",
 )

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

@@ -16,7 +16,7 @@ enum class JobDetails {
     CONFIGURATION_FILE_PATH,
     TARGET_JAVA_VERSION,
     SOURCE_JAVA_VERSION,
-    SKIP_TESTS_FLAG,
+    CUSTOM_BUILD_COMMAND,
 }
 
 enum class StateFlags {
@@ -30,7 +30,7 @@ fun buildState(context: CodeModernizerSessionContext, isJobOngoing: Boolean, job
             JobDetails.CONFIGURATION_FILE_PATH to context.configurationFile.path,
             JobDetails.TARGET_JAVA_VERSION to context.targetJavaVersion.description,
             JobDetails.SOURCE_JAVA_VERSION to context.sourceJavaVersion.description,
-            JobDetails.SKIP_TESTS_FLAG to context.skipTestsFlag
+            JobDetails.CUSTOM_BUILD_COMMAND to context.customBuildCommand
         )
     )
     flags.putAll(
@@ -58,6 +58,6 @@ class CodeModernizerState : BaseState() {
             lastJobContext[JobDetails.SOURCE_JAVA_VERSION] ?: throw RuntimeException("Expected source language for migration path of previous job but was null")
         val targetJavaSdkVersion = JavaSdkVersion.fromVersionString(targetString) ?: throw RuntimeException("Invalid Java SDK version $targetString")
         val sourceJavaSdkVersion = JavaSdkVersion.fromVersionString(sourceString) ?: throw RuntimeException("Invalid Java SDK version $sourceString")
-        return CodeModernizerSessionContext(project, configurationFile, sourceJavaSdkVersion, targetJavaSdkVersion, lastJobContext[JobDetails.SKIP_TESTS_FLAG] ?: "")
+        return CodeModernizerSessionContext(project, configurationFile, sourceJavaSdkVersion, targetJavaSdkVersion, lastJobContext[JobDetails.CUSTOM_BUILD_COMMAND] ?: "")
     }
 }

plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerSessionTest.kt

@@ -143,7 +143,7 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
         assertFalse(roots.isEmpty() || roots.size > 1)
         assert(rootManager.dependencies.isEmpty())
         val root = roots[0]
-        val context = CodeModernizerSessionContext(project, root.children[0], JavaSdkVersion.JDK_1_8, JavaSdkVersion.JDK_11, "-DskipTests")
+        val context = CodeModernizerSessionContext(project, root.children[0], JavaSdkVersion.JDK_1_8, JavaSdkVersion.JDK_11, "test-compile")
         val mockFile = mock(File::class.java)
         val mockStringBuilder = mock(StringBuilder::class.java)
         val file = runInEdtAndGet {
@@ -158,7 +158,7 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
                 when (Path(entry.name)) {
                     Path("manifest.json") -> {
                         assertNotNull(fileContent)
-                        assertTrue(fileContent.contains("-DskipTests"))
+                        assertTrue(fileContent.contains("test-compile"))
                     }
                     Path("sources/src/tmp.txt") -> assertEquals(fileText, fileContent)
                     Path("build-logs.txt") -> assertNotNull(fileContent)