Merge branch 'bugfix/IJMP-1628-Error-uploading-local-file-to-USS' into 'release/v1.2.5-221'

IJMP-1628-Error-uploading-local-file-to-USS

See merge request ijmp/for-mainframe!625

Author: ATsikhamirau

src/main/kotlin/eu/ibagroup/formainframe/dataops/operations/mover/LocalFileToUssDirMover.kt

@@ -42,6 +42,8 @@ class LocalFileToUssDirMoverFactory : OperationRunnerFactory {
  */
 class LocalFileToUssDirMover(val dataOpsManager: DataOpsManager) : AbstractFileMover() {
 
+  private val sourceContentType = "text/plain; charset=UTF-8"
+
   /**
    * Checks that source is local file, dest is uss directory, and destination
    * file is located on remote system (by fetching its attributes).
@@ -78,16 +80,19 @@ class LocalFileToUssDirMover(val dataOpsManager: DataOpsManager) : AbstractFileM
 
     val pathToFile = destAttributes.path + "/" + newName
 
-    val contentToUpload = sourceFile.contentsToByteArray().toMutableList()
+    val currentFileContent = sourceFile.contentsToByteArray()
     val xIBMDataType =
       if (sourceFile.fileType.isBinary) XIBMDataType(XIBMDataType.Type.BINARY) else XIBMDataType(XIBMDataType.Type.TEXT)
 
+    val contentToUpload = if (sourceFile.fileType.isBinary) currentFileContent else
+      currentFileContent.toString(sourceFile.charset).encodeToByteArray()
 
     val response = apiWithBytesConverter<DataAPI>(destConnectionConfig).writeToUssFile(
       authorizationToken = destConnectionConfig.authToken,
       filePath = FilePath(pathToFile),
-      body = contentToUpload.toByteArray(),
-      xIBMDataType = xIBMDataType
+      body = contentToUpload,
+      xIBMDataType = xIBMDataType,
+      contentType = sourceContentType
     ).applyIfNotNull(progressIndicator) { indicator ->
       cancelByIndicator(indicator)
     }.execute()