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,7 +3,10 @@ package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson;
public class AuditEventDetail {
import java.io.Serializable;
public class AuditEventDetail implements Serializable {
private static final long serialVersionUID = 1L;
private String change;
private String from;
......
......@@ -2,4 +2,5 @@
package org.gitlab4j.api.models;
public class Author extends AbstractUser<Author> {
private static final long serialVersionUID = 1L;
}
package org.gitlab4j.api.models;
import java.util.Date;
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;
import java.util.Date;
public class AwardEmoji {
public class AwardEmoji implements Serializable {
private static final long serialVersionUID = 1L;
public enum AwardableType {
ISSUE, MERGE_REQUEST, NOTE, SNIPPET;
......
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 Badge {
public class Badge implements Serializable {
private static final long serialVersionUID = 1L;
public enum BadgeKind {
PROJECT, GROUP;
......
package org.gitlab4j.api.models;
import java.util.List;
import org.gitlab4j.api.utils.JacksonJson;
public class Blame {
import java.io.Serializable;
import java.util.List;
public class Blame implements Serializable {
private static final long serialVersionUID = 1L;
private Commit commit;
private List<String> lines;
......
package org.gitlab4j.api.models;
import java.util.List;
import org.gitlab4j.api.utils.JacksonJson;
public class Board {
import java.io.Serializable;
import java.util.List;
public class Board implements Serializable {
private static final long serialVersionUID = 1L;
private Long id;
private String name;
......
......@@ -2,7 +2,10 @@ package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson;
public class BoardList {
import java.io.Serializable;
public class BoardList implements Serializable {
private static final long serialVersionUID = 1L;
private Long id;
private Label label;
......
......@@ -3,7 +3,10 @@ package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson;
public class Branch {
import java.io.Serializable;
public class Branch implements Serializable {
private static final long serialVersionUID = 1L;
private Commit commit;
private Boolean developersCanMerge;
......
......@@ -2,7 +2,10 @@ package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson;
public class BranchAccessLevel {
import java.io.Serializable;
public class BranchAccessLevel implements Serializable {
private static final long serialVersionUID = 1L;
private Long id;
private AccessLevel accessLevel;
......
......@@ -2,9 +2,12 @@ package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson;
import java.io.Serializable;
import java.util.Date;
public class Bridge {
public class Bridge implements Serializable {
private static final long serialVersionUID = 1L;
private Commit commit;
private boolean allowFailure;
private Date createdAt;
......
......@@ -5,9 +5,11 @@ import org.gitlab4j.api.GitLabApiForm;
import org.gitlab4j.api.utils.ISO8601;
import org.gitlab4j.api.utils.JacksonJson;
import java.io.Serializable;
import java.util.Date;
public class ChangelogPayload {
public class ChangelogPayload implements Serializable {
private static final long serialVersionUID = 1L;
private String version;
private String from;
......
package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.gitlab4j.api.utils.JacksonJson;
import java.io.Serializable;
public class Changes {
public class Changes implements Serializable {
private static final long serialVersionUID = 1L;
@JsonInclude(JsonInclude.Include.ALWAYS)
@JsonProperty("a_mode")
......
......@@ -3,6 +3,7 @@ package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson;
public class ChildEpic extends AbstractEpic<ChildEpic> {
private static final long serialVersionUID = 1L;
public String toString() {
return (JacksonJson.toJsonString(this));
......
package org.gitlab4j.api.models;
import java.util.Date;
import org.gitlab4j.api.Constants.LineType;
import org.gitlab4j.api.utils.JacksonJson;
public class Comment {
import java.io.Serializable;
import java.util.Date;
public class Comment implements Serializable {
private static final long serialVersionUID = 1L;
private Author author;
private Date createdAt;
......
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 Commit {
public class Commit implements Serializable {
private static final long serialVersionUID = 1L;
private Author author;
private Date authoredDate;
......
package org.gitlab4j.api.models;
import java.io.File;
import java.io.IOException;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
import org.gitlab4j.api.Constants.Encoding;
import org.gitlab4j.api.GitLabApiException;
import org.gitlab4j.api.utils.FileUtils;
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.File;
import java.io.IOException;
import java.io.Serializable;
public class CommitAction {
public class CommitAction implements Serializable {
private static final long serialVersionUID = 1L;
public enum Action {
......@@ -142,7 +143,7 @@ public class CommitAction {
public CommitAction withFileContent(File file, String filePath, Encoding encoding) throws GitLabApiException {
this.encoding = (encoding != null ? encoding : Encoding.TEXT);
this.encoding = (encoding != null ? encoding : Encoding.TEXT);
this.filePath = filePath;
try {
......
package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import org.gitlab4j.api.utils.JacksonJson;
public class CommitPayload {
public class CommitPayload implements Serializable {
private static final long serialVersionUID = 1L;
private String branch;
private String commitMessage;
......
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 CommitRef {
public class CommitRef implements Serializable {
private static final long serialVersionUID = 1L;
private RefType type;
private String name;
......
......@@ -2,7 +2,10 @@ package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson;
public class CommitStats {
import java.io.Serializable;
public class CommitStats implements Serializable {
private static final long serialVersionUID = 1L;
private Integer additions;
private Integer deletions;
......
package org.gitlab4j.api.models;
import java.util.Date;
import org.gitlab4j.api.utils.JacksonJson;
public class CommitStatus {
import java.io.Serializable;
import java.util.Date;
public class CommitStatus implements Serializable {
private static final long serialVersionUID = 1L;
private Boolean allowFailure;
private Author author;
......
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