diff --git a/src/main/java/com/gitee/jenkins/gitee/hook/model/BranchData.java b/src/main/java/com/gitee/jenkins/gitee/hook/model/BranchData.java index 0dd10fd..5e8e598 100644 --- a/src/main/java/com/gitee/jenkins/gitee/hook/model/BranchData.java +++ b/src/main/java/com/gitee/jenkins/gitee/hook/model/BranchData.java @@ -15,7 +15,7 @@ public class BranchData { private String ref; private String sha; private User user; - private Project project; + private Project repo; public String getLabel() { return label; @@ -49,16 +49,12 @@ public class BranchData { this.user = user; } - public Project getProject() { - return project; + public Project getRepo() { + return repo; } - public void setProject(Project project) { - this.project = project; - } - - public void setRepo(Project project) { - this.project = project; + public void setRepo(Project repo) { + this.repo = repo; } @Override @@ -75,7 +71,7 @@ public class BranchData { .append(sha, branchData.sha) .append(ref, branchData.ref) .append(user, branchData.user) - .append(project, branchData.project) + .append(repo, branchData.repo) .isEquals(); } @@ -86,7 +82,7 @@ public class BranchData { .append(sha) .append(ref) .append(user) - .append(project) + .append(repo) .toHashCode(); } @@ -97,7 +93,7 @@ public class BranchData { .append("sha", sha) .append("ref", ref) .append("user", user) - .append("project", project) + .append("repo", repo) .toString(); } } diff --git a/src/main/java/com/gitee/jenkins/gitee/hook/model/MergeRequestHook.java b/src/main/java/com/gitee/jenkins/gitee/hook/model/MergeRequestHook.java index 953ec26..6d4a81a 100644 --- a/src/main/java/com/gitee/jenkins/gitee/hook/model/MergeRequestHook.java +++ b/src/main/java/com/gitee/jenkins/gitee/hook/model/MergeRequestHook.java @@ -17,10 +17,10 @@ public class MergeRequestHook extends WebHook { private User user; private User assignee; - private Project project; + private Project repo; private Action action; private State state; - private MergeRequestObjectAttributes objectAttributes; + private MergeRequestObjectAttributes pullRequest; private List labels; public Action getAction() { @@ -55,30 +55,20 @@ public class MergeRequestHook extends WebHook { this.assignee = assignee; } - public Project getProject() { - return project; + public Project getRepo() { + return repo; } - public void setProject(Project project) { - this.project = project; + public void setRepo(Project repo) { + this.repo = repo; } - // adapt gitee hook - public void setRepo(Project project) { - this.project = project; + public MergeRequestObjectAttributes getPullRequest() { + return pullRequest; } - public MergeRequestObjectAttributes getObjectAttributes() { - return objectAttributes; - } - - public void setObjectAttributes(MergeRequestObjectAttributes objectAttributes) { - this.objectAttributes = objectAttributes; - } - - // adapt gitee hook - public void setPullRequest(MergeRequestObjectAttributes objectAttributes) { - this.objectAttributes = objectAttributes; + public void setPullRequest(MergeRequestObjectAttributes pullRequest) { + this.pullRequest = pullRequest; } public List getLabels() { @@ -90,7 +80,7 @@ public class MergeRequestHook extends WebHook { } public String getWebHookDescription() { - return getHookName() + " iid = " + objectAttributes.getIid() + " merge commit sha = " + objectAttributes.getMergeCommitSha(); + return getHookName() + " iid = " + pullRequest.getNumber() + " merge commit sha = " + pullRequest.getMergeCommitSha(); } @Override @@ -105,10 +95,10 @@ public class MergeRequestHook extends WebHook { return new EqualsBuilder() .append(user, that.user) .append(assignee, that.assignee) - .append(project, that.project) + .append(repo, that.repo) .append(action, that.action) .append(state, that.state) - .append(objectAttributes, that.objectAttributes) + .append(pullRequest, that.pullRequest) .append(labels, that.labels) .isEquals(); } @@ -118,8 +108,8 @@ public class MergeRequestHook extends WebHook { return new HashCodeBuilder(17, 37) .append(user) .append(assignee) - .append(project) - .append(objectAttributes) + .append(repo) + .append(pullRequest) .append(labels) .append(state) .append(action) @@ -131,10 +121,10 @@ public class MergeRequestHook extends WebHook { return new ToStringBuilder(this) .append("user", user) .append("assignee", assignee) - .append("project", project) + .append("repo", repo) .append("state", state) .append("action", action) - .append("objectAttributes", objectAttributes) + .append("pullRequest", pullRequest) .append("labels", labels) .toString(); } diff --git a/src/main/java/com/gitee/jenkins/gitee/hook/model/MergeRequestObjectAttributes.java b/src/main/java/com/gitee/jenkins/gitee/hook/model/MergeRequestObjectAttributes.java index 4d5e57a..33183de 100644 --- a/src/main/java/com/gitee/jenkins/gitee/hook/model/MergeRequestObjectAttributes.java +++ b/src/main/java/com/gitee/jenkins/gitee/hook/model/MergeRequestObjectAttributes.java @@ -15,13 +15,13 @@ import java.util.Date; public class MergeRequestObjectAttributes { private Integer id; - private Integer iid; + private Integer number; private Integer authorId; private Integer assigneeId; private String title; private Date createdAt; private Date updatedAt; - private String description; + private String body; private BranchData head; private BranchData base; private String mergeStatus; @@ -38,12 +38,12 @@ public class MergeRequestObjectAttributes { this.id = id; } - public Integer getIid() { - return iid; + public Integer getNumber() { + return number; } - public void setNumber(Integer iid) { - this.iid = iid; + public void setNumber(Integer number) { + this.number = number; } public String getSourceBranch() { @@ -55,11 +55,11 @@ public class MergeRequestObjectAttributes { } public Integer getSourceProjectId() { - return head.getProject().getId(); + return head.getRepo().getId(); } public Integer getTargetProjectId() { - return base.getProject().getId(); + return base.getRepo().getId(); } public Integer getAuthorId() { @@ -102,20 +102,16 @@ public class MergeRequestObjectAttributes { this.updatedAt = updatedAt; } - public String getDescription() { - return description; + public String getBody() { + return body; } - public void setDescription(String description) { - this.description = description; - } - - public void setBody(String description) { - this.description = description; + public void setBody(String body) { + this.body = body; } public Project getSource() { - return head.getProject(); + return head.getRepo(); } public BranchData getHead() { @@ -135,7 +131,7 @@ public class MergeRequestObjectAttributes { } public Project getTarget() { - return base.getProject(); + return base.getRepo(); } @@ -190,13 +186,13 @@ public class MergeRequestObjectAttributes { MergeRequestObjectAttributes that = (MergeRequestObjectAttributes) o; return new EqualsBuilder() .append(id, that.id) - .append(iid, that.iid) + .append(number, that.number) .append(authorId, that.authorId) .append(assigneeId, that.assigneeId) .append(title, that.title) .append(createdAt, that.createdAt) .append(updatedAt, that.updatedAt) - .append(description, that.description) + .append(body, that.body) .append(head, that.head) .append(base, that.base) .append(mergeCommitSha, that.mergeCommitSha) @@ -211,13 +207,13 @@ public class MergeRequestObjectAttributes { public int hashCode() { return new HashCodeBuilder(17, 37) .append(id) - .append(iid) + .append(number) .append(authorId) .append(assigneeId) .append(title) .append(createdAt) .append(updatedAt) - .append(description) + .append(body) .append(head) .append(base) .append(mergeStatus) @@ -232,13 +228,13 @@ public class MergeRequestObjectAttributes { public String toString() { return new ToStringBuilder(this) .append("id", id) - .append("iid", iid) + .append("number", number) .append("authorId", authorId) .append("assigneeId", assigneeId) .append("title", title) .append("createdAt", createdAt) .append("updatedAt", updatedAt) - .append("description", description) + .append("body", body) .append("head", head) .append("base", base) .append("mergeCommitSha", mergeCommitSha) diff --git a/src/main/java/com/gitee/jenkins/gitee/hook/model/Project.java b/src/main/java/com/gitee/jenkins/gitee/hook/model/Project.java index 0917a18..ced474b 100644 --- a/src/main/java/com/gitee/jenkins/gitee/hook/model/Project.java +++ b/src/main/java/com/gitee/jenkins/gitee/hook/model/Project.java @@ -23,7 +23,7 @@ public class Project { private String homepage; private String url; private String sshUrl; - private String httpUrl; + private String gitHttpUrl; public String getName() { return name; @@ -113,12 +113,12 @@ public class Project { this.sshUrl = sshUrl; } - public String getHttpUrl() { - return httpUrl; + public String getGitHttpUrl() { + return gitHttpUrl; } - public void setGitHttpUrl(String httpUrl) { - this.httpUrl = httpUrl; + public void setGitHttpUrl(String gitHttpUrl) { + this.gitHttpUrl = gitHttpUrl; } public Integer getId() { @@ -151,7 +151,7 @@ public class Project { .append(homepage, project.homepage) .append(url, project.url) .append(sshUrl, project.sshUrl) - .append(httpUrl, project.httpUrl) + .append(gitHttpUrl, project.gitHttpUrl) .isEquals(); } @@ -170,7 +170,7 @@ public class Project { .append(homepage) .append(url) .append(sshUrl) - .append(httpUrl) + .append(gitHttpUrl) .toHashCode(); } @@ -189,7 +189,7 @@ public class Project { .append("homepage", homepage) .append("url", url) .append("sshUrl", sshUrl) - .append("httpUrl", httpUrl) + .append("gitHttpUrl", gitHttpUrl) .toString(); } } diff --git a/src/main/java/com/gitee/jenkins/trigger/handler/merge/MergeRequestHookTriggerHandlerImpl.java b/src/main/java/com/gitee/jenkins/trigger/handler/merge/MergeRequestHookTriggerHandlerImpl.java index 9cdb839..253e895 100644 --- a/src/main/java/com/gitee/jenkins/trigger/handler/merge/MergeRequestHookTriggerHandlerImpl.java +++ b/src/main/java/com/gitee/jenkins/trigger/handler/merge/MergeRequestHookTriggerHandlerImpl.java @@ -57,10 +57,10 @@ class MergeRequestHookTriggerHandlerImpl extends AbstractWebHookTriggerHandler job, MergeRequestHook hook, boolean ciSkip, BranchFilter branchFilter, MergeRequestLabelFilter mergeRequestLabelFilter) { - MergeRequestObjectAttributes objectAttributes = hook.getObjectAttributes(); + MergeRequestObjectAttributes objectAttributes = hook.getPullRequest(); try { - LOGGER.log(Level.INFO, "request hook state=" + hook.getState() + ", action = " + hook.getAction() + " pr iid = " + objectAttributes.getIid() + " hook name = " + hook.getHookName()); + LOGGER.log(Level.INFO, "request hook state=" + hook.getState() + ", action = " + hook.getAction() + " pr iid = " + objectAttributes.getNumber() + " hook name = " + hook.getHookName()); if (isAllowedByConfig(hook) && isLastCommitNotYetBuild(job, hook) && isNotSkipWorkInProgressMergeRequest(objectAttributes)) { @@ -88,9 +88,9 @@ class MergeRequestHookTriggerHandlerImpl extends AbstractWebHookTriggerHandler project, MergeRequestHook hook) { - MergeRequestObjectAttributes objectAttributes = hook.getObjectAttributes(); + MergeRequestObjectAttributes objectAttributes = hook.getPullRequest(); if (hook != null && hook.getAction() == Action.approved) { LOGGER.log(Level.FINEST, "Skipping LastCommitNotYetBuild check for approve action"); return true; @@ -203,7 +203,7 @@ class MergeRequestHookTriggerHandlerImpl extends AbstractWebHookTriggerHandler @Override protected boolean isCiSkip(NoteHook hook) { return hook.getMergeRequest() != null - && hook.getMergeRequest().getDescription() != null - && hook.getMergeRequest().getDescription().contains("[ci-skip]"); + && hook.getMergeRequest().getBody() != null + && hook.getMergeRequest().getBody().contains("[ci-skip]"); } @Override @@ -69,17 +69,17 @@ class NoteHookTriggerHandlerImpl extends AbstractWebHookTriggerHandler .withSourceNamespace(hook.getMergeRequest().getSource().getNamespace()) .withSourceRepoUrl(hook.getMergeRequest().getSource().getUrl()) .withSourceRepoSshUrl(hook.getMergeRequest().getSource().getSshUrl()) - .withSourceRepoHttpUrl(hook.getMergeRequest().getSource().getHttpUrl()) + .withSourceRepoHttpUrl(hook.getMergeRequest().getSource().getGitHttpUrl()) .withMergeRequestTitle(hook.getMergeRequest().getTitle()) - .withMergeRequestDescription(hook.getMergeRequest().getDescription()) + .withMergeRequestDescription(hook.getMergeRequest().getBody()) .withMergeRequestId(hook.getMergeRequest().getId()) - .withMergeRequestIid(hook.getMergeRequest().getIid()) + .withMergeRequestIid(hook.getMergeRequest().getNumber()) .withMergeRequestTargetProjectId(hook.getMergeRequest().getTargetProjectId()) .withTargetBranch(hook.getMergeRequest().getTargetBranch()) .withTargetRepoName(hook.getMergeRequest().getTarget().getName()) .withTargetNamespace(hook.getMergeRequest().getTarget().getNamespace()) .withTargetRepoSshUrl(hook.getMergeRequest().getTarget().getSshUrl()) - .withTargetRepoHttpUrl(hook.getMergeRequest().getTarget().getHttpUrl()) + .withTargetRepoHttpUrl(hook.getMergeRequest().getTarget().getGitHttpUrl()) .withTriggeredByUser(hook.getMergeRequest().getHead().getUser().getName()) .withLastCommit(hook.getMergeRequest().getMergeCommitSha()) .withTargetProjectUrl(hook.getMergeRequest().getTarget().getUrl()) diff --git a/src/main/java/com/gitee/jenkins/trigger/handler/push/PushHookTriggerHandlerImpl.java b/src/main/java/com/gitee/jenkins/trigger/handler/push/PushHookTriggerHandlerImpl.java index 3a86e1b..cd91ec9 100644 --- a/src/main/java/com/gitee/jenkins/trigger/handler/push/PushHookTriggerHandlerImpl.java +++ b/src/main/java/com/gitee/jenkins/trigger/handler/push/PushHookTriggerHandlerImpl.java @@ -58,7 +58,7 @@ class PushHookTriggerHandlerImpl extends AbstractWebHookTriggerHandler .withSourceNamespace(hook.getProject().getNamespace()) .withSourceRepoUrl(hook.getProject().getUrl()) .withSourceRepoSshUrl(hook.getProject().getSshUrl()) - .withSourceRepoHttpUrl(hook.getProject().getHttpUrl()) + .withSourceRepoHttpUrl(hook.getProject().getGitHttpUrl()) .withMergeRequestTitle("") .withMergeRequestDescription("") .withMergeRequestId(null) diff --git a/src/main/java/com/gitee/jenkins/webhook/build/MergeRequestBuildAction.java b/src/main/java/com/gitee/jenkins/webhook/build/MergeRequestBuildAction.java index 8e8986a..db36bb8 100644 --- a/src/main/java/com/gitee/jenkins/webhook/build/MergeRequestBuildAction.java +++ b/src/main/java/com/gitee/jenkins/webhook/build/MergeRequestBuildAction.java @@ -35,21 +35,21 @@ public class MergeRequestBuildAction extends BuildWebHookAction { void processForCompatibility() { // url and homepage are introduced in 8.x versions of Gitee - final MergeRequestObjectAttributes attributes = this.mergeRequestHook.getObjectAttributes(); + final MergeRequestObjectAttributes attributes = this.mergeRequestHook.getPullRequest(); if (attributes != null) { final Project source = attributes.getSource(); - if (source != null && source.getHttpUrl() != null) { + if (source != null && source.getGitHttpUrl() != null) { if (source.getUrl() == null) { - source.setUrl(source.getHttpUrl()); + source.setUrl(source.getGitHttpUrl()); } if (source.getHomepage() == null) { - source.setHomepage(source.getHttpUrl().substring(0, source.getHttpUrl().lastIndexOf(".git"))); + source.setHomepage(source.getGitHttpUrl().substring(0, source.getGitHttpUrl().lastIndexOf(".git"))); } } // The MergeRequestHookTriggerHandlerImpl is looking for Project - if (mergeRequestHook.getProject() == null && attributes.getTarget() != null) { - mergeRequestHook.setProject(attributes.getTarget()); + if (mergeRequestHook.getRepo() == null && attributes.getTarget() != null) { + mergeRequestHook.setRepo(attributes.getTarget()); } } }