minor cleanups

Author: David Hasani

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

@@ -160,6 +160,7 @@ class CodeModernizerSession(
                 telemetryErrorMessage = "Disposed when about to create zip"
                 return CodeModernizerStartJobResult.Disposed
             }
+            // for language upgrades, copyResult should always be Successful here, failure cases already handled
             val result = sessionContext.createZipWithModuleFiles(copyResult)
 
             if (result is ZipCreationResult.Missing1P) {

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

@@ -189,6 +189,8 @@ data class CodeModernizerSessionContext(
         val depDirectory = if (copyResult is MavenCopyCommandsResult.Success) {
             showTransformationHub()
             copyResult.dependencyDirectory
+        } else if (copyResult != null) { // failure cases already handled by now, but to be safe set depDir to null if copyResult failed
+            null
         } else {
             sqlMetadataZip // null copyResult means doing a SQL conversion
         }
@@ -212,7 +214,6 @@ data class CodeModernizerSessionContext(
                 val depSources = File(ZIP_DEPENDENCIES_PATH)
                 val outputFile = createTemporaryZipFile { zip ->
                     // 1) Manifest file
-                    // val dependenciesRoot = if (depDirectory != null) "$ZIP_DEPENDENCIES_PATH/${depDirectory.name}" else null
                     var manifest = ZipManifest(customBuildCommand = customBuildCommand)
                     if (sqlMetadataZip != null) {
                         // doing a SQL conversion, not language upgrade
@@ -273,8 +274,8 @@ data class CodeModernizerSessionContext(
                         zip.putNextEntry(Path(BUILD_LOG_PATH).toString(), it)
                     }
                 }.toFile()
-                // only return Missing1P for language upgrades with a null depDirectory; for SQL conversions always use Succeeded since depDirectory not used
-                if (depDirectory != null || schema != null) ZipCreationResult.Succeeded(outputFile) else ZipCreationResult.Missing1P(outputFile)
+                // depDirectory should never be null
+                if (depDirectory != null) ZipCreationResult.Succeeded(outputFile) else ZipCreationResult.Missing1P(outputFile)
             } catch (e: NoSuchFileException) {
                 throw CodeModernizerException("Source folder not found")
             } catch (e: Exception) {

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

@@ -174,7 +174,7 @@ fun validateSctMetadata(sctFile: File?): SqlMetadataValidationResult {
         for (serverNodeLocation in serverNodeLocations) {
             val fullNameNodeInfoList = serverNodeLocation["FullNameNodeInfoList"] as Map<*, *>
             val nameParts = fullNameNodeInfoList["nameParts"] as Map<*, *>
-            var fullNameNodeInfo = nameParts["FullNameNodeInfo"] // as List<Map<*, *>>
+            var fullNameNodeInfo = nameParts["FullNameNodeInfo"]
             if (fullNameNodeInfo is Map<*, *>) {
                 continue
             } else {

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

@@ -80,7 +80,6 @@ fun Project.getSupportedModules(supportedJavaMappings: Map<JavaSdkVersion, Set<J
 }
 
 // return the first file or directory found inside each open Java module, so that user can select a Module for us to ZIP
-// does not strictly need to return the first file or directory found, any one would work fine
 fun Project.getJavaModules() = this.modules.flatMap { module ->
     val rootManager = ModuleRootManager.getInstance(module)
     if (rootManager.sdk?.sdkType?.name?.lowercase()?.contains("java") == true) {