Merge pull request #73 from basil/join

Stop using deprecated `Util#join`
jenkinsci · Jun 2, 2021 · 34fd582 · 34fd582
2 parents 390361b + a5cdc7e
commit 34fd582
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/main/java/hudson/matrix/Axis.java b/src/main/java/hudson/matrix/Axis.java
@@ -216,7 +216,7 @@ public AxisDescriptor getDescriptor() {
 
     @Override
     public String toString() {
-        return new StringBuilder().append(name).append("={").append(Util.join(values,",")).append('}').toString();
+        return new StringBuilder().append(name).append("={").append(String.join(",", values)).append('}').toString();
     }
 
     /**

diff --git a/src/main/java/hudson/matrix/LabelAxis.java b/src/main/java/hudson/matrix/LabelAxis.java
@@ -25,7 +25,6 @@
 
 import hudson.Extension;
 import hudson.Functions;
-import hudson.Util;
 import jenkins.model.Jenkins;
 import hudson.model.labels.LabelAtom;
 import org.kohsuke.stapler.DataBoundConstructor;
@@ -50,7 +49,7 @@ public boolean isSystem() {
 
     @Override
     public String getValueString() {
-        return Util.join(getValues(),"/");
+        return String.join("/", getValues());
     }
 
     @Extension

diff --git a/src/main/java/hudson/matrix/MatrixProject.java b/src/main/java/hudson/matrix/MatrixProject.java
@@ -852,7 +852,7 @@ public JDK getJDK() {
 
         Set<Label> r = new HashSet<Label>();
         for (Combination c : axes.subList(LabelAxis.class).list())
-            r.add(jenkins.getLabel(Util.join(c.values(),"&&")));
+            r.add(jenkins.getLabel(String.join("&&", c.values())));
         return r;
     }