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,8 +3,11 @@ package org.gitlab4j.api.models;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.gitlab4j.api.utils.JacksonJson;
import java.io.Serializable;
public class References {
public class References implements Serializable {
private static final long serialVersionUID = 1L;
@JsonProperty("short")
private String _short;
......
......@@ -2,9 +2,11 @@ package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson;
import java.io.Serializable;
import java.util.Date;
public class RegistryRepository {
public class RegistryRepository implements Serializable {
private static final long serialVersionUID = 1L;
private Long id;
private String name;
......
......@@ -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 RegistryRepositoryTag {
public class RegistryRepositoryTag implements Serializable {
private static final long serialVersionUID = 1L;
private String name;
private String path;
private String location;
......
package org.gitlab4j.api.models;
import java.util.Date;
import org.gitlab4j.api.utils.JacksonJson;
import java.util.Date;
public class RelatedEpic extends AbstractEpic<RelatedEpic> {
private static final long serialVersionUID = 1L;
private Boolean startDateIsFixed;
private Boolean dueDateIsFixed;
......
package org.gitlab4j.api.models;
import java.io.Serializable;
import java.util.Date;
import org.gitlab4j.api.utils.JacksonJson;
public class RelatedEpicLink {
public class RelatedEpicLink implements Serializable {
private static final long serialVersionUID = 1L;
private Long id;
private EpicInLink sourceEpic;
......
package org.gitlab4j.api.models;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.gitlab4j.api.utils.JacksonJson;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.gitlab4j.api.utils.JacksonJson;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
public class Release {
public class Release implements Serializable {
private static final long serialVersionUID = 1L;
private String name;
private String tagName;
......
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 ReleaseParams {
public class ReleaseParams implements Serializable {
private static final long serialVersionUID = 1L;
private String name;
private String tagName;
......
package org.gitlab4j.api.models;
import java.util.Date;
import org.gitlab4j.api.utils.JacksonJson;
public class RemoteMirror {
import java.io.Serializable;
import java.util.Date;
public class RemoteMirror implements Serializable {
private static final long serialVersionUID = 1L;
private Long id;
private Boolean enabled;
......
......@@ -2,7 +2,10 @@ package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson;
public class Repository {
import java.io.Serializable;
public class Repository implements Serializable {
private static final long serialVersionUID = 1L;
private String description;
private String homepage;
......
package org.gitlab4j.api.models;
import java.util.Base64;
import com.fasterxml.jackson.annotation.JsonIgnore;
import org.gitlab4j.api.Constants.Encoding;
import org.gitlab4j.api.utils.JacksonJson;
import com.fasterxml.jackson.annotation.JsonIgnore;
import java.io.Serializable;
import java.util.Base64;
public class RepositoryFile {
public class RepositoryFile implements Serializable {
private static final long serialVersionUID = 1L;
private String fileName; // file name only, Ex. class.rb
private String filePath; // full path to file. Ex. lib/class.rb
......@@ -103,7 +104,7 @@ public class RepositoryFile {
/**
* Returns the content as a String, base64 decoding it if necessary.
* For binary files it is recommended to use getDecodedContentAsBytes()
* For binary files it is recommended to use getDecodedContentAsBytes()
*
* @return the content as a String, base64 decoding it if necessary
*/
......
package org.gitlab4j.api.models;
import java.io.Serializable;
import org.gitlab4j.api.utils.JacksonJson;
public class RepositoryFileResponse {
public class RepositoryFileResponse implements Serializable {
private static final long serialVersionUID = 1L;
private String filePath; // full path to file. Ex. lib/class.rb
private String branch;
......
package org.gitlab4j.api.models;
public class Reviewer extends AbstractUser<Reviewer> {
private static final long serialVersionUID = 1L;
}
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 Runner {
public class Runner implements Serializable {
private static final long serialVersionUID = 1L;
private Long id;
private String description;
......
package org.gitlab4j.api.models;
import java.util.Date;
import java.util.List;
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.util.Date;
import java.util.List;
public class RunnerDetail extends Runner {
private static final long serialVersionUID = 1L;
private String architecture;
private String platform;
......
......@@ -3,7 +3,10 @@ package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson;
public class SamlGroupLink {
import java.io.Serializable;
public class SamlGroupLink implements Serializable {
private static final long serialVersionUID = 1L;
private String name;
......
......@@ -2,7 +2,10 @@ package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson;
public class SearchBlob {
import java.io.Serializable;
public class SearchBlob implements Serializable {
private static final long serialVersionUID = 1L;
private String basename;
private String data;
......
package org.gitlab4j.api.models;
import java.util.Date;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import org.gitlab4j.api.utils.JacksonJson;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import java.io.Serializable;
import java.util.Date;
public class SharedGroup {
public class SharedGroup implements Serializable {
private static final long serialVersionUID = 1L;
private Long groupId;
private String groupName;
......
......@@ -23,11 +23,13 @@
package org.gitlab4j.api.models;
import java.util.Date;
import org.gitlab4j.api.utils.JacksonJson;
public class Snippet {
import java.io.Serializable;
import java.util.Date;
public class Snippet implements Serializable {
private static final long serialVersionUID = 1L;
private Author author;
private Date createdAt;
......
package org.gitlab4j.api.models;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonIgnore;
import org.gitlab4j.api.utils.JacksonJson;
import com.fasterxml.jackson.annotation.JsonIgnore;
import java.io.Serializable;
import java.util.Date;
public class SshKey {
public class SshKey implements Serializable {
private static final long serialVersionUID = 1L;
private Long id;
private String title;
......
package org.gitlab4j.api.models;
import java.util.Date;
import org.gitlab4j.api.utils.JacksonJson;
public class SystemHook {
import java.io.Serializable;
import java.util.Date;
public class SystemHook implements Serializable {
private static final long serialVersionUID = 1L;
private Long id;
private String url;
......
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