feat: make destinationFolderName optional to allow to move directly in destinationParentFolder (#6)

Author: passga

README.md

@@ -55,9 +55,9 @@ pipeline {
 
 # Build
 
-`gw :plugins:gdrive-upload:server` to run jenkins with that plugin
+`./gradlew :gdrive-jenkins:server` to run jenkins with that plugin
 
-`gw :plugins:gdrive-upload:jpi` to produce the plugin
+`./gradlew :gdrive-jenkins:jpi` to produce the plugin
 
 The compilation uses `kapt` for annotation processing along with `net.java.sezpoz:sezpoz` to process `@Extension` annotations
 

gdrive-cli/README.adoc

@@ -13,4 +13,4 @@ To run debug mode on your IDE, add `--debug-jvm`
 
 ## How to move folder
 
-    ./gradlew run --args " -c path/credentialFile.json move sourceFolderId folderName destinationParentFolderId destinationFolderName --renameTo newFolderName" --debug-jvm
+    ./gradlew run --args " -c path/credentialFile.json move sourceFolderId folderName destinationParentFolderId --destinationFolderName destinationFolderName --renameTo newFolderName" --debug-jvm

gdrive-cli/src/main/kotlin/org/bonitasoft/gdrive/cli/MoveCommand.kt

@@ -18,8 +18,8 @@ class MoveCommand : BaseCommand() {
 	@CommandLine.Parameters(paramLabel = "destinationParentFolderId", description = ["Id of the folder containing the destination folder."])
 	lateinit var destinationParentFolderId: String
 
-	@CommandLine.Parameters(paramLabel = "destinationFolderName", description = ["Name of folder which will contain the element to move."])
-	lateinit var destinationFolderName: String
+	@CommandLine.Option(names = ["--destinationFolderName"], description = ["Name of folder which will contain the element to move."])
+	var destinationFolderName: String = ""
 
 
 	override fun run() {

gdrive-core/src/main/kotlin/org/bonitasoft/gdrive/core/GDriveMoveTask.kt

@@ -22,15 +22,19 @@ class GDriveMoveTask(googleCredentials: String,
 
         val sourceElement = execute.files.firstOrNull() ?: throw Exception("No folder $elementName found $sourceId folder")
 
-        val parentFolder = drive.files().list()
-                .setQ("'$destinationParentFolderId' in parents and name = '$destinationFolderName' and trashed = false and  mimeType = '${FOLDER_MIMETYPE}'")
-                .setFields("files(id, name, parents)")
-                .setSupportsAllDrives(true)
-                .setIncludeItemsFromAllDrives(true)
-                .execute().files.firstOrNull() ?: createFolder(drive, destinationFolderName, destinationParentFolderId)
+        var parentFolderId =  destinationParentFolderId
 
+        if(!destinationFolderName.isBlank()) {
+            parentFolderId = (drive.files().list()
+                    .setQ("'$destinationParentFolderId' in parents and name = '$destinationFolderName' and trashed = false and  mimeType = '${FOLDER_MIMETYPE}'")
+                    .setFields("files(id, name, parents)")
+                    .setSupportsAllDrives(true)
+                    .setIncludeItemsFromAllDrives(true)
+                    .execute().files.firstOrNull()
+                    ?: createFolder(drive, destinationFolderName, destinationParentFolderId)).id
+        }
         drive.files().update(sourceElement.id, File().apply { name = renameTo })
-                .setAddParents(parentFolder.id)
+                .setAddParents(parentFolderId)
                 .setRemoveParents(sourceElement.parents[0])
                 .setSupportsAllDrives(true)
                 .execute()

gdrive-jenkins/src/main/kotlin/org/bonitasoft/gdrive/jenkins/GDriveMove.kt

@@ -7,27 +7,35 @@ import org.jenkinsci.plugins.workflow.steps.Step
 import org.jenkinsci.plugins.workflow.steps.StepContext
 import org.jenkinsci.plugins.workflow.steps.StepDescriptor
 import org.kohsuke.stapler.DataBoundConstructor
+import org.kohsuke.stapler.DataBoundSetter
 
 class GDriveMove
-
 @DataBoundConstructor
 constructor(
-		val googleCredentials: String,
-		val sourceId: String,
-		val elementName: String,
-		val destinationParentFolderId: String,
-		val destinationFolderName: String,
-		val renameTo: String
+        val googleCredentials: String,
+        val sourceId: String,
+        val elementName: String,
+        val destinationParentFolderId: String,
+        val renameTo: String
 ) : Step() {
-	override fun start(context: StepContext) = GDriveMoveStepExecution(
-			googleCredentials,
-			sourceId,
-			elementName,
-			destinationParentFolderId,
-			destinationFolderName,
-			renameTo,
-			context
-	)
+
+    private var destinationFolderName: String? = null
+
+    @DataBoundSetter
+    fun setDestinationFolderName(destinationFolderName: String) {
+        this.destinationFolderName = destinationFolderName
+    }
+
+
+    override fun start(context: StepContext) = GDriveMoveStepExecution(
+            googleCredentials,
+            sourceId,
+            elementName,
+            destinationParentFolderId,
+            destinationFolderName,
+            renameTo,
+            context
+    )
 
 
 	@Extension

gdrive-jenkins/src/main/kotlin/org/bonitasoft/gdrive/jenkins/GDriveMoveStepExecution.kt

@@ -13,14 +13,14 @@ class GDriveMoveStepExecution(
 		private val sourceId: String,
 		private val elementName: String,
 		private val destinationParentFolderId: String,
-		private val destinationFolderName: String,
+		private val destinationFolderName: String?,
 		private val renameTo: String,
 		context: StepContext) : SynchronousNonBlockingStepExecution<Void>(context) {
 
 	override fun run(): Void? {
 		val logger = context.get(TaskListener::class.java)?.logger!!
 		try {
-			GDriveMoveTask(googleCredentials, sourceId, elementName, destinationParentFolderId, destinationFolderName, object : Logger {
+			GDriveMoveTask(googleCredentials, sourceId, elementName, destinationParentFolderId, destinationFolderName.orEmpty(), object : Logger {
 				override fun debug(message: String) = logger.println("DEBUG: $message")
 				override fun info(message: String) = logger.println("INFO: $message")
 				override fun warn(message: String) = logger.println("WARN: $message")