fixing one diff and off by one error for multiple diffs and addressing build log errors

Author: ntarakad-aws

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

@@ -58,30 +58,33 @@ import java.nio.file.Files
 import java.nio.file.Path
 import java.time.Instant
 import java.util.concurrent.atomic.AtomicBoolean
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildStartNewTransformFollowup
 
 const val DOWNLOAD_PROXY_WILDCARD_ERROR: String = "Dangling meta character '*' near index 0"
 const val DOWNLOAD_SSL_HANDSHAKE_ERROR: String = "Unable to execute HTTP request: javax.net.ssl.SSLHandshakeException"
 const val INVALID_ARTIFACT_ERROR: String = "Invalid artifact"
 val patchDescriptions: Map<String, String> = mapOf(
     "Prepare minimal upgrade to Java 17" to "This diff patch covers the set of upgrades for Springboot, JUnit, and PowerMockito frameworks.",
-    "Popular Enterprise Specifications and Application Frameworks upgrade" to "This diff patch covers the set of upgrades for Jakarta EE 10, Hibernate 6.2, and Micronaut 3.",
-    "HTTP Client Utilities, Apache Commons Utilities, and Web Frameworks" to "This diff patch covers the set of upgrades for Apache HTTP Client 5, Apache Commons utilities (Collections, IO, Lang, Math), Struts 6.0.",
-    "Testing Tools and Frameworks upgrade" to "This diff patch covers the set of upgrades for ArchUnit, Mockito, TestContainers, Cucumber, and additionally, Jenkins plugins and the Maven Wrapper.",
-    "Miscellaneous Processing Documentation upgrade" to "This diff patch covers a diverse set of upgrades spanning ORMs, XML processing, API documentation, and more.",
+    "Popular Enterprise Specifications and Application Frameworks upgrade" to "This diff patch covers the set of upgrades for Jakarta EE 10, Hibernate 6.2, " +
+        "and Micronaut 3.",
+    "HTTP Client Utilities, Apache Commons Utilities, and Web Frameworks" to "This diff patch covers the set of upgrades for Apache HTTP Client 5, Apache " +
+        "Commons utilities (Collections, IO, Lang, Math), Struts 6.0.",
+    "Testing Tools and Frameworks upgrade" to "This diff patch covers the set of upgrades for ArchUnit, Mockito, TestContainers, Cucumber, and additionally, " +
+        "Jenkins plugins and the Maven Wrapper.",
+    "Miscellaneous Processing Documentation upgrade" to "This diff patch covers a diverse set of upgrades spanning ORMs, XML processing, API documentation, " +
+        "and more.",
     "Updated dependencies to latest version" to "",
     "Upgrade Deprecated API" to ""
 )
 
-class ArtifactHandler(private val project: Project, private val clientAdaptor: GumbyClient, private val codeTransformChatHelper: CodeTransformChatHelper? = null) {
+class ArtifactHandler(private val project: Project, private val clientAdaptor: GumbyClient,
+                      private val codeTransformChatHelper: CodeTransformChatHelper? = null) {
     private val telemetry = CodeTransformTelemetryManager.getInstance(project)
     private val downloadedArtifacts = mutableMapOf<JobId, Path>()
     private val downloadedSummaries = mutableMapOf<JobId, TransformationSummary>()
     private val downloadedBuildLogPath = mutableMapOf<JobId, Path>()
     private var isCurrentlyDownloading = AtomicBoolean(false)
-    private val scope = CoroutineScope(Dispatchers.Default)
+//    private val scope = CoroutineScope(Dispatchers.Default)
     private var totalPatchFiles: Int = 0
 
 
@@ -261,7 +264,8 @@ class ArtifactHandler(private val project: Project, private val clientAdaptor: G
     /**
      * Opens the built-in patch dialog to display the diff and allowing users to apply the changes locally.
      */
-    internal suspend fun displayDiffUsingPatch(patchFile: VirtualFile, totalPatchFiles: Int, diffDescription: PatchInfo?, jobId: JobId, source: CodeTransformVCSViewerSrcComponents) {
+    internal suspend fun displayDiffUsingPatch(patchFile: VirtualFile, totalPatchFiles: Int, diffDescription: PatchInfo?, jobId: JobId,
+                                               source: CodeTransformVCSViewerSrcComponents) {
         runInEdt {
             val dialog = ApplyPatchDifferentiatedDialog(
                 project,
@@ -286,11 +290,11 @@ class ArtifactHandler(private val project: Project, private val clientAdaptor: G
             dialog.isModal = true
 
             if (dialog.showAndGet()) {
-                scope.launch {
+                projectCoroutineScope(project).launch {
                     telemetry.viewArtifact(CodeTransformArtifactType.ClientInstructions, jobId, "Submit", source)
                     if (getCurrentPatchIndex() < totalPatchFiles){
                         val message = if (diffDescription != null) {
-                            "I applied the changes in diff patch ${getCurrentPatchIndex()} of $totalPatchFiles. ${patchDescriptions[diffDescription.name]} You can make a commit if the diff shows success. If the diff shows partial success, apply and fix the errors, and start a new transformation."
+                            "I applied the changes in diff patch ${getCurrentPatchIndex() + 1} of $totalPatchFiles. ${patchDescriptions[diffDescription.name]}"
                         } else {
                             "I applied the changes to your project."
                         }

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

@@ -560,12 +560,6 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
             resumeJob(session, lastJobId, currentJobResult)
         }
 
-//    private fun displayDiffNotificationAction(jobId: JobId): NotificationAction = NotificationAction.createSimple(
-//        message("codemodernizer.notification.info.modernize_complete.view_diff")
-//    ) {
-//        artifactHandler.displayDiffAction(jobId, CodeTransformVCSViewerSrcComponents.ToastNotification)
-//    }
-
     private fun displaySummaryNotificationAction(jobId: JobId) =
         NotificationAction.createSimple(message("codemodernizer.notification.info.modernize_complete.view_summary")) {
             artifactHandler.showTransformationSummary(jobId)

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

@@ -87,11 +87,7 @@ private val viewDiffButton = Button(
 )
 
 fun createViewDiffButton(buttonLabel: String): Button {
-    return Button(
-        id = CodeTransformButtonId.ViewDiff.id,
-        text = buttonLabel,
-        keepCardAfterClick = true
-    )
+    return Button(id = CodeTransformButtonId.ViewDiff.id, text = buttonLabel, keepCardAfterClick = true)
 }
 
 val viewSummaryButton = Button(

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

@@ -63,7 +63,6 @@ fun runMavenCopyCommands(sourceFolder: File, buildlogBuilder: StringBuilder, log
     val telemetry = CodeTransformTelemetryManager.getInstance(project)
     var telemetryErrorMessage = ""
     var telemetryLocalBuildResult = Result.Succeeded
-//    return MavenCopyCommandsResult.Success(destinationDir.toFile())
 
     logger.info { "Executing IntelliJ bundled Maven" }
     try {

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

@@ -18,7 +18,7 @@ import java.io.File
 import kotlin.io.path.ExperimentalPathApi
 import kotlin.io.path.Path
 import kotlin.io.path.isDirectory
-
+import kotlin.io.path.walk
 
 
 /**
@@ -61,7 +61,6 @@ open class CodeModernizerArtifact(
                 val patches = extractPatches(manifest, description)
                 val summary = extractSummary(manifest)
                 val summaryMarkdownFile = getSummaryFile(manifest)
-//                if (patches.size != 1) throw RuntimeException("Expected 1 patch, but found ${patches.size}")
                 return CodeModernizerArtifact(zipPath, manifest, patches, description, summary, summaryMarkdownFile)
             }
             throw RuntimeException("Could not find artifact")
@@ -101,7 +100,7 @@ open class CodeModernizerArtifact(
         @OptIn(ExperimentalPathApi::class)
         private fun extractPatches(manifest: CodeModernizerManifest, description: List<PatchInfo>?): List<VirtualFile> {
             if (description == null) {
-                return listOf(extractSinglePatch(manifest))
+                return extractSinglePatch(manifest)
             }
             val fileSystem = LocalFileSystem.getInstance()
             val patchesDir = tempDir.toPath().resolve(manifest.patchesRoot)
@@ -119,17 +118,15 @@ open class CodeModernizerArtifact(
             }
         }
         @OptIn(ExperimentalPathApi::class)
-        private fun extractSinglePatch(manifest: CodeModernizerManifest): VirtualFile {
+        private fun extractSinglePatch(manifest: CodeModernizerManifest): List<VirtualFile> {
             val fileSystem = LocalFileSystem.getInstance()
             val patchesDir = tempDir.toPath().resolve(manifest.patchesRoot)
-
             if (!patchesDir.isDirectory()) {
                 throw RuntimeException("Expected root for patches was not a directory.")
             }
-
-            val diffPatchFile = patchesDir.resolve("diff.patch")
-            return fileSystem.findFileByNioFile(diffPatchFile.parent.resolve("diff.patch"))
-                ?: throw IllegalStateException("Could not find diff.patch in directory: ${diffPatchFile.parent}")
+            return patchesDir.walk()
+                .map { fileSystem.refreshAndFindFileByNioFile(it) ?: throw RuntimeException("Could not find diff.patch") }
+                .toList()
 
         }
 

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/panels/managers/CodeModernizerBottomWindowPanelManager.kt

@@ -207,7 +207,6 @@ class CodeModernizerBottomWindowPanelManager(private val project: Project) : JPa
     private fun setJobCompletedSuccessfullyUI() {
         add(BorderLayout.CENTER, buildProgressSplitterPanelManager)
         buildProgressSplitterPanelManager.apply {
-//            addViewDiffToBanner()
             addViewSummaryToBanner()
             banner.updateContent(message("codemodernizer.toolwindow.banner.run_scan_complete"), AllIcons.Actions.Commit)
             setSplitPanelStopView()
@@ -278,8 +277,6 @@ class CodeModernizerBottomWindowPanelManager(private val project: Project) : JPa
 
     fun addPlanToBanner() = banner.updateActions(banner.showPlanAction)
 
-    fun addViewDiffToBanner() = banner.updateActions(banner.showDiffAction)
-
     fun addViewSummaryToBanner() = banner.updateActions(banner.showSummaryAction)
 
     private fun stopTimer() {

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

@@ -67,7 +67,7 @@ class CodeModernizerState : BaseState() {
             configurationFile,
             sourceJavaSdkVersion,
             targetJavaSdkVersion,
-            listOf(EXPLAINABILITY_V1), //should this be from lastJobContext? , defaulting to one diff
+            listOf(EXPLAINABILITY_V1), //default to one diff
             lastJobContext[JobDetails.CUSTOM_BUILD_COMMAND] ?: MAVEN_BUILD_RUN_UNIT_TESTS // default to running unit tests
         )
     }

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererConstants.kt

@@ -119,7 +119,7 @@ object CodeWhispererConstants {
     }
 
     object Config {
-        const val CODEWHISPERER_ENDPOINT = "https://rts.alpha-us-west-2.codewhisperer.ai.aws.dev/" // PROD
+        const val CODEWHISPERER_ENDPOINT = "https://codewhisperer.us-east-1.amazonaws.com/" // PROD
         const val CODEWHISPERER_IDPOOL_ID = "us-east-1:70717e99-906f-4add-908c-bd9074a2f5b9"
         val Sigv4ClientRegion = Region.US_EAST_1
         val BearerClientRegion = Region.US_EAST_1

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

@@ -561,8 +561,8 @@ code.aws.workspaces=Amazon CodeCatalyst
 code.aws.workspaces.short=Dev Environments
 codemodernizer.builderrordialog.description.title=Error occurred when building your project
 codemodernizer.chat.form.user_selection.item.choose_module=Choose a module to transform
-codemodernizer.chat.form.user_selection.item.choose_skip_tests_option=Choose to skip unit tests
 codemodernizer.chat.form.user_selection.item.choose_one_or_multiple_diffs_option=Choose how to receive proposed changes
+codemodernizer.chat.form.user_selection.item.choose_skip_tests_option=Choose to skip unit tests
 codemodernizer.chat.form.user_selection.item.choose_target_version=Choose the target code version
 codemodernizer.chat.form.user_selection.title=Q - Code transformation
 codemodernizer.chat.message.absolute_path_detected=I detected {0} potential absolute file path(s) in your {1} file: **{2}**. Absolute file paths might cause issues when I build your code. Any errors will show up in the build log.
@@ -606,6 +606,16 @@ codemodernizer.chat.message.hil.user_rejected=I'll continue upgrading your modul
 codemodernizer.chat.message.local_build_begin=I'm building your module. This can take up to 10 minutes, depending on the size of your module.
 codemodernizer.chat.message.local_build_failed=Sorry, I couldn't run the Maven clean install command to build your module.
 codemodernizer.chat.message.local_build_success=I was able to build your module and will start uploading your code.
+codemodernizer.chat.message.one_or_multiple_diffs=\
+I can now divide the transformation results into diff patches (if applicable to the app) if you would like to review and accept each diff with fewer changes:\n\n\
+- Minimal Compatible Library Upgrade to Java 17: Dependencies to the minimum compatible versions in Java 17, including Springboot, JUnit, and PowerMockito.\n\n\
+- Popular Enterprise Specifications Application Frameworks: Popular enterprise and application frameworks like Jakarta EE, Hibernate, and Micronaut 3.\n\n\
+- HTTP Client Utilities Web Frameworks: HTTP client libraries, Apache Commons utilities, and Struts frameworks.\n\n\
+- Testing Tools Frameworks: Testing tools like ArchUnit, Mockito, and TestContainers and build tools like Jenkins and Maven Wrapper.\n\n\
+- Miscellaneous Processing Documentation: Diverse set spanning ORMs, XML processing, and API documentation like Swagger to SpringDoc/OpenAPI.
+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} when providing the proposed changes.
 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}.
@@ -618,19 +628,9 @@ codemodernizer.chat.message.result.zip_too_large=Sorry, your project size exceed
 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.
 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.one_or_multiple_diffs_form.response=Okay, I will create {0} when providing the proposed changes.
 codemodernizer.chat.message.skip_tests_form.run_tests=Run unit tests
 codemodernizer.chat.message.skip_tests_form.skip=Skip unit tests
-codemodernizer.chat.message.one_or_multiple_diffs_form.one_diff=One diff
-codemodernizer.chat.message.one_or_multiple_diffs_form.multiple_diffs=Multiple diffs
 codemodernizer.chat.message.transform_begin=I'm starting to transform 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.
-codemodernizer.chat.message.one_or_multiple_diffs=\
-I can now divide the transformation results into diff patches (if applicable to the app) if you would like to review and accept each diff with fewer changes:\n\n\
-- Minimal Compatible Library Upgrade to Java 17: Dependencies to the minimum compatible versions in Java 17, including Springboot, JUnit, and PowerMockito.\n\n\
-- Popular Enterprise Specifications Application Frameworks: Popular enterprise and application frameworks like Jakarta EE, Hibernate, and Micronaut 3.\n\n\
-- HTTP Client Utilities Web Frameworks: HTTP client libraries, Apache Commons utilities, and Struts frameworks.\n\n\
-- Testing Tools Frameworks: Testing tools like ArchUnit, Mockito, and TestContainers and build tools like Jenkins and Maven Wrapper.\n\n\
-- Miscellaneous Processing Documentation: Diverse set spanning ORMs, XML processing, and API documentation like Swagger to SpringDoc/OpenAPI.
 codemodernizer.chat.message.transform_cancelled_by_user=I cancelled your transformation. If you want to start another transformation, choose **Start a new transformation**.
 codemodernizer.chat.message.transform_in_progress=If I run into any issues, I might pause the transformation to get input from you on how to proceed.
 codemodernizer.chat.message.transform_stopped_by_user=I stopped your transformation. If you want to start another transformation, choose **Start a new transformation**.