Skip to content

remove usages of commons-lang from core #500

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

Merged
jglick merged 4 commits into from
May 28, 2025
Merged

remove usages of commons-lang from core #500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c88303f
use XS_DATETIME_FORMATTER2 instead of deprecated XS_DATETIME_FORMATTER
mawinter69 May 26, 2025
0839007
use commons-lang3
mawinter69 May 26, 2025
45cd3a2
remove commons-lang3 usage
mawinter69 May 28, 2025
d51a1b6
don't use codepoints stream
mawinter69 May 28, 2025
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
4 changes: 2 additions & 2 deletions src/main/java/com/cloudbees/hudson/plugins/folder/ChildNameGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.Map;
import java.util.Objects;
import java.util.WeakHashMap;
import edu.umd.cs.findbugs.annotations.CheckForNull;
import edu.umd.cs.findbugs.annotations.NonNull;
import java.util.logging.Level;
import java.util.logging.Logger;
import jenkins.model.TransientActionFactory;
import org.apache.commons.lang.StringUtils;

/**
* Provides a way for a {@link ComputedFolder} to break the association between the directory names on disk
Expand Down Expand Up @@ -293,7 +293,7 @@ public final String readItemName(@NonNull File directory) {
File nameFile = new File(directory, CHILD_NAME_FILE);
if (nameFile.isFile()) {
try {
childName = StringUtils.defaultString(StringUtils.trimToNull(Files.readString(nameFile.toPath(), StandardCharsets.UTF_8)), directory.getName());
childName = Objects.toString(Util.fixEmptyAndTrim(Files.readString(nameFile.toPath(), StandardCharsets.UTF_8)), directory.getName());
} catch (IOException e) {
LOGGER.log(Level.WARNING, () -> "Could not read "+ nameFile + ", assuming child name is " + directory.getName());
}
Expand Down
11 changes: 5 additions & 6 deletions src/main/java/com/cloudbees/hudson/plugins/folder/computed/PeriodicFolderTrigger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.commons.lang.StringUtils;
import org.kohsuke.stapler.DataBoundConstructor;

/**
Expand Down Expand Up @@ -107,19 +106,19 @@
interval = interval.toLowerCase();
if (interval.endsWith("h")) {
units = TimeUnit.HOURS;
interval = StringUtils.removeEnd(interval, "h");
interval = interval.substring(0, interval.length() - 1);
}
if (interval.endsWith("m")) {
interval = StringUtils.removeEnd(interval, "m");
interval = interval.substring(0, interval.length() - 1);
} else if (interval.endsWith("d")) {
units = TimeUnit.DAYS;
interval = StringUtils.removeEnd(interval, "d");
interval = interval.substring(0, interval.length() - 1);
} else if (interval.endsWith("ms")) {
units = TimeUnit.SECONDS;
interval = StringUtils.removeEnd(interval, "ms");
interval = interval.substring(0, interval.length() - 1);
Copy link

@szjozsef szjozsef May 29, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here should not be: interval = interval.substring(0, interval.length() - 2); ?

Copy link
Member

@viceice viceice May 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

} else if (interval.endsWith("s")) {
units = TimeUnit.SECONDS;
interval = StringUtils.removeEnd(interval, "s");
interval = interval.substring(0, interval.length() - 1);

Check warning on line 121 in src/main/java/com/cloudbees/hudson/plugins/folder/computed/PeriodicFolderTrigger.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered lines 

Lines 118-121 are not covered by tests
}
long value = 0;
try {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/cloudbees/hudson/plugins/folder/computed/PseudoRun.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
*/
@NonNull
public String getTimestampString2() {
return Util.XS_DATETIME_FORMATTER.format(computation.getTimestamp());
return Util.XS_DATETIME_FORMATTER2.format(computation.getTimestamp().toInstant());

Check warning on line 74 in src/main/java/com/cloudbees/hudson/plugins/folder/computed/PseudoRun.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered line 

Line 74 is not covered by tests
}

@CheckForNull
Expand Down
3 changes: 1 addition & 2 deletions src/test/java/com/cloudbees/hudson/plugins/folder/ChildNameGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
import java.util.TreeSet;
import edu.umd.cs.findbugs.annotations.NonNull;
import net.sf.json.JSONObject;
import org.apache.commons.lang.StringUtils;
import org.junit.Rule;
import org.junit.Test;
import org.jvnet.hudson.test.JenkinsSessionRule;
Expand Down Expand Up @@ -623,7 +622,7 @@ static CharSequence asJavaString(String rawString) {
if (c >= 32 && c < 128) {
b.append(c);
} else {
b.append("\\u").append(StringUtils.leftPad(Integer.toHexString(c & 0xffff), 4, '0'));
b.append(String.format("\\u%04x", (int) c));
}
}
return b;
Expand Down