rtyler
/
blueocean-plugin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[JENKINS-36615] use LinkResolver to populate "blueocean_job_rest_url"

This commit is contained in:
Cliff Meyers 2016-07-13 16:42:27 -04:00
parent 11e065f7b8
commit cc429589c0
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
blueocean-events/src/main/java/io/jenkins/blueocean/events/BlueMessageEnricher.java
View File

@ -27,6 +27,7 @@ import hudson.Extension;
import hudson.model.Item;
import hudson.model.ItemGroup;
import io.jenkins.blueocean.rest.hal.Link;
import io.jenkins.blueocean.rest.hal.LinkResolver;
import io.jenkins.blueocean.service.embedded.rest.OrganizationImpl;
import jenkins.model.ParameterizedJobMixIn;
import org.jenkins.pubsub.EventProps;
@ -38,31 +39,34 @@ import org.jenkinsci.plugins.workflow.job.WorkflowJob;
import org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject;
import javax.annotation.Nonnull;
import javax.inject.Inject;
/**
* @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly@gmail.com</a>
*/
@Extension
public class BlueMessageEnricher extends MessageEnricher {
@Inject
private LinkResolver linkResolver;
enum BlueEventProps {
blueocean_job_rest_url,
blueocean_job_pipeline_name,
blueocean_job_branch_name,
}
@Override
public void enrich(@Nonnull Message message) {
// TODO: Replace once https://issues.jenkins-ci.org/browse/JENKINS-36286 is done
// TODO: Get organization name in generic way once multi-organization support is implemented in API
message.set(EventProps.Jenkins.jenkins_org, OrganizationImpl.INSTANCE.getName());
String channelName = message.getChannelName();
if (channelName.equals(Events.JobChannel.NAME)) {
JobChannelMessage jobChannelMessage = (JobChannelMessage) message;
ParameterizedJobMixIn.ParameterizedJob job = jobChannelMessage.getJob();
Link jobUrl = getLink(job);
Link jobUrl = linkResolver.resolve(job);
jobChannelMessage.set(BlueEventProps.blueocean_job_rest_url, jobUrl.getHref());
jobChannelMessage.set(BlueEventProps.blueocean_job_pipeline_name, job.getName());
if (job instanceof WorkflowJob) {
@ -76,19 +80,4 @@ public class BlueMessageEnricher extends MessageEnricher {
}
}
}
// TODO: Replace once https://issues.jenkins-ci.org/browse/JENKINS-36286 is done
private static @Nonnull Link getLink(@Nonnull ParameterizedJobMixIn.ParameterizedJob job) {
Link orgLink = new Link("/rest/organizations/" + OrganizationImpl.INSTANCE.getName());
if (job instanceof WorkflowJob) {
ItemGroup<? extends Item> parent = job.getParent();
if (parent instanceof WorkflowMultiBranchProject) {
String multiBranchProjectName = ((WorkflowMultiBranchProject) parent).getName();
return orgLink.rel("pipelines").rel(multiBranchProjectName).rel("branches").rel(job.getName());
}
}
return orgLink.rel("pipelines").rel(job.getName());
}
}