fixed issue with undefined in changes applied message and addressing unused imports and minor comments

Author: ntarakad-aws

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

@@ -3,7 +3,6 @@
 
 package software.aws.toolkits.jetbrains.services.codemodernizer
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.intellij.notification.NotificationAction
 import com.intellij.openapi.application.runInEdt
 import com.intellij.openapi.application.runReadAction
@@ -16,11 +15,8 @@ import com.intellij.openapi.vcs.changes.patch.ApplyPatchMode
 import com.intellij.openapi.vcs.changes.patch.ImportToShelfExecutor
 import com.intellij.openapi.vfs.LocalFileSystem
 import com.intellij.openapi.vfs.VirtualFile
-import com.jetbrains.rd.generator.nova.PredefinedType
-import com.squareup.wire.get
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import kotlinx.serialization.Serializable
 import software.amazon.awssdk.services.codewhispererstreaming.model.TransformationDownloadArtifactType
 import software.amazon.awssdk.services.ssooidc.model.SsoOidcException
 import software.aws.toolkits.core.utils.error
@@ -32,16 +28,12 @@ import software.aws.toolkits.jetbrains.core.coroutines.projectCoroutineScope
 import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.NoTokenInitializedException
 import software.aws.toolkits.jetbrains.services.amazonq.CODE_TRANSFORM_TROUBLESHOOT_DOC_DOWNLOAD_ERROR_OVERVIEW
 import software.aws.toolkits.jetbrains.services.amazonq.CODE_TRANSFORM_TROUBLESHOOT_DOC_DOWNLOAD_EXPIRED
-import software.aws.toolkits.jetbrains.services.amazonq.apps.AmazonQAppInitContext
 import software.aws.toolkits.jetbrains.services.codemodernizer.client.GumbyClient
 import software.aws.toolkits.jetbrains.services.codemodernizer.commands.CodeTransformMessageListener
-import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildTransformResultChatContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.getDownloadedArtifactTextFromType
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.createViewDiffButton
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.viewSummaryButton
 import software.aws.toolkits.jetbrains.services.codemodernizer.controller.CodeTransformChatHelper
-import software.aws.toolkits.jetbrains.services.codemodernizer.messages.Button
-import software.aws.toolkits.jetbrains.services.codemodernizer.messages.CodeTransformButtonId
 import software.aws.toolkits.jetbrains.services.codemodernizer.messages.CodeTransformChatMessageContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.messages.CodeTransformChatMessageType
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerArtifact
@@ -53,7 +45,6 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.model.JobId
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.ParseZipFailureReason
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.PatchInfo
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.UnzipFailureReason
-import software.aws.toolkits.jetbrains.services.codemodernizer.session.ChatSessionStorage
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getPathToHilArtifactDir
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isValidCodeTransformConnection
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.openTroubleshootingGuideNotificationAction
@@ -69,18 +60,17 @@ import java.time.Instant
 import java.util.concurrent.atomic.AtomicBoolean
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 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(
-    "Minimal Compatible Library 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" to "This diff patch covers the set of upgrades for Jakarta EE 10, Hibernate 6.2, and Micronaut 3.",
+    "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" 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" to "This diff patch covers a diverse set of upgrades spanning ORMs, XML processing, API documentation, and more.",
+    "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 ""
 )
@@ -91,7 +81,6 @@ class ArtifactHandler(private val project: Project, private val clientAdaptor: G
     private val downloadedSummaries = mutableMapOf<JobId, TransformationSummary>()
     private val downloadedBuildLogPath = mutableMapOf<JobId, Path>()
     private var isCurrentlyDownloading = AtomicBoolean(false)
-//    private var currentPatchIndex: Int = 0
     private val scope = CoroutineScope(Dispatchers.Default)
     private var totalPatchFiles: Int = 0
 
@@ -219,7 +208,6 @@ class ArtifactHandler(private val project: Project, private val clientAdaptor: G
                 path = result.first
                 totalDownloadBytes = result.second
                 zipPath = path.toAbsolutePath().toString()
-//                zipPath = "/Users/ntarakad/Desktop/SampleArtifactOneDiffNoJson.zip"
                 LOG.info { "Successfully converted the download to a zip at $zipPath." }
             } catch (e: Exception) {
                 LOG.error { e.message.toString() }
@@ -299,9 +287,7 @@ class ArtifactHandler(private val project: Project, private val clientAdaptor: G
 
             if (dialog.showAndGet()) {
                 scope.launch {
-//                    notifyStickyInfo("diff accepted", if (codeTransformChatHelper == null) "null" else "not null")
                     telemetry.viewArtifact(CodeTransformArtifactType.ClientInstructions, jobId, "Submit", source)
-                    setCurrentPatchIndex(getCurrentPatchIndex() + 1)
                     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."
@@ -317,6 +303,7 @@ class ArtifactHandler(private val project: Project, private val clientAdaptor: G
                     } else {
                         codeTransformChatHelper?.addNewMessage(buildStartNewTransformFollowup())
                     }
+                    setCurrentPatchIndex(getCurrentPatchIndex() + 1)
                 }
             } else {
                 telemetry.viewArtifact(CodeTransformArtifactType.ClientInstructions, jobId, "Cancel", source)

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

@@ -10,8 +10,6 @@ import com.intellij.util.io.HttpRequests
 import kotlinx.coroutines.delay
 import org.apache.commons.codec.digest.DigestUtils
 import software.amazon.awssdk.core.exception.SdkClientException
-import software.amazon.awssdk.services.codewhispererruntime.endpoints.internal.SourceException
-import software.amazon.awssdk.services.codewhispererruntime.model.CodeWhispererRuntimeResponse
 import software.amazon.awssdk.services.codewhispererruntime.model.ResumeTransformationResponse
 import software.amazon.awssdk.services.codewhispererruntime.model.StartTransformationResponse
 import software.amazon.awssdk.services.codewhispererruntime.model.TransformationJob
@@ -274,9 +272,9 @@ class CodeModernizerSession(
             return CodeModernizerStartJobResult.ZipUploadFailed(UploadFailureReason.OTHER(e.localizedMessage))
         } finally {
             telemetry.uploadProject(payloadSize, startTime, true, telemetryErrorMessage)
-//            if (payload != null) {
-//                deleteUploadArtifact(payload)
-//            }
+            if (payload != null) {
+                deleteUploadArtifact(payload)
+            }
         }
 
         // Send upload completion message to chat (only if successful)
@@ -288,7 +286,6 @@ class CodeModernizerSession(
                 return CodeModernizerStartJobResult.Cancelled
             }
             val startJobResponse = startJob(uploadId)
-//            val startJobResponse = StartTransformationResponse.builder().transformationJobId("123").build()
             state.putJobHistory(sessionContext, TransformationStatus.STARTED, startJobResponse.transformationJobId())
             state.currentJobStatus = TransformationStatus.STARTED
             telemetry.jobStart(startTime, JobId(startJobResponse.transformationJobId()))
@@ -427,7 +424,6 @@ class CodeModernizerSession(
     ): CodeModernizerJobCompletedResult {
         try {
             state.currentJobId = jobId
-//            return CodeModernizerJobCompletedResult.JobCompletedSuccessfully(jobId)
 
             // add delay to avoid the throttling error
             delay(1000)

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

@@ -404,11 +404,6 @@ fun buildTransformBeginChatContent() = CodeTransformChatMessageContent(
     message = message("codemodernizer.chat.message.transform_begin"),
 )
 
-fun buildMultipleDiffsChatContent() = CodeTransformChatMessageContent(
-    type = CodeTransformChatMessageType.PendingAnswer,
-    message = message("codemodernizer.chat.message.multiple_patch_descriptions")
-)
-
 fun buildTransformInProgressChatContent() = CodeTransformChatMessageContent(
     type = CodeTransformChatMessageType.PendingAnswer,
     message = message("codemodernizer.chat.message.transform_in_progress"),

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

@@ -9,7 +9,6 @@ import com.intellij.openapi.module.ModuleUtil
 import com.intellij.openapi.projectRoots.JavaSdkVersion
 import com.intellij.openapi.vfs.VirtualFile
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import software.amazon.awssdk.services.codewhispererstreaming.model.TransformationDownloadArtifactType
 import software.aws.toolkits.core.utils.debug
@@ -44,7 +43,6 @@ 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.buildMultipleDiffsChatContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildProjectInvalidChatContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildProjectValidChatContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildStartNewTransformFollowup
@@ -68,12 +66,8 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUs
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserSelectionSummaryChatContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserSkipTestsFlagSelectionChatContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserStopTransformChatContent
-import software.aws.toolkits.jetbrains.services.codemodernizer.constants.createViewDiffButton
-import software.aws.toolkits.jetbrains.services.codemodernizer.constants.viewSummaryButton
 import software.aws.toolkits.jetbrains.services.codemodernizer.messages.AuthenticationNeededExceptionMessage
 import software.aws.toolkits.jetbrains.services.codemodernizer.messages.CodeTransformChatMessage
-import software.aws.toolkits.jetbrains.services.codemodernizer.messages.CodeTransformChatMessageContent
-import software.aws.toolkits.jetbrains.services.codemodernizer.messages.CodeTransformChatMessageType
 import software.aws.toolkits.jetbrains.services.codemodernizer.messages.CodeTransformCommandMessage
 import software.aws.toolkits.jetbrains.services.codemodernizer.messages.IncomingCodeTransformMessage
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerArtifact
@@ -179,7 +173,6 @@ class CodeTransformChatController(
                 codeTransformChatHelper.addNewMessage(buildTransformInProgressChatContent())
             } else {
                 codeTransformChatHelper.addNewMessage(buildTransformBeginChatContent())
-//                codeTransformChatHelper.addNewMessage(buildMultipleDiffsChatContent())
                 codeTransformChatHelper.addNewMessage(buildTransformInProgressChatContent())
             }
             return true
@@ -256,10 +249,8 @@ class CodeTransformChatController(
             else -> MAVEN_BUILD_RUN_UNIT_TESTS
         }
         codeTransformChatHelper.addNewMessage(buildUserSkipTestsFlagSelectionChatContent(message.skipTestsSelection))
-//        codeTransformChatHelper.addNewMessage(buildCompileLocalInProgressChatContent())
         codeModernizerManager.codeTransformationSession?.let {
             it.sessionContext.customBuildCommand = customBuildCommand
-//            codeModernizerManager.runLocalMavenBuild(context.project, it)
         }
         codeTransformChatHelper.run {
             addNewMessage(buildUserInputOneOrMultipleDiffsChatIntroContent())
@@ -529,7 +520,6 @@ class CodeTransformChatController(
 
     private suspend fun handleCodeTransformUploadCompleted() {
         codeTransformChatHelper.addNewMessage(buildTransformBeginChatContent())
-//        codeTransformChatHelper.addNewMessage(buildMultipleDiffsChatContent())
         codeTransformChatHelper.addNewMessage(buildTransformInProgressChatContent())
     }
 

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

@@ -3,29 +3,22 @@
 
 package software.aws.toolkits.jetbrains.services.codemodernizer.model
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.core.JsonProcessingException
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.intellij.openapi.util.io.FileUtil.createTempDirectory
 import com.intellij.openapi.vfs.LocalFileSystem
 import com.intellij.openapi.vfs.VirtualFile
-import org.gradle.internal.impldep.jcifs.util.DES
 import software.aws.toolkits.core.utils.error
 import software.aws.toolkits.core.utils.exists
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.services.codemodernizer.TransformationSummary
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.unzipFile
-import software.aws.toolkits.jetbrains.utils.notifyStickyInfo
 import java.io.File
 import kotlin.io.path.ExperimentalPathApi
 import kotlin.io.path.Path
 import kotlin.io.path.isDirectory
-import kotlin.io.path.name
-import kotlin.io.path.walk
 
-@JsonIgnoreProperties(ignoreUnknown = true)
-data class DescriptionContent (val content: List<PatchInfo>)
 
 
 /**
@@ -59,9 +52,6 @@ open class CodeModernizerArtifact(
                     LOG.error { "Could not unzip artifact" }
                     throw RuntimeException("Could not unzip artifact")
                 }
-//                notifyStickyInfo("Zip", path.name)
-//                notifyStickyInfo("Zip", tempDir.path)
-//                tempDir = tempDir.resolve("SampleArtifactOneDiffNoJson")
                 val manifest = loadManifest()
                 if (manifest.version > maxSupportedVersion) {
                     // If not supported we can still try to use it, i.e. the versions should largely be backwards compatible
@@ -138,7 +128,9 @@ open class CodeModernizerArtifact(
             }
 
             val diffPatchFile = patchesDir.resolve("diff.patch")
-            return fileSystem.findFileByNioFile(diffPatchFile)!!
+            return fileSystem.findFileByNioFile(diffPatchFile.parent.resolve("diff.patch"))
+                ?: throw IllegalStateException("Could not find diff.patch in directory: ${diffPatchFile.parent}")
+
         }
 
         @OptIn(ExperimentalPathApi::class)

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

@@ -10,3 +10,6 @@ data class CodeModernizerManifest(val version: Float, val patchesRoot: String, v
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 data class PatchInfo (val name: String, val filename: String, val isSuccessful: Boolean)
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+data class DescriptionContent (val content: List<PatchInfo>)

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

@@ -256,7 +256,6 @@ data class CodeModernizerSessionContext(
                         zip.putNextEntry(Path(BUILD_LOG_PATH).toString(), it)
                     }
                 }.toFile()
-                notifyStickyInfo("output zip", outputFile.path)
                 if (depDirectory != null) ZipCreationResult.Succeeded(outputFile) else ZipCreationResult.Missing1P(outputFile)
             } catch (e: NoSuchFileException) {
                 throw CodeModernizerException("Source folder not found")

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

@@ -20,8 +20,6 @@ import software.amazon.awssdk.services.codewhispererruntime.model.Transformation
 import software.amazon.awssdk.services.codewhispererruntime.model.TransformationStatus
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.warn
-import software.aws.toolkits.jetbrains.services.codemodernizer.ArtifactHandler
-import software.aws.toolkits.jetbrains.services.codemodernizer.client.GumbyClient
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerJobCompletedResult
 import software.aws.toolkits.jetbrains.services.codemodernizer.panels.CodeModernizerBanner
 import software.aws.toolkits.jetbrains.services.codemodernizer.panels.CodeModernizerJobHistoryTablePanel