Skip to content

Put ChangeLogs in a list instead of map #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paul8620 merged 2 commits into from
Apr 27, 2017
Merged

Put ChangeLogs in a list instead of map #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66b95df
Put ChangeLogs in a list instead of map
fajran Apr 27, 2017
5555723
Remove unused imports
fajran Apr 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions src/main/java/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
}
}
}

4 changes: 2 additions & 2 deletions src/main/webapp/js/pipeline-aggregator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
11 changes: 0 additions & 11 deletions src/test/java/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down