[FIXED JENKINS-50833] Revert DeclarativeAgentDescriptor.all() signature

jenkinsci · Apr 17, 2018 · 6b0e8f2 · 6b0e8f2
1 parent 6d3b9dc
commit 6b0e8f2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/...rc/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/generator/AgentDirective.java b/...rc/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/generator/AgentDirective.java
@@ -36,7 +36,9 @@
 
 import javax.annotation.Nonnull;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class AgentDirective extends AbstractDirective<AgentDirective> {
     private DeclarativeAgent agent;
@@ -68,7 +70,9 @@ public String getDisplayName() {
         @Nonnull
         public List<Descriptor> getDescriptors() {
             List<Descriptor> descriptors = new ArrayList<>();
-            for (DeclarativeAgentDescriptor td : DeclarativeAgentDescriptor.all()) {
+            List<DeclarativeAgentDescriptor> descs = DeclarativeAgentDescriptor.all().stream()
+                    .sorted(Comparator.comparing(DeclarativeAgentDescriptor::getName)).collect(Collectors.toList());
+            for (DeclarativeAgentDescriptor td : descs) {
                 if (!SymbolLookup.getSymbolValue(td).isEmpty()) {
                     descriptors.add(td);
                 }

diff --git a/...java/org/jenkinsci/plugins/pipeline/modeldefinition/agent/DeclarativeAgentDescriptor.java b/...java/org/jenkinsci/plugins/pipeline/modeldefinition/agent/DeclarativeAgentDescriptor.java
@@ -49,9 +49,8 @@ public abstract class DeclarativeAgentDescriptor<A extends DeclarativeAgent<A>>
      *
      * @return a list of all {@link DeclarativeAgentDescriptor}s registered.`
      */
-    public static List<DeclarativeAgentDescriptor> all() {
-        ExtensionList<DeclarativeAgentDescriptor> descs = ExtensionList.lookup(DeclarativeAgentDescriptor.class);
-        return descs.stream().sorted(Comparator.comparing(DeclarativeAgentDescriptor::getName)).collect(Collectors.toList());
+    public static ExtensionList<DeclarativeAgentDescriptor> all() {
+        return ExtensionList.lookup(DeclarativeAgentDescriptor.class);
     }
 
     /**