diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ArtifactHandler.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ArtifactHandler.kt index 11accfd610c..40ece3b768a 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ArtifactHandler.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ArtifactHandler.kt @@ -23,6 +23,7 @@ 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.info +import software.aws.toolkits.jetbrains.core.coroutines.EDT import software.aws.toolkits.jetbrains.core.coroutines.getCoroutineBgContext import software.aws.toolkits.jetbrains.core.coroutines.projectCoroutineScope import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.NoTokenInitializedException @@ -30,7 +31,13 @@ import software.aws.toolkits.jetbrains.services.amazonq.CODE_TRANSFORM_TROUBLESH import software.aws.toolkits.jetbrains.services.amazonq.CODE_TRANSFORM_TROUBLESHOOT_DOC_DOWNLOAD_EXPIRED 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.buildStartNewTransformFollowup +import software.aws.toolkits.jetbrains.services.codemodernizer.constants.createViewDiffButton import software.aws.toolkits.jetbrains.services.codemodernizer.constants.getDownloadedArtifactTextFromType +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.CodeTransformChatMessageContent +import software.aws.toolkits.jetbrains.services.codemodernizer.messages.CodeTransformChatMessageType import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerArtifact import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeTransformFailureBuildLog import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeTransformHilDownloadArtifact @@ -38,11 +45,13 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.model.DownloadArt import software.aws.toolkits.jetbrains.services.codemodernizer.model.DownloadFailureReason 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.state.CodeModernizerSessionState 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 +import software.aws.toolkits.jetbrains.utils.notifyInfo import software.aws.toolkits.jetbrains.utils.notifyStickyInfo import software.aws.toolkits.jetbrains.utils.notifyStickyWarn import software.aws.toolkits.resources.message @@ -57,20 +66,44 @@ import java.util.concurrent.atomic.AtomicBoolean 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" - -class ArtifactHandler(private val project: Project, private val clientAdaptor: GumbyClient) { +val patchDescriptions = 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.", + "Deprecated API replacement and dependency upgrades" to "This diff patch replaces deprecated APIs and makes additional dependency version upgrades." +) + +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() private val downloadedSummaries = mutableMapOf() private val downloadedBuildLogPath = mutableMapOf() private var isCurrentlyDownloading = AtomicBoolean(false) + private var totalPatchFiles: Int = 0 + private var sharedPatchIndex: Int = 0 internal suspend fun displayDiff(job: JobId, source: CodeTransformVCSViewerSrcComponents) { if (isCurrentlyDownloading.get()) return when (val result = downloadArtifact(job, TransformationDownloadArtifactType.CLIENT_INSTRUCTIONS)) { is DownloadArtifactResult.Success -> { if (result.artifact !is CodeModernizerArtifact) return notifyUnableToApplyPatch("") - displayDiffUsingPatch(result.artifact.patch, job, source) + totalPatchFiles = result.artifact.patches.size + if (result.artifact.description == null) { + displayDiffUsingPatch(result.artifact.patches.first(), totalPatchFiles, null, job, source) + } else { + val diffDescription = result.artifact.description[getCurrentPatchIndex()] + displayDiffUsingPatch(result.artifact.patches[getCurrentPatchIndex()], totalPatchFiles, diffDescription, job, source) + } } is DownloadArtifactResult.ParseZipFailure -> notifyUnableToApplyPatch(result.failureReason.errorMessage) is DownloadArtifactResult.UnzipFailure -> notifyUnableToApplyPatch(result.failureReason.errorMessage) @@ -246,8 +279,14 @@ 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 fun displayDiffUsingPatch(patchFile: VirtualFile, jobId: JobId, source: CodeTransformVCSViewerSrcComponents) { - runInEdt { + internal suspend fun displayDiffUsingPatch( + patchFile: VirtualFile, + totalPatchFiles: Int, + diffDescription: PatchInfo?, + jobId: JobId, + source: CodeTransformVCSViewerSrcComponents, + ) { + withContext(EDT) { val dialog = ApplyPatchDifferentiatedDialog( project, ApplyPatchDefaultExecutor(project), @@ -256,7 +295,14 @@ class ArtifactHandler(private val project: Project, private val clientAdaptor: G patchFile, null, ChangeListManager.getInstance(project) - .addChangeList(message("codemodernizer.patch.name"), ""), + .addChangeList( + if (diffDescription != null) { + "${diffDescription.name} (${if (diffDescription.isSuccessful) "Success" else "Failure"})" + } else { + patchFile.name + }, + "" + ), null, null, null, @@ -265,7 +311,44 @@ class ArtifactHandler(private val project: Project, private val clientAdaptor: G dialog.isModal = true if (dialog.showAndGet()) { + telemetry.submitSelection("Submit-${diffDescription?.name}") telemetry.viewArtifact(CodeTransformArtifactType.ClientInstructions, jobId, "Submit", source) + if (diffDescription == null) { + val resultContent = CodeTransformChatMessageContent( + type = CodeTransformChatMessageType.PendingAnswer, + message = message("codemodernizer.chat.message.changes_applied"), + ) + codeTransformChatHelper?.updateLastPendingMessage(resultContent) + codeTransformChatHelper?.addNewMessage(buildStartNewTransformFollowup()) + } else { + if (getCurrentPatchIndex() < totalPatchFiles) { + val message = "I applied the changes in diff patch ${getCurrentPatchIndex() + 1} of $totalPatchFiles. " + + "${patchDescriptions[diffDescription.name]}" + val notificationMessage = "Amazon Q applied the changes in diff patch ${getCurrentPatchIndex() + 1} of $totalPatchFiles " + + "to your project." + val notificationTitle = "Diff patch ${getCurrentPatchIndex() + 1} of $totalPatchFiles applied" + setCurrentPatchIndex(getCurrentPatchIndex() + 1) + notifyInfo(notificationTitle, notificationMessage, project) + if (getCurrentPatchIndex() == totalPatchFiles) { + codeTransformChatHelper?.updateLastPendingMessage( + CodeTransformChatMessageContent(type = CodeTransformChatMessageType.PendingAnswer, message = message) + ) + } else { + codeTransformChatHelper?.updateLastPendingMessage( + CodeTransformChatMessageContent( + type = CodeTransformChatMessageType.PendingAnswer, + message = message, + buttons = listOf( + createViewDiffButton("View diff ${getCurrentPatchIndex() + 1}/$totalPatchFiles"), + viewSummaryButton + ) + ) + ) + } + } else { + codeTransformChatHelper?.addNewMessage(buildStartNewTransformFollowup()) + } + } } else { telemetry.viewArtifact(CodeTransformArtifactType.ClientInstructions, jobId, "Cancel", source) } @@ -388,6 +471,12 @@ class ArtifactHandler(private val project: Project, private val clientAdaptor: G fun getSummary(job: JobId) = downloadedSummaries[job] + private fun getCurrentPatchIndex() = sharedPatchIndex + + private fun setCurrentPatchIndex(index: Int) { + sharedPatchIndex = index + } + private fun showSummaryFromFile(summaryFile: File) { val summaryMarkdownVirtualFile = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(summaryFile) if (summaryMarkdownVirtualFile != null) { diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt index 5fe7d6fc192..4552cde1037 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt @@ -576,12 +576,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) @@ -638,7 +632,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo message("codemodernizer.notification.info.modernize_partial_complete.title"), message("codemodernizer.notification.info.modernize_partial_complete.content", result.targetJavaVersion.description), project, - listOf(displayDiffNotificationAction(result.jobId), displaySummaryNotificationAction(result.jobId), displayFeedbackNotificationAction()), + listOf(displaySummaryNotificationAction(result.jobId), displayFeedbackNotificationAction()), ) jobId = result.jobId } @@ -648,7 +642,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo message("codemodernizer.notification.info.modernize_complete.title"), message("codemodernizer.notification.info.modernize_complete.content"), project, - listOf(displayDiffNotificationAction(result.jobId), displaySummaryNotificationAction(result.jobId)), + listOf(displaySummaryNotificationAction(result.jobId)), ) jobId = result.jobId } diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerSession.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerSession.kt index 26ffb69b188..0e9d3b1ebc2 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerSession.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerSession.kt @@ -63,6 +63,8 @@ import java.util.concurrent.atomic.AtomicBoolean import javax.net.ssl.SSLHandshakeException const val MAX_ZIP_SIZE = 2000000000 // 2GB +const val EXPLAINABILITY_V1 = "EXPLAINABILITY_V1" +const val SELECTIVE_TRANSFORMATION_V1 = "SELECTIVE_TRANSFORMATION_V1" // constants for handling SDKClientException const val CONNECTION_REFUSED_ERROR: String = "Connection refused" diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformChatApp.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformChatApp.kt index e39c12c908b..22e0a1a2dd1 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformChatApp.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformChatApp.kt @@ -39,6 +39,7 @@ private enum class CodeTransformMessageTypes(val type: String) { CodeTransformStop("codetransform-stop"), CodeTransformCancel("codetransform-cancel"), CodeTransformConfirmSkipTests("codetransform-confirm-skip-tests"), + CodeTransformConfirmOneOrMultipleDiffs("codetransform-confirm-one-or-multiple-diffs"), CodeTransformNew("codetransform-new"), CodeTransformOpenTransformHub("codetransform-open-transform-hub"), CodeTransformOpenMvnBuild("codetransform-open-mvn-build"), @@ -72,6 +73,7 @@ class CodeTransformChatApp : AmazonQApp { CodeTransformMessageTypes.CodeTransformCancel.type to IncomingCodeTransformMessage.CodeTransformCancel::class, CodeTransformMessageTypes.ChatPrompt.type to IncomingCodeTransformMessage.ChatPrompt::class, CodeTransformMessageTypes.CodeTransformConfirmSkipTests.type to IncomingCodeTransformMessage.CodeTransformConfirmSkipTests::class, + CodeTransformMessageTypes.CodeTransformConfirmOneOrMultipleDiffs.type to IncomingCodeTransformMessage.CodeTransformConfirmOneOrMultipleDiffs::class, CodeTransformMessageTypes.CodeTransformNew.type to IncomingCodeTransformMessage.CodeTransformNew::class, CodeTransformMessageTypes.CodeTransformOpenTransformHub.type to IncomingCodeTransformMessage.CodeTransformOpenTransformHub::class, CodeTransformMessageTypes.CodeTransformOpenMvnBuild.type to IncomingCodeTransformMessage.CodeTransformOpenMvnBuild::class, @@ -166,6 +168,7 @@ class CodeTransformChatApp : AmazonQApp { is IncomingCodeTransformMessage.CodeTransformStop -> inboundAppMessagesHandler.processCodeTransformStopAction(message.tabId) is IncomingCodeTransformMessage.ChatPrompt -> inboundAppMessagesHandler.processChatPromptMessage(message) is IncomingCodeTransformMessage.CodeTransformConfirmSkipTests -> inboundAppMessagesHandler.processCodeTransformConfirmSkipTests(message) + is IncomingCodeTransformMessage.CodeTransformConfirmOneOrMultipleDiffs -> inboundAppMessagesHandler.processCodeTransformOneOrMultipleDiffs(message) is IncomingCodeTransformMessage.CodeTransformNew -> inboundAppMessagesHandler.processCodeTransformNewAction(message) is IncomingCodeTransformMessage.CodeTransformOpenTransformHub -> inboundAppMessagesHandler.processCodeTransformOpenTransformHub(message) is IncomingCodeTransformMessage.CodeTransformOpenMvnBuild -> inboundAppMessagesHandler.processCodeTransformOpenMvnBuild(message) diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/InboundAppMessagesHandler.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/InboundAppMessagesHandler.kt index 0b65db328c2..1312328243e 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/InboundAppMessagesHandler.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/InboundAppMessagesHandler.kt @@ -23,6 +23,8 @@ interface InboundAppMessagesHandler { suspend fun processCodeTransformConfirmSkipTests(message: IncomingCodeTransformMessage.CodeTransformConfirmSkipTests) + suspend fun processCodeTransformOneOrMultipleDiffs(message: IncomingCodeTransformMessage.CodeTransformConfirmOneOrMultipleDiffs) + suspend fun processCodeTransformOpenTransformHub(message: IncomingCodeTransformMessage.CodeTransformOpenTransformHub) suspend fun processCodeTransformOpenMvnBuild(message: IncomingCodeTransformMessage.CodeTransformOpenMvnBuild) diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/client/GumbyClient.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/client/GumbyClient.kt index c4378c9077f..2a92dc33d04 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/client/GumbyClient.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/client/GumbyClient.kt @@ -222,7 +222,7 @@ class GumbyClient(private val project: Project) { it.timestamp(Instant.now()) it.ideCategory(IdeCategory.JETBRAINS) it.programmingLanguage { language -> - language.languageName(metrics.programmingLanguage) + language.languageName(metrics.programmingLanguage?.lowercase()) } it.linesOfCodeChanged(metrics.linesOfCodeChanged) it.charsOfCodeChanged(metrics.charactersOfCodeChanged) diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt index ac2d4d8bfc3..8a8358c41b6 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt @@ -71,6 +71,13 @@ private val confirmSkipTestsSelectionButton = Button( id = CodeTransformButtonId.ConfirmSkipTests.id, ) +private val confirmOneOrMultipleDiffsSelectionButton = Button( + keepCardAfterClick = false, + waitMandatoryFormItems = true, + text = message("codemodernizer.chat.message.button.confirm"), + id = CodeTransformButtonId.ConfirmOneOrMultipleDiffs.id, +) + private val openMvnBuildButton = Button( id = CodeTransformButtonId.OpenMvnBuild.id, text = message("codemodernizer.chat.message.button.view_build"), @@ -95,7 +102,13 @@ private val viewDiffButton = Button( keepCardAfterClick = true, ) -private val viewSummaryButton = Button( +fun createViewDiffButton(buttonLabel: String): Button = Button( + id = CodeTransformButtonId.ViewDiff.id, + text = buttonLabel, + keepCardAfterClick = true +) + +val viewSummaryButton = Button( id = CodeTransformButtonId.ViewSummary.id, text = message("codemodernizer.chat.message.button.view_summary"), keepCardAfterClick = true, @@ -197,6 +210,22 @@ private val selectSkipTestsFlagFormItem = FormItem( ) ) +private val selectOneOrMultipleDiffsFlagFormItem = FormItem( + id = CodeTransformFormItemId.SelectOneOrMultipleDiffsFlag.id, + title = message("codemodernizer.chat.form.user_selection.item.choose_one_or_multiple_diffs_option"), + mandatory = true, + options = listOf( + FormItemOption( + label = message("codemodernizer.chat.message.one_or_multiple_diffs_form.one_diff"), + value = message("codemodernizer.chat.message.one_or_multiple_diffs_form.one_diff"), + ), + FormItemOption( + label = message("codemodernizer.chat.message.one_or_multiple_diffs_form.multiple_diffs"), + value = message("codemodernizer.chat.message.one_or_multiple_diffs_form.multiple_diffs"), + ) + ) +) + private fun getUserLanguageUpgradeSelectionFormattedMarkdown(moduleName: String): String = """ ### ${message("codemodernizer.chat.prompt.title.details")} ------------- @@ -289,12 +318,32 @@ fun buildUserInputSkipTestsFlagChatContent(): CodeTransformChatMessageContent = formItems = listOf(selectSkipTestsFlagFormItem), type = CodeTransformChatMessageType.FinalizedAnswer, ) +fun buildUserInputOneOrMultipleDiffsChatIntroContent(): CodeTransformChatMessageContent = + CodeTransformChatMessageContent( + message = message("codemodernizer.chat.message.one_or_multiple_diffs"), + type = CodeTransformChatMessageType.FinalizedAnswer, + ) +fun buildUserInputOneOrMultipleDiffsFlagChatContent(): CodeTransformChatMessageContent = + CodeTransformChatMessageContent( + message = message("codemodernizer.chat.form.user_selection.title"), + buttons = listOf( + confirmOneOrMultipleDiffsSelectionButton, + cancelUserSelectionButton, + ), + formItems = listOf(selectOneOrMultipleDiffsFlagFormItem), + type = CodeTransformChatMessageType.FinalizedAnswer, + ) fun buildUserSkipTestsFlagSelectionChatContent(skipTestsSelection: String) = CodeTransformChatMessageContent( type = CodeTransformChatMessageType.FinalizedAnswer, message = message("codemodernizer.chat.message.skip_tests_form.response", skipTestsSelection.lowercase()) ) +fun buildUserOneOrMultipleDiffsSelectionChatContent(oneOrMultipleDiffsSelection: String) = CodeTransformChatMessageContent( + type = CodeTransformChatMessageType.FinalizedAnswer, + message = message("codemodernizer.chat.message.one_or_multiple_diffs_form.response", oneOrMultipleDiffsSelection.lowercase()) +) + fun buildUserInputLanguageUpgradeChatContent(project: Project, validationResult: ValidationResult): CodeTransformChatMessageContent { val moduleBuildFiles = validationResult.validatedBuildFiles @@ -488,7 +537,7 @@ fun buildTransformResumingChatContent() = CodeTransformChatMessageContent( type = CodeTransformChatMessageType.PendingAnswer, ) -fun buildTransformResultChatContent(result: CodeModernizerJobCompletedResult): CodeTransformChatMessageContent { +fun buildTransformResultChatContent(result: CodeModernizerJobCompletedResult, totalPatchFiles: Int): CodeTransformChatMessageContent { val resultMessage = when (result) { is CodeModernizerJobCompletedResult.JobAbortedZipTooLarge -> { "${message( @@ -502,10 +551,18 @@ fun buildTransformResultChatContent(result: CodeModernizerJobCompletedResult): C buildZipUploadFailedChatMessage(result.failureReason) } is CodeModernizerJobCompletedResult.JobCompletedSuccessfully -> { - message("codemodernizer.chat.message.result.success") + if (totalPatchFiles == 1) { + message("codemodernizer.chat.message.result.success") + } else { + message("codemodernizer.chat.message.result.success.multiple_diffs") + } } is CodeModernizerJobCompletedResult.JobPartiallySucceeded -> { - message("codemodernizer.chat.message.result.partially_success") + if (totalPatchFiles == 1) { + message("codemodernizer.chat.message.result.partially_success") + } else { + message("codemodernizer.chat.message.result.partially_success.multiple_diffs") + } } is CodeModernizerJobCompletedResult.JobFailed -> { message("codemodernizer.chat.message.result.fail_with_known_reason", result.failureReason) @@ -532,7 +589,7 @@ fun buildTransformResultChatContent(result: CodeModernizerJobCompletedResult): C type = CodeTransformChatMessageType.FinalizedAnswer, message = resultMessage, buttons = if (result is CodeModernizerJobCompletedResult.JobPartiallySucceeded || result is CodeModernizerJobCompletedResult.JobCompletedSuccessfully) { - listOf(viewDiffButton, viewSummaryButton) + listOf(createViewDiffButton(if (totalPatchFiles == 1) "View diff" else "View diff 1/$totalPatchFiles"), viewSummaryButton) } else if (result is CodeModernizerJobCompletedResult.JobFailedInitialBuild && result.hasBuildLog) { listOf(viewBuildLog) } else { diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt index b3905c14f3c..5edbe1d465e 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt @@ -14,6 +14,7 @@ import com.intellij.openapi.vfs.VirtualFile import kotlinx.coroutines.delay import kotlinx.coroutines.runBlocking import kotlinx.coroutines.withContext +import software.amazon.awssdk.services.codewhispererstreaming.model.TransformationDownloadArtifactType import software.aws.toolkits.core.utils.debug import software.aws.toolkits.core.utils.error import software.aws.toolkits.core.utils.getLogger @@ -25,8 +26,10 @@ import software.aws.toolkits.jetbrains.services.amazonq.auth.AuthFollowUpType import software.aws.toolkits.jetbrains.services.codemodernizer.ArtifactHandler import software.aws.toolkits.jetbrains.services.codemodernizer.CodeModernizerManager import software.aws.toolkits.jetbrains.services.codemodernizer.CodeTransformTelemetryManager +import software.aws.toolkits.jetbrains.services.codemodernizer.EXPLAINABILITY_V1 import software.aws.toolkits.jetbrains.services.codemodernizer.HilTelemetryMetaData import software.aws.toolkits.jetbrains.services.codemodernizer.InboundAppMessagesHandler +import software.aws.toolkits.jetbrains.services.codemodernizer.SELECTIVE_TRANSFORMATION_V1 import software.aws.toolkits.jetbrains.services.codemodernizer.client.GumbyClient import software.aws.toolkits.jetbrains.services.codemodernizer.commands.CodeTransformActionMessage import software.aws.toolkits.jetbrains.services.codemodernizer.commands.CodeTransformCommand @@ -67,10 +70,13 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildTr 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.buildUserInputLanguageUpgradeChatContent +import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserInputOneOrMultipleDiffsChatIntroContent +import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserInputOneOrMultipleDiffsFlagChatContent import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserInputSQLConversionMetadataChatContent import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserInputSkipTestsFlagChatContent import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserInputSkipTestsFlagChatIntroContent import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserLanguageUpgradeSelectionSummaryChatContent +import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserOneOrMultipleDiffsSelectionChatContent import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserSQLConversionSelectionSummaryChatContent import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserSkipTestsFlagSelectionChatContent import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserStopTransformChatContent @@ -78,10 +84,12 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.messages.Authenti import software.aws.toolkits.jetbrains.services.codemodernizer.messages.CodeTransformChatMessage 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 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerJobCompletedResult import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeTransformHilDownloadArtifact import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeTransformType import software.aws.toolkits.jetbrains.services.codemodernizer.model.CustomerSelection +import software.aws.toolkits.jetbrains.services.codemodernizer.model.DownloadArtifactResult import software.aws.toolkits.jetbrains.services.codemodernizer.model.DownloadFailureReason import software.aws.toolkits.jetbrains.services.codemodernizer.model.JobId import software.aws.toolkits.jetbrains.services.codemodernizer.model.MAVEN_BUILD_RUN_UNIT_TESTS @@ -111,9 +119,9 @@ class CodeTransformChatController( ) : InboundAppMessagesHandler { private val authController = AuthController() private val messagePublisher = context.messagesFromAppToUi - private val codeModernizerManager = CodeModernizerManager.getInstance(context.project) private val codeTransformChatHelper = CodeTransformChatHelper(context.messagesFromAppToUi, chatSessionStorage) - private val artifactHandler = ArtifactHandler(context.project, GumbyClient.getInstance(context.project)) + private val codeModernizerManager = CodeModernizerManager.getInstance(context.project) + private val artifactHandler = ArtifactHandler(context.project, GumbyClient.getInstance(context.project), codeTransformChatHelper) private val telemetry = CodeTransformTelemetryManager.getInstance(context.project) override suspend fun processChatPromptMessage(message: IncomingCodeTransformMessage.ChatPrompt) { @@ -370,10 +378,37 @@ class CodeTransformChatController( message("codemodernizer.chat.message.skip_tests_form.skip") -> MAVEN_BUILD_SKIP_UNIT_TESTS else -> MAVEN_BUILD_RUN_UNIT_TESTS } + // feature flag for Selective Transformation + val isSelectiveTransformationReady = false codeTransformChatHelper.addNewMessage(buildUserSkipTestsFlagSelectionChatContent(message.skipTestsSelection)) - codeTransformChatHelper.addNewMessage(buildCompileLocalInProgressChatContent()) codeModernizerManager.codeTransformationSession?.let { it.sessionContext.customBuildCommand = customBuildCommand + if (!isSelectiveTransformationReady) { + codeModernizerManager.runLocalMavenBuild(context.project, it) + } + } + if (isSelectiveTransformationReady) { + codeTransformChatHelper.run { + addNewMessage(buildUserInputOneOrMultipleDiffsChatIntroContent()) + addNewMessage(buildUserInputOneOrMultipleDiffsFlagChatContent()) + } + } + } + + override suspend fun processCodeTransformOneOrMultipleDiffs(message: IncomingCodeTransformMessage.CodeTransformConfirmOneOrMultipleDiffs) { + val transformCapabilities = when (message.oneOrMultipleDiffsSelection) { + message("codemodernizer.chat.message.one_or_multiple_diffs_form.multiple_diffs") -> listOf( + EXPLAINABILITY_V1, + SELECTIVE_TRANSFORMATION_V1 + ) + else -> listOf( + EXPLAINABILITY_V1 + ) + } + codeTransformChatHelper.addNewMessage(buildUserOneOrMultipleDiffsSelectionChatContent(message.oneOrMultipleDiffsSelection)) + codeTransformChatHelper.addNewMessage(buildCompileLocalInProgressChatContent()) + codeModernizerManager.codeTransformationSession?.let { + it.sessionContext.transformCapabilities = transformCapabilities codeModernizerManager.runLocalMavenBuild(context.project, it) } } @@ -644,10 +679,22 @@ class CodeTransformChatController( if (result is CodeModernizerJobCompletedResult.ZipUploadFailed && result.failureReason is UploadFailureReason.CREDENTIALS_EXPIRED) { return } else { - codeTransformChatHelper.updateLastPendingMessage( - buildTransformResultChatContent(result) + val downloadResult = artifactHandler.downloadArtifact( + CodeModernizerSessionState.getInstance(context.project).currentJobId as JobId, + TransformationDownloadArtifactType.CLIENT_INSTRUCTIONS ) - codeTransformChatHelper.addNewMessage(buildStartNewTransformFollowup()) + when (downloadResult) { + is DownloadArtifactResult.Success -> { + if (downloadResult.artifact !is CodeModernizerArtifact) return artifactHandler.notifyUnableToApplyPatch("") + codeTransformChatHelper.updateLastPendingMessage( + buildTransformResultChatContent(result, downloadResult.artifact.patches.size) + ) + } + is DownloadArtifactResult.DownloadFailure -> artifactHandler.notifyUnableToDownload(downloadResult.failureReason) + is DownloadArtifactResult.ParseZipFailure -> artifactHandler.notifyUnableToApplyPatch(downloadResult.failureReason.errorMessage) + is DownloadArtifactResult.Skipped -> {} + is DownloadArtifactResult.UnzipFailure -> artifactHandler.notifyUnableToApplyPatch(downloadResult.failureReason.errorMessage) + } } } } diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/messages/CodeTransformMessage.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/messages/CodeTransformMessage.kt index 14cc6dc8014..96ca9db9cdd 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/messages/CodeTransformMessage.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/messages/CodeTransformMessage.kt @@ -21,6 +21,7 @@ enum class CodeTransformButtonId(val id: String) { SelectSQLModuleSchema("codetransform-input-select-sql-module-schema"), CancelTransformation("codetransform-input-cancel"), ConfirmSkipTests("codetransform-input-confirm-skip-tests"), + ConfirmOneOrMultipleDiffs("codetransform-input-confirm-one-or-multiple-diffs"), StopTransformation("stop_transform"), OpenTransformationHub("open_transformation_hub"), OpenMvnBuild("open_mvn_build"), @@ -37,6 +38,7 @@ enum class CodeTransformFormItemId(val id: String) { SelectSQLSchema("sqlSchema"), SelectTargetVersion("targetVersion"), SelectSkipTestsFlag("skipTestsSelection"), + SelectOneOrMultipleDiffsFlag("oneOrMultipleDiffsSelection"), DependencyVersion("dependencyVersion"), } @@ -106,6 +108,11 @@ sealed interface IncomingCodeTransformMessage : CodeTransformBaseMessage { val skipTestsSelection: String, ) : IncomingCodeTransformMessage + data class CodeTransformConfirmOneOrMultipleDiffs( + @JsonProperty("tabID") val tabId: String, + val oneOrMultipleDiffsSelection: String, + ) : IncomingCodeTransformMessage + data class CodeTransformOpenMvnBuild( @JsonProperty("tabID") val tabId: String, ) : IncomingCodeTransformMessage diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerArtifact.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerArtifact.kt index 8065baa06f4..2896ba41127 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerArtifact.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerArtifact.kt @@ -30,13 +30,12 @@ import kotlin.io.path.walk open class CodeModernizerArtifact( val zipPath: String, val manifest: CodeModernizerManifest, - private val patches: List, + val patches: List, + val description: List?, val summary: TransformationSummary, val summaryMarkdownFile: File, val metrics: CodeModernizerMetrics?, ) : CodeTransformDownloadArtifact { - val patch: VirtualFile - get() = patches.first() companion object { private const val MAX_SUPPORTED_VERSION = 1.0 @@ -64,12 +63,12 @@ open class CodeModernizerArtifact( // If not supported we can still try to use it, i.e. the versions should largely be backwards compatible LOG.warn { "Unsupported manifest.json version: ${manifest.version}" } } - val patches = extractPatches(manifest) + val description = loadDescription(manifest) + val patches = extractPatches(manifest, description) val summary = extractSummary(manifest) val summaryMarkdownFile = getSummaryFile(manifest) val metrics = loadMetrics(manifest) - if (patches.size != 1) throw RuntimeException("Expected 1 patch, but found ${patches.size}") - return CodeModernizerArtifact(zipPath, manifest, patches, summary, summaryMarkdownFile, metrics) + return CodeModernizerArtifact(zipPath, manifest, patches, description, summary, summaryMarkdownFile, metrics) } throw RuntimeException("Could not find artifact") } @@ -118,16 +117,53 @@ open class CodeModernizerArtifact( } } + private fun extractPatches(manifest: CodeModernizerManifest, description: List?): List { + if (description == null) { + return extractSinglePatch(manifest) + } + val fileSystem = LocalFileSystem.getInstance() + val patchesDir = tempDir.toPath().resolve(manifest.patchesRoot) + if (!patchesDir.isDirectory()) { + error("Expected root for patches was not a directory.") + } + return description.map { patchInfo -> + val patchFile = patchesDir.resolve(patchInfo.filename) + if (patchFile.toFile().exists()) { + fileSystem.findFileByNioFile(patchFile) + ?: error("Could not find patch: ${patchInfo.filename}") + } else { + error("Patch file not found: ${patchInfo.filename}") + } + } + } + @OptIn(ExperimentalPathApi::class) - private fun extractPatches(manifest: CodeModernizerManifest): List { + private fun extractSinglePatch(manifest: CodeModernizerManifest): List { val fileSystem = LocalFileSystem.getInstance() val patchesDir = tempDir.toPath().resolve(manifest.patchesRoot) if (!patchesDir.isDirectory()) { throw RuntimeException("Expected root for patches was not a directory.") } return patchesDir.walk() - .map { fileSystem.refreshAndFindFileByNioFile(it) ?: throw RuntimeException("Could not find patch") } + .map { fileSystem.refreshAndFindFileByNioFile(it) ?: throw RuntimeException("Could not find diff.patch") } .toList() } + + private fun loadDescription(manifest: CodeModernizerManifest): List? { + val patchesDir = tempDir.toPath().resolve(manifest.patchesRoot).toFile() + if (!patchesDir.isDirectory) { + throw RuntimeException("Expected root for patches was not a directory.") + } + + val descriptionFile = patchesDir.listFiles() + ?.firstOrNull { it.name.endsWith(".json") } + + if (descriptionFile == null) { + // No JSON description file found, return null + return null + } + val descriptionContent: DescriptionContent = MAPPER.readValue(descriptionFile) + return descriptionContent.content + } } } diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerManifest.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerManifest.kt index be4bc0303ac..1b8bcbbd1d3 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerManifest.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerManifest.kt @@ -7,3 +7,9 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties @JsonIgnoreProperties(ignoreUnknown = true) data class CodeModernizerManifest(val version: Float, val patchesRoot: String, val artifactsRoot: String, val summaryRoot: String, val metricsRoot: String) + +@JsonIgnoreProperties(ignoreUnknown = true) +data class PatchInfo(val name: String, val filename: String, val isSuccessful: Boolean) + +@JsonIgnoreProperties(ignoreUnknown = true) +data class DescriptionContent(val content: List) diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerSessionContext.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerSessionContext.kt index 24d940d525a..bd75a61c4fc 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerSessionContext.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerSessionContext.kt @@ -16,6 +16,7 @@ import software.aws.toolkits.core.utils.error import software.aws.toolkits.core.utils.getLogger import software.aws.toolkits.core.utils.info import software.aws.toolkits.core.utils.putNextEntry +import software.aws.toolkits.jetbrains.services.codemodernizer.EXPLAINABILITY_V1 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.HIL_DEPENDENCIES_ROOT_NAME import software.aws.toolkits.jetbrains.services.codemodernizer.constants.HIL_MANIFEST_FILE_NAME import software.aws.toolkits.jetbrains.services.codemodernizer.ideMaven.runDependencyReportCommands @@ -63,6 +64,7 @@ data class CodeModernizerSessionContext( var configurationFile: VirtualFile? = null, // used to ZIP module val sourceJavaVersion: JavaSdkVersion, // always needed for startJob API val targetJavaVersion: JavaSdkVersion = JavaSdkVersion.JDK_17, // only one supported + var transformCapabilities: List = listOf(EXPLAINABILITY_V1), var customBuildCommand: String = MAVEN_BUILD_RUN_UNIT_TESTS, // run unit tests by default val sourceVendor: String = ORACLE_DB, // only one supported val targetVendor: String? = null, @@ -218,7 +220,7 @@ data class CodeModernizerSessionContext( val depSources = File(ZIP_DEPENDENCIES_PATH) val outputFile = createTemporaryZipFile { zip -> // 1) Manifest file - var manifest = ZipManifest(customBuildCommand = customBuildCommand) + var manifest = ZipManifest(transformCapabilities = transformCapabilities, customBuildCommand = customBuildCommand) if (sqlMetadataZip != null) { // doing a SQL conversion, not language upgrade val sctFileName = sqlMetadataZip.listFiles { file -> file.name.endsWith(".sct") }.first().name diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/panels/managers/CodeModernizerBottomWindowPanelManager.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/panels/managers/CodeModernizerBottomWindowPanelManager.kt index b07e00987bf..52460512c97 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/panels/managers/CodeModernizerBottomWindowPanelManager.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/panels/managers/CodeModernizerBottomWindowPanelManager.kt @@ -208,7 +208,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() @@ -270,8 +269,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() { diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/state/CodeModernizerState.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/state/CodeModernizerState.kt index 9a109308684..9c4f4727962 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/state/CodeModernizerState.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/state/CodeModernizerState.kt @@ -7,6 +7,7 @@ import com.intellij.openapi.components.BaseState import com.intellij.openapi.project.Project import com.intellij.openapi.projectRoots.JavaSdkVersion import com.intellij.util.xmlb.annotations.Property +import software.aws.toolkits.jetbrains.services.codemodernizer.EXPLAINABILITY_V1 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerSessionContext import software.aws.toolkits.jetbrains.services.codemodernizer.model.JobId import software.aws.toolkits.jetbrains.services.codemodernizer.model.MAVEN_BUILD_RUN_UNIT_TESTS @@ -17,6 +18,7 @@ enum class JobDetails { CONFIGURATION_FILE_PATH, TARGET_JAVA_VERSION, SOURCE_JAVA_VERSION, + TRANSFORM_CAPABILITIES, CUSTOM_BUILD_COMMAND, } @@ -31,6 +33,7 @@ fun buildState(context: CodeModernizerSessionContext, isJobOngoing: Boolean, job JobDetails.CONFIGURATION_FILE_PATH to (context.configurationFile?.path ?: error("No configuration file store in the state")), JobDetails.TARGET_JAVA_VERSION to context.targetJavaVersion.description, JobDetails.SOURCE_JAVA_VERSION to context.sourceJavaVersion.description, + JobDetails.TRANSFORM_CAPABILITIES to context.transformCapabilities.toString(), JobDetails.CUSTOM_BUILD_COMMAND to context.customBuildCommand ) ) @@ -64,6 +67,7 @@ class CodeModernizerState : BaseState() { configurationFile, sourceJavaSdkVersion, targetJavaSdkVersion, + listOf(EXPLAINABILITY_V1), // default to one diff lastJobContext[JobDetails.CUSTOM_BUILD_COMMAND] ?: MAVEN_BUILD_RUN_UNIT_TESTS // default to running unit tests ) } diff --git a/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/diffPatchOutput.json b/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/diffPatchOutput.json new file mode 100644 index 00000000000..5420780a66d --- /dev/null +++ b/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/diffPatchOutput.json @@ -0,0 +1 @@ +{"content":[{"filename":"min_jdk_upgrade.patch","isSuccessful":false,"name":"Prepare minimal upgrade to Java 17"},{"filename":"popular_enterprise_application_framework.patch","isSuccessful":false,"name":"Popular Enterprise Specifications and Application Frameworks upgrade"},{"filename":"testing_tool.patch","isSuccessful":false,"name":"Testing Tools and Frameworks upgrade"},{"filename":"update_deprecated_api.patch","isSuccessful":false,"name":"Upgrade Deprecated API"}]} \ No newline at end of file diff --git a/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/min_jdk_upgrade.patch b/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/min_jdk_upgrade.patch new file mode 100644 index 00000000000..ac831101232 --- /dev/null +++ b/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/min_jdk_upgrade.patch @@ -0,0 +1,161 @@ +diff --git a/pom.xml b/pom.xml +index bb3a51a..ff20499 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -5,24 +5,32 @@ + download-server + 0.0.1-SNAPSHOT + ++ 17 + UTF-8 + 4.1.1.RELEASE + + + org.springframework.boot + spring-boot-starter-parent +- 1.2.3.RELEASE ++ 3.3.5 + + ++ ++ ++ ++ org.codehaus.groovy ++ groovy-all ++ 2.4.16 ++ ++ ++ + + + + org.apache.maven.plugins + maven-compiler-plugin +- 3.0 + +- 1.8 +- 1.8 ++ ${java.version} + + + +@@ -48,7 +56,7 @@ + + org.springframework + spring-test +- 4.1.6.RELEASE ++ 6.1.15 + test + + +@@ -71,22 +79,18 @@ + + commons-codec + commons-codec +- 1.10 + + + org.springframework.boot + spring-boot-starter-web +- 1.2.3.RELEASE + + + org.springframework.boot + spring-boot-starter-actuator +- 1.2.3.RELEASE + + + org.springframework.boot + spring-boot-starter-test +- 1.2.3.RELEASE + + + org.springframework +@@ -100,6 +104,12 @@ + spock-core + 1.0-groovy-2.4 + test ++ ++ ++ junit ++ junit ++ ++ + + + com.google.guava +@@ -114,53 +124,46 @@ + + org.springframework + spring-beans +- 4.1.6.RELEASE ++ 6.1.15 + + + org.springframework + spring-context +- 4.1.6.RELEASE ++ 6.1.15 + + + org.springframework + spring-context-support +- 4.1.6.RELEASE ++ 6.1.15 + + + org.springframework + spring-webmvc +- 4.1.6.RELEASE ++ 6.1.15 + + + org.springframework + spring-web +- 4.1.6.RELEASE ++ 6.1.15 + + + org.springframework + spring-aop +- 4.1.6.RELEASE ++ 6.1.15 + + + org.springframework + spring-core +- 4.1.6.RELEASE ++ 6.1.15 + + + org.springframework + spring-expression +- 4.1.6.RELEASE +- +- +- org.springframework +- spring-test +- 4.1.6.RELEASE +- test ++ 6.1.15 + + + org.codehaus.groovy + groovy-all +- 2.4.3 + + + +diff --git a/src/main/java/com/nurkiewicz/download/MainApplication.java b/src/main/java/com/nurkiewicz/download/MainApplication.java +index 3bccd44..fe10ce1 100644 +--- a/src/main/java/com/nurkiewicz/download/MainApplication.java ++++ b/src/main/java/com/nurkiewicz/download/MainApplication.java +@@ -7,7 +7,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; + class MainApplication { + + public static void main(String[] args) { +- Integer temp = new Integer("1234"); ++ Integer temp = Integer.valueOf("1234"); + SpringApplication.run(MainApplication.class, args); + } + } diff --git a/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/multiple-diff.zip b/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/multiple-diff.zip new file mode 100644 index 00000000000..61d3e4bb60f Binary files /dev/null and b/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/multiple-diff.zip differ diff --git a/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/popular_enterprise_application_framework.patch b/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/popular_enterprise_application_framework.patch new file mode 100644 index 00000000000..3290286ea4e --- /dev/null +++ b/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/popular_enterprise_application_framework.patch @@ -0,0 +1,15 @@ +diff --git a/src/test/java/org/springframework/web/filter/Sha512ShallowEtagHeaderFilter.java b/src/test/java/org/springframework/web/filter/Sha512ShallowEtagHeaderFilter.java +index 50b2c90..8e9b1f8 100644 +--- a/src/test/java/org/springframework/web/filter/Sha512ShallowEtagHeaderFilter.java ++++ b/src/test/java/org/springframework/web/filter/Sha512ShallowEtagHeaderFilter.java +@@ -5,9 +5,9 @@ import com.google.common.hash.Hashing; + + public class Sha512ShallowEtagHeaderFilter extends ShallowEtagHeaderFilter { + +- @Override + protected String generateETagHeaderValue(byte[] bytes) { + final HashCode hash = Hashing.sha512().hashBytes(bytes); + return "\"" + hash + "\""; + } + } ++ diff --git a/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/testing_tool.patch b/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/testing_tool.patch new file mode 100644 index 00000000000..4dd31fefc73 --- /dev/null +++ b/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/testing_tool.patch @@ -0,0 +1,838 @@ +diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties +index f95f1ee..20c678d 100644 +--- a/.mvn/wrapper/maven-wrapper.properties ++++ b/.mvn/wrapper/maven-wrapper.properties +@@ -16,4 +16,5 @@ + # under the License. + wrapperVersion=3.3.2 + distributionType=only-script +-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip ++distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip ++distributionSha256Sum=7822eb593d29558d8edf87845a2c47e36e2a89d17a84cd2390824633214ed423 +diff --git a/mvnw b/mvnw +old mode 100644 +new mode 100755 +index 19529dd..5e9618c +--- a/mvnw ++++ b/mvnw +@@ -21,239 +21,312 @@ + # ---------------------------------------------------------------------------- + # Apache Maven Wrapper startup batch script, version 3.3.2 + # ++# Required ENV vars: ++# ------------------ ++# JAVA_HOME - location of a JDK home dir ++# + # Optional ENV vars + # ----------------- +-# JAVA_HOME - location of a JDK home dir, required when download maven via java source +-# MVNW_REPOURL - repo url base for downloading maven distribution +-# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +-# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output ++# MAVEN_OPTS - parameters passed to the Java VM when running Maven ++# e.g. to debug Maven itself, use ++# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 ++# MAVEN_SKIP_RC - flag to disable loading of mavenrc files + # ---------------------------------------------------------------------------- + +-set -euf +-[ "${MVNW_VERBOSE-}" != debug ] || set -x ++if [ -z "$MAVEN_SKIP_RC" ]; then ++ ++ if [ -f /usr/local/etc/mavenrc ]; then ++ . /usr/local/etc/mavenrc ++ fi ++ ++ if [ -f /etc/mavenrc ]; then ++ . /etc/mavenrc ++ fi + +-# OS specific support. +-native_path() { printf %s\\n "$1"; } ++ if [ -f "$HOME/.mavenrc" ]; then ++ . "$HOME/.mavenrc" ++ fi ++ ++fi ++ ++# OS specific support. $var _must_ be set to either true or false. ++cygwin=false ++darwin=false ++mingw=false + case "$(uname)" in +-CYGWIN* | MINGW*) +- [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" +- native_path() { cygpath --path --windows "$1"; } ++CYGWIN*) cygwin=true ;; ++MINGW*) mingw=true ;; ++Darwin*) ++ darwin=true ++ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home ++ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html ++ if [ -z "$JAVA_HOME" ]; then ++ if [ -x "/usr/libexec/java_home" ]; then ++ JAVA_HOME="$(/usr/libexec/java_home)" ++ export JAVA_HOME ++ else ++ JAVA_HOME="/Library/Java/Home" ++ export JAVA_HOME ++ fi ++ fi + ;; + esac + +-# set JAVACMD and JAVACCMD +-set_java_home() { +- # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched +- if [ -n "${JAVA_HOME-}" ]; then ++if [ -z "$JAVA_HOME" ]; then ++ if [ -r /etc/gentoo-release ]; then ++ JAVA_HOME=$(java-config --jre-home) ++ fi ++fi ++ ++# For Cygwin, ensure paths are in UNIX format before anything is touched ++if $cygwin; then ++ [ -n "$JAVA_HOME" ] \ ++ && JAVA_HOME=$(cygpath --unix "$JAVA_HOME") ++ [ -n "$CLASSPATH" ] \ ++ && CLASSPATH=$(cygpath --path --unix "$CLASSPATH") ++fi ++ ++# For Mingw, ensure paths are in UNIX format before anything is touched ++if $mingw; then ++ [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] \ ++ && JAVA_HOME="$( ++ cd "$JAVA_HOME" || ( ++ echo "cannot cd into $JAVA_HOME." >&2 ++ exit 1 ++ ) ++ pwd ++ )" ++fi ++ ++if [ -z "$JAVA_HOME" ]; then ++ javaExecutable="$(which javac)" ++ if [ -n "$javaExecutable" ] && ! [ "$(expr "$javaExecutable" : '\([^ ]*\)')" = "no" ]; then ++ # readlink(1) is not available as standard on Solaris 10. ++ readLink=$(which readlink) ++ if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then ++ if $darwin; then ++ javaHome="$(dirname "$javaExecutable")" ++ javaExecutable="$(cd "$javaHome" && pwd -P)/javac" ++ else ++ javaExecutable="$(readlink -f "$javaExecutable")" ++ fi ++ javaHome="$(dirname "$javaExecutable")" ++ javaHome=$(expr "$javaHome" : '\(.*\)/bin') ++ JAVA_HOME="$javaHome" ++ export JAVA_HOME ++ fi ++ fi ++fi ++ ++if [ -z "$JAVACMD" ]; then ++ if [ -n "$JAVA_HOME" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" +- JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" +- JAVACCMD="$JAVA_HOME/bin/javac" +- +- if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then +- echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 +- echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 +- return 1 +- fi + fi + else + JAVACMD="$( +- 'set' +e +- 'unset' -f command 2>/dev/null +- 'command' -v java +- )" || : +- JAVACCMD="$( +- 'set' +e +- 'unset' -f command 2>/dev/null +- 'command' -v javac +- )" || : +- +- if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then +- echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 +- return 1 +- fi ++ \unset -f command 2>/dev/null ++ \command -v java ++ )" + fi +-} +- +-# hash string like Java String::hashCode +-hash_string() { +- str="${1:-}" h=0 +- while [ -n "$str" ]; do +- char="${str%"${str#?}"}" +- h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) +- str="${str#?}" +- done +- printf %x\\n $h +-} +- +-verbose() { :; } +-[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } ++fi + +-die() { +- printf %s\\n "$1" >&2 ++if [ ! -x "$JAVACMD" ]; then ++ echo "Error: JAVA_HOME is not defined correctly." >&2 ++ echo " We cannot execute $JAVACMD" >&2 + exit 1 +-} ++fi + +-trim() { +- # MWRAPPER-139: +- # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. +- # Needed for removing poorly interpreted newline sequences when running in more +- # exotic environments such as mingw bash on Windows. +- printf "%s" "${1}" | tr -d '[:space:]' +-} ++if [ -z "$JAVA_HOME" ]; then ++ echo "Warning: JAVA_HOME environment variable is not set." >&2 ++fi + +-# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +-while IFS="=" read -r key value; do +- case "${key-}" in +- distributionUrl) distributionUrl=$(trim "${value-}") ;; +- distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; +- esac +-done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +-[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" ++# traverses directory structure from process work directory to filesystem root ++# first directory with .mvn subdirectory is considered project base directory ++find_maven_basedir() { ++ if [ -z "$1" ]; then ++ echo "Path not specified to find_maven_basedir" >&2 ++ return 1 ++ fi + +-case "${distributionUrl##*/}" in +-maven-mvnd-*bin.*) +- MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ +- case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in +- *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; +- :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; +- :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; +- :Linux*x86_64*) distributionPlatform=linux-amd64 ;; +- *) +- echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 +- distributionPlatform=linux-amd64 +- ;; +- esac +- distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" +- ;; +-maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +-*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +-esac ++ basedir="$1" ++ wdir="$1" ++ while [ "$wdir" != '/' ]; do ++ if [ -d "$wdir"/.mvn ]; then ++ basedir=$wdir ++ break ++ fi ++ # workaround for JBEAP-8937 (on Solaris 10/Sparc) ++ if [ -d "${wdir}" ]; then ++ wdir=$( ++ cd "$wdir/.." || exit 1 ++ pwd ++ ) ++ fi ++ # end of workaround ++ done ++ printf '%s' "$( ++ cd "$basedir" || exit 1 ++ pwd ++ )" ++} + +-# apply MVNW_REPOURL and calculate MAVEN_HOME +-# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +-[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +-distributionUrlName="${distributionUrl##*/}" +-distributionUrlNameMain="${distributionUrlName%.*}" +-distributionUrlNameMain="${distributionUrlNameMain%-bin}" +-MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +-MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" ++# concatenates all lines of a file ++concat_lines() { ++ if [ -f "$1" ]; then ++ # Remove \r in case we run on Windows within Git Bash ++ # and check out the repository with auto CRLF management ++ # enabled. Otherwise, we may read lines that are delimited with ++ # \r\n and produce $'-Xarg\r' rather than -Xarg due to word ++ # splitting rules. ++ tr -s '\r\n' ' ' <"$1" ++ fi ++} + +-exec_maven() { +- unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : +- exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" ++log() { ++ if [ "$MVNW_VERBOSE" = true ]; then ++ printf '%s\n' "$1" ++ fi + } + +-if [ -d "$MAVEN_HOME" ]; then +- verbose "found existing MAVEN_HOME at $MAVEN_HOME" +- exec_maven "$@" ++BASE_DIR=$(find_maven_basedir "$(dirname "$0")") ++if [ -z "$BASE_DIR" ]; then ++ exit 1 + fi + +-case "${distributionUrl-}" in +-*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +-*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +-esac ++MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} ++export MAVEN_PROJECTBASEDIR ++log "$MAVEN_PROJECTBASEDIR" + +-# prepare tmp dir +-if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then +- clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } +- trap clean HUP INT TERM EXIT ++########################################################################################## ++# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central ++# This allows using the maven wrapper in projects that prohibit checking in binary data. ++########################################################################################## ++wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" ++if [ -r "$wrapperJarPath" ]; then ++ log "Found $wrapperJarPath" + else +- die "cannot create temp dir" +-fi +- +-mkdir -p -- "${MAVEN_HOME%/*}" ++ log "Couldn't find $wrapperJarPath, downloading it ..." + +-# Download and Install Apache Maven +-verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +-verbose "Downloading from: $distributionUrl" +-verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" +- +-# select .zip or .tar.gz +-if ! command -v unzip >/dev/null; then +- distributionUrl="${distributionUrl%.zip}.tar.gz" +- distributionUrlName="${distributionUrl##*/}" +-fi +- +-# verbose opt +-__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +-[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v ++ if [ -n "$MVNW_REPOURL" ]; then ++ wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar" ++ else ++ wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar" ++ fi ++ while IFS="=" read -r key value; do ++ # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) ++ safeValue=$(echo "$value" | tr -d '\r') ++ case "$key" in wrapperUrl) ++ wrapperUrl="$safeValue" ++ break ++ ;; ++ esac ++ done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" ++ log "Downloading from: $wrapperUrl" + +-# normalize http auth +-case "${MVNW_PASSWORD:+has-password}" in +-'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +-has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +-esac ++ if $cygwin; then ++ wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") ++ fi + +-if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then +- verbose "Found wget ... using wget" +- wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +-elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then +- verbose "Found curl ... using curl" +- curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +-elif set_java_home; then +- verbose "Falling back to use Java to download" +- javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" +- targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" +- cat >"$javaSource" <<-END +- public class Downloader extends java.net.Authenticator +- { +- protected java.net.PasswordAuthentication getPasswordAuthentication() +- { +- return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); +- } +- public static void main( String[] args ) throws Exception +- { +- setDefault( new Downloader() ); +- java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); +- } +- } +- END +- # For Cygwin/MinGW, switch paths to Windows format before running javac and java +- verbose " - Compiling Downloader.java ..." +- "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" +- verbose " - Running Downloader.java ..." +- "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" ++ if command -v wget >/dev/null; then ++ log "Found wget ... using wget" ++ [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" ++ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then ++ wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" ++ else ++ wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" ++ fi ++ elif command -v curl >/dev/null; then ++ log "Found curl ... using curl" ++ [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" ++ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then ++ curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" ++ else ++ curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" ++ fi ++ else ++ log "Falling back to using Java to download" ++ javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" ++ javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" ++ # For Cygwin, switch paths to Windows format before running javac ++ if $cygwin; then ++ javaSource=$(cygpath --path --windows "$javaSource") ++ javaClass=$(cygpath --path --windows "$javaClass") ++ fi ++ if [ -e "$javaSource" ]; then ++ if [ ! -e "$javaClass" ]; then ++ log " - Compiling MavenWrapperDownloader.java ..." ++ ("$JAVA_HOME/bin/javac" "$javaSource") ++ fi ++ if [ -e "$javaClass" ]; then ++ log " - Running MavenWrapperDownloader.java ..." ++ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" ++ fi ++ fi ++ fi + fi ++########################################################################################## ++# End of extension ++########################################################################################## + +-# If specified, validate the SHA-256 sum of the Maven distribution zip file +-if [ -n "${distributionSha256Sum-}" ]; then +- distributionSha256Result=false +- if [ "$MVN_CMD" = mvnd.sh ]; then +- echo "Checksum validation is not supported for maven-mvnd." >&2 +- echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 +- exit 1 +- elif command -v sha256sum >/dev/null; then +- if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then +- distributionSha256Result=true ++# If specified, validate the SHA-256 sum of the Maven wrapper jar file ++wrapperSha256Sum="" ++while IFS="=" read -r key value; do ++ case "$key" in wrapperSha256Sum) ++ wrapperSha256Sum=$value ++ break ++ ;; ++ esac ++done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" ++if [ -n "$wrapperSha256Sum" ]; then ++ wrapperSha256Result=false ++ if command -v sha256sum >/dev/null; then ++ if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c >/dev/null 2>&1; then ++ wrapperSha256Result=true + fi + elif command -v shasum >/dev/null; then +- if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then +- distributionSha256Result=true ++ if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c >/dev/null 2>&1; then ++ wrapperSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 +- echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 ++ echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi +- if [ $distributionSha256Result = false ]; then +- echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 +- echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 ++ if [ $wrapperSha256Result = false ]; then ++ echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 ++ echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 ++ echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 + exit 1 + fi + fi + +-# unzip and move +-if command -v unzip >/dev/null; then +- unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +-else +- tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" ++MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" ++ ++# For Cygwin, switch paths to Windows format before running java ++if $cygwin; then ++ [ -n "$JAVA_HOME" ] \ ++ && JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") ++ [ -n "$CLASSPATH" ] \ ++ && CLASSPATH=$(cygpath --path --windows "$CLASSPATH") ++ [ -n "$MAVEN_PROJECTBASEDIR" ] \ ++ && MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") + fi +-printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +-mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +-clean || : +-exec_maven "$@" ++# Provide a "standardized" way to retrieve the CLI args that will ++# work with both Windows and non-Windows executions. ++MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" ++export MAVEN_CMD_LINE_ARGS ++ ++WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain ++ ++# shellcheck disable=SC2086 # safe args ++exec "$JAVACMD" \ ++ $MAVEN_OPTS \ ++ $MAVEN_DEBUG_OPTS \ ++ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ ++ "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ ++ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" +diff --git a/mvnw.cmd b/mvnw.cmd +old mode 100644 +new mode 100755 +index b150b91..1204076 +--- a/mvnw.cmd ++++ b/mvnw.cmd +@@ -1,4 +1,3 @@ +-<# : batch portion + @REM ---------------------------------------------------------------------------- + @REM Licensed to the Apache Software Foundation (ASF) under one + @REM or more contributor license agreements. See the NOTICE file +@@ -21,129 +20,187 @@ + @REM ---------------------------------------------------------------------------- + @REM Apache Maven Wrapper startup batch script, version 3.3.2 + @REM ++@REM Required ENV vars: ++@REM JAVA_HOME - location of a JDK home dir ++@REM + @REM Optional ENV vars +-@REM MVNW_REPOURL - repo url base for downloading maven distribution +-@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +-@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output ++@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands ++@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending ++@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven ++@REM e.g. to debug Maven itself, use ++@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 ++@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files + @REM ---------------------------------------------------------------------------- + +-@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +-@SET __MVNW_CMD__= +-@SET __MVNW_ERROR__= +-@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +-@SET PSModulePath= +-@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( +- IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) ++@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' ++@echo off ++@REM set title of command window ++title %0 ++@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' ++@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% ++ ++@REM set %HOME% to equivalent of $HOME ++if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") ++ ++@REM Execute a user defined script before this one ++if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre ++@REM check for pre script, once with legacy .bat ending and once with .cmd ending ++if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* ++if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* ++:skipRcPre ++ ++@setlocal ++ ++set ERROR_CODE=0 ++ ++@REM To isolate internal variables from possible post scripts, we use another setlocal ++@setlocal ++ ++@REM ==== START VALIDATION ==== ++if not "%JAVA_HOME%" == "" goto OkJHome ++ ++echo. >&2 ++echo Error: JAVA_HOME not found in your environment. >&2 ++echo Please set the JAVA_HOME variable in your environment to match the >&2 ++echo location of your Java installation. >&2 ++echo. >&2 ++goto error ++ ++:OkJHome ++if exist "%JAVA_HOME%\bin\java.exe" goto init ++ ++echo. >&2 ++echo Error: JAVA_HOME is set to an invalid directory. >&2 ++echo JAVA_HOME = "%JAVA_HOME%" >&2 ++echo Please set the JAVA_HOME variable in your environment to match the >&2 ++echo location of your Java installation. >&2 ++echo. >&2 ++goto error ++ ++@REM ==== END VALIDATION ==== ++ ++:init ++ ++@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". ++@REM Fallback to current working directory if not found. ++ ++set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% ++IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir ++ ++set EXEC_DIR=%CD% ++set WDIR=%EXEC_DIR% ++:findBaseDir ++IF EXIST "%WDIR%"\.mvn goto baseDirFound ++cd .. ++IF "%WDIR%"=="%CD%" goto baseDirNotFound ++set WDIR=%CD% ++goto findBaseDir ++ ++:baseDirFound ++set MAVEN_PROJECTBASEDIR=%WDIR% ++cd "%EXEC_DIR%" ++goto endDetectBaseDir ++ ++:baseDirNotFound ++set MAVEN_PROJECTBASEDIR=%EXEC_DIR% ++cd "%EXEC_DIR%" ++ ++:endDetectBaseDir ++ ++IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig ++ ++@setlocal EnableExtensions EnableDelayedExpansion ++for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a ++@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% ++ ++:endReadAdditionalConfig ++ ++SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" ++set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" ++set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain ++ ++set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar" ++ ++FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( ++ IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B ++) ++ ++@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central ++@REM This allows using the maven wrapper in projects that prohibit checking in binary data. ++if exist %WRAPPER_JAR% ( ++ if "%MVNW_VERBOSE%" == "true" ( ++ echo Found %WRAPPER_JAR% ++ ) ++) else ( ++ if not "%MVNW_REPOURL%" == "" ( ++ SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar" ++ ) ++ if "%MVNW_VERBOSE%" == "true" ( ++ echo Couldn't find %WRAPPER_JAR%, downloading it ... ++ echo Downloading from: %WRAPPER_URL% ++ ) ++ ++ powershell -Command "&{"^ ++ "$webclient = new-object System.Net.WebClient;"^ ++ "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ ++ "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ ++ "}"^ ++ "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ ++ "}" ++ if "%MVNW_VERBOSE%" == "true" ( ++ echo Finished downloading %WRAPPER_JAR% ++ ) ++) ++@REM End of extension ++ ++@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file ++SET WRAPPER_SHA_256_SUM="" ++FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( ++ IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B + ) +-@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +-@SET __MVNW_PSMODULEP_SAVE= +-@SET __MVNW_ARG0_NAME__= +-@SET MVNW_USERNAME= +-@SET MVNW_PASSWORD= +-@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +-@echo Cannot start maven from wrapper >&2 && exit /b 1 +-@GOTO :EOF +-: end batch / begin powershell #> +- +-$ErrorActionPreference = "Stop" +-if ($env:MVNW_VERBOSE -eq "true") { +- $VerbosePreference = "Continue" +-} +- +-# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +-$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +-if (!$distributionUrl) { +- Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +-} +- +-switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { +- "maven-mvnd-*" { +- $USE_MVND = $true +- $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" +- $MVN_CMD = "mvnd.cmd" +- break +- } +- default { +- $USE_MVND = $false +- $MVN_CMD = $script -replace '^mvnw','mvn' +- break +- } +-} +- +-# apply MVNW_REPOURL and calculate MAVEN_HOME +-# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +-if ($env:MVNW_REPOURL) { +- $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } +- $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +-} +-$distributionUrlName = $distributionUrl -replace '^.*/','' +-$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +-$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +-if ($env:MAVEN_USER_HOME) { +- $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +-} +-$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +-$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" +- +-if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { +- Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" +- Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" +- exit $? +-} +- +-if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { +- Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +-} +- +-# prepare tmp dir +-$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +-$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +-$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +-trap { +- if ($TMP_DOWNLOAD_DIR.Exists) { +- try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } +- catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +- } +-} +- +-New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null +- +-# Download and Install Apache Maven +-Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +-Write-Verbose "Downloading from: $distributionUrl" +-Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" +- +-$webclient = New-Object System.Net.WebClient +-if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { +- $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +-} +-[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +-$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null +- +-# If specified, validate the SHA-256 sum of the Maven distribution zip file +-$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +-if ($distributionSha256Sum) { +- if ($USE_MVND) { +- Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." +- } +- Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash +- if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { +- Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." +- } +-} +- +-# unzip and move +-Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +-Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +-try { +- Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +-} catch { +- if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { +- Write-Error "fail to move MAVEN_HOME" +- } +-} finally { +- try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } +- catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +-} +- +-Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" ++IF NOT %WRAPPER_SHA_256_SUM%=="" ( ++ powershell -Command "&{"^ ++ "Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash;"^ ++ "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ ++ "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ ++ " Write-Error 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ ++ " Write-Error 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ ++ " Write-Error 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ ++ " exit 1;"^ ++ "}"^ ++ "}" ++ if ERRORLEVEL 1 goto error ++) ++ ++@REM Provide a "standardized" way to retrieve the CLI args that will ++@REM work with both Windows and non-Windows executions. ++set MAVEN_CMD_LINE_ARGS=%* ++ ++%MAVEN_JAVA_EXE% ^ ++ %JVM_CONFIG_MAVEN_PROPS% ^ ++ %MAVEN_OPTS% ^ ++ %MAVEN_DEBUG_OPTS% ^ ++ -classpath %WRAPPER_JAR% ^ ++ "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ ++ %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* ++if ERRORLEVEL 1 goto error ++goto end ++ ++:error ++set ERROR_CODE=1 ++ ++:end ++@endlocal & set ERROR_CODE=%ERROR_CODE% ++ ++if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost ++@REM check for post script, once with legacy .bat ending and once with .cmd ending ++if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" ++if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" ++:skipRcPost ++ ++@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' ++if "%MAVEN_BATCH_PAUSE%"=="on" pause ++ ++if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% ++ ++cmd /C exit /B %ERROR_CODE% diff --git a/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/update_deprecated_api.patch b/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/update_deprecated_api.patch new file mode 100644 index 00000000000..42ea73fdc7f --- /dev/null +++ b/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/update_deprecated_api.patch @@ -0,0 +1,14 @@ +diff --git a/pom.xml b/pom.xml +index ff20499..7f6c83b 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -8,6 +8,9 @@ + 17 + UTF-8 + 4.1.1.RELEASE ++ 17 ++ 17 ++ 17 + + + org.springframework.boot diff --git a/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerSessionTest.kt b/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerSessionTest.kt index 50f165c9745..f50e5e9c737 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerSessionTest.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerSessionTest.kt @@ -145,7 +145,14 @@ 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, MAVEN_BUILD_SKIP_UNIT_TESTS) + val context = CodeModernizerSessionContext( + project, + root.children[0], + JavaSdkVersion.JDK_1_8, + JavaSdkVersion.JDK_11, + listOf(EXPLAINABILITY_V1, SELECTIVE_TRANSFORMATION_V1), + MAVEN_BUILD_SKIP_UNIT_TESTS + ) val mockFile = mock(File::class.java) val mockStringBuilder = mock(StringBuilder::class.java) val file = runInEdtAndGet { diff --git a/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerTest.kt b/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerTest.kt index 39bb0bc5cb6..e8de6cfc5c3 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerTest.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerTest.kt @@ -3,12 +3,15 @@ package software.aws.toolkits.jetbrains.services.codemodernizer +import com.intellij.openapi.vcs.changes.patch.ApplyPatchDifferentiatedDialog import com.intellij.testFramework.LightVirtualFile import junit.framework.TestCase.assertEquals import junit.framework.TestCase.assertFalse import kotlinx.coroutines.runBlocking import org.junit.Before import org.junit.Test +import org.mockito.Mockito.doAnswer +import org.mockito.Mockito.mock import org.mockito.kotlin.any import org.mockito.kotlin.doNothing import org.mockito.kotlin.doReturn @@ -128,10 +131,21 @@ class CodeWhispererCodeModernizerTest : CodeWhispererCodeModernizerTestBase() { val path = testCodeModernizerArtifact.zipPath val result = DownloadArtifactResult.Success(testCodeModernizerArtifact, path) doReturn(result).whenever(handler).downloadArtifact(any(), eq(TransformationDownloadArtifactType.CLIENT_INSTRUCTIONS), eq(false)) - doNothing().whenever(handler).displayDiffUsingPatch(any(), any(), any()) + val mockDialog = mock() + whenever(mockDialog.showAndGet()).thenReturn(true) + doAnswer { + mockDialog.showAndGet() + mockDialog + }.whenever(handler).displayDiffUsingPatch(any(), any(), any(), any(), any()) handler.displayDiff(jobId, CodeTransformVCSViewerSrcComponents.Chat) verify(handler, never()).notifyUnableToApplyPatch(any()) - verify(handler, times(1)).displayDiffUsingPatch(testCodeModernizerArtifact.patch, jobId, CodeTransformVCSViewerSrcComponents.Chat) + verify(handler, times(1)).displayDiffUsingPatch( + testCodeModernizerArtifact.patches[0], + testCodeModernizerArtifact.patches.size, + testCodeModernizerArtifact.description?.get(0), + jobId, + CodeTransformVCSViewerSrcComponents.Chat + ) } @Test @@ -158,6 +172,14 @@ class CodeWhispererCodeModernizerTest : CodeWhispererCodeModernizerTestBase() { assertEquals(validMetrics.linesOfCodeChanged, artifact.metrics?.linesOfCodeChanged) } + @Test + fun `CodeModernizerArtifact can process a valid zip file with multiple diffs`() { + val artifact = CodeModernizerArtifact.create(multipleDiffZipPath.toAbsolutePath().toString()) + assertEquals(4, artifact.patches.size) + assertEquals(validManifest, artifact.manifest) + assertEquals(validMetricsMultipleDiffs.linesOfCodeChanged, artifact.metrics?.linesOfCodeChanged) + } + @Test fun `can unzip a file`() { val tempDir = createTempDirectory() @@ -167,6 +189,15 @@ class CodeWhispererCodeModernizerTest : CodeWhispererCodeModernizerTestBase() { assert(tempDir.resolve(validZipPatchFilePath).exists()) } + @Test + fun `can unzip a file with multiple diffs`() { + val tempDir = createTempDirectory() + val result = unzipFile(multipleDiffZipPath, tempDir) + assert(result) + assert(tempDir.resolve(validZipManifestPath).exists()) + assert(tempDir.resolve(validZipPatchFilePath).exists()) + } + @Test fun `returns False when unable to unzip file`() { assertFalse(unzipFile(Path("dummy1"), Path("dummy2"))) diff --git a/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerTestBase.kt b/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerTestBase.kt index 5ec2dd198f2..a02cd5baa97 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerTestBase.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerTestBase.kt @@ -51,11 +51,13 @@ import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenAu import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenProvider import software.aws.toolkits.jetbrains.services.codemodernizer.client.GumbyClient import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerArtifact +import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerArtifact.Companion.MAPPER import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerManifest import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerMetrics import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerSessionContext import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeTransformFailureBuildLog import software.aws.toolkits.jetbrains.services.codemodernizer.model.CustomerSelection +import software.aws.toolkits.jetbrains.services.codemodernizer.model.DescriptionContent import software.aws.toolkits.jetbrains.services.codemodernizer.model.JobId import software.aws.toolkits.jetbrains.services.codemodernizer.panels.managers.CodeModernizerBottomWindowPanelManager import software.aws.toolkits.jetbrains.services.codemodernizer.state.CodeModernizerSessionState @@ -88,14 +90,26 @@ open class CodeWhispererCodeModernizerTestBase( lateinit var testModernizerBottomWindowPanelSpy: CodeModernizerBottomWindowPanelManager internal lateinit var testSessionSpy: CodeModernizerSession internal lateinit var testSessionStateSpy: CodeModernizerSessionState - internal val diffResource = "diff.patch".toResourceFile() - internal val examplePatchVirtualFile = LightVirtualFile("diff.patch", diffResource.readText()) + internal val minJDKUpgradePatchResource = "min_jdk_upgrade.patch".toResourceFile() + internal val minJDKUpgradePatchResourceFile = LightVirtualFile("min_jdk_upgrade.patch", minJDKUpgradePatchResource.readText()) + internal val enterpriseApplicationUpgradePatchResource = "popular_enterprise_application_framework.patch".toResourceFile() + internal val enterpriseApplicationUpgradePatchResourceFile = LightVirtualFile( + "popular_enterprise_application_framework.patch", + enterpriseApplicationUpgradePatchResource.readText() + ) + internal val testingToolPatchResource = "testing_tool.patch".toResourceFile() + internal val testingToolPatchResourceFile = LightVirtualFile("testing_tool.patch", testingToolPatchResource.readText()) + internal val deprecatedAPIPatchResource = "update_deprecated_api.patch".toResourceFile() + internal val deprecatedAPIPatchResourceFile = LightVirtualFile("update_deprecated_api.patch", deprecatedAPIPatchResource.readText()) + internal val diffJsonResource = "diffPatchOutput.json".toResourceFile() + internal val exampleDescriptionContent: DescriptionContent = MAPPER.readValue(diffJsonResource, DescriptionContent::class.java) internal val emptyPomFile = LightVirtualFile("pom.xml", "") internal val emptyPomFileSpy = spy(emptyPomFile) internal val jobId = JobId("Test job id") internal lateinit var testCodeModernizerArtifact: CodeModernizerArtifact internal lateinit var testTransformFailureBuildLog: CodeTransformFailureBuildLog internal val exampleZipPath = "simple.zip".toResourceFile().toPath() + internal val multipleDiffZipPath = "multiple-diff.zip".toResourceFile().toPath() internal val expectedFilePath = "expectedFile".toResourceFile().toPath() internal val overwrittenFilePath = "overwrittenFile".toResourceFile().toPath() internal val testRequestId = "test_aws_request_id" @@ -139,6 +153,14 @@ open class CodeWhispererCodeModernizerTestBase( programmingLanguage = "JAVA", ) + internal val validMetricsMultipleDiffs = + CodeModernizerMetrics( + charactersOfCodeChanged = 83, + linesOfCodeChanged = 3, + linesOfCodeSubmitted = 567, + programmingLanguage = "JAVA", + ) + internal val exampleCreateUploadUrlResponse = CreateUploadUrlResponse.builder() .uploadUrl("https://smth.com") @@ -279,7 +301,17 @@ open class CodeWhispererCodeModernizerTestBase( val summaryFileMock = Mockito.mock(File::class.java) val logFileMock = Mockito.mock(File::class.java) doReturn("dummy/path").whenever(virtualFileMock).path - testSessionContextSpy = spy(CodeModernizerSessionContext(project, virtualFileMock, JavaSdkVersion.JDK_1_8, JavaSdkVersion.JDK_11, "test")) + testSessionContextSpy = spy( + CodeModernizerSessionContext( + project, + virtualFileMock, + JavaSdkVersion.JDK_1_8, + JavaSdkVersion.JDK_11, + listOf("EXPLAINABILITY_V1", "SELECTIVE_TRANSFORMATION_V1"), + "test" + ) + ) + testSessionSpy = spy(CodeModernizerSession(testSessionContextSpy, 0, 0)) doNothing().whenever(testSessionSpy).deleteUploadArtifact(any()) doReturn(Job()).whenever(codeModernizerManagerSpy).launchModernizationJob(any(), any()) @@ -288,7 +320,13 @@ open class CodeWhispererCodeModernizerTestBase( CodeModernizerArtifact( exampleZipPath.toAbsolutePath().toString(), validManifest, - listOf(examplePatchVirtualFile), + listOf( + minJDKUpgradePatchResourceFile, + enterpriseApplicationUpgradePatchResourceFile, + testingToolPatchResourceFile, + deprecatedAPIPatchResourceFile + ), + exampleDescriptionContent.content, validTransformationSummary, summaryFileMock, validMetrics diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/codeTransformChatConnector.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/codeTransformChatConnector.ts index 35609731fac..b335a3d6fb7 100644 --- a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/codeTransformChatConnector.ts +++ b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/codeTransformChatConnector.ts @@ -273,6 +273,13 @@ export class CodeTransformChatConnector { tabType: 'codetransform', skipTestsSelection: action.formItemValues?.skipTestsSelection }) + } else if (action.id === FormButtonIds.CodeTransformInputOneOrMultipleDiffs) { + this.sendMessageToExtension({ + command: 'codetransform-confirm-one-or-multiple-diffs', + tabID, + tabType: 'codetransform', + oneOrMultipleDiffsSelection: action.formItemValues?.oneOrMultipleDiffsSelection + }) } else if (action.id === FormButtonIds.OpenTransformationHub) { this.sendMessageToExtension({ command: 'codetransform-open-transform-hub', diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/commands.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/commands.ts index d69c36d1410..b0a7ae447af 100644 --- a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/commands.ts +++ b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/commands.ts @@ -36,6 +36,7 @@ type MessageCommand = | 'codetransform-cancel' | 'codetransform-stop' | 'codetransform-confirm-skip-tests' + | 'codetransform-confirm-one-or-multiple-diffs' | 'codetransform-new' | 'codetransform-open-transform-hub' | 'codetransform-open-mvn-build' diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/forms/constants.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/forms/constants.ts index 32312888bd8..2ad5730375e 100644 --- a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/forms/constants.ts +++ b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/forms/constants.ts @@ -9,6 +9,7 @@ export const enum FormButtonIds { CodeTransformInputSQLModuleSchema = 'codetransform-input-select-sql-module-schema', CodeTransformInputCancel = 'codetransform-input-cancel', CodeTransformInputSkipTests = 'codetransform-input-confirm-skip-tests', + CodeTransformInputOneOrMultipleDiffs = 'codetransform-input-confirm-one-or-multiple-diffs', OpenMvnBuild = 'open_mvn_build', StopTransform = 'stop_transform', OpenTransformationHub = 'open_transformation_hub', @@ -27,6 +28,7 @@ export const isFormButtonCodeTransform = (id: string): boolean => { id === FormButtonIds.CodeTransformInputSQLMetadata || id === FormButtonIds.CodeTransformInputSQLModuleSchema || id === FormButtonIds.CodeTransformInputSkipTests || + id === FormButtonIds.CodeTransformInputOneOrMultipleDiffs || id === FormButtonIds.CodeTransformViewDiff || id === FormButtonIds.CodeTransformViewSummary || id === FormButtonIds.CodeTransformViewBuildLog || diff --git a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties index 512fa934d86..543c7c8b69e 100644 --- a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties +++ b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties @@ -563,6 +563,7 @@ 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_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_sql_metadata_file=Okay, I can convert the embedded SQL code for your Oracle to PostgreSQL transformation. To get started, upload the zipped metadata file from your schema conversion in AWS Data Migration Service (DMS). To retrieve the metadata file:\n1. Open your database migration project in the AWS DMS console.\n2. Open the schema conversion and choose **Convert the embedded SQL in your application**.\n3. Once you complete the conversion, close the project and go to the S3 bucket where your project is stored.\n4. Open the folder and find the project folder ("sct-project").\n5. Download the object inside the project folder. This will be a zip file.\n\nFor more info, refer to the [documentation](https://docs.aws.amazon.com/dms/latest/userguide/schema-conversion-save-apply.html#schema-conversion-save). codemodernizer.chat.form.user_selection.item.choose_target_version=Choose the target code version @@ -581,6 +582,7 @@ codemodernizer.chat.message.button.view_build=View build progress codemodernizer.chat.message.button.view_diff=View diff codemodernizer.chat.message.button.view_failure_build_log=View Failure Build Log codemodernizer.chat.message.button.view_summary=View summary +codemodernizer.chat.message.changes_applied=I applied the changes to your project. codemodernizer.chat.message.choose_objective=Enter "language upgrade" or "SQL conversion" codemodernizer.chat.message.download_failed_client_instructions_expired=Your transformation is not available anymore. Your code and transformation summary are deleted 24 hours after the transformation completes. Please try starting the transformation again. codemodernizer.chat.message.download_failed_invalid_artifact=Sorry, I was unable to find your {0}. Artifacts are deleted after 24 hours. Please try starting the transformation again. @@ -610,12 +612,18 @@ 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.\n\n\ - Deprecated API replacement and dependency upgrades: Replaces deprecated APIs and makes additional dependency version upgrades. +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}. codemodernizer.chat.message.result.fail_with_known_reason=Sorry, I couldn''t complete the transformation. {0} codemodernizer.chat.message.result.partially_success=I transformed part of your code. You can review the diff to see my proposed changes and accept or reject them. The transformation summary has details about the files I updated and the errors that prevented a complete transformation. +codemodernizer.chat.message.result.partially_success.multiple_diffs=I upgraded part of your code to Java 17. You can review the diff to see my proposed changes and accept or reject them. If you reject the diff, you will not be able to see the diffs later. The transformation summary has details about the files I updated and the errors that prevented a complete transformation. codemodernizer.chat.message.result.success=I successfully transformed your code. You can review the diff to see my proposed changes and accept or reject them. The transformation summary has details about the files I updated. +codemodernizer.chat.message.result.success.multiple_diffs=I successfully upgraded your code to Java 17. You can review the diff to see my proposed changes and accept or reject them. If you reject the diff, you will not be able to see the diffs later. The transformation summary has details about the files I updated. 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. 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`. @@ -745,7 +753,6 @@ codemodernizer.notification.warn.zip_creation_failed=Amazon Q could not zip the codemodernizer.notification.warn.zip_creation_failed.reasons.unknown=An unexpected error occurred codemodernizer.notification.warn.zip_too_large.content=Sorry, your project size exceeds the Amazon Q Code Transformation upload limit of 2GB. codemodernizer.notification.warn.zip_too_large.title=Project size exceeds limit -codemodernizer.patch.name=Patch with code changes required to upgrade to Java 17 codemodernizer.toolwindow.banner.action.diff=View diff codemodernizer.toolwindow.banner.action.feedback=Provide Feedback codemodernizer.toolwindow.banner.action.plan=View transformation plan