Merge pull request #1195 from daspilker/JENKINS-54231

[JENKINS-54231] show items with same display name on job and build pages

Author: daspilker

docs/Home.md

@@ -37,6 +37,8 @@ Browse the Jenkins issue tracker to see any [open issues](https://issues.jenkins
     ([JENKINS-44142](https://issues.jenkins-ci.org/browse/JENKINS-44142))
   * Fixed [[Dynamic DSL]] problem
     ([JENKINS-57817](https://issues.jenkins-ci.org/browse/JENKINS-57817))
+  * Show items with same display name on job and build pages
+    ([JENKINS-54231](https://issues.jenkins-ci.org/browse/JENKINS-54231))
   * Deprecated `concurrentBuild` method in `pipelineJob` context, see [Migration](Migration#migrating-to-176)
     ([JENKINS-53775](https://issues.jenkins-ci.org/browse/JENKINS-53775))
   * Support for older versions of the [Pipeline Job Plugin](https://plugins.jenkins.io/workflow-job) is deprecated, see

job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/actions/GeneratedJobsAction.groovy

@@ -10,14 +10,14 @@ class GeneratedJobsAction extends GeneratedObjectsAction<GeneratedJob, Generated
         super(job, GeneratedJobsBuildAction)
     }
 
-    Set<Item> getItems() {
-        Set<Item> result = new TreeSet<>(Comparators.ITEM_COMPARATOR)
+    Iterable<Item> getItems() {
+        Set<Item> result = []
         for (Run run : job.builds) {
             GeneratedJobsBuildAction action = run.getAction(GeneratedJobsBuildAction)
             if (action != null) {
                 result.addAll(action.items)
             }
         }
-        result
+        result.toSorted(Comparators.ITEM_COMPARATOR)
     }
 }

job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/actions/GeneratedJobsBuildAction.groovy

@@ -19,15 +19,15 @@ class GeneratedJobsBuildAction extends GeneratedObjectsRunAction<GeneratedJob> {
         this.lookupStrategy = lookupStrategy
     }
 
-    Set<Item> getItems() {
-        Set<Item> result = new TreeSet<>(Comparators.ITEM_COMPARATOR)
+    Iterable<Item> getItems() {
+        Set<Item> result = []
         for (GeneratedJob job : modifiedObjects) {
             Item item = lookupStrategy.getItem(owner.parent, job.jobName, Item)
             if (item != null) {
                 result << item
             }
         }
-        result
+        result.toSorted(Comparators.ITEM_COMPARATOR)
     }
 
     @Override

job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/actions/GeneratedViewsAction.groovy

@@ -10,14 +10,14 @@ class GeneratedViewsAction extends GeneratedObjectsAction<GeneratedView, Generat
         super(job, GeneratedViewsBuildAction)
     }
 
-    Set<View> getViews() {
-        Set<View> result = new TreeSet<>(Comparators.VIEW_COMPARATOR)
+    Iterable<View> getViews() {
+        Set<View> result = []
         for (Run run : job.builds) {
             GeneratedViewsBuildAction action = run.getAction(GeneratedViewsBuildAction)
             if (action != null) {
                 result.addAll(action.views)
             }
         }
-        result
+        result.toSorted(Comparators.VIEW_COMPARATOR)
     }
 }

job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/actions/GeneratedViewsBuildAction.groovy

@@ -22,8 +22,8 @@ class GeneratedViewsBuildAction extends GeneratedObjectsRunAction<GeneratedView>
         this.lookupStrategy = lookupStrategy
     }
 
-    Set<View> getViews() {
-        Set<View> allGeneratedViews = new TreeSet<>(Comparators.VIEW_COMPARATOR)
+    Iterable<View> getViews() {
+        Set<View> allGeneratedViews = []
         for (GeneratedView generatedView : modifiedObjects) {
             ItemGroup itemGroup = lookupStrategy.getParent(owner.parent, generatedView.name)
             if (itemGroup instanceof ViewGroup) {
@@ -34,7 +34,7 @@ class GeneratedViewsBuildAction extends GeneratedObjectsRunAction<GeneratedView>
                 }
             }
         }
-        allGeneratedViews
+        allGeneratedViews.toSorted(Comparators.VIEW_COMPARATOR)
     }
 
     @Override

job-dsl-plugin/src/test/groovy/javaposse/jobdsl/plugin/actions/GeneratedJobsBuildActionSpec.groovy

@@ -46,11 +46,11 @@ class GeneratedJobsBuildActionSpec extends Specification {
         action.onLoad(run)
 
         when:
-        Set<Item> items = action.items
+        Iterable<Item> items = action.items
 
         then:
         items != null
-        items.empty
+        items.size() == 0
     }
 
     def 'get items'() {

job-dsl-plugin/src/test/groovy/javaposse/jobdsl/plugin/actions/GeneratedViewsActionSpec.groovy

@@ -82,11 +82,11 @@ class GeneratedViewsActionSpec extends Specification {
         project.builds >> fromRuns([])
 
         when:
-        Set<View> views = new GeneratedViewsAction(project).views
+        Iterable<View> views = new GeneratedViewsAction(project).views
 
         then:
         views != null
-        views.isEmpty()
+        views.size() == 0
     }
 
     def 'getViews no build action'() {
@@ -95,11 +95,11 @@ class GeneratedViewsActionSpec extends Specification {
         project.builds >> fromRuns([build1])
 
         when:
-        Set<View> views = new GeneratedViewsAction(project).views
+        Iterable<View> views = new GeneratedViewsAction(project).views
 
         then:
         views != null
-        views.isEmpty()
+        views.size() == 0
     }
 
     def 'getViews'() {
@@ -116,7 +116,7 @@ class GeneratedViewsActionSpec extends Specification {
         project.builds >> fromRuns([build1, build2])
 
         when:
-        Set<View> views = new GeneratedViewsAction(project).views
+        Iterable<View> views = new GeneratedViewsAction(project).views
 
         then:
         views != null

job-dsl-plugin/src/test/groovy/javaposse/jobdsl/plugin/actions/GeneratedViewsBuildActionSpec.groovy

@@ -46,11 +46,11 @@ class GeneratedViewsBuildActionSpec extends Specification {
         action.onLoad(run)
 
         when:
-        Set<View> views = action.views
+        Iterable<View> views = action.views
 
         then:
         views != null
-        views.empty
+        views.size() == 0
     }
 
     def 'get views'() {