Skip to content

Commit 6b6e77d

Browse files
authored
Replace StringUtils with native Java Platform equivalents (#382)
1 parent baf91e4 commit 6b6e77d

File tree

4 files changed

+5
-9
lines changed

4 files changed

+5
-9
lines changed

src/main/java/org/jenkinsci/plugins/workflow/multibranch/ResolveScmStep.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
import jenkins.scm.api.SCMSource;
4747
import net.sf.json.JSONArray;
4848
import net.sf.json.JSONObject;
49-
import org.apache.commons.lang.StringUtils;
5049
import org.jenkinsci.plugins.workflow.steps.Step;
5150
import org.jenkinsci.plugins.workflow.steps.StepContext;
5251
import org.jenkinsci.plugins.workflow.steps.StepDescriptor;
@@ -213,7 +212,7 @@ public Step newInstance(@CheckForNull StaplerRequest2 req, @NonNull JSONObject f
213212
}
214213

215214
public FormValidation doCheckTarget(@QueryParameter String value) {
216-
if (StringUtils.isNotBlank(value)) {
215+
if (value != null && !value.isBlank()) {
217216
return FormValidation.ok();
218217
}
219218
return FormValidation.error("You must supply a target branch name to resolve");
@@ -303,7 +302,7 @@ private static class ObserverImpl extends SCMHeadObserver {
303302
public ObserverImpl(@NonNull List<String> heads) {
304303
heads.getClass(); // fail fast if null
305304
for (String head : heads) {
306-
if (StringUtils.isNotBlank(head)) {
305+
if (head != null && !head.isBlank()) {
307306
revision.put(head, null);
308307
}
309308
}

src/main/java/org/jenkinsci/plugins/workflow/multibranch/WorkflowBranchProjectFactory.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import jenkins.scm.api.SCMProbeStat;
3232
import jenkins.scm.api.SCMSource;
3333
import jenkins.scm.api.SCMSourceCriteria;
34-
import org.apache.commons.lang.StringUtils;
3534
import org.jenkinsci.plugins.workflow.flow.FlowDefinition;
3635
import org.kohsuke.stapler.DataBoundConstructor;
3736
import org.kohsuke.stapler.DataBoundSetter;
@@ -54,7 +53,7 @@ public Object readResolve() {
5453

5554
@DataBoundSetter
5655
public void setScriptPath(String scriptPath) {
57-
if (StringUtils.isEmpty(scriptPath)) {
56+
if (scriptPath == null || scriptPath.isEmpty()) {
5857
this.scriptPath = SCRIPT;
5958
} else {
6059
this.scriptPath = scriptPath;

src/main/java/org/jenkinsci/plugins/workflow/multibranch/WorkflowMultiBranchProject.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
import jenkins.scm.api.SCMRevisionAction;
5151
import jenkins.scm.api.SCMSource;
5252
import jenkins.scm.api.SCMSourceCriteria;
53-
import org.apache.commons.lang.StringUtils;
5453
import org.jenkins.ui.icon.Icon;
5554
import org.jenkins.ui.icon.IconSet;
5655
import org.jenkins.ui.icon.IconSpec;
@@ -114,7 +113,7 @@ public void onLoad(ItemGroup<? extends Item> parent, String name) throws IOExcep
114113

115114
private BranchJobProperty reconstructBranchJobProperty(@NonNull WorkflowJob job, @NonNull SCMRevisionAction action) {
116115
String sourceId = action.getSourceId();
117-
if (StringUtils.isEmpty(sourceId)) {
116+
if (sourceId == null || sourceId.isEmpty()) {
118117
return null;
119118
}
120119
SCMHead head = action.getRevision().getHead();

src/main/java/org/jenkinsci/plugins/workflow/multibranch/WorkflowMultiBranchProjectFactory.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import jenkins.branch.MultiBranchProjectFactoryDescriptor;
3131
import jenkins.scm.api.SCMSource;
3232
import jenkins.scm.api.SCMSourceCriteria;
33-
import org.apache.commons.lang.StringUtils;
3433
import org.kohsuke.stapler.DataBoundConstructor;
3534
import org.kohsuke.stapler.DataBoundSetter;
3635
import java.io.IOException;
@@ -50,7 +49,7 @@ public Object readResolve() {
5049

5150
@DataBoundSetter
5251
public void setScriptPath(String scriptPath) {
53-
if (StringUtils.isEmpty(scriptPath)) {
52+
if (scriptPath == null || scriptPath.isEmpty()) {
5453
this.scriptPath = WorkflowBranchProjectFactory.SCRIPT;
5554
} else {
5655
this.scriptPath = scriptPath;

0 commit comments

Comments
 (0)