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

Mods to support GitLab 8.

parent f05942ff
...@@ -6,7 +6,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; ...@@ -6,7 +6,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeInfo;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
@JsonTypeInfo( @JsonTypeInfo(
use = JsonTypeInfo.Id.NAME, use = JsonTypeInfo.Id.NAME,
...@@ -19,9 +18,8 @@ import javax.xml.bind.annotation.XmlRootElement; ...@@ -19,9 +18,8 @@ import javax.xml.bind.annotation.XmlRootElement;
@JsonSubTypes.Type(value = PushEvent.class, name = PushEvent.OBJECT_KIND), @JsonSubTypes.Type(value = PushEvent.class, name = PushEvent.OBJECT_KIND),
@JsonSubTypes.Type(value = MergeRequestEvent.class, name = MergeRequestEvent.OBJECT_KIND) @JsonSubTypes.Type(value = MergeRequestEvent.class, name = MergeRequestEvent.OBJECT_KIND)
}) })
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class EventObject { public abstract class EventObject {
public static enum ObjectKind { public static enum ObjectKind {
ISSUE, MERGE_REQUEST, PUSH; ISSUE, MERGE_REQUEST, PUSH;
...@@ -35,7 +33,7 @@ public class EventObject { ...@@ -35,7 +33,7 @@ public class EventObject {
private ObjectKind objectKind; private ObjectKind objectKind;
public ObjectKind getObjectKind() { public ObjectKind getObjectKind() {
return this.objectKind; return (this.objectKind);
} }
public void setObjectKind(ObjectKind objectKind) { public void setObjectKind(ObjectKind objectKind) {
......
...@@ -11,6 +11,7 @@ import com.messners.gitlab.api.models.User; ...@@ -11,6 +11,7 @@ import com.messners.gitlab.api.models.User;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class IssueEvent extends EventObject { public class IssueEvent extends EventObject {
public static final String X_GITLAB_EVENT = "Issue Hook";
public static final String OBJECT_KIND = "issue"; public static final String OBJECT_KIND = "issue";
private User user; private User user;
......
...@@ -10,6 +10,7 @@ import com.messners.gitlab.api.models.Assignee; ...@@ -10,6 +10,7 @@ import com.messners.gitlab.api.models.Assignee;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class MergeRequestEvent extends EventObject { public class MergeRequestEvent extends EventObject {
public static final String X_GITLAB_EVENT = "Merge Request Hook";
public static final String OBJECT_KIND = "merge_request"; public static final String OBJECT_KIND = "merge_request";
private ObjectAttributes objectAttributes; private ObjectAttributes objectAttributes;
......
...@@ -11,6 +11,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; ...@@ -11,6 +11,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class PushEvent extends EventObject { public class PushEvent extends EventObject {
public static final String X_GITLAB_EVENT = "Push Hook";
public static final String OBJECT_KIND = "push"; public static final String OBJECT_KIND = "push";
private String after; private String after;
......
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