Skip to content

Fix Move files select "Do Nothing" #5790 #5815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+46 −6
Open

Fix Move files select "Do Nothing" #5790 #5815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 25 additions & 5 deletions ...ns/movefiles/src/main/java/org/apache/hop/workflow/actions/movefiles/ActionMoveFiles.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.vfs2.AllFileSelector;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSelectInfo;
import org.apache.commons.vfs2.FileType;
import org.apache.commons.vfs2.*;
import org.apache.hop.core.Const;
import org.apache.hop.core.ICheckResult;
import org.apache.hop.core.Result;
Expand Down Expand Up @@ -612,7 +609,7 @@ private boolean processFileFolder(
FileObject destinationfile =
HopVfs.getFileObject(destinationfilenamefull, getVariables());

destinationfile.createFolder();
createFolderIfNotExists(destinationfilefolder);

entrystatus =
moveFile(
Expand Down Expand Up @@ -1019,6 +1016,8 @@ private boolean moveFile(
} else if (ifFileExists.equals("fail")) {
// Update Errors
updateErrors();
} else if (ifFileExists.equals(CONST_DO_NOTHING)) {
retval = true;
}
}
} catch (Exception e) {
Expand Down Expand Up @@ -1561,4 +1560,25 @@ public void check(
public boolean isEvaluation() {
return true;
}

/**
* Ensures that the given FileObject represents an existing folder.
*
* @param folder the FileObject representing the target folder
* @throws FileSystemException if the path exists as a file or the folder creation fails
*/
private void createFolderIfNotExists(FileObject folder) throws FileSystemException {
// If the path already exists, it's a folder (directory)
if (folder.exists() && folder.getType().hasChildren()) {
return;
}

// Ensure parent folder exists before creating this one
FileObject parent = folder.getParent();
if (parent != null && !parent.exists()) {
parent.createFolder();
}

folder.createFolder();
}
}
22 changes: 21 additions & 1 deletion ...test/java/org/apache/hop/workflow/actions/movefiles/WorkflowActionMoveFilesLocalTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ void testMoveToExistingFile() throws IOException, HopException {
action.setDestinationIsAFile(true);

Result result = action.execute(new Result(), 0);
assertFalse(result.getResult(), "Move should not succeed when destination exists");
assertTrue(result.getResult(), "Move should not succeed when destination exists");
assertTrue(Files.exists(sourceFile), "Source file should still exist");
assertEquals(
originalContent,
Expand Down Expand Up @@ -154,6 +154,26 @@ void testCreateDestinationFolder() throws IOException, HopException {
assertTrue(Files.exists(destFile), "File should be moved");
}

@Test
void testMoveWithOverwriteFileExist() throws IOException, HopException {
Path sourceFile = createTestFilePath(sourceFolder, "test.txt");
Path destFile = createTestFilePath(destinationFolder, "test.txt");

action.sourceFileFolder = new String[] {sourceFile.toString()};
action.destinationFileFolder = new String[] {destinationFolder.toString()};
action.setDestinationIsAFile(true);
action.setIfFileExists("overwrite_file");

Result result = action.execute(new Result(), 0);
assertTrue(result.getResult(), "Move with overwrite should succeed");
assertFalse(Files.exists(sourceFile), "Source file should not exist");
assertTrue(Files.exists(destFile), "Destination file should exist");
assertEquals(
TEST_FILE_CONTENT,
Files.readString(destFile, StandardCharsets.UTF_8),
"File content should match source");
}

private Path createTestFilePath(File folder, String filename) throws IOException {
Path filePath = folder.toPath().resolve(filename);
Files.writeString(filePath, TEST_FILE_CONTENT, StandardCharsets.UTF_8);
Expand Down