Correction of #166

Author: Turiok

src/main/java/io/jenkins/plugins/gitlabbranchsource/Cause/GitLabMergeRequestCauseData.java

@@ -21,7 +21,7 @@ public class GitLabMergeRequestCauseData {
     private Map<String, String> variables = new HashMap<>();
 
     public GitLabMergeRequestCauseData(MergeRequestEvent mergeRequestEvent) {
-        this.variables.put("GITLAB_OBJECT_KIND", defaultString(mergeRequestEvent.OBJECT_KIND));
+        this.variables.put("GITLAB_OBJECT_KIND", defaultString(MergeRequestEvent.OBJECT_KIND));
         this.variables.put("GITLAB_USER_NAME", defaultString(mergeRequestEvent.getUser().getName()));
         this.variables.put("GITLAB_USER_USERNAME", defaultString(mergeRequestEvent.getUser().getUsername()));
         this.variables.put("GITLAB_USER_AVATAR_URL", defaultString(mergeRequestEvent.getUser().getAvatarUrl()));

src/main/java/io/jenkins/plugins/gitlabbranchsource/Cause/GitLabPushCauseData.java

@@ -17,7 +17,7 @@ public class GitLabPushCauseData {
     private Map<String, String> variables = new HashMap<>();
 
     public GitLabPushCauseData(PushEvent pushEvent) {
-        this.variables.put("GITLAB_OBJECT_KIND", defaultString(pushEvent.OBJECT_KIND));
+        this.variables.put("GITLAB_OBJECT_KIND", defaultString(PushEvent.OBJECT_KIND));
         this.variables.put("GITLAB_AFTER", defaultString(pushEvent.getAfter()));
         this.variables.put("GITLAB_BEFORE", defaultString(pushEvent.getBefore()));
         this.variables.put("GITLAB_REF", defaultString(pushEvent.getRef()));

src/main/java/io/jenkins/plugins/gitlabbranchsource/Cause/GitLabTagPushCauseData.java

@@ -17,7 +17,7 @@ public class GitLabTagPushCauseData {
     private Map<String, String> variables = new HashMap<>();
 
     public GitLabTagPushCauseData(TagPushEvent tagPushEvent) {
-        this.variables.put("GITLAB_OBJECT_KIND", defaultString(tagPushEvent.OBJECT_KIND));
+        this.variables.put("GITLAB_OBJECT_KIND", defaultString(TagPushEvent.OBJECT_KIND));
         this.variables.put("GITLAB_AFTER", defaultString(tagPushEvent.getAfter()));
         this.variables.put("GITLAB_BEFORE", defaultString(tagPushEvent.getBefore()));
         this.variables.put("GITLAB_REF", defaultString(tagPushEvent.getRef()));

src/main/java/io/jenkins/plugins/gitlabbranchsource/helpers/GitLabPipelineStatusNotifier.java

@@ -41,6 +41,7 @@
 import jenkins.scm.api.SCMRevision;
 import jenkins.scm.api.SCMRevisionAction;
 import jenkins.scm.api.SCMSource;
+
 import org.gitlab4j.api.Constants;
 import org.gitlab4j.api.GitLabApi;
 import org.gitlab4j.api.GitLabApiException;
@@ -103,7 +104,7 @@ static String getStatusName(final GitLabSCMSourceContext sourceContext, final St
         if (revision instanceof BranchSCMRevision) {
             type = "branch";
         } else if (revision instanceof MergeRequestSCMRevision) {
-            type = getMrBuildName(fullDisplayName);
+            type = getMrBuildName((MergeRequestSCMRevision)revision);
         } else if (revision instanceof GitTagSCMRevision) {
             type = "tag";
         } else {
@@ -137,8 +138,8 @@ static String getRevisionRef(final SCMRevision revision) {
         return refName;
     }
 
-    private static String getMrBuildName(final String buildName) {
-        return (buildName.contains("merge") ? "mr-merge" : "mr-head");
+    private static String getMrBuildName(final MergeRequestSCMRevision revision) {
+        return (revision.isMerge() ? "mr-merge" : "mr-head");
     }
 
     /**

src/test/java/io/jenkins/plugins/gitlabbranchsource/helpers/GitLabPipelineStatusNotifierTest.java

@@ -11,6 +11,8 @@
 import jenkins.plugins.git.GitTagSCMHead;
 import jenkins.plugins.git.GitTagSCMRevision;
 import jenkins.scm.api.SCMRevision;
+import jenkins.scm.api.mixin.ChangeRequestCheckoutStrategy;
+
 import org.gitlab4j.api.GitLabApi;
 import org.gitlab4j.api.MergeRequestApi;
 import org.gitlab4j.api.models.MergeRequest;
@@ -44,7 +46,7 @@ public void should_set_merge_request_head_status_name() {
         GitLabSCMSourceContext sourceContext = new GitLabSCMSourceContext(null, null);
 
         BranchSCMHead targetHead = new BranchSCMHead("target");
-        MergeRequestSCMHead head = new MergeRequestSCMHead("head", 0, targetHead, null, null, null, null, null, null);
+        MergeRequestSCMHead head = new MergeRequestSCMHead("head", 0, targetHead, ChangeRequestCheckoutStrategy.HEAD, null, null, null, null, null);
 
         BranchSCMRevision target = new BranchSCMRevision(targetHead, "target-hash");
         BranchSCMRevision source = new BranchSCMRevision(new BranchSCMHead("source"), "source-hash");
@@ -63,7 +65,7 @@ public void should_set_merge_request_merge_status_name() {
         GitLabSCMSourceContext sourceContext = new GitLabSCMSourceContext(null, null);
 
         BranchSCMHead targetHead = new BranchSCMHead("target");
-        MergeRequestSCMHead head = new MergeRequestSCMHead("head", 0, targetHead, null, null, null, null, null, null);
+        MergeRequestSCMHead head = new MergeRequestSCMHead("head", 0, targetHead, ChangeRequestCheckoutStrategy.MERGE, null, null, null, null, null);
 
         BranchSCMRevision target = new BranchSCMRevision(targetHead, "target-hash");
         BranchSCMRevision source = new BranchSCMRevision(new BranchSCMHead("source"), "source-hash");