Merge pull request #927 from Moln/fix/issues-723

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

Author: Marky Jackson

src/main/java/com/dabsquared/gitlabjenkins/trigger/handler/pipeline/PipelineHookTriggerHandlerImpl.java

@@ -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())
@@ -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("")
@@ -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();

src/test/java/com/dabsquared/gitlabjenkins/trigger/handler/pipeline/PipelineHookTriggerHandlerImplTest.java

@@ -70,7 +70,6 @@ public void setup() throws IOException, GitAPIException {
 
         pipelineHookTriggerHandler = new PipelineHookTriggerHandlerImpl(allowedStates);
         pipelineHook = pipelineHook()
-            .withProjectId(1)
             .withUser(user)
             .withRepository(repository()
                 .withName("test")

src/test/resources/com/dabsquared/gitlabjenkins/webhook/build/PipelineEvent.json

@@ -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",