Commit 3c27dd06 authored by Jeremie Bresson's avatar Jeremie Bresson
Browse files

Merge remote-tracking branch 'origin/main' into 6.x

# Conflicts:
#	src/main/java/org/gitlab4j/api/models/Link.java
#	src/main/java/org/gitlab4j/api/models/PackageFile.java
parents 982f4b64 ad6d8d4f
......@@ -6,6 +6,7 @@ import org.gitlab4j.api.models.Visibility;
import org.gitlab4j.api.utils.JacksonJson;
public class ProjectSystemHookEvent extends AbstractSystemHookEvent {
private static final long serialVersionUID = 1L;
public static final String PROJECT_CREATE_EVENT = "project_create";
public static final String PROJECT_DESTROY_EVENT = "project_destroy";
......
......@@ -4,6 +4,7 @@ import org.gitlab4j.api.utils.JacksonJson;
import org.gitlab4j.api.webhook.AbstractPushEvent;
public class PushSystemHookEvent extends AbstractPushEvent implements SystemHookEvent {
private static final long serialVersionUID = 1L;
public static final String PUSH_EVENT = "push";
......
package org.gitlab4j.api.systemhooks;
import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
......@@ -31,7 +33,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
@JsonSubTypes.Type(value = RepositorySystemHookEvent.class, name = RepositorySystemHookEvent.REPOSITORY_UPDATE_EVENT),
@JsonSubTypes.Type(value = MergeRequestSystemHookEvent.class, name = MergeRequestSystemHookEvent.MERGE_REQUEST_EVENT)
})
public interface SystemHookEvent {
public interface SystemHookEvent extends Serializable {
String getEventName();
......
......@@ -4,6 +4,7 @@ import org.gitlab4j.api.utils.JacksonJson;
import org.gitlab4j.api.webhook.AbstractPushEvent;
public class TagPushSystemHookEvent extends AbstractPushEvent implements SystemHookEvent {
private static final long serialVersionUID = 1L;
public static final String TAG_PUSH_EVENT = "tag_push";
......
......@@ -6,6 +6,7 @@ import org.gitlab4j.api.models.Visibility;
import org.gitlab4j.api.utils.JacksonJson;
public class TeamMemberSystemHookEvent extends AbstractSystemHookEvent {
private static final long serialVersionUID = 1L;
public static final String NEW_TEAM_MEMBER_EVENT = "user_add_to_team";
public static final String TEAM_MEMBER_REMOVED_EVENT = "user_remove_from_team";
......
......@@ -5,6 +5,7 @@ import java.util.Date;
import org.gitlab4j.api.utils.JacksonJson;
public class UserSystemHookEvent extends AbstractSystemHookEvent {
private static final long serialVersionUID = 1L;
public static final String USER_CREATE_EVENT = "user_create";
public static final String USER_DESTROY_EVENT = "user_destroy";
......
......@@ -3,8 +3,9 @@ package org.gitlab4j.api.webhook;
import com.fasterxml.jackson.annotation.JsonIgnore;
public abstract class AbstractEvent implements Event {
private static final long serialVersionUID = 1L;
private String requestUrl;
private String requestUrl;
private String requestQueryString;
private String secretToken;
......
......@@ -9,6 +9,7 @@ import org.gitlab4j.api.utils.JacksonJson;
* Job Events</a> is incorrect, this class represents the actual content of the Job Hook event.
*/
public class BuildEvent extends AbstractEvent {
private static final long serialVersionUID = 1L;
public static final String JOB_HOOK_X_GITLAB_EVENT = "Job Hook";
public static final String OBJECT_KIND = "build";
......
......@@ -3,6 +3,7 @@ package org.gitlab4j.api.webhook;
import org.gitlab4j.api.utils.JacksonJson;
public class DeploymentEvent extends AbstractEvent {
private static final long serialVersionUID = 1L;
public static final String X_GITLAB_EVENT = "Deployment Hook";
public static final String OBJECT_KIND = "deployment";
......
package org.gitlab4j.api.webhook;
import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
......@@ -21,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
@JsonSubTypes.Type(value = DeploymentEvent.class, name = DeploymentEvent.OBJECT_KIND),
@JsonSubTypes.Type(value = ReleaseEvent.class, name = ReleaseEvent.OBJECT_KIND)
})
public interface Event {
public interface Event extends Serializable {
String getObjectKind();
void setRequestUrl(String url);
......
package org.gitlab4j.api.webhook;
import java.io.Serializable;
import java.util.Date;
import org.gitlab4j.api.utils.JacksonJson;
......@@ -8,7 +9,8 @@ import org.gitlab4j.api.utils.JacksonJsonEnumHelper;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
public class EventLabel {
public class EventLabel implements Serializable {
private static final long serialVersionUID = 1L;
public enum LabelType {
......
package org.gitlab4j.api.webhook;
import java.io.Serializable;
import java.util.List;
import org.gitlab4j.api.models.Assignee;
import org.gitlab4j.api.utils.JacksonJson;
import org.gitlab4j.api.webhook.MergeRequestEvent.ObjectAttributes;
public class ExternalStatusCheckEvent {
public class ExternalStatusCheckEvent implements Serializable {
private static final long serialVersionUID = 1L;
private String objectKind;
private String eventType;
......
......@@ -6,6 +6,7 @@ import org.gitlab4j.api.models.Assignee;
import org.gitlab4j.api.utils.JacksonJson;
public class IssueEvent extends AbstractEvent {
private static final long serialVersionUID = 1L;
public static final String X_GITLAB_EVENT = "Issue Hook";
public static final String OBJECT_KIND = "issue";
......
......@@ -5,6 +5,7 @@ import java.util.Date;
import org.gitlab4j.api.utils.JacksonJson;
public class JobEvent extends AbstractEvent {
private static final long serialVersionUID = 1L;
public static final String JOB_HOOK_X_GITLAB_EVENT = "Job Hook";
public static final String OBJECT_KIND = "job";
......
......@@ -7,6 +7,7 @@ import org.gitlab4j.api.models.Reviewer;
import org.gitlab4j.api.utils.JacksonJson;
public class MergeRequestEvent extends AbstractEvent {
private static final long serialVersionUID = 1L;
public static final String X_GITLAB_EVENT = "Merge Request Hook";
public static final String OBJECT_KIND = "merge_request";
......
......@@ -10,6 +10,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
public class NoteEvent extends AbstractEvent {
private static final long serialVersionUID = 1L;
public static final String X_GITLAB_EVENT = "Note Hook";
public static final String OBJECT_KIND = "note";
......
......@@ -8,6 +8,7 @@ import org.gitlab4j.api.models.Variable;
import org.gitlab4j.api.utils.JacksonJson;
public class PipelineEvent extends AbstractEvent {
private static final long serialVersionUID = 1L;
public static final String X_GITLAB_EVENT = "Pipeline Hook";
public static final String OBJECT_KIND = "pipeline";
......
......@@ -4,6 +4,7 @@ package org.gitlab4j.api.webhook;
import org.gitlab4j.api.utils.JacksonJson;
public class PushEvent extends AbstractPushEvent implements Event {
private static final long serialVersionUID = 1L;
public static final String X_GITLAB_EVENT = "Push Hook";
public static final String OBJECT_KIND = "push";
......
......@@ -3,6 +3,7 @@ package org.gitlab4j.api.webhook;
import org.gitlab4j.api.utils.JacksonJson;
public class ReleaseEvent extends AbstractEvent {
private static final long serialVersionUID = 1L;
public static final String X_GITLAB_EVENT = "Release Hook";
public static final String OBJECT_KIND = "release";
......
......@@ -4,6 +4,7 @@ package org.gitlab4j.api.webhook;
import org.gitlab4j.api.utils.JacksonJson;
public class TagPushEvent extends AbstractPushEvent implements Event {
private static final long serialVersionUID = 1L;
public static final String X_GITLAB_EVENT = "Tag Push Hook";
public static final String OBJECT_KIND = "tag_push";
......
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