Skip to content

Commit 6bf1a6d

Browse files
author
David Hasani
committed
fix detekt
1 parent 06f2ae5 commit 6bf1a6d

File tree

1 file changed

+28
-25
lines changed
  • plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ideMaven

1 file changed

+28
-25
lines changed

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

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import java.nio.file.Path
2727
fun runHilMavenCopyDependency(
2828
sourceFolder: File,
2929
destinationDir: File,
30-
buildlogBuilder: StringBuilder,
30+
logBuilder: StringBuilder,
3131
logger: Logger,
3232
project: Project,
3333
): MavenCopyCommandsResult {
@@ -39,13 +39,13 @@ fun runHilMavenCopyDependency(
3939

4040
// run copy dependencies
4141
val copyDependenciesRunnable =
42-
runMavenCopyDependencies(sourceFolder, buildlogBuilder, mvnSettings, transformMvnRunner, destinationDir.toPath(), logger)
42+
runMavenCopyDependencies(sourceFolder, logBuilder, mvnSettings, transformMvnRunner, destinationDir.toPath(), logger)
4343
copyDependenciesRunnable.await()
44-
buildlogBuilder.appendLine(copyDependenciesRunnable.getOutput())
44+
logBuilder.appendLine(copyDependenciesRunnable.getOutput())
4545
if (copyDependenciesRunnable.isComplete()) {
4646
val successMsg = "IntelliJ IDEA bundled Maven copy-dependencies executed successfully"
4747
logger.info { successMsg }
48-
buildlogBuilder.appendLine(successMsg)
48+
logBuilder.appendLine(successMsg)
4949
} else if (copyDependenciesRunnable.isTerminated()) {
5050
return MavenCopyCommandsResult.Cancelled
5151
}
@@ -57,7 +57,7 @@ fun runHilMavenCopyDependency(
5757
return MavenCopyCommandsResult.Success(destinationDir)
5858
}
5959

60-
fun runMavenCopyCommands(sourceFolder: File, buildlogBuilder: StringBuilder, logger: Logger, project: Project, shouldSkipTests: Boolean): MavenCopyCommandsResult {
60+
fun runMavenCopyCommands(sourceFolder: File, logBuilder: StringBuilder, logger: Logger, project: Project, shouldSkipTests: Boolean): MavenCopyCommandsResult {
6161
val currentTimestamp = System.currentTimeMillis()
6262
val destinationDir = Files.createTempDirectory("transformation_dependencies_temp_$currentTimestamp")
6363
val telemetry = CodeTransformTelemetryManager.getInstance(project)
@@ -79,13 +79,13 @@ fun runMavenCopyCommands(sourceFolder: File, buildlogBuilder: StringBuilder, log
7979

8080
// run copy dependencies
8181
val copyDependenciesRunnable =
82-
runMavenCopyDependencies(sourceFolder, buildlogBuilder, mvnSettings, transformMvnRunner, destinationDir, logger)
82+
runMavenCopyDependencies(sourceFolder, logBuilder, mvnSettings, transformMvnRunner, destinationDir, logger)
8383
copyDependenciesRunnable.await()
84-
buildlogBuilder.appendLine(copyDependenciesRunnable.getOutput())
84+
logBuilder.appendLine(copyDependenciesRunnable.getOutput())
8585
if (copyDependenciesRunnable.isComplete()) {
8686
val successMsg = "IntelliJ IDEA bundled Maven copy-dependencies executed successfully"
8787
logger.info { successMsg }
88-
buildlogBuilder.appendLine(successMsg)
88+
logBuilder.appendLine(successMsg)
8989
} else if (copyDependenciesRunnable.isTerminated()) {
9090
telemetryLocalBuildResult = Result.Cancelled
9191
return MavenCopyCommandsResult.Cancelled
@@ -94,13 +94,13 @@ fun runMavenCopyCommands(sourceFolder: File, buildlogBuilder: StringBuilder, log
9494
}
9595

9696
// Run clean
97-
val cleanRunnable = runMavenClean(sourceFolder, buildlogBuilder, mvnSettings, transformMvnRunner, logger, destinationDir)
97+
val cleanRunnable = runMavenClean(sourceFolder, logBuilder, mvnSettings, transformMvnRunner, logger, destinationDir)
9898
cleanRunnable.await()
99-
buildlogBuilder.appendLine(cleanRunnable.getOutput())
99+
logBuilder.appendLine(cleanRunnable.getOutput())
100100
if (cleanRunnable.isComplete()) {
101101
val successMsg = "IntelliJ bundled Maven clean executed successfully"
102102
logger.info { successMsg }
103-
buildlogBuilder.appendLine(successMsg)
103+
logBuilder.appendLine(successMsg)
104104
} else if (cleanRunnable.isTerminated()) {
105105
telemetryLocalBuildResult = Result.Cancelled
106106
return MavenCopyCommandsResult.Cancelled
@@ -112,13 +112,13 @@ fun runMavenCopyCommands(sourceFolder: File, buildlogBuilder: StringBuilder, log
112112
}
113113

114114
// Run install
115-
val installRunnable = runMavenInstall(sourceFolder, buildlogBuilder, mvnSettings, transformMvnRunner, logger, destinationDir, shouldSkipTests)
115+
val installRunnable = runMavenInstall(sourceFolder, logBuilder, mvnSettings, transformMvnRunner, logger, destinationDir, shouldSkipTests)
116116
installRunnable.await()
117-
buildlogBuilder.appendLine(installRunnable.getOutput())
117+
logBuilder.appendLine(installRunnable.getOutput())
118118
if (installRunnable.isComplete()) {
119119
val successMsg = "IntelliJ bundled Maven install executed successfully"
120120
logger.info { successMsg }
121-
buildlogBuilder.appendLine(successMsg)
121+
logBuilder.appendLine(successMsg)
122122
} else if (installRunnable.isTerminated()) {
123123
telemetryLocalBuildResult = Result.Cancelled
124124
return MavenCopyCommandsResult.Cancelled
@@ -212,16 +212,19 @@ private fun runMavenClean(
212212

213213
private fun runMavenInstall(
214214
sourceFolder: File,
215-
buildlogBuilder: StringBuilder,
215+
logBuilder: StringBuilder,
216216
mvnSettings: MavenRunnerSettings,
217217
transformMavenRunner: TransformMavenRunner,
218218
logger: Logger,
219219
destinationDir: Path,
220220
shouldSkipTests: Boolean,
221221
): TransformRunnable {
222-
buildlogBuilder.appendLine("Command Run: IntelliJ IDEA bundled Maven install")
223-
val flags = if (shouldSkipTests) listOf("-Dmaven.repo.local=$destinationDir", "install", "-DskipTests") else
222+
logBuilder.appendLine("Command Run: IntelliJ IDEA bundled Maven install")
223+
val flags = if (shouldSkipTests) {
224+
listOf("-Dmaven.repo.local=$destinationDir", "install", "-DskipTests")
225+
} else {
224226
listOf("-Dmaven.repo.local=$destinationDir", "install")
227+
}
225228
val installParams = MavenRunnerParameters(
226229
false,
227230
sourceFolder.absolutePath,
@@ -237,20 +240,20 @@ private fun runMavenInstall(
237240
} catch (t: Throwable) {
238241
logger.error(t) { "Maven Install: Unexpected error when executing bundled Maven install" }
239242
installTransformRunnable.setExitCode(Integer.MIN_VALUE) // to stop looking for the exitCode
240-
buildlogBuilder.appendLine("IntelliJ bundled Maven install failed: ${t.message}")
243+
logBuilder.appendLine("IntelliJ bundled Maven install failed: ${t.message}")
241244
}
242245
}
243246
return installTransformRunnable
244247
}
245248

246249
private fun runMavenDependencyUpdatesReport(
247250
sourceFolder: File,
248-
buildlogBuilder: StringBuilder,
251+
logBuilder: StringBuilder,
249252
mvnSettings: MavenRunnerSettings,
250253
transformMavenRunner: TransformMavenRunner,
251254
logger: Logger,
252255
): TransformRunnable {
253-
buildlogBuilder.appendLine("Command Run: IntelliJ IDEA bundled Maven dependency updates report")
256+
logBuilder.appendLine("Command Run: IntelliJ IDEA bundled Maven dependency updates report")
254257

255258
val dependencyUpdatesReportCommandList = listOf(
256259
"versions:dependency-updates-aggregate-report",
@@ -273,25 +276,25 @@ private fun runMavenDependencyUpdatesReport(
273276
} catch (t: Throwable) {
274277
logger.error(t) { "Maven dependency report: Unexpected error when executing bundled Maven dependency updates report" }
275278
dependencyUpdatesReportRunnable.setExitCode(Integer.MIN_VALUE) // to stop looking for the exitCode
276-
buildlogBuilder.appendLine("IntelliJ bundled Maven dependency updates report failed: ${t.message}")
279+
logBuilder.appendLine("IntelliJ bundled Maven dependency updates report failed: ${t.message}")
277280
}
278281
}
279282
return dependencyUpdatesReportRunnable
280283
}
281284

282-
fun runDependencyReportCommands(sourceFolder: File, buildlogBuilder: StringBuilder, logger: Logger, project: Project): MavenDependencyReportCommandsResult {
285+
fun runDependencyReportCommands(sourceFolder: File, logBuilder: StringBuilder, logger: Logger, project: Project): MavenDependencyReportCommandsResult {
283286
logger.info { "Executing IntelliJ bundled Maven" }
284287

285288
val transformMvnRunner = TransformMavenRunner(project)
286289
val mvnSettings = MavenRunner.getInstance(project).settings.clone() // clone required to avoid editing user settings
287290

288-
val runnable = runMavenDependencyUpdatesReport(sourceFolder, buildlogBuilder, mvnSettings, transformMvnRunner, logger)
291+
val runnable = runMavenDependencyUpdatesReport(sourceFolder, logBuilder, mvnSettings, transformMvnRunner, logger)
289292
runnable.await()
290-
buildlogBuilder.appendLine(runnable.getOutput())
293+
logBuilder.appendLine(runnable.getOutput())
291294
if (runnable.isComplete()) {
292295
val successMsg = "IntelliJ bundled Maven dependency report executed successfully"
293296
logger.info { successMsg }
294-
buildlogBuilder.appendLine(successMsg)
297+
logBuilder.appendLine(successMsg)
295298
} else if (runnable.isTerminated()) {
296299
return MavenDependencyReportCommandsResult.Cancelled
297300
} else {

0 commit comments

Comments
 (0)