Script order #70
Script order #70
Conversation
Nit: Comma after "Before" in commit message. |
| * A comparator that orders path names. Files in the same directory are ordered alphabetically, and always come before | ||
| * files in subdirectories. Subdirectories are also ordered alphabetically. | ||
| */ | ||
| class PathComparator implements Comparator<String> { |
There was a problem hiding this comment.
How about this code instead which is a bit shorter?
There was a problem hiding this comment.
The code is not sorting folders alphabetically, you can see in the example output that /games/snake comes after /usr/local, with more files and more folders this would become a total mess.
| class PathComparator implements Comparator<String> { | ||
| @Override | ||
| int compare(String o1, String o2) { | ||
| def tokens1 = o1.tokenize('/') |
There was a problem hiding this comment.
Shouldn't this use File.separator for portability?
There was a problem hiding this comment.
I had to revert this as it fails on Windows.
mnonnenmacher
force-pushed
the
script-order
branch
from
e6580b7 to
1ccc493
Compare
| def tokens1 = o1.tokenize('/') | ||
| def tokens2 = o2.tokenize('/') | ||
| for (int i = 0; i < Math.max(tokens1.size(), tokens2.size()); i++) { | ||
| def hasNext1 = tokens1.size() > i + 1 |
There was a problem hiding this comment.
Nit: Maybe i + 1 < tokens1.size() is more readable?
| int compare(String o1, String o2) { | ||
| def tokens1 = o1.tokenize('/') | ||
| def tokens2 = o2.tokenize('/') | ||
| for (int i = 0; i < Math.max(tokens1.size(), tokens2.size()); i++) { |
There was a problem hiding this comment.
Nit: Prefer pre-increment in for loops, ++i.
| int compare(String o1, String o2) { | ||
| def tokens1 = o1.tokenize(File.separatorChar) | ||
| def tokens2 = o2.tokenize(File.separatorChar) | ||
| for (int i = 0; i < Math.max(tokens1.size(), tokens2.size()); i++) { |
There was a problem hiding this comment.
Nit: Prefer prefix-increment in for-loops, ++i.
| def tokens1 = o1.tokenize(File.separatorChar) | ||
| def tokens2 = o2.tokenize(File.separatorChar) | ||
| for (int i = 0; i < Math.max(tokens1.size(), tokens2.size()); i++) { | ||
| def hasNext1 = tokens1.size() > i + 1 |
There was a problem hiding this comment.
Nit: Maybe i + 1 < tokens1.size() reads better?
Before, the Job DSL scripts were processed in whatever order they were returned from the source set. This made the behaviour unpredictable in situations were order matters. Therefore define a sorting order for Job DSL scripts. Job DSL scripts from the same folder are now executed in alphabetical order, and before all scripts from subfolders. Subfolders are also processed in alphabetical order.
sschuberth
force-pushed
the
script-order
branch
from
1ccc493 to
3c99d2d
Compare
No description provided.