Skip to content

Fix PipelineHookTriggerHandlerImpl, replace hook.getProjectId() to hook.getProject().getId() #927

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
merged 2 commits into from
Feb 9, 2020
Merged

Fix PipelineHookTriggerHandlerImpl, replace hook.getProjectId() to hook.getProject().getId() #927

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43b4511
Replace `hook.getProjectId()` to `hook.getProject().getId()`
Moln May 16, 2019
14fc616
PipelineHookTriggerHandlerImplTest remove `withProjectId(1)`
Moln May 16, 2019
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
Next Next commit
Replace hook.getProjectId() to hook.getProject().getId()
  • Loading branch information
@Moln
Moln committed May 16, 2019
commit 43b4511e815591f68f7887e9aaf9769b0bd3f8c8
6 changes: 3 additions & 3 deletions ...com/dabsquared/gitlabjenkins/trigger/handler/pipeline/PipelineHookTriggerHandlerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ protected String getTriggerType() {
protected CauseData retrieveCauseData(PipelineHook hook) {
return causeData()
.withActionType(CauseData.ActionType.PIPELINE)
.withSourceProjectId(hook.getProjectId())
.withSourceProjectId(hook.getProject().getId())
.withBranch(getTargetBranch(hook)==null?"":getTargetBranch(hook))
.withSourceBranch(getTargetBranch(hook)==null?"":getTargetBranch(hook))
.withUserName(hook.getUser()==null||hook.getUser().getName()==null?"":hook.getUser().getName())
Expand All @@ -109,7 +109,7 @@ protected CauseData retrieveCauseData(PipelineHook hook) {
.withSourceRepoSshUrl(hook.getRepository()==null||hook.getRepository().getGitSshUrl()==null?"":hook.getRepository().getGitSshUrl())
.withSourceRepoHttpUrl(hook.getRepository()==null||hook.getRepository()==null?"":hook.getRepository().getGitHttpUrl())
.withMergeRequestTitle("")
.withTargetProjectId(hook.getProjectId())
.withTargetProjectId(hook.getProject().getId())
.withTargetBranch(getTargetBranch(hook)==null?"":getTargetBranch(hook))
.withTargetRepoName("")
.withTargetNamespace("")
Expand All @@ -136,7 +136,7 @@ protected RevisionParameterAction createRevisionParameter(PipelineHook hook, Git
@Override
protected BuildStatusUpdate retrieveBuildStatusUpdate(PipelineHook hook) {
return buildStatusUpdate()
.withProjectId(hook.getProjectId())
.withProjectId(hook.getProject().getId())
.withSha(hook.getObjectAttributes().getSha())
.withRef(hook.getObjectAttributes().getRef())
.build();
Expand Down
1 change: 1 addition & 0 deletions src/test/resources/com/dabsquared/gitlabjenkins/webhook/build/PipelineEvent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
},
"project": {
"id": 1,
"name": "Gitlab Test",
"description": "Atque in sunt eos similique dolores voluptatem.",
"web_url": "http://192.168.64.1:3005/gitlab-org/gitlab-test",
Expand Down