Skip to content

Commit 3c27dd0

Browse files
committed
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
2 parents 982f4b6 + ad6d8d4 commit 3c27dd0

File tree

202 files changed

+899
-402
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

202 files changed

+899
-402
lines changed

src/main/java/org/gitlab4j/api/GitLabApiException.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
* with a GitLab API endpoint.
2323
*/
2424
public class GitLabApiException extends Exception {
25-
2625
private static final long serialVersionUID = 1L;
26+
2727
private StatusType statusInfo;
2828
private int httpStatus;
2929
private String message;

src/main/java/org/gitlab4j/api/models/AbstractEpic.java

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
package org.gitlab4j.api.models;
22

3-
import java.util.Date;
4-
import java.util.List;
5-
import java.util.Map;
6-
7-
import org.gitlab4j.api.utils.JacksonJsonEnumHelper;
8-
import org.gitlab4j.api.utils.JacksonJson;
9-
103
import com.fasterxml.jackson.annotation.JsonCreator;
114
import com.fasterxml.jackson.annotation.JsonIgnore;
125
import com.fasterxml.jackson.annotation.JsonProperty;
136
import com.fasterxml.jackson.annotation.JsonValue;
7+
import org.gitlab4j.api.utils.JacksonJson;
8+
import org.gitlab4j.api.utils.JacksonJsonEnumHelper;
9+
10+
import java.io.Serializable;
11+
import java.util.Date;
12+
import java.util.List;
13+
import java.util.Map;
1414

15-
public class AbstractEpic<E extends AbstractEpic<E>> extends AbstractMinimalEpic<E> {
15+
public class AbstractEpic<E extends AbstractEpic<E>> extends AbstractMinimalEpic<E> implements Serializable {
16+
private static final long serialVersionUID = 1L;
1617

17-
public enum EpicState {
18+
public enum EpicState {
1819
OPENED, CLOSED, ALL;
1920

2021
private static JacksonJsonEnumHelper<EpicState> enumHelper = new JacksonJsonEnumHelper<>(EpicState.class);

src/main/java/org/gitlab4j/api/models/AbstractGroup.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11

22
package org.gitlab4j.api.models;
33

4+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
45
import org.gitlab4j.api.utils.JacksonJson;
56

6-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
7+
import java.io.Serializable;
78

89
@JsonIgnoreProperties(ignoreUnknown = true)
9-
public abstract class AbstractGroup<G extends AbstractGroup<G>> {
10+
public abstract class AbstractGroup<G extends AbstractGroup<G>> implements Serializable {
11+
private static final long serialVersionUID = 1L;
1012

1113
private Long id;
1214
private String name;

src/main/java/org/gitlab4j/api/models/AbstractIssue.java

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11

22
package org.gitlab4j.api.models;
33

4-
import java.util.Date;
5-
import java.util.List;
6-
7-
import org.gitlab4j.api.Constants.IssueState;
8-
import org.gitlab4j.api.utils.JacksonJson;
9-
104
import com.fasterxml.jackson.annotation.JsonIgnore;
115
import com.fasterxml.jackson.annotation.JsonProperty;
126
import com.fasterxml.jackson.databind.node.IntNode;
137
import com.fasterxml.jackson.databind.node.LongNode;
148
import com.fasterxml.jackson.databind.node.TextNode;
159
import com.fasterxml.jackson.databind.node.ValueNode;
10+
import org.gitlab4j.api.Constants.IssueState;
11+
import org.gitlab4j.api.utils.JacksonJson;
12+
13+
import java.io.Serializable;
14+
import java.util.Date;
15+
import java.util.List;
1616

17-
public abstract class AbstractIssue {
17+
public abstract class AbstractIssue implements Serializable {
18+
private static final long serialVersionUID = 1L;
1819

19-
public static class TaskCompletionStatus {
20+
public static class TaskCompletionStatus implements Serializable {
21+
private static final long serialVersionUID = 1L;
2022

2123
private Integer count;
2224
private Integer completedCount;

src/main/java/org/gitlab4j/api/models/AbstractMinimalEpic.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22

33
import org.gitlab4j.api.utils.JacksonJson;
44

5-
public class AbstractMinimalEpic<E extends AbstractMinimalEpic<E>> {
5+
import java.io.Serializable;
6+
7+
public class AbstractMinimalEpic<E extends AbstractMinimalEpic<E>> implements Serializable {
8+
private static final long serialVersionUID = 1L;
69

710
private Long id;
811
private Long iid;

src/main/java/org/gitlab4j/api/models/AbstractUser.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package org.gitlab4j.api.models;
22

3-
import java.util.Date;
4-
3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
54
import org.gitlab4j.api.utils.JacksonJson;
65

7-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
6+
import java.io.Serializable;
7+
import java.util.Date;
88

99
@JsonIgnoreProperties(ignoreUnknown = true)
10-
public abstract class AbstractUser<U extends AbstractUser<U>> {
10+
public abstract class AbstractUser<U extends AbstractUser<U>> implements Serializable {
11+
private static final long serialVersionUID = 1L;
1112

1213
private String avatarUrl;
1314
private Date createdAt;

src/main/java/org/gitlab4j/api/models/AcceptMergeRequestParams.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22

33
import org.gitlab4j.api.GitLabApiForm;
44

5-
public class AcceptMergeRequestParams {
5+
import java.io.Serializable;
6+
7+
public class AcceptMergeRequestParams implements Serializable {
8+
private static final long serialVersionUID = 1L;
69

710
private String mergeCommitMessage;
811
private Boolean mergeWhenPipelineSucceeds;

src/main/java/org/gitlab4j/api/models/AccessRequest.java

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.util.Date;
44

55
public class AccessRequest extends AbstractUser<AccessRequest> {
6+
private static final long serialVersionUID = 1L;
67

78
private Date requestedAt;
89
private AccessLevel accessLevel;

src/main/java/org/gitlab4j/api/models/AllowedTo.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@
22

33
import org.gitlab4j.api.GitLabApiForm;
44

5+
import java.io.Serializable;
6+
57
/**
68
* This class is used by the ProtectedBranchesAPi to set up the
79
* allowed_to_push, allowed_to_merge, and allowed_to_unprotect values.
810
*/
9-
public class AllowedTo {
11+
public class AllowedTo implements Serializable {
12+
private static final long serialVersionUID = 1L;
1013

1114
private AccessLevel accessLevel;
1215
private Long userId;

src/main/java/org/gitlab4j/api/models/Application.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
package org.gitlab4j.api.models;
22

3-
public class Application {
3+
import java.io.Serializable;
4+
5+
public class Application implements Serializable {
6+
private static final long serialVersionUID = 1L;
47

58
private Long id;
69
private String applicationId;

src/main/java/org/gitlab4j/api/models/ApplicationSettings.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.gitlab4j.api.models;
22

3+
import java.io.Serializable;
34
import java.util.Date;
45
import java.util.HashMap;
56
import java.util.Map;
@@ -17,7 +18,8 @@
1718
import com.fasterxml.jackson.databind.node.NullNode;
1819
import com.fasterxml.jackson.databind.node.TextNode;
1920

20-
public class ApplicationSettings {
21+
public class ApplicationSettings implements Serializable {
22+
private static final long serialVersionUID = 1L;
2123

2224
private Long id;
2325
private Date createdAt;

src/main/java/org/gitlab4j/api/models/ApprovalRule.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
import org.gitlab4j.api.utils.JacksonJson;
44

5+
import java.io.Serializable;
56
import java.util.List;
67

7-
public class ApprovalRule {
8+
public class ApprovalRule implements Serializable {
9+
private static final long serialVersionUID = 1L;
810

911
private Long id;
1012
private String name;

src/main/java/org/gitlab4j/api/models/ApprovalRuleParams.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
package org.gitlab4j.api.models;
22

3+
import java.io.Serializable;
34
import java.util.List;
45

56
import org.gitlab4j.api.GitLabApiForm;
67

7-
public class ApprovalRuleParams {
8+
public class ApprovalRuleParams implements Serializable {
9+
private static final long serialVersionUID = 1L;
810

9-
private Integer approvalsRequired;
11+
private Integer approvalsRequired;
1012
private String name;
1113
private Boolean appliesToAllProtectedBranches;
1214
private List<Long> groupIds;

src/main/java/org/gitlab4j/api/models/ApprovalState.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package org.gitlab4j.api.models;
22

3-
import java.util.List;
4-
53
import org.gitlab4j.api.utils.JacksonJson;
64

7-
public class ApprovalState {
5+
import java.io.Serializable;
6+
import java.util.List;
7+
8+
public class ApprovalState implements Serializable {
9+
private static final long serialVersionUID = 1L;
810

911
private Boolean approvalRulesOverwritten;
1012
private List<ApprovalRule> rules;

src/main/java/org/gitlab4j/api/models/ApprovedBy.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11

22
package org.gitlab4j.api.models;
33

4+
import com.fasterxml.jackson.annotation.JsonIgnore;
45
import org.gitlab4j.api.utils.JacksonJson;
56

6-
import com.fasterxml.jackson.annotation.JsonIgnore;
7+
import java.io.Serializable;
78

89
/**
910
* This class is used by various models to represent the approved_by property,
1011
* which can contain a User or Group instance.
1112
*
1213
* @since 4.19.0
1314
*/
14-
public class ApprovedBy {
15+
public class ApprovedBy implements Serializable {
16+
private static final long serialVersionUID = 1L;
1517

1618
private User user;
1719
private Group group;

src/main/java/org/gitlab4j/api/models/Artifact.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
package org.gitlab4j.api.models;
22

3+
import com.fasterxml.jackson.annotation.JsonCreator;
4+
import com.fasterxml.jackson.annotation.JsonValue;
35
import org.gitlab4j.api.utils.JacksonJson;
46
import org.gitlab4j.api.utils.JacksonJsonEnumHelper;
57

6-
import com.fasterxml.jackson.annotation.JsonCreator;
7-
import com.fasterxml.jackson.annotation.JsonValue;
8+
import java.io.Serializable;
89

9-
public class Artifact {
10+
public class Artifact implements Serializable {
11+
private static final long serialVersionUID = 1L;
1012

1113
public enum FileType {
1214
ARCHIVE, METADATA, TRACE, JUNIT;

src/main/java/org/gitlab4j/api/models/ArtifactsFile.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22

33
import org.gitlab4j.api.utils.JacksonJson;
44

5-
public class ArtifactsFile {
5+
import java.io.Serializable;
6+
7+
public class ArtifactsFile implements Serializable {
8+
private static final long serialVersionUID = 1L;
69

710
private String filename;
811
private Long size;

src/main/java/org/gitlab4j/api/models/Assets.java

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
package org.gitlab4j.api.models;
22

3-
import java.util.List;
4-
53
import org.gitlab4j.api.Constants.ArchiveFormat;
64
import org.gitlab4j.api.utils.JacksonJson;
75

6+
import java.io.Serializable;
7+
import java.util.List;
8+
89
/**
910
* This class is part of the Release class model.
1011
*/
11-
public class Assets {
12+
public class Assets implements Serializable {
13+
private static final long serialVersionUID = 1L;
1214

13-
public static class Source {
15+
public static class Source implements Serializable {
16+
private static final long serialVersionUID = 1L;
1417

1518
private ArchiveFormat format;
1619
private String url;
@@ -37,7 +40,8 @@ public String toString() {
3740
}
3841
}
3942

40-
public static class Link {
43+
public static class Link implements Serializable {
44+
private static final long serialVersionUID = 1L;
4145

4246
private Long id;
4347
private String name;

src/main/java/org/gitlab4j/api/models/Assignee.java

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import org.gitlab4j.api.utils.JacksonJson;
55

66
public class Assignee extends AbstractUser<Assignee> {
7+
private static final long serialVersionUID = 1L;
78

89
@Override
910
public String toString() {

src/main/java/org/gitlab4j/api/models/AuditEvent.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11

22
package org.gitlab4j.api.models;
33

4-
import java.util.Date;
5-
64
import org.gitlab4j.api.utils.JacksonJson;
75

8-
public class AuditEvent {
6+
import java.io.Serializable;
7+
import java.util.Date;
8+
9+
public class AuditEvent implements Serializable {
10+
private static final long serialVersionUID = 1L;
911

1012
private Long id;
1113
private Long authorId;

src/main/java/org/gitlab4j/api/models/AuditEventDetail.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33

44
import org.gitlab4j.api.utils.JacksonJson;
55

6-
public class AuditEventDetail {
6+
import java.io.Serializable;
7+
8+
public class AuditEventDetail implements Serializable {
9+
private static final long serialVersionUID = 1L;
710

811
private String change;
912
private String from;

src/main/java/org/gitlab4j/api/models/Author.java

+1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
package org.gitlab4j.api.models;
33

44
public class Author extends AbstractUser<Author> {
5+
private static final long serialVersionUID = 1L;
56
}

src/main/java/org/gitlab4j/api/models/AwardEmoji.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11

22
package org.gitlab4j.api.models;
33

4-
import java.util.Date;
5-
4+
import com.fasterxml.jackson.annotation.JsonCreator;
5+
import com.fasterxml.jackson.annotation.JsonValue;
66
import org.gitlab4j.api.utils.JacksonJson;
77
import org.gitlab4j.api.utils.JacksonJsonEnumHelper;
88

9-
import com.fasterxml.jackson.annotation.JsonCreator;
10-
import com.fasterxml.jackson.annotation.JsonValue;
9+
import java.io.Serializable;
10+
import java.util.Date;
1111

12-
public class AwardEmoji {
12+
public class AwardEmoji implements Serializable {
13+
private static final long serialVersionUID = 1L;
1314

1415
public enum AwardableType {
1516
ISSUE, MERGE_REQUEST, NOTE, SNIPPET;

0 commit comments

Comments
 (0)