pan3793 commented on code in PR #6335: URL: https://github.com/apache/kyuubi/pull/6335#discussion_r1704966791
########## kyuubi-server/src/main/scala/org/apache/kyuubi/server/api/v1/BatchesResource.scala: ########## @@ -525,22 +538,105 @@ private[v1] class BatchesResource extends ApiRequestContext with Logging { } } } + + private def handleUploadingFiles( + batchId: String, + request: BatchRequest, + resourceFileInputStream: InputStream, + resourceFileName: String, + formDataMultiPartOpt: Option[FormDataMultiPart]): Option[JPath] = { + val uploadFileFolderPath = batchResourceUploadFolderPath(batchId) + handleUploadingResourceFile( + request, + resourceFileInputStream, + resourceFileName, + uploadFileFolderPath) + handleUploadingExtraResourcesFiles(request, formDataMultiPartOpt, uploadFileFolderPath) + Some(uploadFileFolderPath) + } + + private def handleUploadingResourceFile( + request: BatchRequest, + inputStream: InputStream, + fileName: String, + uploadFileFolderPath: JPath): Unit = { + try { + val tempFile = Utils.writeToTempFile(inputStream, uploadFileFolderPath, fileName) + request.setResource(tempFile.getPath) + } catch { + case e: Exception => + throw new RuntimeException( + s"Failed handling uploaded resource file $fileName: ${e.getMessage}", + e) + } + } + + private def handleUploadingExtraResourcesFiles( + request: BatchRequest, + formDataMultiPartOpt: Option[FormDataMultiPart], + uploadFileFolderPath: JPath): Unit = { + val extraResourceMap = request.getExtraResourcesMap.asScala + if (extraResourceMap.nonEmpty) { + val fileNameSeperator = "," + val formDataMultiPart = formDataMultiPartOpt.get + val transformedExtraResourcesMap = extraResourceMap + .mapValues(confValue => + confValue.split(fileNameSeperator).filter(StringUtils.isNotBlank(_))) + .filter { case (confKey, fileNames) => + fileNames.nonEmpty && StringUtils.isNotBlank(confKey) + }.mapValues { fileNames => + fileNames.map(fileName => + Option(formDataMultiPart.getField(fileName)) + .getOrElse(throw new RuntimeException(s"File part for file $fileName not found"))) + }.map { + case (confKey, fileParts) => + val tempFilePaths = fileParts.map(filePart => { Review Comment: nit: for multi lines lambda, `{` is always preferred over `(` ```suggestion val tempFilePaths = fileParts.map { filePart => ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@kyuubi.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: notifications-unsubscr...@kyuubi.apache.org For additional commands, e-mail: notifications-h...@kyuubi.apache.org