address rli comments

Author: David Hasani

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

@@ -5,6 +5,7 @@ package software.aws.toolkits.jetbrains.services.codemodernizer.model
 
 import com.fasterxml.jackson.core.JsonProcessingException
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.fasterxml.jackson.module.kotlin.readValue
 import com.intellij.openapi.util.io.FileUtil.createTempDirectory
 import com.intellij.openapi.vfs.LocalFileSystem
 import com.intellij.openapi.vfs.VirtualFile
@@ -41,7 +42,7 @@ open class CodeModernizerArtifact(
         private const val SUMMARY_FILE_NAME = "summary.md"
         private const val METRICS_FILE_NAME = "metrics.json"
         val LOG = getLogger<CodeModernizerArtifact>()
-        private val MAPPER = jacksonObjectMapper()
+        val MAPPER = jacksonObjectMapper()
 
         /**
          * Extracts the file at [zipPath] and uses its contents to produce a [CodeModernizerArtifact].
@@ -88,7 +89,7 @@ open class CodeModernizerArtifact(
                     ?.firstOrNull { it.name.endsWith(MANIFEST_FILE_NAME) }
                     ?: throw RuntimeException("Could not find manifest")
             try {
-                val manifest = MAPPER.readValue(manifestFile, CodeModernizerManifest::class.java)
+                val manifest = MAPPER.readValue<CodeModernizerManifest>(manifestFile)
                 if (manifest.version == 0.0F) {
                     throw RuntimeException(
                         "Unable to deserialize the manifest",
@@ -106,7 +107,7 @@ open class CodeModernizerArtifact(
                     tempDir.resolve(manifest.metricsRoot).listFiles()
                         ?.firstOrNull { it.name.endsWith(METRICS_FILE_NAME) }
                         ?: throw RuntimeException("Could not find metrics.json")
-                return MAPPER.readValue(metricsFile, CodeModernizerMetrics::class.java)
+                return MAPPER.readValue<CodeModernizerMetrics>(metricsFile)
             } catch (exception: Exception) {
                 // if metrics.json not present or parsing fails, can still show diff.patch and summary.md
                 return null

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

@@ -3,7 +3,6 @@
 
 package software.aws.toolkits.jetbrains.services.codemodernizer.plan
 
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.intellij.ide.BrowserUtil
 import com.intellij.openapi.fileEditor.FileEditor
@@ -22,6 +21,7 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.constants.APPENDI
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.CodeModernizerUIConstants
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.JOB_STATISTICS_TABLE_KEY
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.LOC_THRESHOLD
+import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerArtifact.Companion.MAPPER
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.PlanTable
 import software.aws.toolkits.jetbrains.services.codemodernizer.plan.CodeModernizerPlanEditorProvider.Companion.MIGRATION_PLAN_KEY
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getAuthType
@@ -62,7 +62,6 @@ import javax.swing.table.DefaultTableModel
 class CodeModernizerPlanEditor(val project: Project, private val virtualFile: VirtualFile) : UserDataHolderBase(), FileEditor {
     val plan = virtualFile.getUserData(MIGRATION_PLAN_KEY) ?: throw RuntimeException("Migration plan not found")
     private val tableMapping = getTableMapping(plan.transformationSteps()[0].progressUpdates())
-    private val mapper = jacksonObjectMapper()
 
     // to-do: convert to UI DSL
     private val contentPanel =
@@ -77,7 +76,7 @@ class CodeModernizerPlanEditor(val project: Project, private val virtualFile: Vi
                     // comes from "name" field of each progressUpdate in step zero of plan
                     if (JOB_STATISTICS_TABLE_KEY in tableMapping) {
                         val planTable = parseTableMapping(tableMapping)
-                        val linesOfCode = getLinesOfCodeSubmitted(planTable)
+                        val linesOfCode = planTable?.let { getLinesOfCodeSubmitted(it) }
                         if (linesOfCode != null && linesOfCode > LOC_THRESHOLD && getAuthType(project) == CredentialSourceId.IamIdentityCenter) {
                             val billingText = getBillingText(linesOfCode)
                             val billingTextComponent =
@@ -99,15 +98,15 @@ class CodeModernizerPlanEditor(val project: Project, private val virtualFile: Vi
                             add(billingTextComponent, CodeModernizerUIConstants.transformationPlanPlaneConstraint)
                         }
                         add(
-                            transformationPlanInfo(planTable),
+                            planTable?.let { transformationPlanInfo(it) },
                             CodeModernizerUIConstants.transformationPlanPlaneConstraint,
                         )
                     }
                     add(transformationPlanPanel(plan), CodeModernizerUIConstants.transformationPlanPlaneConstraint)
                     // key "-1" reserved for appendix table
                     if (APPENDIX_TABLE_KEY in tableMapping) {
                         add(
-                            transformationPlanAppendix(mapper.readValue(tableMapping[APPENDIX_TABLE_KEY], PlanTable::class.java)),
+                            tableMapping[APPENDIX_TABLE_KEY]?.let { MAPPER.readValue<PlanTable>(it) }?.let { transformationPlanAppendix(it) },
                             CodeModernizerUIConstants.transformationPlanPlaneConstraint,
                         )
                     }
@@ -397,7 +396,7 @@ class CodeModernizerPlanEditor(val project: Project, private val virtualFile: Vi
         val table = tableMapping[step.id()]
 
         val parsedTable = table?.let {
-            mapper.readValue<PlanTable>(it)
+            MAPPER.readValue<PlanTable>(it)
         }
 
         val renderedStepTable = parsedTable?.let {

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

@@ -3,7 +3,7 @@
 
 package software.aws.toolkits.jetbrains.services.codemodernizer.utils
 
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.fasterxml.jackson.module.kotlin.readValue
 import com.intellij.openapi.project.Project
 import com.intellij.serviceContainer.AlreadyDisposedException
 import kotlinx.coroutines.delay
@@ -25,6 +25,7 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.CodeTransformTele
 import software.aws.toolkits.jetbrains.services.codemodernizer.client.GumbyClient
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.BILLING_RATE
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.JOB_STATISTICS_TABLE_KEY
+import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerArtifact.Companion.MAPPER
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.JobId
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.PlanTable
 import software.aws.toolkits.resources.message
@@ -137,12 +138,12 @@ fun getTableMapping(stepZeroProgressUpdates: List<TransformationProgressUpdate>)
             it.name() to it.description()
         }
     } else {
-        throw RuntimeException("GetPlan response missing step 0 progress updates with table data")
+        error("GetPlan response missing step 0 progress updates with table data")
     }
 }
 
-fun parseTableMapping(tableMapping: Map<String, String>): PlanTable =
-    jacksonObjectMapper().readValue(tableMapping[JOB_STATISTICS_TABLE_KEY], PlanTable::class.java)
+fun parseTableMapping(tableMapping: Map<String, String>): PlanTable? =
+    tableMapping[JOB_STATISTICS_TABLE_KEY]?.let { MAPPER.readValue<PlanTable>(it) }
 
 fun getBillingText(linesOfCode: Int): String {
     val estimatedCost = String.format(Locale.US, "%.2f", linesOfCode.times(BILLING_RATE))