Skip to content

Commit 5bffbc7

Browse files
author
David Hasani
committed
fix detekt
1 parent 4c37ca1 commit 5bffbc7

File tree

11 files changed

+45
-45
lines changed

11 files changed

+45
-45
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import software.aws.toolkits.core.utils.exists
2424
import software.aws.toolkits.core.utils.getLogger
2525
import software.aws.toolkits.core.utils.info
2626
import software.aws.toolkits.jetbrains.core.coroutines.EDT
27-
import software.aws.toolkits.jetbrains.core.coroutines.getCoroutineBgContext
2827
import software.aws.toolkits.jetbrains.core.coroutines.projectCoroutineScope
2928
import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.NoTokenInitializedException
3029
import software.aws.toolkits.jetbrains.services.amazonq.CODE_TRANSFORM_TROUBLESHOOT_DOC_DOWNLOAD_ERROR_OVERVIEW

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ class CodeModernizerSession(
423423
createUploadUrlResponse.kmsKeyArn().orEmpty(),
424424
) { shouldStop.get() }
425425
}
426-
LOG.info { "Upload of ${payload.path} to S3 succeeded with upload context of ${uploadContext.toString()}" }
426+
LOG.info { "Upload of ${payload.path} to S3 succeeded with upload context of $uploadContext" }
427427
if (!shouldStop.get()) {
428428
LOG.info { "Uploaded artifact. Latency: ${calculateTotalLatency(uploadStartTime, Instant.now())} ms" }
429429
}

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
@@ -76,7 +76,8 @@ class CodeTransformChatApp : AmazonQApp {
7676
CodeTransformMessageTypes.Transform.type to IncomingCodeTransformMessage.Transform::class,
7777
CodeTransformMessageTypes.CodeTransformStart.type to IncomingCodeTransformMessage.CodeTransformStart::class,
7878
CodeTransformMessageTypes.CodeTransformSelectSQLMetadata.type to IncomingCodeTransformMessage.CodeTransformSelectSQLMetadata::class,
79-
CodeTransformMessageTypes.CodeTransformConfirmCustomDependencyVersions.type to IncomingCodeTransformMessage.CodeTransformConfirmCustomDependencyVersions::class,
79+
CodeTransformMessageTypes.CodeTransformConfirmCustomDependencyVersions.type to
80+
IncomingCodeTransformMessage.CodeTransformConfirmCustomDependencyVersions::class,
8081
CodeTransformMessageTypes.CodeTransformSelectSQLModuleSchema.type to IncomingCodeTransformMessage.CodeTransformSelectSQLModuleSchema::class,
8182
CodeTransformMessageTypes.CodeTransformStop.type to IncomingCodeTransformMessage.CodeTransformStop::class,
8283
CodeTransformMessageTypes.CodeTransformCancel.type to IncomingCodeTransformMessage.CodeTransformCancel::class,

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -400,14 +400,12 @@ fun buildUserInputCustomDependencyVersionsChatContent() = CodeTransformChatMessa
400400
)
401401

402402
fun buildPromptTargetJDKNameChatContent(version: String) = CodeTransformChatMessageContent(
403-
// TODO: get this text reviewed by Allie
404-
message = "Enter the name of your $version from Settings -> Project Structure -> SDKs.",
403+
message = message("codemodernizer.chat.message.enter_jdk_name", version),
405404
type = CodeTransformChatMessageType.FinalizedAnswer,
406405
)
407406

408407
fun buildInvalidTargetJdkNameChatContent(jdkName: String) = CodeTransformChatMessageContent(
409-
// TODO: get this text reviewed by Allie
410-
message = "I could not find '$jdkName' under Settings -> Project Structure -> SDKs. Please add the target JDK there and try again.",
408+
message = message("codemodernizer.chat.message.enter_jdk_name_error", jdkName),
411409
type = CodeTransformChatMessageType.FinalizedAnswer,
412410
followUps = listOf(startNewTransformFollowUp)
413411
)

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.SELECTIVE_TRANSFO
3636
import software.aws.toolkits.jetbrains.services.codemodernizer.client.GumbyClient
3737
import software.aws.toolkits.jetbrains.services.codemodernizer.commands.CodeTransformActionMessage
3838
import software.aws.toolkits.jetbrains.services.codemodernizer.commands.CodeTransformCommand
39-
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.FEATURE_NAME
4039
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildAbsolutePathWarning
4140
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildCheckingValidProjectChatContent
4241
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildChooseTransformationObjectiveChatContent
@@ -59,8 +58,8 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildIn
5958
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildLanguageUpgradeProjectValidChatContent
6059
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildModuleSchemaFormChatContent
6160
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildModuleSchemaFormIntroChatContent
62-
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserReplyChatContent
6361
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildProjectInvalidChatContent
62+
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildPromptTargetJDKNameChatContent
6463
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildSQLMetadataValidationErrorChatContent
6564
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildSQLMetadataValidationSuccessDetailsChatContent
6665
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildSQLMetadataValidationSuccessIntroChatContent
@@ -85,15 +84,19 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUs
8584
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserInputSkipTestsFlagChatIntroContent
8685
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserLanguageUpgradeSelectionSummaryChatContent
8786
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserOneOrMultipleDiffsSelectionChatContent
87+
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserReplyChatContent
8888
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserSQLConversionSelectionSummaryChatContent
8989
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserSkipTestsFlagSelectionChatContent
9090
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserStopTransformChatContent
91+
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.FEATURE_NAME
9192
import software.aws.toolkits.jetbrains.services.codemodernizer.messages.AuthenticationNeededExceptionMessage
9293
import software.aws.toolkits.jetbrains.services.codemodernizer.messages.CodeTransformChatMessage
9394
import software.aws.toolkits.jetbrains.services.codemodernizer.messages.CodeTransformCommandMessage
9495
import software.aws.toolkits.jetbrains.services.codemodernizer.messages.IncomingCodeTransformMessage
96+
import software.aws.toolkits.jetbrains.services.codemodernizer.model.CLIENT_SIDE_BUILD
9597
import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerArtifact
9698
import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerJobCompletedResult
99+
import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeTransformConversationState
97100
import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeTransformHilDownloadArtifact
98101
import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeTransformType
99102
import software.aws.toolkits.jetbrains.services.codemodernizer.model.CustomerSelection
@@ -122,10 +125,6 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.utils.validateYam
122125
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.QFeatureEvent
123126
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.broadcastQEvent
124127
import software.aws.toolkits.jetbrains.services.cwc.messages.ChatMessageType
125-
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildPromptTargetJDKNameChatContent
126-
import software.aws.toolkits.jetbrains.services.codemodernizer.model.CLIENT_SIDE_BUILD
127-
import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeTransformConversationState
128-
import software.aws.toolkits.jetbrains.utils.notifyStickyInfo
129128
import software.aws.toolkits.resources.message
130129
import software.aws.toolkits.telemetry.CodeTransformPreValidationError
131130

@@ -491,7 +490,7 @@ class CodeTransformChatController(
491490
}
492491
}
493492

494-
/*
493+
/*
495494
private suspend fun promptForCustomYamlFile() {
496495
codeTransformChatHelper.addNewMessage(buildUserInputCustomDependencyVersionsChatContent())
497496
val sampleYAML = """
@@ -519,7 +518,7 @@ dependencyManagement:
519518
FileEditorManager.getInstance(context.project).openFile(virtualFile, true)
520519
}
521520
}
522-
*/
521+
*/
523522

524523
override suspend fun processCodeTransformContinueAction(message: IncomingCodeTransformMessage.CodeTransformContinue) {
525524
codeTransformChatHelper.addNewMessage(buildContinueTransformationChatContent())

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ private fun runClientSideBuild(
220220
mvnSettings: MavenRunnerSettings,
221221
transformMavenRunner: TransformMavenRunner,
222222
logger: Logger,
223-
project: Project
223+
project: Project,
224224
): TransformRunnable {
225225
val customBuildCommand = CodeModernizerManager.getInstance(project).codeTransformationSession?.sessionContext?.customBuildCommand
226226
val clientSideBuildCommand = if (customBuildCommand == MAVEN_BUILD_RUN_UNIT_TESTS) "test" else "test-compile"

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import software.aws.toolkits.core.utils.error
1717
import software.aws.toolkits.core.utils.getLogger
1818
import software.aws.toolkits.core.utils.info
1919
import software.aws.toolkits.core.utils.putNextEntry
20-
import software.aws.toolkits.jetbrains.services.codemodernizer.EXPLAINABILITY_V1
2120
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.HIL_DEPENDENCIES_ROOT_NAME
2221
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.HIL_MANIFEST_FILE_NAME
2322
import software.aws.toolkits.jetbrains.services.codemodernizer.ideMaven.TransformMavenRunner
@@ -78,7 +77,7 @@ data class CodeModernizerSessionContext(
7877
val sqlMetadataZip: File? = null,
7978
var customDependencyVersionsFile: VirtualFile? = null,
8079
var targetJdkName: String? = null,
81-
var originalUploadZipPath: Path? = null
80+
var originalUploadZipPath: Path? = null,
8281
) : Disposable {
8382
private val mapper = jacksonObjectMapper()
8483
private val ignoredDependencyFileExtensions = setOf(INVALID_SUFFIX_SHA, INVALID_SUFFIX_REPOSITORIES)

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

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,21 @@
44
package software.aws.toolkits.jetbrains.services.codemodernizer.utils
55

66
import com.fasterxml.jackson.module.kotlin.readValue
7+
import com.intellij.notification.NotificationAction
78
import com.intellij.openapi.application.runInEdt
8-
import com.intellij.openapi.fileEditor.FileEditorManager
9+
import com.intellij.openapi.application.runWriteAction
910
import com.intellij.openapi.diff.impl.patch.PatchReader
1011
import com.intellij.openapi.diff.impl.patch.formove.PatchApplier
11-
import com.intellij.openapi.roots.ModuleRootManager
12-
import com.intellij.openapi.application.runWriteAction
12+
import com.intellij.openapi.fileEditor.FileEditorManager
1313
import com.intellij.openapi.module.JavaModuleType
1414
import com.intellij.openapi.module.ModuleManager
15-
import com.intellij.notification.NotificationAction
1615
import com.intellij.openapi.project.Project
16+
import com.intellij.openapi.roots.ModuleRootManager
17+
import com.intellij.openapi.util.io.FileUtil.createTempDirectory
18+
import com.intellij.openapi.vfs.LocalFileSystem
1719
import com.intellij.serviceContainer.AlreadyDisposedException
1820
import kotlinx.coroutines.delay
21+
import kotlinx.coroutines.withContext
1922
import software.amazon.awssdk.awscore.exception.AwsServiceException
2023
import software.amazon.awssdk.services.codewhispererruntime.model.AccessDeniedException
2124
import software.amazon.awssdk.services.codewhispererruntime.model.CodeWhispererRuntimeException
@@ -27,35 +30,32 @@ import software.amazon.awssdk.services.codewhispererruntime.model.Transformation
2730
import software.amazon.awssdk.services.codewhispererruntime.model.TransformationProgressUpdate
2831
import software.amazon.awssdk.services.codewhispererruntime.model.TransformationStatus
2932
import software.amazon.awssdk.services.codewhispererruntime.model.TransformationStep
33+
import software.amazon.awssdk.services.codewhispererruntime.model.TransformationUploadContext
34+
import software.amazon.awssdk.services.codewhispererruntime.model.UploadContext
3035
import software.amazon.awssdk.services.codewhispererruntime.model.ValidationException
3136
import software.amazon.awssdk.services.ssooidc.model.InvalidGrantException
37+
import software.aws.toolkits.core.utils.getLogger
3238
import software.aws.toolkits.core.utils.WaiterUnrecoverableException
3339
import software.aws.toolkits.core.utils.Waiters.waitUntil
34-
import software.aws.toolkits.jetbrains.services.codemodernizer.CodeTransformTelemetryManager
40+
import software.aws.toolkits.jetbrains.core.coroutines.EDT
3541
import software.aws.toolkits.jetbrains.services.codemodernizer.client.GumbyClient
42+
import software.aws.toolkits.jetbrains.services.codemodernizer.CodeModernizerManager
43+
import software.aws.toolkits.jetbrains.services.codemodernizer.CodeTransformTelemetryManager
3644
import software.aws.toolkits.jetbrains.services.codemodernizer.commands.CodeTransformMessageListener
3745
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.BILLING_RATE
3846
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.JOB_STATISTICS_TABLE_KEY
47+
import software.aws.toolkits.jetbrains.services.codemodernizer.ideMaven.runClientSideBuild
3948
import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerArtifact.Companion.MAPPER
4049
import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeTransformType
4150
import software.aws.toolkits.jetbrains.services.codemodernizer.model.JobId
4251
import software.aws.toolkits.jetbrains.services.codemodernizer.model.PlanTable
4352
import software.aws.toolkits.jetbrains.utils.notifyStickyWarn
4453
import software.aws.toolkits.resources.message
54+
import java.nio.file.Path
55+
import java.nio.file.Paths
4556
import java.time.Duration
4657
import java.util.Locale
4758
import java.util.concurrent.atomic.AtomicBoolean
48-
import com.intellij.openapi.util.io.FileUtil.createTempDirectory
49-
import com.intellij.openapi.vfs.LocalFileSystem
50-
import kotlinx.coroutines.withContext
51-
import software.amazon.awssdk.services.codewhispererruntime.model.TransformationUploadContext
52-
import software.amazon.awssdk.services.codewhispererruntime.model.UploadContext
53-
import software.aws.toolkits.core.utils.getLogger
54-
import software.aws.toolkits.jetbrains.core.coroutines.EDT
55-
import software.aws.toolkits.jetbrains.services.codemodernizer.CodeModernizerManager
56-
import software.aws.toolkits.jetbrains.services.codemodernizer.ideMaven.runClientSideBuild
57-
import java.nio.file.Path
58-
import java.nio.file.Paths
5959

6060
data class PollingResult(
6161
val succeeded: Boolean,
@@ -179,7 +179,7 @@ suspend fun attemptLocalBuild(plan: TransformationPlan, jobId: JobId, project: P
179179
}
180180

181181
suspend fun processClientInstructions(clientInstructionsPath: Path, jobId: JobId, artifactId: String, project: Project) {
182-
var copyOfProjectSources = createTempDirectory("originalCopy_${jobId.id}_${artifactId}", null).toPath()
182+
var copyOfProjectSources = createTempDirectory("originalCopy_${jobId.id}_$artifactId", null).toPath()
183183
getLogger<CodeModernizerManager>().info("About to copy the original project ZIP to: $copyOfProjectSources")
184184
val originalProjectZip = CodeModernizerManager.getInstance(project).codeTransformationSession?.sessionContext?.originalUploadZipPath
185185
originalProjectZip?.let { unzipFile(it, copyOfProjectSources, isSqlMetadata = false, extractOnlySources = true) }
@@ -220,8 +220,10 @@ suspend fun processClientInstructions(clientInstructionsPath: Path, jobId: JobId
220220
?: throw RuntimeException("Cannot find patch file at $clientInstructionsPath")
221221
FileEditorManager.getInstance(project).openFile(virtualFile, true)
222222
} catch (e: Exception) {
223-
getLogger<CodeModernizerManager>().error("Error applying intermediate diff.patch for job ${jobId.id} and artifact $artifactId located at " +
224-
"$clientInstructionsPath: $e")
223+
getLogger<CodeModernizerManager>().error(
224+
"Error applying intermediate diff.patch for job ${jobId.id} and artifact $artifactId located at " +
225+
"$clientInstructionsPath: $e"
226+
)
225227
} finally {
226228
runWriteAction {
227229
ModuleManager.getInstance(project).disposeModule(tempModule)
@@ -234,7 +236,9 @@ suspend fun processClientInstructions(clientInstructionsPath: Path, jobId: JobId
234236
getLogger<CodeModernizerManager>().info("Ran client-side build with an exit code of $exitCode")
235237
val uploadZip = createClientSideBuildUploadZip(exitCode, buildOutput)
236238
getLogger<CodeModernizerManager>().info("Created client-side build result upload zip for job ${jobId.id} and artifact $artifactId: ${uploadZip.path}")
237-
val uploadContext = UploadContext.fromTransformationUploadContext(TransformationUploadContext.builder().jobId(jobId.id).uploadArtifactType("ClientBuildResult").build())
239+
val uploadContext = UploadContext.fromTransformationUploadContext(
240+
TransformationUploadContext.builder().jobId(jobId.id).uploadArtifactType("ClientBuildResult").build()
241+
)
238242
getLogger<CodeModernizerManager>().info("About to call uploadPayload for job ${jobId.id} and artifact $artifactId")
239243
try {
240244
CodeModernizerManager.getInstance(project).codeTransformationSession?.uploadPayload(uploadZip, uploadContext)

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

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

66
import com.intellij.openapi.vcs.changes.patch.ApplyPatchDifferentiatedDialog
7-
import com.intellij.openapi.vfs.VirtualFile
87
import com.intellij.testFramework.LightVirtualFile
98
import java.util.zip.ZipOutputStream
109
import java.util.zip.ZipEntry
@@ -13,7 +12,6 @@ import junit.framework.TestCase.assertEquals
1312
import junit.framework.TestCase.assertFalse
1413
import junit.framework.TestCase.assertTrue
1514
import kotlinx.coroutines.runBlocking
16-
import org.jetbrains.idea.maven.execution.MavenRunnerSettings
1715
import org.junit.Before
1816
import org.junit.Test
1917
import org.mockito.Mockito.doAnswer

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
package software.aws.toolkits.jetbrains.services.codemodernizer
5+
56
import io.mockk.every
67
import io.mockk.just
78
import io.mockk.mockkStatic
89
import io.mockk.runs
9-
import java.util.zip.ZipFile
1010
import io.mockk.verify
11+
import kotlin.io.path.createTempFile
1112
import kotlinx.coroutines.runBlocking
1213
import org.assertj.core.api.Assertions.assertThat
1314
import org.junit.Before
@@ -33,12 +34,12 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.utils.parseBuildF
3334
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.pollTransformationStatusAndPlan
3435
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.refreshToken
3536
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.validateSctMetadata
36-
import software.aws.toolkits.jetbrains.utils.notifyStickyWarn
3737
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.validateYamlFile
38+
import software.aws.toolkits.jetbrains.utils.notifyStickyWarn
3839
import software.aws.toolkits.jetbrains.utils.rules.addFileToModule
3940
import software.aws.toolkits.resources.message
4041
import java.util.concurrent.atomic.AtomicBoolean
41-
import kotlin.io.path.createTempFile
42+
import java.util.zip.ZipFile
4243

4344
class CodeWhispererCodeModernizerUtilsTest : CodeWhispererCodeModernizerTestBase() {
4445
@Before

0 commit comments

Comments
 (0)