Skip to content

Commit 7424217

Browse files
rhenckeproski
authored andcommitted
Convert StashPullRequestsBuilder and StashRepository to Job and Run
1 parent 11a4715 commit 7424217

File tree

2 files changed

+12
-16
lines changed

2 files changed

+12
-16
lines changed

src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashPullRequestsBuilder.java

+7-8
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import static java.lang.String.format;
44

5-
import hudson.model.AbstractProject;
5+
import hudson.model.Job;
66
import java.lang.invoke.MethodHandles;
77
import java.util.Collection;
88
import java.util.logging.Logger;
@@ -13,29 +13,28 @@
1313
public class StashPullRequestsBuilder {
1414
private static final Logger logger =
1515
Logger.getLogger(MethodHandles.lookup().lookupClass().getName());
16-
private AbstractProject<?, ?> project;
16+
private Job<?, ?> job;
1717
private StashBuildTrigger trigger;
1818
private StashRepository repository;
1919
private StashBuilds builds;
2020

21-
public StashPullRequestsBuilder(
22-
@Nonnull AbstractProject project, @Nonnull StashBuildTrigger trigger) {
23-
this.project = project;
21+
public StashPullRequestsBuilder(@Nonnull Job<?, ?> job, @Nonnull StashBuildTrigger trigger) {
22+
this.job = job;
2423
this.trigger = trigger;
2524
this.repository = new StashRepository(trigger.getProjectPath(), this);
2625
this.builds = new StashBuilds(trigger, repository);
2726
}
2827

2928
public void run() {
30-
logger.info(format("Build Start (%s).", project.getName()));
29+
logger.info(format("Build Start (%s).", job.getName()));
3130
this.repository.init();
3231
Collection<StashPullRequestResponseValue> targetPullRequests =
3332
this.repository.getTargetPullRequests();
3433
this.repository.addFutureBuildTasks(targetPullRequests);
3534
}
3635

37-
public AbstractProject<?, ?> getProject() {
38-
return this.project;
36+
public Job<?, ?> getJob() {
37+
return this.job;
3938
}
4039

4140
public StashBuildTrigger getTrigger() {

src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashRepository.java

+5-8
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void init() {
7373
}
7474

7575
public Collection<StashPullRequestResponseValue> getTargetPullRequests() {
76-
logger.info(format("Fetch PullRequests (%s).", builder.getProject().getName()));
76+
logger.info(format("Fetch PullRequests (%s).", builder.getJob().getName()));
7777
List<StashPullRequestResponseValue> pullRequests = client.getPullRequests();
7878
List<StashPullRequestResponseValue> targetPullRequests =
7979
new ArrayList<StashPullRequestResponseValue>();
@@ -90,10 +90,7 @@ public String postBuildStartCommentTo(StashPullRequestResponseValue pullRequest)
9090
String destinationCommit = pullRequest.getToRef().getLatestCommit();
9191
String comment =
9292
format(
93-
BUILD_START_MARKER,
94-
builder.getProject().getDisplayName(),
95-
sourceCommit,
96-
destinationCommit);
93+
BUILD_START_MARKER, builder.getJob().getDisplayName(), sourceCommit, destinationCommit);
9794
StashPullRequestComment commentResponse =
9895
this.client.postPullRequestComment(pullRequest.getId(), comment);
9996
return commentResponse.getCommentId().toString();
@@ -216,7 +213,7 @@ public void postFinishedComment(
216213
String comment =
217214
format(
218215
BUILD_FINISH_SENTENCE,
219-
builder.getProject().getDisplayName(),
216+
builder.getJob().getDisplayName(),
220217
sourceCommit,
221218
destinationCommit,
222219
message,
@@ -292,7 +289,7 @@ private void deletePreviousBuildFinishedComments(StashPullRequestResponseValue p
292289
}
293290

294291
String project_build_finished =
295-
format(BUILD_FINISH_REGEX, builder.getProject().getDisplayName());
292+
format(BUILD_FINISH_REGEX, builder.getJob().getDisplayName());
296293
Matcher finishMatcher =
297294
Pattern.compile(project_build_finished, Pattern.CASE_INSENSITIVE).matcher(content);
298295

@@ -354,7 +351,7 @@ private boolean isBuildTarget(StashPullRequestResponseValue pullRequest) {
354351
}
355352

356353
// These will match any start or finish message -- need to check commits
357-
String escapedBuildName = Pattern.quote(builder.getProject().getDisplayName());
354+
String escapedBuildName = Pattern.quote(builder.getJob().getDisplayName());
358355
String project_build_start = String.format(BUILD_START_REGEX, escapedBuildName);
359356
String project_build_finished = String.format(BUILD_FINISH_REGEX, escapedBuildName);
360357
Matcher startMatcher =

0 commit comments

Comments
 (0)