Skip to content

Commit c442c19

Browse files
author
David Hasani
committed
fix detekt issues
1 parent f1f16da commit c442c19

File tree

16 files changed

+59
-63
lines changed

16 files changed

+59
-63
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import software.aws.toolkits.jetbrains.services.amazonq.CODE_TRANSFORM_TROUBLESH
3535
import software.aws.toolkits.jetbrains.services.codemodernizer.client.GumbyClient
3636
import software.aws.toolkits.jetbrains.services.codemodernizer.commands.CodeTransformMessageListener
3737
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.HIL_POM_FILE_NAME
38-
import software.aws.toolkits.jetbrains.services.codemodernizer.controller.CodeTransformChatController
3938
import software.aws.toolkits.jetbrains.services.codemodernizer.file.PomFileAnnotator
4039
import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerException
4140
import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerJobCompletedResult
@@ -264,7 +263,8 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
264263
}
265264

266265
suspend fun resumePollingFromHil() {
267-
val transformationType = if (codeTransformationSession?.sessionContext?.schema != null) CodeTransformType.SQL_CONVERSION else CodeTransformType.LANGUAGE_UPGRADE
266+
val transformationType =
267+
if (codeTransformationSession?.sessionContext?.schema != null) CodeTransformType.SQL_CONVERSION else CodeTransformType.LANGUAGE_UPGRADE
268268
val result = handleJobResumedFromHil(managerState.getLatestJobId(), codeTransformationSession as CodeModernizerSession, transformationType)
269269
postModernizationJob(result)
270270
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isValidCode
4949
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.pollTransformationStatusAndPlan
5050
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.toTransformationLanguage
5151
import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.CodeWhispererCodeScanSession
52-
import software.aws.toolkits.jetbrains.utils.notifyStickyInfo
5352
import software.aws.toolkits.resources.message
5453
import java.io.File
5554
import java.io.FileInputStream

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,8 @@ class CodeTransformChatApp : AmazonQApp {
160160
is IncomingCodeTransformMessage.Transform -> inboundAppMessagesHandler.processTransformQuickAction(message)
161161
is IncomingCodeTransformMessage.CodeTransformStart -> inboundAppMessagesHandler.processCodeTransformStartAction(message)
162162
is IncomingCodeTransformMessage.CodeTransformSelectSQLMetadata -> inboundAppMessagesHandler.processCodeTransformSelectSQLMetadataAction(message)
163-
is IncomingCodeTransformMessage.CodeTransformSelectSQLModuleSchema -> inboundAppMessagesHandler.processCodeTransformSelectSQLModuleSchemaAction(message)
163+
is IncomingCodeTransformMessage.CodeTransformSelectSQLModuleSchema ->
164+
inboundAppMessagesHandler.processCodeTransformSelectSQLModuleSchemaAction(message)
164165
is IncomingCodeTransformMessage.CodeTransformCancel -> inboundAppMessagesHandler.processCodeTransformCancelAction(message)
165166
is IncomingCodeTransformMessage.CodeTransformStop -> inboundAppMessagesHandler.processCodeTransformStopAction(message.tabId)
166167
is IncomingCodeTransformMessage.ChatPrompt -> inboundAppMessagesHandler.processChatPromptMessage(message)

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@
33

44
package software.aws.toolkits.jetbrains.services.codemodernizer.constants
55

6-
import com.intellij.openapi.module.Module
76
import com.intellij.openapi.project.Project
8-
import com.intellij.openapi.roots.ModuleRootManager
97
import com.intellij.openapi.vfs.VirtualFile
10-
import com.jetbrains.python.sdk.basePath
118
import software.amazon.awssdk.services.codewhispererstreaming.model.TransformationDownloadArtifactType
129
import software.aws.toolkits.jetbrains.services.amazonq.CODE_TRANSFORM_PREREQUISITES
1310
import software.aws.toolkits.jetbrains.services.amazonq.CODE_TRANSFORM_TROUBLESHOOT_DOC_ALLOW_S3_ACCESS
@@ -37,7 +34,6 @@ import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.FollowUpT
3734
import software.aws.toolkits.jetbrains.services.cwc.messages.FollowUp
3835
import software.aws.toolkits.resources.message
3936
import software.aws.toolkits.telemetry.CodeTransformPreValidationError
40-
import java.io.File
4137

4238
// shared Cancel button
4339
private val cancelUserSelectionButton = Button(
@@ -259,7 +255,7 @@ fun buildProjectInvalidChatContent(validationResult: ValidationResult): CodeTran
259255
CodeTransformPreValidationError.NonSsoLogin -> message("codemodernizer.notification.warn.invalid_project.description.reason.not_logged_in")
260256
CodeTransformPreValidationError.EmptyProject -> message("codemodernizer.notification.warn.invalid_project.description.reason.missing_content_roots")
261257
CodeTransformPreValidationError.UnsupportedBuildSystem -> message("codemodernizer.chat.message.validation.error.no_pom")
262-
CodeTransformPreValidationError.NoJavaProject -> "Sorry, I could not find an open Java module. Make sure you have a module open that has the JDK configured and has at least 1 content root."
258+
CodeTransformPreValidationError.NoJavaProject -> message("codemodernizer.chat.message.validation.error.no_java_project")
263259
else -> message("codemodernizer.chat.message.validation.error.other")
264260
}
265261

@@ -315,16 +311,14 @@ fun buildUserInputLanguageUpgradeChatContent(project: Project, validationResult:
315311
)
316312
}
317313

318-
fun buildUserInputSQLConversionMetadataChatContent(): CodeTransformChatMessageContent {
319-
return CodeTransformChatMessageContent(
314+
fun buildUserInputSQLConversionMetadataChatContent() = CodeTransformChatMessageContent(
320315
message = message("codemodernizer.chat.form.user_selection.item.choose_sql_metadata_file"),
321316
buttons = listOf(
322317
confirmUserSelectionSQLConversionMetadataButton,
323318
cancelUserSelectionButton,
324319
),
325320
type = CodeTransformChatMessageType.FinalizedAnswer,
326321
)
327-
}
328322

329323
fun buildModuleSchemaFormChatContent(project: Project, javaModules: List<VirtualFile>, schemaOptions: Set<String>) = CodeTransformChatMessageContent(
330324
type = CodeTransformChatMessageType.FinalizedAnswer,

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

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,23 @@
33

44
package software.aws.toolkits.jetbrains.services.codemodernizer.controller
55

6-
import com.fasterxml.jackson.dataformat.xml.JacksonXmlModule
7-
import com.fasterxml.jackson.dataformat.xml.XmlMapper
86
import com.intellij.ide.BrowserUtil
97
import com.intellij.openapi.application.runInEdt
108
import com.intellij.openapi.fileChooser.FileChooser
119
import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory
1210
import com.intellij.openapi.module.ModuleUtil
1311
import com.intellij.openapi.projectRoots.JavaSdkVersion
1412
import com.intellij.openapi.util.io.FileUtil.createTempDirectory
15-
import com.intellij.openapi.vfs.LocalFileSystem
1613
import com.intellij.openapi.vfs.VirtualFile
1714
import kotlinx.coroutines.CoroutineScope
18-
import kotlinx.coroutines.Dispatchers
1915
import kotlinx.coroutines.delay
2016
import kotlinx.coroutines.launch
2117
import kotlinx.coroutines.runBlocking
2218
import software.aws.toolkits.core.utils.debug
2319
import software.aws.toolkits.core.utils.error
2420
import software.aws.toolkits.core.utils.getLogger
2521
import software.aws.toolkits.core.utils.info
22+
import software.aws.toolkits.jetbrains.core.coroutines.EDT
2623
import software.aws.toolkits.jetbrains.services.amazonq.apps.AmazonQAppInitContext
2724
import software.aws.toolkits.jetbrains.services.amazonq.auth.AuthController
2825
import software.aws.toolkits.jetbrains.services.amazonq.auth.AuthFollowUpType
@@ -92,7 +89,6 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.model.MAVEN_BUILD
9289
import software.aws.toolkits.jetbrains.services.codemodernizer.model.MAVEN_BUILD_SKIP_UNIT_TESTS
9390
import software.aws.toolkits.jetbrains.services.codemodernizer.model.MavenCopyCommandsResult
9491
import software.aws.toolkits.jetbrains.services.codemodernizer.model.MavenDependencyReportCommandsResult
95-
import software.aws.toolkits.jetbrains.services.codemodernizer.model.SqlMetadataValidationResult
9692
import software.aws.toolkits.jetbrains.services.codemodernizer.model.UploadFailureReason
9793
import software.aws.toolkits.jetbrains.services.codemodernizer.model.ValidationResult
9894
import software.aws.toolkits.jetbrains.services.codemodernizer.panels.managers.CodeModernizerBottomWindowPanelManager
@@ -107,17 +103,8 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.utils.tryGetJdk
107103
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.unzipFile
108104
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.validateSctMetadata
109105
import software.aws.toolkits.jetbrains.services.cwc.messages.ChatMessageType
110-
import software.aws.toolkits.jetbrains.utils.notifyStickyInfo
111106
import software.aws.toolkits.resources.message
112107
import software.aws.toolkits.telemetry.CodeTransformVCSViewerSrcComponents
113-
import java.io.BufferedReader
114-
import java.io.File
115-
import java.io.FileInputStream
116-
import java.io.InputStreamReader
117-
import java.nio.charset.StandardCharsets
118-
import java.util.zip.ZipFile
119-
import java.util.zip.ZipInputStream
120-
import kotlin.io.path.Path
121108

122109
class CodeTransformChatController(
123110
private val context: AmazonQAppInitContext,
@@ -163,7 +150,7 @@ class CodeTransformChatController(
163150
// Publish a metric when transform is first initiated from chat prompt.
164151
telemetry.initiateTransform()
165152

166-
val isSqlTransformReady = false // feature flag for SQL conversions
153+
val isSqlTransformReady = true // feature flag for SQL conversions
167154

168155
if (isSqlTransformReady) {
169156
this.getUserObjective(message.tabId)
@@ -335,7 +322,7 @@ class CodeTransformChatController(
335322
val metadataValidationResult = validateSctMetadata(sctFile)
336323

337324
if (!metadataValidationResult.valid) {
338-
CoroutineScope(Dispatchers.Main).launch {
325+
CoroutineScope(EDT).launch {
339326
codeTransformChatHelper.run {
340327
addNewMessage(buildSQLMetadataValidationErrorChatContent(metadataValidationResult.errorReason))
341328
addNewMessage(buildStartNewTransformFollowup())
@@ -344,7 +331,7 @@ class CodeTransformChatController(
344331
return@runInEdt
345332
}
346333

347-
CoroutineScope(Dispatchers.Main).launch {
334+
CoroutineScope(EDT).launch {
348335
codeTransformChatHelper.run {
349336
addNewMessage(buildSQLMetadataValidationSuccessIntroChatContent())
350337
addNewMessage(buildSQLMetadataValidationSuccessDetailsChatContent(metadataValidationResult))

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ class CodeTransformChatHelper(
3939

4040
suspend fun sendChatInputEnabledMessage(tabId: String, enabled: Boolean) = messagePublisher.publish(CodeTransformChatInputEnabledMessage(tabId, enabled))
4141

42-
suspend fun sendUpdatePlaceholderMessage(tabId: String, newPlaceholder: String) = messagePublisher.publish(CodeTransformUpdatePlaceholderMessage(tabId, newPlaceholder))
42+
suspend fun sendUpdatePlaceholderMessage(tabId: String, newPlaceholder: String) =
43+
messagePublisher.publish(CodeTransformUpdatePlaceholderMessage(tabId, newPlaceholder))
4344

4445
suspend fun addNewMessage(
4546
content: CodeTransformChatMessageContent,

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.toolwindow.CodeMo
2626
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getPathToHilArtifactPomFolder
2727
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getPathToHilDependenciesRootDir
2828
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getPathToHilUploadZip
29-
import software.aws.toolkits.jetbrains.utils.notifyStickyInfo
3029
import software.aws.toolkits.resources.message
3130
import java.io.File
3231
import java.io.IOException
@@ -190,7 +189,9 @@ data class CodeModernizerSessionContext(
190189
val depDirectory = if (copyResult is MavenCopyCommandsResult.Success) {
191190
showTransformationHub()
192191
copyResult.dependencyDirectory
193-
} else sqlMetadataZip // null copyResult means doing a SQL conversion
192+
} else {
193+
sqlMetadataZip // null copyResult means doing a SQL conversion
194+
}
194195

195196
return runReadAction {
196197
try {
@@ -215,8 +216,9 @@ data class CodeModernizerSessionContext(
215216
var manifest = ZipManifest(customBuildCommand = customBuildCommand)
216217
if (sqlMetadataZip != null) {
217218
// doing a SQL conversion, not language upgrade
218-
// sctFileName below will not work since configurationFile points to any file in the Java module, not the metadata ZIP
219-
manifest = ZipManifest(requestedConversions = RequestedConversions(sqlConversion = SQLConversion(source = sourceVendor, target = targetVendor, schema = schema, host = sourceServerName, sctFileName = sqlMetadataZip.listFiles { file -> file.name.endsWith(".sct") }.first().name)))
219+
val sctFileName = sqlMetadataZip.listFiles { file -> file.name.endsWith(".sct") }.first().name
220+
manifest = ZipManifest(requestedConversions = RequestedConversions(
221+
SQLConversion(sourceVendor, targetVendor, schema, sourceServerName, sctFileName)))
220222
}
221223
mapper.writeValueAsString(manifest)
222224
.byteInputStream()

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

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,15 @@ class BuildProgressSplitterPanelManager(private val project: Project) :
115115
}
116116
}
117117

118-
fun handleProgressStateChanged(newState: TransformationStatus, transformationPlan: TransformationPlan?, jdkVersion: JavaSdkVersion, transformationType: CodeTransformType) {
118+
fun handleProgressStateChanged(newState: TransformationStatus, plan: TransformationPlan?, jdk: JavaSdkVersion, transformationType: CodeTransformType) {
119119
val currentState = statusTreePanel.getCurrentElements()
120120
val loadingPanelText: String
121121
// show the details panel when there are progress updates
122122
// otherwise it would show an empty panel
123123
val backendProgressStepsAvailable = (
124-
transformationPlan != null &&
125-
transformationPlan.hasTransformationSteps() &&
126-
haveProgressUpdates(transformationPlan)
124+
plan != null &&
125+
plan.hasTransformationSteps() &&
126+
haveProgressUpdates(plan)
127127
)
128128

129129
fun maybeAdd(stepId: ProgressStepId, string: String) {
@@ -191,11 +191,11 @@ class BuildProgressSplitterPanelManager(private val project: Project) :
191191
val statuses: List<BuildProgressStepTreeItem> = if (currentState.isEmpty()) {
192192
defaultProgressData().toList()
193193
} else {
194-
if (backendProgressStepsAvailable && transformationPlan != null) {
194+
if (backendProgressStepsAvailable && plan != null) {
195195
currentBuildingTransformationStep = newBuildingTransformationStep
196196
// skip step 0 (contains supplemental info)
197-
newBuildingTransformationStep = transformationPlan.transformationSteps().size - 1
198-
val transformationPlanSteps = transformationPlan.transformationSteps()?.drop(1)?.map {
197+
newBuildingTransformationStep = plan.transformationSteps().size - 1
198+
val transformationPlanSteps = plan.transformationSteps()?.drop(1)?.map {
199199
getUpdatedBuildProgressStepTreeItem(it)
200200
}
201201
transformationPlanSteps?.sortedBy { it.transformationStepId }
@@ -217,17 +217,29 @@ class BuildProgressSplitterPanelManager(private val project: Project) :
217217
}
218218

219219
TransformationStatus.PREPARING -> {
220-
loadingPanelText = if (transformationType != CodeTransformType.SQL_CONVERSION) message("codemodernizer.toolwindow.scan_in_progress.building", jdkVersion.description) else message("codemodernizer.toolwindow.scan_in_progress.planning")
220+
loadingPanelText = if (transformationType != CodeTransformType.SQL_CONVERSION) {
221+
message("codemodernizer.toolwindow.scan_in_progress.building", jdk.description)
222+
} else {
223+
message("codemodernizer.toolwindow.scan_in_progress.planning")
224+
}
221225
statuses.update(BuildStepStatus.DONE, ProgressStepId.UPLOADING)
222226
}
223227

224228
TransformationStatus.PREPARED -> {
225-
loadingPanelText = if (transformationType != CodeTransformType.SQL_CONVERSION) message("codemodernizer.toolwindow.scan_in_progress.building", jdkVersion.description) else message("codemodernizer.toolwindow.scan_in_progress.planning")
229+
loadingPanelText = if (transformationType != CodeTransformType.SQL_CONVERSION) {
230+
message("codemodernizer.toolwindow.scan_in_progress.building", jdk.description)
231+
} else {
232+
message("codemodernizer.toolwindow.scan_in_progress.planning")
233+
}
226234
statuses.update(BuildStepStatus.DONE, ProgressStepId.BUILDING)
227235
}
228236

229237
TransformationStatus.PLANNING -> {
230-
loadingPanelText = if (transformationType != CodeTransformType.SQL_CONVERSION) message("codemodernizer.toolwindow.scan_in_progress.building", jdkVersion.description) else message("codemodernizer.toolwindow.scan_in_progress.planning")
238+
loadingPanelText = if (transformationType != CodeTransformType.SQL_CONVERSION) {
239+
message("codemodernizer.toolwindow.scan_in_progress.building", jdk.description)
240+
} else {
241+
message("codemodernizer.toolwindow.scan_in_progress.planning")
242+
}
231243
statuses.update(BuildStepStatus.DONE, ProgressStepId.BUILDING)
232244
}
233245

@@ -291,8 +303,8 @@ class BuildProgressSplitterPanelManager(private val project: Project) :
291303
this.remove(loadingPanel)
292304
setProgressStepsDefaultUI()
293305
}
294-
if (transformationPlan != null) {
295-
buildProgressStepDetailsPanel.setTransformationPlan(transformationPlan)
306+
if (plan != null) {
307+
buildProgressStepDetailsPanel.setTransformationPlan(plan)
296308
// automatically jump to the next step's right details' panel only when the current step is finished and next step starts
297309
if (newBuildingTransformationStep == 1 || currentBuildingTransformationStep != newBuildingTransformationStep) {
298310
buildProgressStepDetailsPanel.updateListData(newBuildingTransformationStep)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ class CodeModernizerBottomWindowPanelManager(private val project: Project) : JPa
239239
return actionManager.createActionToolbar(ACTION_PLACE, group, false)
240240
}
241241

242-
fun handleJobTransition(new: TransformationStatus, plan: TransformationPlan?, sourceJavaVersion: JavaSdkVersion, transformationType: CodeTransformType) = invokeLater {
242+
fun handleJobTransition(new: TransformationStatus, plan: TransformationPlan?, sourceJdk: JavaSdkVersion, transformType: CodeTransformType) = invokeLater {
243243
if (new in listOf(
244244
TransformationStatus.PLANNED,
245245
TransformationStatus.TRANSFORMING,
@@ -252,7 +252,7 @@ class CodeModernizerBottomWindowPanelManager(private val project: Project) : JPa
252252
addPlanToBanner()
253253
}
254254
buildProgressSplitterPanelManager.apply {
255-
handleProgressStateChanged(new, plan, sourceJavaVersion, transformationType)
255+
handleProgressStateChanged(new, plan, sourceJdk, transformType)
256256
if (timer == null) {
257257
timer = Timer()
258258
timer?.scheduleAtFixedRate(
@@ -301,11 +301,11 @@ class CodeModernizerBottomWindowPanelManager(private val project: Project) : JPa
301301
}
302302
}
303303

304-
fun setResumeJobUI(currentJobResult: TransformationJob, plan: TransformationPlan?, sourceJavaVersion: JavaSdkVersion, transformationType: CodeTransformType) {
304+
fun setResumeJobUI(currentJobResult: TransformationJob, plan: TransformationPlan?, sourceJdk: JavaSdkVersion, transformationType: CodeTransformType) {
305305
setJobRunningUI()
306306
buildProgressSplitterPanelManager.apply {
307307
reset()
308-
handleProgressStateChanged(currentJobResult.status(), plan, sourceJavaVersion, transformationType)
308+
handleProgressStateChanged(currentJobResult.status(), plan, sourceJdk, transformationType)
309309
}
310310
}
311311

0 commit comments

Comments
 (0)