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
......@@ -2,7 +2,10 @@ package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson;
public class Identity {
import java.io.Serializable;
public class Identity implements Serializable {
private static final long serialVersionUID = 1L;
private String provider;
private String externUid;
......
package org.gitlab4j.api.models;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
......@@ -9,7 +10,8 @@ import org.gitlab4j.api.utils.JacksonJsonEnumHelper;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
public class ImpersonationToken {
public class ImpersonationToken implements Serializable {
private static final long serialVersionUID = 1L;
/** Enum to specify the scope of an ImpersonationToken. */
public enum Scope {
......
package org.gitlab4j.api.models;
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 ImportStatus {
public class ImportStatus implements Serializable {
private static final long serialVersionUID = 1L;
/**
* Enum representing the status of the import.
......
......@@ -4,6 +4,7 @@ package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson;
public class Issue extends AbstractIssue {
private static final long serialVersionUID = 1L;
private Boolean subscribed;
......
......@@ -5,7 +5,11 @@ import com.fasterxml.jackson.annotation.JsonValue;
import org.gitlab4j.api.utils.JacksonJson;
import org.gitlab4j.api.utils.JacksonJsonEnumHelper;
public class IssueEvent {
import java.io.Serializable;
public class IssueEvent implements Serializable {
private static final long serialVersionUID = 1L;
/** Enum to use for specifying the state events resource type. */
public enum ResourceType {
......
package org.gitlab4j.api.models;
import com.fasterxml.jackson.annotation.JsonIgnore;
import java.util.Date;
import java.util.List;
import org.gitlab4j.api.Constants;
import org.gitlab4j.api.Constants.IssueOrderBy;
import org.gitlab4j.api.Constants.IssueScope;
......@@ -11,10 +9,15 @@ import org.gitlab4j.api.Constants.SortOrder;
import org.gitlab4j.api.GitLabApiForm;
import org.gitlab4j.api.utils.ISO8601;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* This class is used to filter issues when getting lists of them.
*/
public class IssueFilter {
public class IssueFilter implements Serializable {
private static final long serialVersionUID = 1L;
/**
* Return only the milestone having the given iid.
......
......@@ -2,7 +2,10 @@ package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson;
public class IssueLink {
import java.io.Serializable;
public class IssueLink implements Serializable {
private static final long serialVersionUID = 1L;
private Issue sourceIssue;
private Issue targetIssue;
......
......@@ -4,7 +4,10 @@ import org.gitlab4j.api.utils.JacksonJson;
import com.fasterxml.jackson.annotation.JsonIgnore;
public class IssuesStatistics {
import java.io.Serializable;
public class IssuesStatistics implements Serializable {
private static final long serialVersionUID = 1L;
private Statistics statistics;
......@@ -21,7 +24,9 @@ public class IssuesStatistics {
return (statistics != null ? statistics.counts : null);
}
public static class Statistics {
public static class Statistics implements Serializable {
private static final long serialVersionUID = 1L;
private Counts counts;
public Counts getCounts() {
......@@ -33,7 +38,9 @@ public class IssuesStatistics {
}
}
public static class Counts {
public static class Counts implements Serializable {
private static final long serialVersionUID = 1L;
private Integer all;
private Integer closed;
......
package org.gitlab4j.api.models;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
......@@ -13,7 +14,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
/**
* This class is used to filter issues when getting issue statistics. of them.
*/
public class IssuesStatisticsFilter {
public class IssuesStatisticsFilter implements Serializable {
private static final long serialVersionUID = 1L;
private List<String> labels;
private String milestone;
......
package org.gitlab4j.api.models;
import java.util.Date;
import org.gitlab4j.api.utils.JacksonJson;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
import org.gitlab4j.api.utils.JacksonJson;
import java.io.Serializable;
import java.util.Date;
public class Iteration implements Serializable {
private static final long serialVersionUID = 1L;
public class Iteration {
public enum IterationState {
UPCOMMING(1), CURRENT(2), CLOSED(3);
......
package org.gitlab4j.api.models;
import java.io.Serializable;
import java.util.Date;
import org.gitlab4j.api.Constants;
......@@ -11,7 +12,8 @@ import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonValue;
public class IterationFilter {
public class IterationFilter implements Serializable {
private static final long serialVersionUID = 1L;
public enum IterationFilterState {
OPENED, UPCOMING, CURRENT, CLOSED, ALL;
......
package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
import org.gitlab4j.api.utils.JacksonJson;
public class Job {
public class Job implements Serializable {
private static final long serialVersionUID = 1L;
private Long id;
private Commit commit;
......
......@@ -2,9 +2,12 @@ package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson;
public class JobAttribute {
import java.io.Serializable;
private String key;
public class JobAttribute implements Serializable {
private static final long serialVersionUID = 1L;
private String key;
private String value;
public JobAttribute(String key, String value) {
......
package org.gitlab4j.api.models;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.List;
import org.gitlab4j.api.utils.JacksonJson;
public class JobAttributes {
import java.io.Serializable;
import java.util.List;
public class JobAttributes implements Serializable {
private static final long serialVersionUID = 1L;
@JsonProperty("job_variables_attributes")
@JsonProperty("job_variables_attributes")
private List<JobAttribute> jobAttributes;
public JobAttributes(List<JobAttribute> jobAttributes) {
......
package org.gitlab4j.api.models;
import java.util.Date;
import org.gitlab4j.api.utils.JacksonJson;
public class Key {
import java.io.Serializable;
import java.util.Date;
public class Key implements Serializable {
private static final long serialVersionUID = 1L;
private Date createdAt;
private Long id;
......
package org.gitlab4j.api.models;
import com.fasterxml.jackson.annotation.JsonIgnore;
import org.gitlab4j.api.GitLabApiForm;
import org.gitlab4j.api.utils.JacksonJson;
import com.fasterxml.jackson.annotation.JsonIgnore;
import java.io.Serializable;
public class Label {
public class Label implements Serializable {
private static final long serialVersionUID = 1L;
private Long id;
private String name;
......
package org.gitlab4j.api.models;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
import org.gitlab4j.api.utils.JacksonJson;
import org.gitlab4j.api.utils.JacksonJsonEnumHelper;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
import java.io.Serializable;
public class LabelEvent {
public class LabelEvent implements Serializable {
private static final long serialVersionUID = 1L;
/** Enum to use for specifying the label event resource type. */
public enum ResourceType {
......
......@@ -3,7 +3,10 @@ package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson;
public class LdapGroupLink {
import java.io.Serializable;
public class LdapGroupLink implements Serializable {
private static final long serialVersionUID = 1L;
private String cn;
......
package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson;
import java.io.Serializable;
import java.util.Date;
import java.util.Map;
import org.gitlab4j.api.utils.JacksonJson;
public class License {
public class License implements Serializable {
private static final long serialVersionUID = 1L;
private Long id;
private String plan;
......
package org.gitlab4j.api.models;
import java.io.Serializable;
import java.util.List;
import org.gitlab4j.api.utils.JacksonJson;
public class LicenseTemplate {
public class LicenseTemplate implements Serializable {
private static final long serialVersionUID = 1L;
private String key;
private String name;
......
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