From d841f1d1f7bd3a164c00cdfa2048df0e2ed9746d Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Sat, 29 Jul 2023 10:39:22 -0400 Subject: [PATCH] Simpler `Jenkins.getComputers` (#8299) --- core/src/main/java/jenkins/model/Jenkins.java | 9 ++------- .../test/java/jenkins/model/JenkinsTest.java | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java index 17914efda4..9bf94cf938 100644 --- a/core/src/main/java/jenkins/model/Jenkins.java +++ b/core/src/main/java/jenkins/model/Jenkins.java @@ -225,6 +225,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -2049,13 +2050,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve * Gets the read-only list of all {@link Computer}s. */ public Computer[] getComputers() { - Computer[] r = computers.values().toArray(new Computer[0]); - Arrays.sort(r, (lhs, rhs) -> { - if (lhs.getNode() == Jenkins.this) return -1; - if (rhs.getNode() == Jenkins.this) return 1; - return lhs.getName().compareTo(rhs.getName()); - }); - return r; + return computers.values().stream().sorted(Comparator.comparing(Computer::getName)).toArray(Computer[]::new); } @CLIResolver diff --git a/test/src/test/java/jenkins/model/JenkinsTest.java b/test/src/test/java/jenkins/model/JenkinsTest.java index a5ebe87533..479837a4ca 100644 --- a/test/src/test/java/jenkins/model/JenkinsTest.java +++ b/test/src/test/java/jenkins/model/JenkinsTest.java @@ -25,6 +25,7 @@ package jenkins.model; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.arrayContaining; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasItem; @@ -50,6 +51,7 @@ import hudson.model.Node; import hudson.model.RestartListener; import hudson.model.RootAction; import hudson.model.Saveable; +import hudson.model.Slave; import hudson.model.TaskListener; import hudson.model.UnprotectedRootAction; import hudson.model.User; @@ -67,9 +69,12 @@ import java.io.IOException; import java.net.HttpURLConnection; import java.net.Socket; import java.net.URL; +import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; +import java.util.List; import java.util.Set; +import java.util.stream.Stream; import jenkins.AgentProtocol; import org.htmlunit.FailingHttpStatusCodeException; import org.htmlunit.HttpMethod; @@ -701,6 +706,19 @@ public class JenkinsTest { } } + @Test + public void getComputers() throws Exception { + List agents = new ArrayList<>(); + for (String n : List.of("zestful", "bilking", "grouchiest")) { + agents.add(j.createSlave(n, null, null)); + } + for (Slave agent : agents) { + j.waitOnline(agent); + } + assertThat(Stream.of(j.jenkins.getComputers()).map(Computer::getName).toArray(String[]::new), + arrayContaining("", "bilking", "grouchiest", "zestful")); + } + @Issue("JENKINS-42577") @Test public void versionIsSavedInSave() throws Exception {