Skip to content
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

Jump to bottom

Handle absolute path in getAll method DAT-11890 #3369

Merged
merged 8 commits into from Oct 19, 2022
Merged

Handle absolute path in getAll method DAT-11890 #3369

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c147c3e
Handle absolute path in getAll method
wwillard7800 Oct 13, 2022
2ba1311
Handle edge case for FileUtil.isAbsolute(path)
wwillard7800 Oct 13, 2022
7ebcb88
Another strategy for handling absolute path
wwillard7800 Oct 14, 2022
38b3653
Merge remote-tracking branch 'origin/DAT-11890' into DAT-11890
wwillard7800 Oct 14, 2022
724e259
Added comments
wwillard7800 Oct 17, 2022
cebb4af
Removed accidental commit
wwillard7800 Oct 17, 2022
00c2573
Added a unit test for ResourceAccessor.getAll() to test full Windows …
wwillard7800 Oct 17, 2022
0375e78
Merge branch 'master' into DAT-11890
suryaaki2 Oct 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 15 additions & 1 deletion liquibase-core/src/main/java/liquibase/resource/AbstractPathResourceAccessor.java
View file
Open in desktop
Expand Up @@ -2,6 +2,7 @@

import liquibase.Scope;
import liquibase.logging.Logger;
import liquibase.util.FileUtil;

import java.io.File;
import java.io.IOException;
Expand Down Expand Up @@ -48,7 +49,20 @@ public List<Resource> getAll(String path) throws IOException {

private String standardizePath(String path) {
try {
return new File(path).toPath().normalize().toString().replace("\\", "/").replaceFirst("^/", "");
//
// Flip the separators to Linux-style and replace the first separator
// If then root path is the absolute path for Linux or Windows then return that result
//
String rootPath = getRootPath().toString();
String result = new File(path).toPath().normalize().toString().replace("\\", "/").replaceFirst("^/", "");
if (rootPath.equals("/") || rootPath.equals("\\")) {
return result;
}

//
// Strip off any Windows drive prefix and return the result
//
return result.replaceFirst("^\\w:/","");
} catch (InvalidPathException e) {
Scope.getCurrentScope().getLog(getClass()).warning("Failed to standardize path " + path, e);
return path;
Expand Down
3 changes: 1 addition & 2 deletions liquibase-core/src/main/java/liquibase/util/FileUtil.java
View file
Open in desktop
Expand Up @@ -52,11 +52,10 @@ public static String getFileNotFoundMessage(String physicalChangeLogLocation) {
return message;
}

public static boolean isAbsolute(String path) throws IOException {
public static boolean isAbsolute(String path) {
if (path == null) {
return false;
}
return new File(path).isAbsolute();
}

}
17 changes: 9 additions & 8 deletions liquibase-core/src/test/groovy/liquibase/resource/DirectoryResourceAccessorTest.groovy
View file
Open in desktop
Expand Up @@ -93,14 +93,15 @@ class DirectoryResourceAccessorTest extends Specification {
simpleTestAccessor.getAll(path)*.getPath() == expected

where:
path | expected
"liquibase/resource/DirectoryResourceAccessorTest.class" | ["liquibase/resource/DirectoryResourceAccessorTest.class"]
"/liquibase/resource/DirectoryResourceAccessorTest.class" | ["liquibase/resource/DirectoryResourceAccessorTest.class"]
"liquibase\\resource\\DirectoryResourceAccessorTest.class" | ["liquibase/resource/DirectoryResourceAccessorTest.class"]
"\\liquibase\\resource\\DirectoryResourceAccessorTest.class" | ["liquibase/resource/DirectoryResourceAccessorTest.class"]
"com/example/file with space.txt" | ["com/example/file with space.txt"]
"com\\example\\file with space.txt" | ["com/example/file with space.txt"]
"com/example/file with space.txt" | ["com/example/file with space.txt"]
path | expected
"liquibase/resource/DirectoryResourceAccessorTest.class" | ["liquibase/resource/DirectoryResourceAccessorTest.class"]
"/liquibase/resource/DirectoryResourceAccessorTest.class" | ["liquibase/resource/DirectoryResourceAccessorTest.class"]
"liquibase\\resource\\DirectoryResourceAccessorTest.class" | ["liquibase/resource/DirectoryResourceAccessorTest.class"]
"\\liquibase\\resource\\DirectoryResourceAccessorTest.class" | ["liquibase/resource/DirectoryResourceAccessorTest.class"]
"com/example/file with space.txt" | ["com/example/file with space.txt"]
"com\\example\\file with space.txt" | ["com/example/file with space.txt"]
"com/example/file with space.txt" | ["com/example/file with space.txt"]
"c:\\liquibase\\resource\\DirectoryResourceAccessorTest.class" | ["liquibase/resource/DirectoryResourceAccessorTest.class"]
}

def "getAll returns empty if nothing matches"() {
Expand Down