Skip to content

Commit ed4ffa7

Browse files
dhasani23Gaurav Gandhi
dhasani23
authored and
Gaurav Gandhi
committed
Revert "feat(amazonq): support Java 21 (aws#5226)" (aws#5343)
This reverts commit 5416099.
1 parent cdba755 commit ed4ffa7

File tree

12 files changed

+30
-72
lines changed

12 files changed

+30
-72
lines changed

‎.changes/next-release/feature-a6b77635-5ddb-42c9-a31a-518f8cae1ebc.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ const val DOWNLOAD_PROXY_WILDCARD_ERROR: String = "Dangling meta character '*' n
6565
const val DOWNLOAD_SSL_HANDSHAKE_ERROR: String = "Unable to execute HTTP request: javax.net.ssl.SSLHandshakeException"
6666
const val INVALID_ARTIFACT_ERROR: String = "Invalid artifact"
6767
val patchDescriptions = mapOf(
68-
"Prepare minimal upgrade to Java 17" to "This diff patch covers the set of upgrades for Springboot, JUnit, and PowerMockito frameworks in Java 17.",
69-
"Prepare minimal upgrade to Java 21" to "This diff patch covers the set of upgrades for Springboot, JUnit, and PowerMockito frameworks in Java 21.",
68+
"Prepare minimal upgrade to Java 17" to "This diff patch covers the set of upgrades for Springboot, JUnit, and PowerMockito frameworks.",
7069
"Popular Enterprise Specifications and Application Frameworks upgrade" to "This diff patch covers the set of upgrades for Jakarta EE 10, Hibernate 6.2, " +
7170
"and Micronaut 3.",
7271
"HTTP Client Utilities, Apache Commons Utilities, and Web Frameworks" to "This diff patch covers the set of upgrades for Apache HTTP Client 5, Apache " +

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,9 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
122122
}
123123
private val artifactHandler = ArtifactHandler(project, GumbyClient.getInstance(project))
124124
private val supportedJavaMappings = mapOf(
125-
JavaSdkVersion.JDK_1_8 to setOf(JavaSdkVersion.JDK_17, JavaSdkVersion.JDK_21),
126-
JavaSdkVersion.JDK_11 to setOf(JavaSdkVersion.JDK_17, JavaSdkVersion.JDK_21),
127-
JavaSdkVersion.JDK_17 to setOf(JavaSdkVersion.JDK_17, JavaSdkVersion.JDK_21),
128-
JavaSdkVersion.JDK_21 to setOf(JavaSdkVersion.JDK_21),
125+
JavaSdkVersion.JDK_1_8 to setOf(JavaSdkVersion.JDK_17),
126+
JavaSdkVersion.JDK_11 to setOf(JavaSdkVersion.JDK_17),
127+
JavaSdkVersion.JDK_17 to setOf(JavaSdkVersion.JDK_17),
129128
)
130129

131130
init {

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

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
package software.aws.toolkits.jetbrains.services.codemodernizer.constants
55

66
import com.intellij.openapi.project.Project
7-
import com.intellij.openapi.projectRoots.JavaSdkVersion
87
import com.intellij.openapi.vfs.VirtualFile
98
import software.amazon.awssdk.services.codewhispererstreaming.model.TransformationDownloadArtifactType
109
import software.aws.toolkits.jetbrains.services.amazonq.CODE_TRANSFORM_PREREQUISITES
@@ -177,12 +176,8 @@ private val selectTargetVersionFormItem = FormItem(
177176
mandatory = true,
178177
options = listOf(
179178
FormItemOption(
180-
label = JavaSdkVersion.JDK_17.toString(),
181-
value = JavaSdkVersion.JDK_17.toString(),
182-
),
183-
FormItemOption(
184-
label = JavaSdkVersion.JDK_21.toString(),
185-
value = JavaSdkVersion.JDK_21.toString(),
179+
label = "JDK17",
180+
value = "17",
186181
)
187182
)
188183
)
@@ -231,14 +226,14 @@ private val selectOneOrMultipleDiffsFlagFormItem = FormItem(
231226
)
232227
)
233228

234-
private fun getUserLanguageUpgradeSelectionFormattedMarkdown(moduleName: String, targetJdkVersion: String): String = """
229+
private fun getUserLanguageUpgradeSelectionFormattedMarkdown(moduleName: String): String = """
235230
### ${message("codemodernizer.chat.prompt.title.details")}
236231
-------------
237232
238233
| | |
239234
| :------------------- | -------: |
240235
| **${message("codemodernizer.chat.prompt.label.module")}** | $moduleName |
241-
| **${message("codemodernizer.chat.prompt.label.target_version")}** | $targetJdkVersion |
236+
| **${message("codemodernizer.chat.prompt.label.target_version")}** | JDK17 |
242237
""".trimIndent()
243238

244239
private fun getUserSQLConversionSelectionFormattedMarkdown(moduleName: String, schema: String) = """
@@ -291,7 +286,6 @@ fun buildProjectInvalidChatContent(validationResult: ValidationResult): CodeTran
291286
CodeTransformPreValidationError.EmptyProject -> message("codemodernizer.notification.warn.invalid_project.description.reason.missing_content_roots")
292287
CodeTransformPreValidationError.UnsupportedBuildSystem -> message("codemodernizer.chat.message.validation.error.no_pom")
293288
CodeTransformPreValidationError.NoJavaProject -> message("codemodernizer.chat.message.validation.error.no_java_project")
294-
CodeTransformPreValidationError.JavaDowngradeAttempt -> message("codemodernizer.chat.message.validation.error.downgrade_attempt")
295289
else -> message("codemodernizer.chat.message.validation.error.other")
296290
}
297291

@@ -324,9 +318,9 @@ fun buildUserInputSkipTestsFlagChatContent(): CodeTransformChatMessageContent =
324318
formItems = listOf(selectSkipTestsFlagFormItem),
325319
type = CodeTransformChatMessageType.FinalizedAnswer,
326320
)
327-
fun buildUserInputOneOrMultipleDiffsChatIntroContent(version: String): CodeTransformChatMessageContent =
321+
fun buildUserInputOneOrMultipleDiffsChatIntroContent(): CodeTransformChatMessageContent =
328322
CodeTransformChatMessageContent(
329-
message = message("codemodernizer.chat.message.one_or_multiple_diffs", version.substring(4)), // extract "17" / "21" from "JDK_17" / "JDK_21"
323+
message = message("codemodernizer.chat.message.one_or_multiple_diffs"),
330324
type = CodeTransformChatMessageType.FinalizedAnswer,
331325
)
332326
fun buildUserInputOneOrMultipleDiffsFlagChatContent(): CodeTransformChatMessageContent =
@@ -447,9 +441,9 @@ fun buildUserSQLConversionSelectionSummaryChatContent(moduleName: String, schema
447441
message = getUserSQLConversionSelectionFormattedMarkdown(moduleName, schema)
448442
)
449443

450-
fun buildUserLanguageUpgradeSelectionSummaryChatContent(moduleName: String, targetJdkVersion: String) = CodeTransformChatMessageContent(
444+
fun buildUserLanguageUpgradeSelectionSummaryChatContent(moduleName: String) = CodeTransformChatMessageContent(
451445
type = CodeTransformChatMessageType.Prompt,
452-
message = getUserLanguageUpgradeSelectionFormattedMarkdown(moduleName, targetJdkVersion)
446+
message = getUserLanguageUpgradeSelectionFormattedMarkdown(moduleName)
453447
)
454448

455449
fun buildCompileLocalInProgressChatContent() = CodeTransformChatMessageContent(

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

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeTransfo
9393
import software.aws.toolkits.jetbrains.services.codemodernizer.model.CustomerSelection
9494
import software.aws.toolkits.jetbrains.services.codemodernizer.model.DownloadArtifactResult
9595
import software.aws.toolkits.jetbrains.services.codemodernizer.model.DownloadFailureReason
96-
import software.aws.toolkits.jetbrains.services.codemodernizer.model.InvalidTelemetryReason
9796
import software.aws.toolkits.jetbrains.services.codemodernizer.model.JobId
9897
import software.aws.toolkits.jetbrains.services.codemodernizer.model.MAVEN_BUILD_RUN_UNIT_TESTS
9998
import software.aws.toolkits.jetbrains.services.codemodernizer.model.MAVEN_BUILD_SKIP_UNIT_TESTS
@@ -116,7 +115,6 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.QFeature
116115
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.broadcastQEvent
117116
import software.aws.toolkits.jetbrains.services.cwc.messages.ChatMessageType
118117
import software.aws.toolkits.resources.message
119-
import software.aws.toolkits.telemetry.CodeTransformPreValidationError
120118

121119
class CodeTransformChatController(
122120
private val context: AmazonQAppInitContext,
@@ -300,28 +298,14 @@ class CodeTransformChatController(
300298
val moduleVirtualFile: VirtualFile = modulePath.toVirtualFile() as VirtualFile
301299
val moduleName = context.project.getModuleOrProjectNameForFile(moduleVirtualFile)
302300

303-
codeTransformChatHelper.addNewMessage(buildUserLanguageUpgradeSelectionSummaryChatContent(moduleName, targetVersion))
301+
codeTransformChatHelper.addNewMessage(buildUserLanguageUpgradeSelectionSummaryChatContent(moduleName))
304302

305303
val sourceJdk = getSourceJdk(moduleVirtualFile)
306304

307-
val sourceVersion = sourceJdk.toString()
308-
309-
if (sourceVersion == JavaSdkVersion.JDK_21.toString() && targetVersion == JavaSdkVersion.JDK_17.toString()) {
310-
codeTransformChatHelper.addNewMessage(
311-
buildProjectInvalidChatContent(
312-
ValidationResult(
313-
false,
314-
InvalidTelemetryReason(CodeTransformPreValidationError.JavaDowngradeAttempt)
315-
)
316-
)
317-
)
318-
return
319-
}
320-
321305
val selection = CustomerSelection(
322306
configurationFile = moduleVirtualFile,
323307
sourceJavaVersion = sourceJdk,
324-
targetJavaVersion = if (targetVersion == JavaSdkVersion.JDK_17.toString()) JavaSdkVersion.JDK_17 else JavaSdkVersion.JDK_21,
308+
targetJavaVersion = JavaSdkVersion.JDK_17,
325309
)
326310

327311
// Create and set a session
@@ -403,9 +387,8 @@ class CodeTransformChatController(
403387
codeModernizerManager.codeTransformationSession?.let {
404388
it.sessionContext.customBuildCommand = customBuildCommand
405389
}
406-
val targetJdkVersion = codeModernizerManager.codeTransformationSession?.sessionContext?.targetJavaVersion?.name.orEmpty()
407390
codeTransformChatHelper.run {
408-
addNewMessage(buildUserInputOneOrMultipleDiffsChatIntroContent(targetJdkVersion))
391+
addNewMessage(buildUserInputOneOrMultipleDiffsChatIntroContent())
409392
addNewMessage(buildUserInputOneOrMultipleDiffsFlagChatContent())
410393
}
411394
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ data class CodeModernizerSessionContext(
6363
val project: Project,
6464
var configurationFile: VirtualFile? = null, // used to ZIP module
6565
val sourceJavaVersion: JavaSdkVersion, // always needed for startJob API
66-
val targetJavaVersion: JavaSdkVersion, // 17 or 21
66+
val targetJavaVersion: JavaSdkVersion = JavaSdkVersion.JDK_17, // only one supported
6767
var transformCapabilities: List<String> = listOf(EXPLAINABILITY_V1),
6868
var customBuildCommand: String = MAVEN_BUILD_RUN_UNIT_TESTS, // run unit tests by default
6969
val sourceVendor: String = ORACLE_DB, // only one supported

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import java.io.File
1010
data class CustomerSelection(
1111
val configurationFile: VirtualFile? = null, // used to ZIP module
1212
val sourceJavaVersion: JavaSdkVersion, // always needed, use default of JDK_8 for SQL conversions for startJob API call
13-
val targetJavaVersion: JavaSdkVersion, // 17 or 21
13+
val targetJavaVersion: JavaSdkVersion = JavaSdkVersion.JDK_17,
1414
val sourceVendor: String = ORACLE_DB, // only one supported
1515
val targetVendor: String? = null,
1616
val sourceServerName: String? = null,

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,5 @@ fun String.toTransformationLanguage() = when (this) {
8080
"JDK_1_8" -> TransformationLanguage.JAVA_8
8181
"JDK_11" -> TransformationLanguage.JAVA_11
8282
"JDK_17" -> TransformationLanguage.JAVA_17
83-
"JDK_21" -> TransformationLanguage.JAVA_21
8483
else -> TransformationLanguage.UNKNOWN_TO_SDK_VERSION
8584
}

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

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ class CodeWhispererCodeModernizerGumbyClientTest : CodeWhispererCodeModernizerTe
136136
}
137137

138138
@Test
139-
fun `check startCodeModernization on JAVA_17 target`() {
139+
fun `check startCodeModernization`() {
140140
val actual = gumbyClient.startCodeModernization("jobId", TransformationLanguage.JAVA_8, TransformationLanguage.JAVA_17)
141141
argumentCaptor<StartTransformationRequest>().apply {
142142
verify(bearerClient).startTransformation(capture())
@@ -146,17 +146,6 @@ class CodeWhispererCodeModernizerGumbyClientTest : CodeWhispererCodeModernizerTe
146146
}
147147
}
148148

149-
@Test
150-
fun `check startCodeModernization on JAVA_21 target`() {
151-
val actual = gumbyClient.startCodeModernization("jobId", TransformationLanguage.JAVA_8, TransformationLanguage.JAVA_21)
152-
argumentCaptor<StartTransformationRequest>().apply {
153-
verify(bearerClient).startTransformation(capture())
154-
verifyNoInteractions(streamingBearerClient)
155-
assertThat(actual).isInstanceOf(StartTransformationResponse::class.java)
156-
assertThat(actual).usingRecursiveComparison().comparingOnlyFields("transformationJobId").isEqualTo(exampleStartCodeMigrationResponse)
157-
}
158-
}
159-
160149
@Test
161150
fun `check getCodeModernizationPlan`() {
162151
val actual = gumbyClient.getCodeModernizationPlan(JobId("JobId"))

‎plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/codeTransformChatConnector.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ export class CodeTransformChatConnector {
244244
tabID,
245245
tabType: 'codetransform',
246246
modulePath: action.formItemValues?.module,
247-
targetVersion: action.formItemValues?.targetVersion,
247+
targetVersion: 'Java 17',
248248
})
249249
} else if (action.id === FormButtonIds.CodeTransformInputSQLMetadata) {
250250
this.sendMessageToExtension({

0 commit comments

Comments
 (0)