Commit c7e65c3e authored by Greg Messner's avatar Greg Messner
Browse files

Moved commit_events property to JiraService (#405).

parent e2713f33
...@@ -13,6 +13,7 @@ public class JiraService extends NotificationService { ...@@ -13,6 +13,7 @@ public class JiraService extends NotificationService {
public static final String PROJECT_KEY_PROP = "project_key"; public static final String PROJECT_KEY_PROP = "project_key";
public static final String USERNAME_PROP = "username"; public static final String USERNAME_PROP = "username";
public static final String JIRA_ISSUE_TRANSITION_ID_PROP = "jira_issue_transition_id"; public static final String JIRA_ISSUE_TRANSITION_ID_PROP = "jira_issue_transition_id";
public static final String COMMIT_EVENTS_PROP = "commit_events";
private CharSequence password; private CharSequence password;
...@@ -25,18 +26,28 @@ public class JiraService extends NotificationService { ...@@ -25,18 +26,28 @@ public class JiraService extends NotificationService {
public GitLabApiForm servicePropertiesForm() { public GitLabApiForm servicePropertiesForm() {
GitLabApiForm formData = new GitLabApiForm() GitLabApiForm formData = new GitLabApiForm()
.withParam("merge_requests_events", getMergeRequestsEvents()) .withParam("merge_requests_events", getMergeRequestsEvents())
.withParam("commit_events", getCommitEvents()) .withParam(COMMIT_EVENTS_PROP, getCommitEvents())
.withParam("url", getUrl(), true) .withParam(URL_PROP, getUrl(), true)
.withParam("api_url", getApiUrl()) .withParam(API_URL_PROP, getApiUrl())
.withParam("project_key", getProjectKey()) .withParam(PROJECT_KEY_PROP, getProjectKey())
.withParam("username", getUsername(), true) .withParam(USERNAME_PROP, getUsername(), true)
.withParam("password", getPassword(), true) .withParam("password", getPassword(), true)
.withParam("jira_issue_transition_id", getJiraIssueTransitionId()); .withParam(JIRA_ISSUE_TRANSITION_ID_PROP, getJiraIssueTransitionId());
return formData; return formData;
} }
@JsonIgnore
public Boolean getCommitEvents() {
return (getProperty(COMMIT_EVENTS_PROP, (Boolean) null));
}
public void setCommitEvents(Boolean commitEvents) {
setProperty(COMMIT_EVENTS_PROP, commitEvents);
}
public JiraService withCommitEvents(Boolean commitEvents) { public JiraService withCommitEvents(Boolean commitEvents) {
return withCommitEvents(commitEvents, this); setCommitEvents(commitEvents);
return (this);
} }
public JiraService withMergeRequestsEvents(Boolean mergeRequestsEvents) { public JiraService withMergeRequestsEvents(Boolean mergeRequestsEvents) {
......
...@@ -41,7 +41,6 @@ public abstract class NotificationService { ...@@ -41,7 +41,6 @@ public abstract class NotificationService {
private Boolean pushEvents; private Boolean pushEvents;
private Boolean issuesEvents; private Boolean issuesEvents;
private Boolean confidentialIssuesEvents; private Boolean confidentialIssuesEvents;
private Boolean commitEvents;
private Boolean mergeRequestsEvents; private Boolean mergeRequestsEvents;
private Boolean tagPushEvents; private Boolean tagPushEvents;
private Boolean noteEvents; private Boolean noteEvents;
...@@ -137,20 +136,6 @@ public abstract class NotificationService { ...@@ -137,20 +136,6 @@ public abstract class NotificationService {
return (derivedInstance); return (derivedInstance);
} }
@JsonIgnore
public Boolean getCommitEvents() {
return commitEvents;
}
public void setCommitEvents(Boolean commitEvents) {
this.commitEvents = commitEvents;
}
protected <T> T withCommitEvents(Boolean commitEvents, T derivedInstance) {
setCommitEvents(commitEvents);
return (derivedInstance);
}
public Boolean getMergeRequestsEvents() { public Boolean getMergeRequestsEvents() {
return mergeRequestsEvents; return mergeRequestsEvents;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment