Skip to content

Commit 11a4715

Browse files
rhenckeproski
authored andcommitted
StashBuildListener: Add pipeline support
Implement in terms of Job and Run. Use ParameterizedJobMixIn.getTrigger() to get the trigger. Remove StashBuildTrigger.getTrigger(), it's not used anymore.
1 parent 304e0e9 commit 11a4715

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,38 @@
11
package stashpullrequestbuilder.stashpullrequestbuilder;
22

33
import hudson.Extension;
4-
import hudson.model.AbstractBuild;
4+
import hudson.model.Run;
55
import hudson.model.TaskListener;
66
import hudson.model.listeners.RunListener;
77
import java.lang.invoke.MethodHandles;
88
import java.util.logging.Logger;
99
import javax.annotation.Nonnull;
10+
import jenkins.model.ParameterizedJobMixIn;
1011

1112
/** Created by Nathan McCarthy */
1213
@Extension
13-
public class StashBuildListener extends RunListener<AbstractBuild> {
14+
public class StashBuildListener extends RunListener<Run<?, ?>> {
1415
private static final Logger logger =
1516
Logger.getLogger(MethodHandles.lookup().lookupClass().getName());
1617

1718
@Override
18-
public void onStarted(AbstractBuild abstractBuild, TaskListener listener) {
19+
public void onStarted(Run<?, ?> run, TaskListener listener) {
1920
logger.info("BuildListener onStarted called.");
20-
StashBuildTrigger trigger = StashBuildTrigger.getTrigger(abstractBuild.getProject());
21+
StashBuildTrigger trigger =
22+
ParameterizedJobMixIn.getTrigger(run.getParent(), StashBuildTrigger.class);
2123
if (trigger == null) {
2224
return;
2325
}
24-
trigger.getBuilder().getBuilds().onStarted(abstractBuild);
26+
trigger.getBuilder().getBuilds().onStarted(run);
2527
}
2628

2729
@Override
28-
public void onCompleted(AbstractBuild abstractBuild, @Nonnull TaskListener listener) {
29-
StashBuildTrigger trigger = StashBuildTrigger.getTrigger(abstractBuild.getProject());
30+
public void onCompleted(Run<?, ?> run, @Nonnull TaskListener listener) {
31+
StashBuildTrigger trigger =
32+
ParameterizedJobMixIn.getTrigger(run.getParent(), StashBuildTrigger.class);
3033
if (trigger == null) {
3134
return;
3235
}
33-
trigger.getBuilder().getBuilds().onCompleted(abstractBuild, listener);
36+
trigger.getBuilder().getBuilds().onCompleted(run, listener);
3437
}
3538
}

src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildTrigger.java

-5
Original file line numberDiff line numberDiff line change
@@ -207,11 +207,6 @@ public void start(AbstractProject<?, ?> project, boolean newInstance) {
207207
super.start(project, newInstance);
208208
}
209209

210-
public static StashBuildTrigger getTrigger(AbstractProject project) {
211-
Trigger trigger = project.getTrigger(StashBuildTrigger.class);
212-
return (StashBuildTrigger) trigger;
213-
}
214-
215210
public StashPullRequestsBuilder getBuilder() {
216211
return this.stashPullRequestsBuilder;
217212
}

0 commit comments

Comments
 (0)