Merge pull request #1 from fajran/JENKINS-43783

Put ChangeLogs in a list instead of map
jenkinsci · Apr 27, 2017 · b3a2c3a · b3a2c3a
2 parents fdb8b74 + 5555723
commit b3a2c3a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 23 deletions.
diff --git a/src/main/java/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator.java b/src/main/java/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator.java
@@ -7,7 +7,6 @@
 import hudson.util.RunList;
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
-import org.jenkinsci.plugins.workflow.graph.FlowNode;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
 import org.kohsuke.stapler.DataBoundConstructor;
@@ -20,10 +19,8 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
@@ -206,7 +203,7 @@ public static class Build {
       @Exported
       public String result;
       @Exported
-      public Map<String, String> changeLogSet;
+      public List<ChangeLog> changeLogSet;
 
       public Build(String jobName, String buildName, String url, int number, long startTime, long duration, String result, List<ChangeLogSet<? extends ChangeLogSet.Entry>> changeLogSets) {
          this.jobName = jobName;
@@ -220,23 +217,32 @@ public Build(String jobName, String buildName, String url, int number, long star
          this.changeLogSet = processChanges(changeLogSets);
       }
 
-      private Map<String, String> processChanges(List<ChangeLogSet<? extends ChangeLogSet.Entry>> changeLogSets) {
-         Map<String, String> changes = new HashMap<>();
-         if (changeLogSets.isEmpty()) {
-            return changes;
-         }
+      private List<ChangeLog> processChanges(List<ChangeLogSet<? extends ChangeLogSet.Entry>> changeLogSets) {
+         List<ChangeLog> changes = new ArrayList<>();
          for (ChangeLogSet<? extends ChangeLogSet.Entry> set : changeLogSets) {
             for (Object entry : set.getItems()) {
                ChangeLogSet.Entry setEntry = (ChangeLogSet.Entry) entry;
                String author = setEntry.getAuthor().getFullName();
                String message = setEntry.getMsg();
-               changes.put(message, author);
+               changes.add(new ChangeLog(author, message));
             }
 
          }
          return changes;
       }
    }
 
+   @ExportedBean(defaultVisibility = 999)
+   public static class ChangeLog {
+      @Exported
+      public String author;
+      @Exported
+      public String message;
+
+      public ChangeLog(String author, String message) {
+         this.author = author;
+         this.message = message;
+      }
+   }
 }
 
diff --git a/src/main/webapp/js/pipeline-aggregator.js b/src/main/webapp/js/pipeline-aggregator.js
@@ -58,8 +58,8 @@ function reload_jenkins_build_history(tableSelector, viewUrl, buildHistorySize,
             if (typeof data.stages !== 'undefined' && data.stages.length > 0) {
                var changeSet = val.changeLogSet;
                if (typeof data._links.changesets !== 'undefined') {
-                  for (change in changeSet) {
-                     text = '<strong>' + changeSet[change] + '</strong> ' + change+ '</br>'
+                  for (var i=0; i<changeSet.length; i++) {
+                     text = '<strong>' + changeSet[i].author + '</strong> ' + changeSet[i].message + '</br>'
                      authors += text ;
                   }
                } else {

diff --git a/src/test/java/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregatorTest.java b/src/test/java/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregatorTest.java
@@ -5,27 +5,16 @@
 
 import static org.mockito.Mockito.when;
 
-import hudson.model.AbstractBuild;
-import hudson.model.ItemGroup;
-import hudson.util.RunList;
-import javafx.util.Duration;
-import jenkins.model.Jenkins;
-import jenkins.util.TimeDuration;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
 import org.junit.Assert;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.jvnet.hudson.test.JenkinsRule;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
 import org.mockito.Mockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.regex.Pattern;