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
...@@ -3,6 +3,7 @@ package org.gitlab4j.api.models; ...@@ -3,6 +3,7 @@ package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJson;
public class EpicInLink extends AbstractEpic<EpicInLink> { public class EpicInLink extends AbstractEpic<EpicInLink> {
private static final long serialVersionUID = 1L;
public String toString() { public String toString() {
return (JacksonJson.toJsonString(this)); return (JacksonJson.toJsonString(this));
......
...@@ -3,7 +3,10 @@ package org.gitlab4j.api.models; ...@@ -3,7 +3,10 @@ package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJson;
public class EpicIssueLink { import java.io.Serializable;
public class EpicIssueLink implements Serializable {
private static final long serialVersionUID = 1L;
private Long id; private Long id;
private Integer relativePosition; private Integer relativePosition;
......
package org.gitlab4j.api.models; package org.gitlab4j.api.models;
import java.util.Date;
import org.gitlab4j.api.Constants.TargetType; import org.gitlab4j.api.Constants.TargetType;
import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJson;
public class Event { import java.io.Serializable;
import java.util.Date;
public class Event implements Serializable {
private static final long serialVersionUID = 1L;
private Long id; private Long id;
private String actionName; private String actionName;
......
package org.gitlab4j.api.models; package org.gitlab4j.api.models;
import java.util.List;
import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJson;
public class EventData { import java.io.Serializable;
import java.util.List;
public class EventData implements Serializable {
private static final long serialVersionUID = 1L;
private String after; private String after;
private String before; private String before;
......
package org.gitlab4j.api.models; package org.gitlab4j.api.models;
import java.util.Date;
import java.util.Map;
import org.gitlab4j.api.utils.JacksonJson;
import org.gitlab4j.api.utils.JacksonJsonEnumHelper;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonValue;
import org.gitlab4j.api.utils.JacksonJson;
import org.gitlab4j.api.utils.JacksonJsonEnumHelper;
import java.io.Serializable;
import java.util.Date;
import java.util.Map;
public class ExportStatus { public class ExportStatus implements Serializable {
private static final long serialVersionUID = 1L;
/** /**
* Enum representing the status of the export. * Enum representing the status of the export.
......
...@@ -2,9 +2,11 @@ package org.gitlab4j.api.models; ...@@ -2,9 +2,11 @@ package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJson;
import java.io.Serializable;
import java.util.List; import java.util.List;
public class ExternalStatusCheck { public class ExternalStatusCheck implements Serializable {
private static final long serialVersionUID = 1L;
private Long id; private Long id;
private String name; private String name;
......
package org.gitlab4j.api.models; package org.gitlab4j.api.models;
import java.io.Serializable;
import java.util.Date; import java.util.Date;
import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJson;
public class ExternalStatusCheckProtectedBranch { public class ExternalStatusCheckProtectedBranch implements Serializable {
private static final long serialVersionUID = 1L;
private Long id; private Long id;
private Long projectId; private Long projectId;
......
...@@ -2,7 +2,10 @@ package org.gitlab4j.api.models; ...@@ -2,7 +2,10 @@ package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJson;
public class ExternalStatusCheckResult { import java.io.Serializable;
public class ExternalStatusCheckResult implements Serializable {
private static final long serialVersionUID = 1L;
private Long id; private Long id;
private MergeRequest mergeRequest; private MergeRequest mergeRequest;
......
...@@ -6,7 +6,10 @@ import org.gitlab4j.api.utils.JacksonJsonEnumHelper; ...@@ -6,7 +6,10 @@ import org.gitlab4j.api.utils.JacksonJsonEnumHelper;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonValue;
public class ExternalStatusCheckStatus { import java.io.Serializable;
public class ExternalStatusCheckStatus implements Serializable {
private static final long serialVersionUID = 1L;
private Long id; private Long id;
private String name; private String name;
...@@ -33,7 +36,7 @@ public class ExternalStatusCheckStatus { ...@@ -33,7 +36,7 @@ public class ExternalStatusCheckStatus {
return (enumHelper.toString(this)); return (enumHelper.toString(this));
} }
} }
public Long getId() { public Long getId() {
return id; return id;
} }
......
...@@ -2,7 +2,10 @@ package org.gitlab4j.api.models; ...@@ -2,7 +2,10 @@ package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJson;
public class FileUpload { import java.io.Serializable;
public class FileUpload implements Serializable {
private static final long serialVersionUID = 1L;
private String alt; private String alt;
private String url; private String url;
......
...@@ -2,7 +2,10 @@ package org.gitlab4j.api.models; ...@@ -2,7 +2,10 @@ package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJson;
public class GitLabCiTemplate { import java.io.Serializable;
public class GitLabCiTemplate implements Serializable {
private static final long serialVersionUID = 1L;
private String name; private String name;
private String content; private String content;
......
...@@ -2,7 +2,10 @@ package org.gitlab4j.api.models; ...@@ -2,7 +2,10 @@ package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJson;
public class GitLabCiTemplateElement { import java.io.Serializable;
public class GitLabCiTemplateElement implements Serializable {
private static final long serialVersionUID = 1L;
private String key; private String key;
private String name; private String name;
......
...@@ -2,7 +2,10 @@ package org.gitlab4j.api.models; ...@@ -2,7 +2,10 @@ package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJson;
public class GpgSignature { import java.io.Serializable;
public class GpgSignature implements Serializable {
private static final long serialVersionUID = 1L;
private Long gpgKeyId; private Long gpgKeyId;
private String gpgKeyPrimaryKeyid; private String gpgKeyPrimaryKeyid;
......
...@@ -8,6 +8,7 @@ import java.util.Date; ...@@ -8,6 +8,7 @@ import java.util.Date;
import java.util.List; import java.util.List;
public class Group extends AbstractGroup<Group> { public class Group extends AbstractGroup<Group> {
private static final long serialVersionUID = 1L;
public class Statistics { public class Statistics {
private Long storageSize; private Long storageSize;
......
...@@ -3,6 +3,8 @@ package org.gitlab4j.api.models; ...@@ -3,6 +3,8 @@ package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJson;
public class GroupAccessToken extends ImpersonationToken { public class GroupAccessToken extends ImpersonationToken {
private static final long serialVersionUID = 1L;
private AccessLevel accessLevel; private AccessLevel accessLevel;
public AccessLevel getAccessLevel() { public AccessLevel getAccessLevel() {
......
package org.gitlab4j.api.models; package org.gitlab4j.api.models;
import java.util.List;
import org.gitlab4j.api.Constants.GroupOrderBy; import org.gitlab4j.api.Constants.GroupOrderBy;
import org.gitlab4j.api.Constants.SortOrder; import org.gitlab4j.api.Constants.SortOrder;
import org.gitlab4j.api.utils.JacksonJson;
import org.gitlab4j.api.GitLabApiForm; import org.gitlab4j.api.GitLabApiForm;
import org.gitlab4j.api.utils.JacksonJson;
import java.io.Serializable;
import java.util.List;
/** /**
* This class is used to filter Groups when getting lists of groups. * This class is used to filter Groups when getting lists of groups.
*/ */
public class GroupFilter { public class GroupFilter implements Serializable {
private static final long serialVersionUID = 1L;
private List<Integer> skipGroups; private List<Integer> skipGroups;
private Boolean allAvailable; private Boolean allAvailable;
......
...@@ -2,12 +2,15 @@ package org.gitlab4j.api.models; ...@@ -2,12 +2,15 @@ package org.gitlab4j.api.models;
import org.gitlab4j.api.GitLabApiForm; import org.gitlab4j.api.GitLabApiForm;
import java.io.Serializable;
/** /**
* This class is utilized by the {@link org.gitlab4j.api.GroupApi#createGroup(GroupParams)} * This class is utilized by the {@link org.gitlab4j.api.GroupApi#createGroup(GroupParams)}
* and {@link org.gitlab4j.api.GroupApi#updateGroup(Object, GroupParams)} methods to set * and {@link org.gitlab4j.api.GroupApi#updateGroup(Object, GroupParams)} methods to set
* the parameters for the call to the GitLab API. * the parameters for the call to the GitLab API.
*/ */
public class GroupParams { public class GroupParams implements Serializable {
private static final long serialVersionUID = 1L;
/** /**
* Constant to specify the project_creation_level for the group. * Constant to specify the project_creation_level for the group.
......
...@@ -5,10 +5,13 @@ import org.gitlab4j.api.Constants.SortOrder; ...@@ -5,10 +5,13 @@ import org.gitlab4j.api.Constants.SortOrder;
import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJson;
import org.gitlab4j.api.GitLabApiForm; import org.gitlab4j.api.GitLabApiForm;
import java.io.Serializable;
/** /**
* This class is used to filter Projects when getting lists of projects for a specified group. * This class is used to filter Projects when getting lists of projects for a specified group.
*/ */
public class GroupProjectsFilter { public class GroupProjectsFilter implements Serializable {
private static final long serialVersionUID = 1L;
private Boolean archived; private Boolean archived;
private Visibility visibility; private Visibility visibility;
...@@ -32,7 +35,7 @@ public class GroupProjectsFilter { ...@@ -32,7 +35,7 @@ public class GroupProjectsFilter {
*/ */
public GroupProjectsFilter withArchived(Boolean archived) { public GroupProjectsFilter withArchived(Boolean archived) {
this.archived = archived; this.archived = archived;
return (this); return (this);
} }
/** /**
...@@ -43,7 +46,7 @@ public class GroupProjectsFilter { ...@@ -43,7 +46,7 @@ public class GroupProjectsFilter {
*/ */
public GroupProjectsFilter withVisibility(Visibility visibility) { public GroupProjectsFilter withVisibility(Visibility visibility) {
this.visibility = visibility; this.visibility = visibility;
return (this); return (this);
} }
/** /**
...@@ -80,7 +83,7 @@ public class GroupProjectsFilter { ...@@ -80,7 +83,7 @@ public class GroupProjectsFilter {
} }
/** /**
* Return only limited fields for each project. This is a no-op without * Return only limited fields for each project. This is a no-op without
* authentication as then only simple fields are returned. * authentication as then only simple fields are returned.
* *
* @param simple if true, return only limited fields for each project * @param simple if true, return only limited fields for each project
...@@ -115,7 +118,7 @@ public class GroupProjectsFilter { ...@@ -115,7 +118,7 @@ public class GroupProjectsFilter {
/** /**
* Include custom attributes in response (admins only). * Include custom attributes in response (admins only).
* *
* @param withCustomAttributes if true, include custom attributes in the repsonse * @param withCustomAttributes if true, include custom attributes in the repsonse
* @return the reference to this ProjectFilter instance * @return the reference to this ProjectFilter instance
*/ */
......
package org.gitlab4j.api.models; package org.gitlab4j.api.models;
import java.io.IOException; import java.io.IOException;
import java.io.Serializable;
import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJson;
...@@ -12,7 +13,8 @@ import com.fasterxml.jackson.databind.JsonNode; ...@@ -12,7 +13,8 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
public class HealthCheckInfo { public class HealthCheckInfo implements Serializable {
private static final long serialVersionUID = 1L;
@JsonDeserialize(using = HealthCheckItemDeserializer.class) @JsonDeserialize(using = HealthCheckItemDeserializer.class)
private HealthCheckItem dbCheck; private HealthCheckItem dbCheck;
......
package org.gitlab4j.api.models; package org.gitlab4j.api.models;
import java.io.Serializable;
import java.util.Map; import java.util.Map;
import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJson;
public class HealthCheckItem { public class HealthCheckItem implements Serializable {
private static final long serialVersionUID = 1L;
private HealthCheckStatus status; private HealthCheckStatus status;
private Map<String, String> labels; private Map<String, String> labels;
private String message; private String message;
......
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