prompt for jdk name instead of path

Author: David Hasani

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

@@ -399,11 +399,19 @@ fun buildUserInputCustomDependencyVersionsChatContent() = CodeTransformChatMessa
     type = CodeTransformChatMessageType.FinalizedAnswer,
 )
 
-fun buildPromptTargetJDKPathChatContent(prompt: String) = CodeTransformChatMessageContent(
-    message = prompt,
+fun buildPromptTargetJDKNameChatContent(version: String) = CodeTransformChatMessageContent(
+    // TODO: get this text reviewed by Allie
+    message = "Enter the name of your $version from Settings -> Project Structure -> SDKs.",
     type = CodeTransformChatMessageType.FinalizedAnswer,
 )
 
+fun buildInvalidTargetJdkNameChatContent(jdkName: String) = CodeTransformChatMessageContent(
+    // TODO: get this text reviewed by Allie
+    message = "I could not find '$jdkName' under Settings -> Project Structure -> SDKs. Please add the target JDK there and try again.",
+    type = CodeTransformChatMessageType.FinalizedAnswer,
+    followUps = listOf(startNewTransformFollowUp)
+)
+
 fun buildCustomDependencyVersionsFileValidChatContent() = CodeTransformChatMessageContent(
     message = "I received your .yaml file and will upload it to Q.",
     type = CodeTransformChatMessageType.FinalizedAnswer,

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

@@ -9,6 +9,7 @@ import com.intellij.openapi.fileChooser.FileChooser
 import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory
 import com.intellij.openapi.module.ModuleUtil
 import com.intellij.openapi.projectRoots.JavaSdkVersion
+import com.intellij.openapi.projectRoots.ProjectJdkTable
 import com.intellij.openapi.util.io.FileUtil.createTempDirectory
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.vfs.readText
@@ -54,6 +55,7 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildHi
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildHilRejectContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildHilResumeWithErrorContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildHilResumedContent
+import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildInvalidTargetJdkNameChatContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildLanguageUpgradeProjectValidChatContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildModuleSchemaFormChatContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildModuleSchemaFormIntroChatContent
@@ -75,7 +77,6 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildTr
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildTransformStoppingChatContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserCancelledChatContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserHilSelection
-import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserInputCustomDependencyVersionsChatContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserInputLanguageUpgradeChatContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserInputOneOrMultipleDiffsChatIntroContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserInputOneOrMultipleDiffsFlagChatContent
@@ -121,10 +122,10 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.utils.validateYam
 import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.QFeatureEvent
 import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.broadcastQEvent
 import software.aws.toolkits.jetbrains.services.cwc.messages.ChatMessageType
-import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildPromptTargetJDKPathChatContent
+import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildPromptTargetJDKNameChatContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CLIENT_SIDE_BUILD
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeTransformConversationState
-import software.aws.toolkits.jetbrains.services.codemodernizer.utils.createJavaHomePrompt
+import software.aws.toolkits.jetbrains.utils.notifyStickyInfo
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.CodeTransformPreValidationError
 
@@ -140,9 +141,9 @@ class CodeTransformChatController(
     private val telemetry = CodeTransformTelemetryManager.getInstance(context.project)
 
     override suspend fun processChatPromptMessage(message: IncomingCodeTransformMessage.ChatPrompt) {
-        if (chatSessionStorage.getSession(message.tabId).conversationState == CodeTransformConversationState.PROMPT_TARGET_JDK_PATH) {
-            // we are prompting user for target JDK path
-            processJDKPathChatPromptMessage(message)
+        if (chatSessionStorage.getSession(message.tabId).conversationState == CodeTransformConversationState.PROMPT_TARGET_JDK_NAME) {
+            // we are prompting user for target JDK name
+            processJDKNameChatPromptMessage(message)
             return
         }
 
@@ -445,7 +446,7 @@ class CodeTransformChatController(
         codeModernizerManager.codeTransformationSession?.let {
             it.sessionContext.transformCapabilities = transformCapabilities
         }
-        promptForTargetJdkPath(message.tabId)
+        promptForTargetJdkName(message.tabId)
         // TODO: when custom 1P upgrades ready, delete line above and uncomment line below
         // promptForCustomYamlFile()
     }
@@ -466,12 +467,22 @@ class CodeTransformChatController(
                 it.sessionContext.customDependencyVersionsFile = selectedFile
             }
             codeTransformChatHelper.addNewMessage(buildCustomDependencyVersionsFileValidChatContent())
-            promptForTargetJdkPath(message.tabId)
+            promptForTargetJdkName(message.tabId)
         }
     }
 
-    private suspend fun processJDKPathChatPromptMessage(message: IncomingCodeTransformMessage.ChatPrompt) {
-        codeModernizerManager.codeTransformationSession?.sessionContext?.targetJdkPath = message.message.trim()
+    private suspend fun processJDKNameChatPromptMessage(message: IncomingCodeTransformMessage.ChatPrompt) {
+        chatSessionStorage.getSession(message.tabId).conversationState = CodeTransformConversationState.IDLE
+        codeTransformChatHelper.sendChatInputEnabledMessage(message.tabId, false)
+        codeTransformChatHelper.sendUpdatePlaceholderMessage(message.tabId, "")
+
+        val providedJdkName = message.message.trim().lowercase()
+        val targetJdkName = ProjectJdkTable.getInstance().allJdks.find { it.name.trim().lowercase() == providedJdkName }?.name
+        if (targetJdkName == null) {
+            codeTransformChatHelper.addNewMessage(buildInvalidTargetJdkNameChatContent(providedJdkName))
+            return
+        }
+        codeModernizerManager.codeTransformationSession?.sessionContext?.targetJdkName = targetJdkName
         codeTransformChatHelper.addNewMessage(buildUserReplyChatContent(message.message.trim()))
         // start local build once we get target JDK path
         codeTransformChatHelper.addNewMessage(buildCompileLocalInProgressChatContent())
@@ -512,16 +523,15 @@ dependencyManagement:
 
     override suspend fun processCodeTransformContinueAction(message: IncomingCodeTransformMessage.CodeTransformContinue) {
         codeTransformChatHelper.addNewMessage(buildContinueTransformationChatContent())
-        promptForTargetJdkPath(message.tabId)
+        promptForTargetJdkName(message.tabId)
     }
 
-    private suspend fun promptForTargetJdkPath(tabId: String) {
-        chatSessionStorage.getSession(tabId).conversationState = CodeTransformConversationState.PROMPT_TARGET_JDK_PATH
-        val targetJdk = codeModernizerManager.codeTransformationSession?.sessionContext?.targetJavaVersion?.name.orEmpty()
-        val javaHomePrompt = createJavaHomePrompt(targetJdk)
-        codeTransformChatHelper.addNewMessage(buildPromptTargetJDKPathChatContent(javaHomePrompt))
+    private suspend fun promptForTargetJdkName(tabId: String) {
+        chatSessionStorage.getSession(tabId).conversationState = CodeTransformConversationState.PROMPT_TARGET_JDK_NAME
+        val targetJdkVersion = codeModernizerManager.codeTransformationSession?.sessionContext?.targetJavaVersion?.name.orEmpty()
+        codeTransformChatHelper.addNewMessage(buildPromptTargetJDKNameChatContent(targetJdkVersion))
         codeTransformChatHelper.sendChatInputEnabledMessage(tabId, true)
-        codeTransformChatHelper.sendUpdatePlaceholderMessage(tabId, "Enter the path to your Java installation")
+        codeTransformChatHelper.sendUpdatePlaceholderMessage(tabId, "Enter the name of your $targetJdkVersion")
     }
 
     private fun getSourceJdk(moduleConfigurationFile: VirtualFile): JavaSdkVersion {

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

@@ -15,19 +15,13 @@ import org.jetbrains.idea.maven.execution.MavenRunConfigurationType
 import org.jetbrains.idea.maven.execution.MavenRunnerParameters
 import org.jetbrains.idea.maven.execution.MavenRunnerSettings
 import software.aws.toolkits.jetbrains.services.codemodernizer.CodeModernizerManager
-import com.intellij.openapi.projectRoots.ProjectJdkTable
 
 class TransformMavenRunner(val project: Project) {
     private var handler: ProcessHandler? = null
     fun run(parameters: MavenRunnerParameters, settings: MavenRunnerSettings, onComplete: TransformRunnable, isClientSideBuild: Boolean = false) {
         if (isClientSideBuild) {
-            // TODO: if we go with this implementation 1) consult UX and
-            // 2) run this check much sooner in chat with an appropriate error message if JDK is not found
-            val targetJdkPath = CodeModernizerManager.getInstance(project).codeTransformationSession?.sessionContext?.targetJdkPath
-                ?: throw RuntimeException("No target JDK path provided by user; cannot run client-side build")
-            val jdkTable = ProjectJdkTable.getInstance()
-            val targetJdkName = jdkTable.allJdks.find { it.homePath == targetJdkPath }?.name
-                ?: throw RuntimeException("Could not find user's target JDK; cannot run client-side build")
+            val targetJdkName = CodeModernizerManager.getInstance(project).codeTransformationSession?.sessionContext?.targetJdkName
+                ?: throw RuntimeException("Could not find user's target JDK; cannot run client-side build") // should not happen; already validated earlier
             settings.setJreName(targetJdkName)
         }
 

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

@@ -77,7 +77,7 @@ data class CodeModernizerSessionContext(
     var schema: String? = null,
     val sqlMetadataZip: File? = null,
     var customDependencyVersionsFile: VirtualFile? = null,
-    var targetJdkPath: String? = null,
+    var targetJdkName: String? = null,
     var originalUploadZipPath: Path? = null
 ) : Disposable {
     private val mapper = jacksonObjectMapper()

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

@@ -5,6 +5,6 @@ package software.aws.toolkits.jetbrains.services.codemodernizer.model
 
 enum class CodeTransformConversationState {
     PROMPT_OBJECTIVE,
-    PROMPT_TARGET_JDK_PATH,
+    PROMPT_TARGET_JDK_NAME,
     IDLE,
 }

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

@@ -83,24 +83,3 @@ fun String.toTransformationLanguage() = when (this) {
     "JDK_21" -> TransformationLanguage.JAVA_21
     else -> TransformationLanguage.UNKNOWN_TO_SDK_VERSION
 }
-
-fun createJavaHomePrompt(jdkVersion: String): String {
-    var javaHomePrompt = "Enter the path to $jdkVersion.\n\n"
-    val os = System.getProperty("os.name").lowercase()
-    if (os.contains("windows")) {
-        javaHomePrompt += "To find the JDK path, run the following commands in a new terminal: `cd \"C:/Program Files/Java\"` and then `dir`. " +
-            "If you see your JDK version, run `cd <version>` and then `cd` to show the path."
-    } else if (os.contains("mac") || os.contains("darwin")) {
-        val version = when (jdkVersion) {
-            "JDK_1_8" -> "1.8"
-            "JDK_11" -> "11"
-            "JDK_17" -> "17"
-            "JDK_21" -> "21"
-            else -> "JAVA_VERSION" // shouldn't happen; we only support Java 8, 11, 17, and 21
-        }
-        javaHomePrompt += "To find the JDK path, run the following command in a new terminal: `/usr/libexec/java_home -v $version`"
-    } else {
-        javaHomePrompt += "To find the JDK path, run the following command in a new terminal: `update-java-alternatives --list`"
-    }
-    return javaHomePrompt
-}

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

@@ -25,7 +25,6 @@ import software.amazon.awssdk.services.codewhispererruntime.model.Transformation
 import software.amazon.awssdk.services.codewhispererruntime.model.TransformationStep
 import software.amazon.awssdk.services.ssooidc.model.InvalidGrantException
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeTransformType
-import software.aws.toolkits.jetbrains.services.codemodernizer.utils.createJavaHomePrompt
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.createClientSideBuildUploadZip
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getBillingText
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getClientInstructionArtifactId
@@ -303,22 +302,6 @@ class CodeWhispererCodeModernizerUtilsTest : CodeWhispererCodeModernizerTestBase
         zipFile.delete()
     }
 
-    @Test
-    fun `createJavaHomePrompt returns Windows instructions when on Windows`() {
-        System.setProperty("os.name", "Windows 10")
-        val prompt = createJavaHomePrompt("JDK_11")
-        assertThat(prompt).contains("Enter the path to JDK_11")
-        assertThat(prompt).contains("cd \"C:/Program Files/Java\"")
-    }
-
-    @Test
-    fun `createJavaHomePrompt returns Mac instructions with correct version`() {
-        System.setProperty("os.name", "Mac OS X")
-        val prompt = createJavaHomePrompt("JDK_11")
-        assertThat(prompt).contains("Enter the path to JDK_11")
-        assertThat(prompt).contains("/usr/libexec/java_home -v 11")
-    }
-
     @Test
     fun `parseBuildFile can detect absolute paths in build file`() {
         val module = projectRule.module

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

@@ -669,7 +669,6 @@ codemodernizer.chat.message.one_or_multiple_diffs=If you would like to update an
 codemodernizer.chat.message.one_or_multiple_diffs_form.multiple_diffs=Multiple diffs
 codemodernizer.chat.message.one_or_multiple_diffs_form.one_diff=One diff
 codemodernizer.chat.message.one_or_multiple_diffs_form.response=Okay, I will create {0} with my proposed changes.
-codemodernizer.chat.message.permission_to_build=I will build your project on this machine throughout the transformation.
 codemodernizer.chat.message.result.fail=Sorry, I ran into an issue during the transformation. Please try again.
 codemodernizer.chat.message.result.fail_initial_build=I am having trouble building your project in the secure build environment and couldn't complete the transformation.
 codemodernizer.chat.message.result.fail_initial_build_no_build_log=I am having trouble building your project in the secure build environment: {0}.
@@ -680,6 +679,7 @@ codemodernizer.chat.message.result.success=I successfully completed your transfo
 codemodernizer.chat.message.result.success.multiple_diffs=I successfully completed your transformation. You will be able to accept changes from one diff at a time. If you reject changes in one diff, you will not be able to view or accept changes in the other diffs. The transformation summary has details about the changes I'm proposing.
 codemodernizer.chat.message.result.zip_too_large=Sorry, your project size exceeds the Amazon Q Code Transformation upload limit of 2GB.
 codemodernizer.chat.message.resume_ongoing=I'm still transforming your code. It can take 10 to 30 minutes to upgrade your code, depending on the size of your module. To monitor progress, go to the Transformation Hub.
+// TODO: get text from Allie for this
 codemodernizer.chat.message.skip_tests=I will build your module using `mvn test` by default. If you would like me to build your module without running unit tests, I will use `mvn test-compile`.
 codemodernizer.chat.message.skip_tests_form.response=Okay, I will {0} when building your module.
 codemodernizer.chat.message.skip_tests_form.run_tests=Run unit tests