Skip to content

Fix compilation against 2.372+ #1358

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
MarkEWaite merged 1 commit into from
Nov 11, 2022
Merged

Fix compilation against 2.372+ #1358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/main/java/com/dabsquared/gitlabjenkins/GitLabPushTrigger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,9 +551,9 @@ protected Object readResolve() throws ObjectStreamException {
public static GitLabPushTrigger getFromJob(Job<?, ?> job) {
GitLabPushTrigger trigger = null;
if (job instanceof ParameterizedJobMixIn.ParameterizedJob) {
ParameterizedJobMixIn.ParameterizedJob p = (ParameterizedJobMixIn.ParameterizedJob) job;
Collection<Trigger> triggerList = p.getTriggers().values();
for (Trigger t : triggerList) {
ParameterizedJobMixIn.ParameterizedJob<?, ?> p = (ParameterizedJobMixIn.ParameterizedJob) job;
Collection<Trigger<?>> triggerList = p.getTriggers().values();
for (Trigger<?> t : triggerList) {
if (t instanceof GitLabPushTrigger) {
trigger = (GitLabPushTrigger) t;
}
Expand Down
6 changes: 3 additions & 3 deletions ...dabsquared/gitlabjenkins/trigger/handler/push/OpenMergeRequestPushHookTriggerHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ class OpenMergeRequestPushHookTriggerHandler implements PushHookTriggerHandler {
public void handle(Job<?, ?> job, PushHook hook, boolean ciSkip, BranchFilter branchFilter, MergeRequestLabelFilter mergeRequestLabelFilter) {
try {
if (job instanceof ParameterizedJobMixIn.ParameterizedJob) {
ParameterizedJob project = (ParameterizedJobMixIn.ParameterizedJob) job;
ParameterizedJob<?, ?> project = (ParameterizedJobMixIn.ParameterizedJob) job;
GitLabConnectionProperty property = job.getProperty(GitLabConnectionProperty.class);
Collection<Trigger> triggerList = project.getTriggers().values();
for (Trigger t : triggerList) {
Collection<Trigger<?>> triggerList = project.getTriggers().values();
for (Trigger<?> t : triggerList) {
if (t instanceof GitLabPushTrigger) {
final GitLabPushTrigger trigger = (GitLabPushTrigger) t;
Integer projectId = hook.getProjectId();
Expand Down