From 956f9888b259eea2a4eb84fa1693f12fa39ea884 Mon Sep 17 00:00:00 2001 From: "ben.gould" Date: Sun, 24 Nov 2024 13:08:39 -0500 Subject: [PATCH 01/21] use @JsonProperty annotation to specify actual key the GitLab API is using --- .../java/org/gitlab4j/api/webhook/MergeRequestEvent.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/org/gitlab4j/api/webhook/MergeRequestEvent.java b/src/main/java/org/gitlab4j/api/webhook/MergeRequestEvent.java index 667c06f80..fae959248 100644 --- a/src/main/java/org/gitlab4j/api/webhook/MergeRequestEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/MergeRequestEvent.java @@ -6,6 +6,8 @@ import org.gitlab4j.api.models.Reviewer; import org.gitlab4j.api.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class MergeRequestEvent extends AbstractEvent { private static final long serialVersionUID = 1L; @@ -15,7 +17,10 @@ public class MergeRequestEvent extends AbstractEvent { private EventUser user; private EventProject project; private EventRepository repository; + + @JsonProperty(value = "object_attributes") private ObjectAttributes objectAttributes; + private List labels; private MergeRequestChanges changes; private List assignees; From 79e90ba611a9de382b36be95198f6011d25383a5 Mon Sep 17 00:00:00 2001 From: "ben.gould" Date: Sun, 24 Nov 2024 13:34:53 -0500 Subject: [PATCH 02/21] other object_attribute fields --- .../org/gitlab4j/api/webhook/ExternalStatusCheckEvent.java | 5 +++++ src/main/java/org/gitlab4j/api/webhook/IssueEvent.java | 5 +++++ src/main/java/org/gitlab4j/api/webhook/NoteEvent.java | 4 ++++ src/main/java/org/gitlab4j/api/webhook/PipelineEvent.java | 4 ++++ src/main/java/org/gitlab4j/api/webhook/WikiPageEvent.java | 4 ++++ src/main/java/org/gitlab4j/api/webhook/WorkItemEvent.java | 5 +++++ 6 files changed, 27 insertions(+) diff --git a/src/main/java/org/gitlab4j/api/webhook/ExternalStatusCheckEvent.java b/src/main/java/org/gitlab4j/api/webhook/ExternalStatusCheckEvent.java index 5c7178930..b5f5a5c24 100644 --- a/src/main/java/org/gitlab4j/api/webhook/ExternalStatusCheckEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/ExternalStatusCheckEvent.java @@ -7,6 +7,8 @@ import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.webhook.MergeRequestEvent.ObjectAttributes; +import com.fasterxml.jackson.annotation.JsonProperty; + public class ExternalStatusCheckEvent implements Serializable { private static final long serialVersionUID = 1L; @@ -15,7 +17,10 @@ public class ExternalStatusCheckEvent implements Serializable { private EventUser user; private EventProject project; private EventRepository repository; + + @JsonProperty(value = "object_attributes") private ObjectAttributes objectAttributes; + private List labels; private MergeRequestChanges changes; private List assignees; diff --git a/src/main/java/org/gitlab4j/api/webhook/IssueEvent.java b/src/main/java/org/gitlab4j/api/webhook/IssueEvent.java index 6d2d37db3..eb6de611c 100644 --- a/src/main/java/org/gitlab4j/api/webhook/IssueEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/IssueEvent.java @@ -5,6 +5,8 @@ import org.gitlab4j.api.models.Assignee; import org.gitlab4j.api.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class IssueEvent extends AbstractEvent { private static final long serialVersionUID = 1L; @@ -14,7 +16,10 @@ public class IssueEvent extends AbstractEvent { private EventUser user; private EventProject project; private EventRepository repository; + + @JsonProperty(value = "object_attributes") private ObjectAttributes objectAttributes; + private List assignees; private Assignee assignee; private List labels; diff --git a/src/main/java/org/gitlab4j/api/webhook/NoteEvent.java b/src/main/java/org/gitlab4j/api/webhook/NoteEvent.java index 62363d79f..16579b8d6 100644 --- a/src/main/java/org/gitlab4j/api/webhook/NoteEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/NoteEvent.java @@ -7,6 +7,7 @@ import org.gitlab4j.api.utils.JacksonJsonEnumHelper; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; public class NoteEvent extends AbstractEvent { @@ -19,7 +20,10 @@ public class NoteEvent extends AbstractEvent { private Long projectId; private EventProject project; private EventRepository repository; + + @JsonProperty(value = "object_attributes") private ObjectAttributes objectAttributes; + private EventCommit commit; private EventIssue issue; private EventMergeRequest mergeRequest; diff --git a/src/main/java/org/gitlab4j/api/webhook/PipelineEvent.java b/src/main/java/org/gitlab4j/api/webhook/PipelineEvent.java index 7dac2129d..8b001941d 100644 --- a/src/main/java/org/gitlab4j/api/webhook/PipelineEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/PipelineEvent.java @@ -7,13 +7,17 @@ import org.gitlab4j.api.models.Variable; import org.gitlab4j.api.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class PipelineEvent extends AbstractEvent { private static final long serialVersionUID = 1L; public static final String X_GITLAB_EVENT = "Pipeline Hook"; public static final String OBJECT_KIND = "pipeline"; + @JsonProperty(value = "object_attributes") private ObjectAttributes objectAttributes; + private EventUser user; private EventProject project; private EventCommit commit; diff --git a/src/main/java/org/gitlab4j/api/webhook/WikiPageEvent.java b/src/main/java/org/gitlab4j/api/webhook/WikiPageEvent.java index 28b240042..e0647129d 100644 --- a/src/main/java/org/gitlab4j/api/webhook/WikiPageEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/WikiPageEvent.java @@ -2,6 +2,8 @@ import org.gitlab4j.api.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class WikiPageEvent extends AbstractEvent { private static final long serialVersionUID = 1L; @@ -11,6 +13,8 @@ public class WikiPageEvent extends AbstractEvent { private EventUser user; private EventProject project; private Wiki wiki; + + @JsonProperty(value = "object_attributes") private ObjectAttributes objectAttributes; public String getObjectKind() { diff --git a/src/main/java/org/gitlab4j/api/webhook/WorkItemEvent.java b/src/main/java/org/gitlab4j/api/webhook/WorkItemEvent.java index 8d883d32d..1f30023e7 100644 --- a/src/main/java/org/gitlab4j/api/webhook/WorkItemEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/WorkItemEvent.java @@ -5,6 +5,8 @@ import org.gitlab4j.api.models.User; import org.gitlab4j.api.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class WorkItemEvent extends AbstractEvent { private static final long serialVersionUID = 1L; @@ -14,7 +16,10 @@ public class WorkItemEvent extends AbstractEvent { private User user; private EventProject project; private EventRepository repository; + + @JsonProperty(value = "object_attributes") private ObjectAttributes objectAttributes; + private List labels; private WorkItemChanges changes; From 610650c184ed54492385b661b6d87c17e2c97ae2 Mon Sep 17 00:00:00 2001 From: "ben.gould" Date: Mon, 25 Nov 2024 13:36:55 -0500 Subject: [PATCH 03/21] also noticed this file had a similar issue for mergeRequest -> merge_request --- src/main/java/org/gitlab4j/api/webhook/NoteEvent.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/org/gitlab4j/api/webhook/NoteEvent.java b/src/main/java/org/gitlab4j/api/webhook/NoteEvent.java index 16579b8d6..9e9f5ed53 100644 --- a/src/main/java/org/gitlab4j/api/webhook/NoteEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/NoteEvent.java @@ -26,7 +26,10 @@ public class NoteEvent extends AbstractEvent { private EventCommit commit; private EventIssue issue; + + @JsonProperty(value = "merge_request") private EventMergeRequest mergeRequest; + private EventSnippet snippet; @Override From 0ee803254d699139be1266afcda558e7ae33136a Mon Sep 17 00:00:00 2001 From: "ben.gould" Date: Sat, 7 Dec 2024 00:33:49 -0500 Subject: [PATCH 04/21] webhooks using @JsonProperty and Format annotations --- .../gitlab4j/api/webhook/AbstractEvent.java | 8 ++ .../api/webhook/AbstractPushEvent.java | 32 +++++ .../org/gitlab4j/api/webhook/BuildCommit.java | 24 ++++ .../org/gitlab4j/api/webhook/BuildEvent.java | 42 +++++++ .../gitlab4j/api/webhook/DeploymentEvent.java | 25 ++++ .../gitlab4j/api/webhook/EventChanges.java | 24 ++++ .../org/gitlab4j/api/webhook/EventCommit.java | 19 +++ .../api/webhook/EventExternalStatusCheck.java | 7 ++ .../org/gitlab4j/api/webhook/EventIssue.java | 30 +++++ .../org/gitlab4j/api/webhook/EventLabel.java | 23 ++++ .../api/webhook/EventMergeRequest.java | 116 ++++++++++++++++++ .../gitlab4j/api/webhook/EventProject.java | 33 +++++ .../api/webhook/EventReleaseAssets.java | 7 ++ .../api/webhook/EventReleaseLink.java | 12 ++ .../api/webhook/EventReleaseSource.java | 5 + .../gitlab4j/api/webhook/EventRepository.java | 15 +++ .../gitlab4j/api/webhook/EventSnippet.java | 27 ++++ .../org/gitlab4j/api/webhook/EventUser.java | 11 ++ .../gitlab4j/api/webhook/EventWorkItem.java | 67 ++++++++++ .../api/webhook/ExternalStatusCheckEvent.java | 18 ++- .../gitlab4j/api/webhook/IssueChanges.java | 15 ++- .../org/gitlab4j/api/webhook/IssueEvent.java | 14 ++- .../org/gitlab4j/api/webhook/JobEvent.java | 40 ++++++ .../api/webhook/MergeRequestChanges.java | 5 + .../api/webhook/MergeRequestEvent.java | 14 ++- .../org/gitlab4j/api/webhook/NoteEvent.java | 46 ++++++- .../gitlab4j/api/webhook/PipelineEvent.java | 9 +- .../gitlab4j/api/webhook/ReleaseEvent.java | 23 ++++ .../gitlab4j/api/webhook/WikiPageEvent.java | 5 + .../gitlab4j/api/webhook/WorkItemChanges.java | 15 ++- .../gitlab4j/api/webhook/WorkItemEvent.java | 10 +- 31 files changed, 725 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/gitlab4j/api/webhook/AbstractEvent.java b/src/main/java/org/gitlab4j/api/webhook/AbstractEvent.java index 2c8f66194..a0e32bc5e 100644 --- a/src/main/java/org/gitlab4j/api/webhook/AbstractEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/AbstractEvent.java @@ -1,13 +1,21 @@ package org.gitlab4j.api.webhook; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; public abstract class AbstractEvent implements Event { private static final long serialVersionUID = 1L; + @JsonProperty("event_type") private String eventType; + + @JsonProperty("request_url") private String requestUrl; + + @JsonProperty("request_query_string") private String requestQueryString; + + @JsonProperty("secret_token") private String secretToken; public String getEventType() { diff --git a/src/main/java/org/gitlab4j/api/webhook/AbstractPushEvent.java b/src/main/java/org/gitlab4j/api/webhook/AbstractPushEvent.java index 6e89431f0..77927f26f 100644 --- a/src/main/java/org/gitlab4j/api/webhook/AbstractPushEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/AbstractPushEvent.java @@ -3,30 +3,62 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; public abstract class AbstractPushEvent { + @JsonProperty("event_name") private String eventName; + @JsonProperty("after") private String after; + + @JsonProperty("before") private String before; + + @JsonProperty("ref") private String ref; + + @JsonProperty("checkout_sha") private String checkoutSha; + @JsonProperty("user_id") private Long userId; + + @JsonProperty("user_name") private String userName; + + @JsonProperty("user_username") private String userUsername; + + @JsonProperty("user_email") private String userEmail; + + @JsonProperty("user_avatar") private String userAvatar; + @JsonProperty("project_id") private Long projectId; + + @JsonProperty("project") private EventProject project; + + @JsonProperty("repository") private EventRepository repository; + + @JsonProperty("commits") private List commits; + + @JsonProperty("total_commits_count") private Integer totalCommitsCount; + @JsonProperty("request_url") private String requestUrl; + + @JsonProperty("request_query_string") private String requestQueryString; + + @JsonProperty("request_secret_token") private String requestSecretToken; public String getEventName() { diff --git a/src/main/java/org/gitlab4j/api/webhook/BuildCommit.java b/src/main/java/org/gitlab4j/api/webhook/BuildCommit.java index a6dfbcae8..1f450b8f8 100644 --- a/src/main/java/org/gitlab4j/api/webhook/BuildCommit.java +++ b/src/main/java/org/gitlab4j/api/webhook/BuildCommit.java @@ -4,17 +4,41 @@ import org.gitlab4j.api.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class BuildCommit { + @JsonProperty("id") private Long id; + + @JsonProperty("sha") private String sha; + + @JsonProperty("message") private String message; + + @JsonProperty("author_name") private String authorName; + + @JsonProperty("author_email") private String authorEmail; + + @JsonProperty("author_url") private String authorUrl; + + @JsonProperty("status") private String status; + + @JsonProperty("duration") private Float duration; + + @JsonProperty("started_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") private Date startedAt; + + @JsonProperty("finished_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") private Date finishedAt; public Long getId() { diff --git a/src/main/java/org/gitlab4j/api/webhook/BuildEvent.java b/src/main/java/org/gitlab4j/api/webhook/BuildEvent.java index 0e954a107..9827bd754 100644 --- a/src/main/java/org/gitlab4j/api/webhook/BuildEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/BuildEvent.java @@ -4,6 +4,9 @@ import org.gitlab4j.api.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * The documentation at: * Job Events is incorrect, this class represents the actual content of the Job Hook event. @@ -14,27 +17,66 @@ public class BuildEvent extends AbstractEvent { public static final String JOB_HOOK_X_GITLAB_EVENT = "Job Hook"; public static final String OBJECT_KIND = "build"; + @JsonProperty("ref") private String ref; + + @JsonProperty("tag") private Boolean tag; + + @JsonProperty("before_sha") private String beforeSha; + + @JsonProperty("sha") private String sha; + + @JsonProperty("build_id") private Long buildId; + + @JsonProperty("build_name") private String buildName; + + @JsonProperty("build_stage") private String buildStage; + + @JsonProperty("build_status") private String buildStatus; + + @JsonProperty("build_started_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") private Date buildStartedAt; + + @JsonProperty("build_finished_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") private Date buildFinishedAt; + + @JsonProperty("build_duration") private Float buildDuration; + @JsonProperty("build_queued_duration") private Float buildQueuedDuration; + + @JsonProperty("build_allow_failure") private Boolean buildAllowFailure; + + @JsonProperty("build_failure_reason") private String buildFailureReason; + + @JsonProperty("project_id") private Long projectId; + @JsonProperty("pipeline_id") private Long pipelineId; + + @JsonProperty("project_name") private String projectName; + + @JsonProperty("user") private EventUser user; + + @JsonProperty("commit") private BuildCommit commit; + + @JsonProperty("repository") private EventRepository repository; @Override diff --git a/src/main/java/org/gitlab4j/api/webhook/DeploymentEvent.java b/src/main/java/org/gitlab4j/api/webhook/DeploymentEvent.java index 76b0e2cba..cd796f0ae 100644 --- a/src/main/java/org/gitlab4j/api/webhook/DeploymentEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/DeploymentEvent.java @@ -2,22 +2,47 @@ import org.gitlab4j.api.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class DeploymentEvent extends AbstractEvent { private static final long serialVersionUID = 1L; public static final String X_GITLAB_EVENT = "Deployment Hook"; public static final String OBJECT_KIND = "deployment"; + @JsonProperty("status") private String status; + + @JsonProperty("status_changed_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss Z") private String statusChangedAt; + + @JsonProperty("deployable_id") private Long deployableId; + + @JsonProperty("deployable_url") private String deployableUrl; + + @JsonProperty("environment") private String environment; + + @JsonProperty("project") private EventProject project; + + @JsonProperty("short_sha") private String shortSha; + + @JsonProperty("user") private EventUser user; + + @JsonProperty("user_url") private String userUrl; + + @JsonProperty("commit_url") private String commitUrl; + + @JsonProperty("commit_title") private String commitTitle; @Override diff --git a/src/main/java/org/gitlab4j/api/webhook/EventChanges.java b/src/main/java/org/gitlab4j/api/webhook/EventChanges.java index bc40f7e9e..f4c07461b 100644 --- a/src/main/java/org/gitlab4j/api/webhook/EventChanges.java +++ b/src/main/java/org/gitlab4j/api/webhook/EventChanges.java @@ -10,20 +10,44 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonProperty; public abstract class EventChanges { + @JsonProperty("author_id") private ChangeContainer authorId; + + @JsonProperty("created_at") private ChangeContainer createdAt; + + @JsonProperty("updated_at") private ChangeContainer updatedAt; + + @JsonProperty("updated_by_id") private ChangeContainer updatedById; + + @JsonProperty("title") private ChangeContainer title; + + @JsonProperty("description") private ChangeContainer description; + + @JsonProperty("state") private ChangeContainer state; + + @JsonProperty("milestone_id") private ChangeContainer milestoneId; + + @JsonProperty("labels") private ChangeContainer> labels; + + @JsonProperty("assignees") private ChangeContainer> assignees; + + @JsonProperty("total_time_spent") private ChangeContainer totalTimeSpent; + + @JsonProperty("other_properties") private Map> otherProperties = new LinkedHashMap<>(); public ChangeContainer getAuthorId() { diff --git a/src/main/java/org/gitlab4j/api/webhook/EventCommit.java b/src/main/java/org/gitlab4j/api/webhook/EventCommit.java index 55cfd689b..e830ac62e 100644 --- a/src/main/java/org/gitlab4j/api/webhook/EventCommit.java +++ b/src/main/java/org/gitlab4j/api/webhook/EventCommit.java @@ -6,15 +6,34 @@ import org.gitlab4j.api.models.Author; import org.gitlab4j.api.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class EventCommit { + @JsonProperty("id") private String id; + + @JsonProperty("message") private String message; + + @JsonProperty("timestamp") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date timestamp; + + @JsonProperty("url") private String url; + + @JsonProperty("author") private Author author; + + @JsonProperty("added") private List added; + + @JsonProperty("modified") private List modified; + + @JsonProperty("removed") private List removed; public String getId() { diff --git a/src/main/java/org/gitlab4j/api/webhook/EventExternalStatusCheck.java b/src/main/java/org/gitlab4j/api/webhook/EventExternalStatusCheck.java index 16feb98b1..9482d4b24 100644 --- a/src/main/java/org/gitlab4j/api/webhook/EventExternalStatusCheck.java +++ b/src/main/java/org/gitlab4j/api/webhook/EventExternalStatusCheck.java @@ -2,10 +2,17 @@ import org.gitlab4j.api.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class EventExternalStatusCheck { + @JsonProperty("id") private Long id; + + @JsonProperty("name") private String name; + + @JsonProperty("external_url") private String externalUrl; public Long getId() { diff --git a/src/main/java/org/gitlab4j/api/webhook/EventIssue.java b/src/main/java/org/gitlab4j/api/webhook/EventIssue.java index 27c4abf97..67c8b0596 100644 --- a/src/main/java/org/gitlab4j/api/webhook/EventIssue.java +++ b/src/main/java/org/gitlab4j/api/webhook/EventIssue.java @@ -4,26 +4,56 @@ import org.gitlab4j.api.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class EventIssue { + @JsonProperty("assignee_id") private Long assigneeId; + + @JsonProperty("author_id") private Long authorId; + + @JsonProperty("branch_name") private String branchName; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("description") private String description; + + @JsonProperty("id") private Long id; + + @JsonProperty("iid") private Long iid; + @JsonProperty("milestone_id") private String milestoneId; + + @JsonProperty("position") private Integer position; + + @JsonProperty("project_id") private Long projectId; + @JsonProperty("state") private String state; + @JsonProperty("title") private String title; + + @JsonProperty("updated_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAt; + @JsonProperty("url") private String url; + + @JsonProperty("action") private String action; public Long getAssigneeId() { diff --git a/src/main/java/org/gitlab4j/api/webhook/EventLabel.java b/src/main/java/org/gitlab4j/api/webhook/EventLabel.java index c77b7db76..8f7a39920 100644 --- a/src/main/java/org/gitlab4j/api/webhook/EventLabel.java +++ b/src/main/java/org/gitlab4j/api/webhook/EventLabel.java @@ -7,6 +7,8 @@ import org.gitlab4j.api.utils.JacksonJsonEnumHelper; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; public class EventLabel implements Serializable { @@ -35,15 +37,36 @@ public String toString() { } } + @JsonProperty("id") private Long id; + + @JsonProperty("title") private String title; + + @JsonProperty("color") private String color; + + @JsonProperty("project_id") private Long projectId; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("updated_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAt; + + @JsonProperty("template") private Boolean template; + + @JsonProperty("description") private String description; + + @JsonProperty("type") private LabelType type; + + @JsonProperty("group_id") private Long groupId; public Long getId() { diff --git a/src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java b/src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java index dbdd25c1e..9c536dace 100644 --- a/src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java +++ b/src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java @@ -8,66 +8,182 @@ import org.gitlab4j.api.models.Duration; import org.gitlab4j.api.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class EventMergeRequest { + @JsonProperty("assignee_id") private Long assigneeId; + + @JsonProperty("author_id") private Long authorId; + + @JsonProperty("branch_name") private String branchName; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") private Date createdAt; + + @JsonProperty("description") private String description; + + @JsonProperty("id") private Long id; + + @JsonProperty("iid") private Long iid; + + @JsonProperty("merge_commit_sha") private String mergeCommitSha; + + @JsonProperty("merge_status") private String mergeStatus; + + @JsonProperty("detailed_merge_status") private String detailedMergeStatus; + + @JsonProperty("milestone_id") private Long milestoneId; + + @JsonProperty("position") private Integer position; + + @JsonProperty("locked_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") private Date lockedAt; + + @JsonProperty("project_id") private Long projectId; + + @JsonProperty("source_branch") private String sourceBranch; + + @JsonProperty("source_project_id") private Long sourceProjectId; + + @JsonProperty("st_commits") private String stCommits; + + @JsonProperty("st_diffs") private String stDiffs; + + @JsonProperty("state") private String state; + + @JsonProperty("state_id") private Long stateId; + + @JsonProperty("target_branch") private String targetBranch; + + @JsonProperty("target_project_id") private Long targetProjectId; + + @JsonProperty("title") private String title; + + @JsonProperty("updated_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") private Date updatedAt; + @JsonProperty("source") private EventProject source; + + @JsonProperty("target") private EventProject target; + + @JsonProperty("last_commit") private EventCommit lastCommit; + + @JsonProperty("blocking_discussions_resolved") private Boolean blockingDiscussionsResolved; + + @JsonProperty("work_in_progress") private Boolean workInProgress; + + @JsonProperty("first_contribution") private Boolean firstContribution; + + @JsonProperty("url") private String url; + + @JsonProperty("labels") private List labels; + + @JsonProperty("action") private String action; + + @JsonProperty("assignee") private Assignee assignee; + @JsonProperty("updated_by_id") private Long updatedById; + + @JsonProperty("merge_error") private String mergeError; + + @JsonProperty("merge_params") private Map mergeParams; + + @JsonProperty("merge_when_pipeline_succeeds") private Boolean mergeWhenPipelineSucceeds; + + @JsonProperty("merge_user_id") private Long mergeUserId; + + @JsonProperty("deleted_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date deletedAt; + + @JsonProperty("in_progress_merge_commit_sha") private String inProgressMergeCommitSha; + + @JsonProperty("lock_version") private Integer lockVersion; + @JsonProperty("last_edited_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date lastEditedAt; + + @JsonProperty("last_edited_by_id") private Long lastEditedById; + + @JsonProperty("head_pipeline_id") private Long headPipelineId; + + @JsonProperty("ref_fetched") private Boolean refFetched; + + @JsonProperty("merge_iid") private Long mergeIid; + + @JsonProperty("total_time_spent") private Integer totalTimeSpent; + + @JsonProperty("human_total_time_spent") private Duration humanTotalTimeSpent; + + @JsonProperty("time_change") private Integer timeChange; + + @JsonProperty("time_estimate") private Integer timeEstimate; + + @JsonProperty("human_time_estimate") private Duration humanTimeEstimate; + + @JsonProperty("human_time_change") private Duration humanTimeChange; + + @JsonProperty("assignee_ids") private List assigneeIds; + + @JsonProperty("reviewer_ids") private List reviewerIds; + + @JsonProperty("oldrev") private String oldrev; public Long getAssigneeId() { diff --git a/src/main/java/org/gitlab4j/api/webhook/EventProject.java b/src/main/java/org/gitlab4j/api/webhook/EventProject.java index cccf45789..f2118f260 100644 --- a/src/main/java/org/gitlab4j/api/webhook/EventProject.java +++ b/src/main/java/org/gitlab4j/api/webhook/EventProject.java @@ -3,23 +3,56 @@ import org.gitlab4j.api.models.AccessLevel; import org.gitlab4j.api.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class EventProject { + @JsonProperty("id") private Long id; + + @JsonProperty("name") private String name; + + @JsonProperty("description") private String description; + + @JsonProperty("web_url") private String webUrl; + + @JsonProperty("avatar_url") private String avatarUrl; + + @JsonProperty("git_ssh_url") private String gitSshUrl; + + @JsonProperty("git_http_url") private String gitHttpUrl; + + @JsonProperty("namespace") private String namespace; + + @JsonProperty("visibility_level") private AccessLevel visibilityLevel; + + @JsonProperty("path_with_namespace") private String pathWithNamespace; + + @JsonProperty("default_branch") private String defaultBranch; + + @JsonProperty("ci_config_path") private String ciConfigPath; + + @JsonProperty("homepage") private String homepage; + + @JsonProperty("url") private String url; + + @JsonProperty("ssh_url") private String sshUrl; + + @JsonProperty("http_url") private String httpUrl; public Long getId() { diff --git a/src/main/java/org/gitlab4j/api/webhook/EventReleaseAssets.java b/src/main/java/org/gitlab4j/api/webhook/EventReleaseAssets.java index 7bd5cb51f..ef010c416 100644 --- a/src/main/java/org/gitlab4j/api/webhook/EventReleaseAssets.java +++ b/src/main/java/org/gitlab4j/api/webhook/EventReleaseAssets.java @@ -4,10 +4,17 @@ import org.gitlab4j.api.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class EventReleaseAssets { + @JsonProperty("count") private Integer count; + + @JsonProperty("links") private List links; + + @JsonProperty("sources") private List sources; public Integer getCount() { diff --git a/src/main/java/org/gitlab4j/api/webhook/EventReleaseLink.java b/src/main/java/org/gitlab4j/api/webhook/EventReleaseLink.java index 2f3bc120a..8fa1c4c36 100644 --- a/src/main/java/org/gitlab4j/api/webhook/EventReleaseLink.java +++ b/src/main/java/org/gitlab4j/api/webhook/EventReleaseLink.java @@ -2,11 +2,23 @@ import org.gitlab4j.api.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class EventReleaseLink { + + @JsonProperty("id") private Long id; + + @JsonProperty("external") private Boolean external; + + @JsonProperty("link_type") private String linkType; + + @JsonProperty("name") private String name; + + @JsonProperty("url") private String url; public Long getId() { diff --git a/src/main/java/org/gitlab4j/api/webhook/EventReleaseSource.java b/src/main/java/org/gitlab4j/api/webhook/EventReleaseSource.java index 15862481c..30768c254 100644 --- a/src/main/java/org/gitlab4j/api/webhook/EventReleaseSource.java +++ b/src/main/java/org/gitlab4j/api/webhook/EventReleaseSource.java @@ -2,8 +2,13 @@ import org.gitlab4j.api.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class EventReleaseSource { + @JsonProperty("format") private String format; + + @JsonProperty("url") private String url; public String getFormat() { diff --git a/src/main/java/org/gitlab4j/api/webhook/EventRepository.java b/src/main/java/org/gitlab4j/api/webhook/EventRepository.java index b9915f614..c7cfb2451 100644 --- a/src/main/java/org/gitlab4j/api/webhook/EventRepository.java +++ b/src/main/java/org/gitlab4j/api/webhook/EventRepository.java @@ -3,14 +3,29 @@ import org.gitlab4j.api.models.AccessLevel; import org.gitlab4j.api.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class EventRepository { + @JsonProperty("name") private String name; + + @JsonProperty("url") private String url; + + @JsonProperty("description") private String description; + + @JsonProperty("homepage") private String homepage; + + @JsonProperty("git_http_url") private String git_http_url; + + @JsonProperty("git_ssh_url") private String git_ssh_url; + + @JsonProperty("visibility_level") private AccessLevel visibility_level; public String getName() { diff --git a/src/main/java/org/gitlab4j/api/webhook/EventSnippet.java b/src/main/java/org/gitlab4j/api/webhook/EventSnippet.java index c81ed9bb9..b22f7ec9d 100644 --- a/src/main/java/org/gitlab4j/api/webhook/EventSnippet.java +++ b/src/main/java/org/gitlab4j/api/webhook/EventSnippet.java @@ -5,18 +5,45 @@ import org.gitlab4j.api.models.AccessLevel; import org.gitlab4j.api.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class EventSnippet { + @JsonProperty("id") private Long id; + + @JsonProperty("title") private String title; + + @JsonProperty("content") private String content; + + @JsonProperty("author_id") private Long authorId; + + @JsonProperty("project_id") private Long projectId; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("updated_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAt; + + @JsonProperty("file_name") private String fileName; + + @JsonProperty("expires_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date expiresAt; + + @JsonProperty("type") private String type; + + @JsonProperty("visibility_level") private AccessLevel visibilityLevel; public Long getId() { diff --git a/src/main/java/org/gitlab4j/api/webhook/EventUser.java b/src/main/java/org/gitlab4j/api/webhook/EventUser.java index b45da199f..7d942bec5 100644 --- a/src/main/java/org/gitlab4j/api/webhook/EventUser.java +++ b/src/main/java/org/gitlab4j/api/webhook/EventUser.java @@ -2,12 +2,23 @@ import org.gitlab4j.api.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class EventUser { + @JsonProperty("id") private Long id; + + @JsonProperty("name") private String name; + + @JsonProperty("username") private String username; + + @JsonProperty("avatar_url") private String avatarUrl; + + @JsonProperty("email") private String email; public Long getId() { diff --git a/src/main/java/org/gitlab4j/api/webhook/EventWorkItem.java b/src/main/java/org/gitlab4j/api/webhook/EventWorkItem.java index d542e06cf..60f342b89 100644 --- a/src/main/java/org/gitlab4j/api/webhook/EventWorkItem.java +++ b/src/main/java/org/gitlab4j/api/webhook/EventWorkItem.java @@ -5,37 +5,104 @@ import org.gitlab4j.api.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class EventWorkItem { + @JsonProperty("author_id") private Long authorId; + + @JsonProperty("closed_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") private Date closedAt; + + @JsonProperty("confidential") private Boolean confidential; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") private Date createdAt; + + @JsonProperty("description") private String description; + + @JsonProperty("due_date") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") private Date dueDate; + + @JsonProperty("id") private Long id; + + @JsonProperty("iid") private Long iid; + + @JsonProperty("last_edited_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") private Date lastEditedAt; + + @JsonProperty("last_edited_by_id") private Long lastEditedById; + + @JsonProperty("milestone_id") private Long milestoneId; + + @JsonProperty("project_id") private Long projectId; + + @JsonProperty("relative_position") private Long relativePosition; + + @JsonProperty("state_id") private Long stateId; + + @JsonProperty("time_estimate") private Integer timeEstimate; + + @JsonProperty("title") private String title; + + @JsonProperty("updated_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") private Date updatedAt; + + @JsonProperty("updated_by_id") private Long updatedById; + + @JsonProperty("weight") private Integer weight; + + @JsonProperty("health_status") private String healthStatus; + + @JsonProperty("type") private String type; + + @JsonProperty("url") private String url; + + @JsonProperty("total_time_spent") private Integer totalTimeSpent; + + @JsonProperty("time_change") private Integer timeChange; + + @JsonProperty("assignee_ids") private List assigneeIds; + + @JsonProperty("assignee_id") private Long assigneeId; + + @JsonProperty("labels") private List labels; + + @JsonProperty("state") private String state; + + @JsonProperty("severity") private String severity; + + @JsonProperty("action") private String action; public Long getAuthorId() { diff --git a/src/main/java/org/gitlab4j/api/webhook/ExternalStatusCheckEvent.java b/src/main/java/org/gitlab4j/api/webhook/ExternalStatusCheckEvent.java index b5f5a5c24..6f667a319 100644 --- a/src/main/java/org/gitlab4j/api/webhook/ExternalStatusCheckEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/ExternalStatusCheckEvent.java @@ -12,18 +12,34 @@ public class ExternalStatusCheckEvent implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("object_kind") private String objectKind; + + @JsonProperty("event_type") private String eventType; + + @JsonProperty("user") private EventUser user; + + @JsonProperty("project") private EventProject project; + + @JsonProperty("repository") private EventRepository repository; - @JsonProperty(value = "object_attributes") + @JsonProperty("object_attributes") private ObjectAttributes objectAttributes; + @JsonProperty("labels") private List labels; + + @JsonProperty("changes") private MergeRequestChanges changes; + + @JsonProperty("assignees") private List assignees; + + @JsonProperty("external_approval_rule") private EventExternalStatusCheck externalApprovalRule; public String getObjectKind() { diff --git a/src/main/java/org/gitlab4j/api/webhook/IssueChanges.java b/src/main/java/org/gitlab4j/api/webhook/IssueChanges.java index 9e52adec7..5908f07a8 100644 --- a/src/main/java/org/gitlab4j/api/webhook/IssueChanges.java +++ b/src/main/java/org/gitlab4j/api/webhook/IssueChanges.java @@ -2,11 +2,18 @@ import java.util.Date; +import com.fasterxml.jackson.annotation.JsonProperty; + public class IssueChanges extends EventChanges { + @JsonProperty("due_date") private ChangeContainer dueDate; + + @JsonProperty("confidential") private ChangeContainer confidential; - private ChangeContainer heathStatus; + + @JsonProperty("health_status") + private ChangeContainer healthStatus; public ChangeContainer getDueDate() { return dueDate; @@ -25,10 +32,10 @@ public void setConfidential(ChangeContainer confidential) { } public ChangeContainer getHeathStatus() { - return heathStatus; + return healthStatus; } - public void setHeathStatus(ChangeContainer heathStatus) { - this.heathStatus = heathStatus; + public void setHeathStatus(ChangeContainer healthStatus) { + this.healthStatus = healthStatus; } } diff --git a/src/main/java/org/gitlab4j/api/webhook/IssueEvent.java b/src/main/java/org/gitlab4j/api/webhook/IssueEvent.java index eb6de611c..59166b3ad 100644 --- a/src/main/java/org/gitlab4j/api/webhook/IssueEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/IssueEvent.java @@ -13,16 +13,28 @@ public class IssueEvent extends AbstractEvent { public static final String X_GITLAB_EVENT = "Issue Hook"; public static final String OBJECT_KIND = "issue"; + @JsonProperty("user") private EventUser user; + + @JsonProperty("project") private EventProject project; + + @JsonProperty("repository") private EventRepository repository; - @JsonProperty(value = "object_attributes") + @JsonProperty("object_attributes") private ObjectAttributes objectAttributes; + @JsonProperty("assignees") private List assignees; + + @JsonProperty("assignee") private Assignee assignee; + + @JsonProperty("labels") private List labels; + + @JsonProperty("changes") private IssueChanges changes; public String getObjectKind() { diff --git a/src/main/java/org/gitlab4j/api/webhook/JobEvent.java b/src/main/java/org/gitlab4j/api/webhook/JobEvent.java index 32c6e8705..e08e5bbca 100644 --- a/src/main/java/org/gitlab4j/api/webhook/JobEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/JobEvent.java @@ -4,29 +4,69 @@ import org.gitlab4j.api.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class JobEvent extends AbstractEvent { private static final long serialVersionUID = 1L; public static final String JOB_HOOK_X_GITLAB_EVENT = "Job Hook"; public static final String OBJECT_KIND = "job"; + @JsonProperty("ref") private String ref; + + @JsonProperty("tag") private Boolean tag; + + @JsonProperty("before_sha") private String beforeSha; + + @JsonProperty("sha") private String sha; + + @JsonProperty("job_id") private Long jobId; + + @JsonProperty("job_name") private String jobName; + + @JsonProperty("job_stage") private String jobStage; + + @JsonProperty("job_status") private String jobStatus; + + @JsonProperty("job_started_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") private Date jobStartedAt; + + @JsonProperty("job_finished_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") private Date jobFinishedAt; + + @JsonProperty("job_duration") private Integer jobDuration; + + @JsonProperty("job_allow_failure") private Boolean jobAllowFailure; + + @JsonProperty("job_failure_reason") private String jobFailureReason; + + @JsonProperty("project_id") private Long projectId; + + @JsonProperty("project_name") private String projectName; + + @JsonProperty("user") private EventUser user; + + @JsonProperty("commit") private BuildCommit commit; + + @JsonProperty("repository") private EventRepository repository; @Override diff --git a/src/main/java/org/gitlab4j/api/webhook/MergeRequestChanges.java b/src/main/java/org/gitlab4j/api/webhook/MergeRequestChanges.java index 07061f9e5..d81478bd9 100644 --- a/src/main/java/org/gitlab4j/api/webhook/MergeRequestChanges.java +++ b/src/main/java/org/gitlab4j/api/webhook/MergeRequestChanges.java @@ -4,9 +4,14 @@ import org.gitlab4j.api.models.Reviewer; +import com.fasterxml.jackson.annotation.JsonProperty; + public class MergeRequestChanges extends EventChanges { + @JsonProperty("merge_status") private ChangeContainer mergeStatus; + + @JsonProperty("reviewers") private ChangeContainer> reviewers; public ChangeContainer getMergeStatus() { diff --git a/src/main/java/org/gitlab4j/api/webhook/MergeRequestEvent.java b/src/main/java/org/gitlab4j/api/webhook/MergeRequestEvent.java index fae959248..bb96c5862 100644 --- a/src/main/java/org/gitlab4j/api/webhook/MergeRequestEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/MergeRequestEvent.java @@ -14,16 +14,28 @@ public class MergeRequestEvent extends AbstractEvent { public static final String X_GITLAB_EVENT = "Merge Request Hook"; public static final String OBJECT_KIND = "merge_request"; + @JsonProperty("user") private EventUser user; + + @JsonProperty("project") private EventProject project; + + @JsonProperty("repository") private EventRepository repository; - @JsonProperty(value = "object_attributes") + @JsonProperty("object_attributes") private ObjectAttributes objectAttributes; + @JsonProperty("labels") private List labels; + + @JsonProperty("changes") private MergeRequestChanges changes; + + @JsonProperty("assignees") private List assignees; + + @JsonProperty("reviewers") private List reviewers; public String getObjectKind() { diff --git a/src/main/java/org/gitlab4j/api/webhook/NoteEvent.java b/src/main/java/org/gitlab4j/api/webhook/NoteEvent.java index 9e9f5ed53..5970ac858 100644 --- a/src/main/java/org/gitlab4j/api/webhook/NoteEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/NoteEvent.java @@ -16,20 +16,31 @@ public class NoteEvent extends AbstractEvent { public static final String X_GITLAB_EVENT = "Note Hook"; public static final String OBJECT_KIND = "note"; + @JsonProperty("user") private EventUser user; + + @JsonProperty("project_id") private Long projectId; + + @JsonProperty("project") private EventProject project; + + @JsonProperty("repository") private EventRepository repository; - @JsonProperty(value = "object_attributes") + @JsonProperty("object_attributes") private ObjectAttributes objectAttributes; + @JsonProperty("commit") private EventCommit commit; + + @JsonProperty("issue") private EventIssue issue; - @JsonProperty(value = "merge_request") + @JsonProperty("merge_request") private EventMergeRequest mergeRequest; + @JsonProperty("snippet") private EventSnippet snippet; @Override @@ -140,21 +151,52 @@ public String toString() { public static class ObjectAttributes { + @JsonProperty("id") private Long id; + + @JsonProperty("note") private String note; + + @JsonProperty("discussion_id") private String discussionId; + + @JsonProperty("type") private String type; + + @JsonProperty("noteable_type") private NoteableType noteableType; + + @JsonProperty("author_id") private Long authorId; + + @JsonProperty("created_at") private Date createdAt; + + @JsonProperty("updated_at") private Date updatedAt; + + @JsonProperty("project_id") private Long projectId; + + @JsonProperty("attachment") private String attachment; + + @JsonProperty("line_code") private String lineCode; + + @JsonProperty("commit_id") private String commitId; + + @JsonProperty("noteable_id") private Long noteableId; + + @JsonProperty("system") private Boolean system; + + @JsonProperty("st_diff") private Diff stDiff; + + @JsonProperty("url") private String url; public Long getId() { diff --git a/src/main/java/org/gitlab4j/api/webhook/PipelineEvent.java b/src/main/java/org/gitlab4j/api/webhook/PipelineEvent.java index 8b001941d..4687b620a 100644 --- a/src/main/java/org/gitlab4j/api/webhook/PipelineEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/PipelineEvent.java @@ -15,12 +15,19 @@ public class PipelineEvent extends AbstractEvent { public static final String X_GITLAB_EVENT = "Pipeline Hook"; public static final String OBJECT_KIND = "pipeline"; - @JsonProperty(value = "object_attributes") + @JsonProperty("object_attributes") private ObjectAttributes objectAttributes; + @JsonProperty("user") private EventUser user; + + @JsonProperty("project") private EventProject project; + + @JsonProperty("commit") private EventCommit commit; + + @JsonProperty("jobs") private List jobs; public String getObjectKind() { diff --git a/src/main/java/org/gitlab4j/api/webhook/ReleaseEvent.java b/src/main/java/org/gitlab4j/api/webhook/ReleaseEvent.java index 2fc16a702..1cd72ced0 100644 --- a/src/main/java/org/gitlab4j/api/webhook/ReleaseEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/ReleaseEvent.java @@ -2,22 +2,45 @@ import org.gitlab4j.api.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class ReleaseEvent extends AbstractEvent { private static final long serialVersionUID = 1L; public static final String X_GITLAB_EVENT = "Release Hook"; public static final String OBJECT_KIND = "release"; + @JsonProperty("id") private Long id; + + @JsonProperty("created_at") private String createdAt; + + @JsonProperty("description") private String description; + + @JsonProperty("name") private String name; + + @JsonProperty("released_at") private String releasedAt; + + @JsonProperty("tag") private String tag; + + @JsonProperty("project") private EventProject project; + + @JsonProperty("url") private String url; + + @JsonProperty("action") private String action; + + @JsonProperty("assets") private EventReleaseAssets assets; + + @JsonProperty("commit") private EventCommit commit; @Override diff --git a/src/main/java/org/gitlab4j/api/webhook/WikiPageEvent.java b/src/main/java/org/gitlab4j/api/webhook/WikiPageEvent.java index e0647129d..b74e25c4d 100644 --- a/src/main/java/org/gitlab4j/api/webhook/WikiPageEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/WikiPageEvent.java @@ -10,8 +10,13 @@ public class WikiPageEvent extends AbstractEvent { public static final String X_GITLAB_EVENT = "Wiki Page Hook"; public static final String OBJECT_KIND = "wiki_page"; + @JsonProperty("user") private EventUser user; + + @JsonProperty("project") private EventProject project; + + @JsonProperty("wiki") private Wiki wiki; @JsonProperty(value = "object_attributes") diff --git a/src/main/java/org/gitlab4j/api/webhook/WorkItemChanges.java b/src/main/java/org/gitlab4j/api/webhook/WorkItemChanges.java index 6bb3ac84f..11c2567de 100644 --- a/src/main/java/org/gitlab4j/api/webhook/WorkItemChanges.java +++ b/src/main/java/org/gitlab4j/api/webhook/WorkItemChanges.java @@ -2,16 +2,21 @@ import java.util.Date; +import com.fasterxml.jackson.annotation.JsonProperty; + public class WorkItemChanges extends EventChanges { - private ChangeContainer heathStatus; + @JsonProperty("health_status") + private ChangeContainer healthStatus; + + @JsonProperty("last_edited_at") private ChangeContainer lastEditedAt; - public ChangeContainer getHeathStatus() { - return heathStatus; + public ChangeContainer getHealthStatus() { + return healthStatus; } - public void setHeathStatus(ChangeContainer heathStatus) { - this.heathStatus = heathStatus; + public void setHealthStatus(ChangeContainer healthStatus) { + this.healthStatus = healthStatus; } public ChangeContainer getLastEditedAt() { diff --git a/src/main/java/org/gitlab4j/api/webhook/WorkItemEvent.java b/src/main/java/org/gitlab4j/api/webhook/WorkItemEvent.java index 1f30023e7..59aa3da24 100644 --- a/src/main/java/org/gitlab4j/api/webhook/WorkItemEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/WorkItemEvent.java @@ -13,14 +13,22 @@ public class WorkItemEvent extends AbstractEvent { public static final String X_GITLAB_EVENT = "Issue Hook"; public static final String OBJECT_KIND = "work_item"; + @JsonProperty("user") private User user; + + @JsonProperty("project") private EventProject project; + + @JsonProperty("repository") private EventRepository repository; - @JsonProperty(value = "object_attributes") + @JsonProperty("object_attributes") private ObjectAttributes objectAttributes; + @JsonProperty("labels") private List labels; + + @JsonProperty("changes") private WorkItemChanges changes; public String getObjectKind() { From 2f9098b8e4eb581433358e296858b0aed9d098d7 Mon Sep 17 00:00:00 2001 From: "ben.gould" Date: Sat, 7 Dec 2024 00:45:21 -0500 Subject: [PATCH 05/21] system hooks using @JsonProperty and @JsonFormat --- .../systemhooks/AbstractSystemHookEvent.java | 6 ++++ .../GroupMemberSystemHookEvent.java | 25 ++++++++++++++++ .../api/systemhooks/GroupSystemHookEvent.java | 25 ++++++++++++++++ .../api/systemhooks/KeySystemHookEvent.java | 15 ++++++++++ .../MergeRequestSystemHookEvent.java | 4 +++ .../systemhooks/ProjectSystemHookEvent.java | 25 ++++++++++++++++ .../api/systemhooks/RepositoryChange.java | 6 ++++ .../RepositorySystemHookEvent.java | 16 ++++++++++ .../TeamMemberSystemHookEvent.java | 30 ++++++++++++++++++- .../api/systemhooks/UserSystemHookEvent.java | 21 +++++++++++++ 10 files changed, 172 insertions(+), 1 deletion(-) diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/AbstractSystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/AbstractSystemHookEvent.java index 6d30d4696..cecf38de8 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/AbstractSystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/AbstractSystemHookEvent.java @@ -1,12 +1,18 @@ package org.gitlab4j.api.systemhooks; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; public abstract class AbstractSystemHookEvent implements SystemHookEvent { private static final long serialVersionUID = 1L; + @JsonProperty("request_url") private String requestUrl; + + @JsonProperty("request_query_string") private String requestQueryString; + + @JsonProperty("request_secret_token") private String requestSecretToken; @Override diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupMemberSystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupMemberSystemHookEvent.java index c85a5db2a..a3a2c95d8 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupMemberSystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupMemberSystemHookEvent.java @@ -2,6 +2,8 @@ import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; import org.gitlab4j.models.utils.JacksonJson; public class GroupMemberSystemHookEvent extends AbstractSystemHookEvent { @@ -10,16 +12,39 @@ public class GroupMemberSystemHookEvent extends AbstractSystemHookEvent { public static final String NEW_GROUP_MEMBER_EVENT = "user_add_to_group"; public static final String GROUP_MEMBER_REMOVED_EVENT = "user_remove_from_group"; + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("updated_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAt; + + @JsonProperty("event_name") private String eventName; + + @JsonProperty("group_access") private String groupAccess; + + @JsonProperty("group_name") private String groupName; + + @JsonProperty("group_path") private String groupPath; + + @JsonProperty("group_id") private Long groupId; + + @JsonProperty("user_email") private String userEmail; + + @JsonProperty("user_name") private String userName; + + @JsonProperty("user_username") private String userUsername; + + @JsonProperty("user_id") private Long userId; public Date getCreatedAt() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupSystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupSystemHookEvent.java index 04af93545..c40bb1de0 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupSystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupSystemHookEvent.java @@ -2,6 +2,8 @@ import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; import org.gitlab4j.models.utils.JacksonJson; public class GroupSystemHookEvent extends AbstractSystemHookEvent { @@ -11,16 +13,39 @@ public class GroupSystemHookEvent extends AbstractSystemHookEvent { public static final String GROUP_DESTROY_EVENT = "group_destroy"; public static final String GROUP_RENAME_EVENT = "group_rename"; + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("updated_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAt; + + @JsonProperty("event_name") private String eventName; + + @JsonProperty("name") private String name; + + @JsonProperty("path") private String path; + + @JsonProperty("full_path") private String fullPath; + + @JsonProperty("group_id") private Long groupId; + + @JsonProperty("owner_email") private String ownerEmail; + + @JsonProperty("owner_name") private String ownerName; + + @JsonProperty("old_path") private String oldPath; + + @JsonProperty("old_full_path") private String oldFullPath; public Date getCreatedAt() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/KeySystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/KeySystemHookEvent.java index 1c31a0cdc..bf111d5a6 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/KeySystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/KeySystemHookEvent.java @@ -2,6 +2,8 @@ import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; import org.gitlab4j.models.utils.JacksonJson; public class KeySystemHookEvent extends AbstractSystemHookEvent { @@ -10,11 +12,24 @@ public class KeySystemHookEvent extends AbstractSystemHookEvent { public static final String KEY_CREATE_EVENT = "key_create"; public static final String KEY_DESTROY_EVENT = "key_destroy"; + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("updated_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAt; + + @JsonProperty("event_name") private String eventName; + + @JsonProperty("username") private String username; + + @JsonProperty("key") private String key; + + @JsonProperty("id") private Long id; public Date getCreatedAt() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/MergeRequestSystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/MergeRequestSystemHookEvent.java index ed09c445c..ddcc56c17 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/MergeRequestSystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/MergeRequestSystemHookEvent.java @@ -1,5 +1,6 @@ package org.gitlab4j.api.systemhooks; +import com.fasterxml.jackson.annotation.JsonProperty; import org.gitlab4j.api.webhook.MergeRequestEvent; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -10,7 +11,10 @@ public class MergeRequestSystemHookEvent extends MergeRequestEvent implements Sy public static final String X_GITLAB_EVENT = "System Hook"; public static final String MERGE_REQUEST_EVENT = "merge_request"; + @JsonProperty("event_type") private String eventType; + + @JsonProperty("event_name") private String eventName; @Override diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/ProjectSystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/ProjectSystemHookEvent.java index ef832ae9d..50cd496ef 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/ProjectSystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/ProjectSystemHookEvent.java @@ -2,6 +2,8 @@ import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; import org.gitlab4j.api.models.Visibility; import org.gitlab4j.models.utils.JacksonJson; @@ -14,16 +16,39 @@ public class ProjectSystemHookEvent extends AbstractSystemHookEvent { public static final String PROJECT_TRANSFER_EVENT = "project_transfer"; public static final String PROJECT_UPDATE_EVENT = "project_update"; + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("updated_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAt; + + @JsonProperty("event_name") private String eventName; + + @JsonProperty("name") private String name; + + @JsonProperty("owner_email") private String ownerEmail; + + @JsonProperty("owner_name") private String ownerName; + + @JsonProperty("path") private String path; + + @JsonProperty("project_id") private Long projectId; + + @JsonProperty("path_with_namespace") private String pathWithNamespace; + + @JsonProperty("project_visibility") private Visibility projectVisibility; + + @JsonProperty("old_path_with_namespace") private String oldPathWithNamespace; public Date getCreatedAt() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/RepositoryChange.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/RepositoryChange.java index b575b8932..fd78f8257 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/RepositoryChange.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/RepositoryChange.java @@ -1,11 +1,17 @@ package org.gitlab4j.api.systemhooks; +import com.fasterxml.jackson.annotation.JsonProperty; import org.gitlab4j.models.utils.JacksonJson; public class RepositoryChange { + @JsonProperty("after") private String after; + + @JsonProperty("before") private String before; + + @JsonProperty("ref") private String ref; public String getAfter() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/RepositorySystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/RepositorySystemHookEvent.java index 9fd3ef3e6..79815bd87 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/RepositorySystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/RepositorySystemHookEvent.java @@ -2,6 +2,7 @@ import java.util.List; +import com.fasterxml.jackson.annotation.JsonProperty; import org.gitlab4j.api.webhook.EventProject; import org.gitlab4j.models.utils.JacksonJson; @@ -9,16 +10,31 @@ public class RepositorySystemHookEvent extends AbstractSystemHookEvent { public static final String REPOSITORY_UPDATE_EVENT = "repository_update"; + @JsonProperty("event_name") private String eventName; + + @JsonProperty("user_id") private Long userId; + + @JsonProperty("user_name") private String userName; + + @JsonProperty("user_email") private String userEmail; + + @JsonProperty("user_avatar") private String userAvatar; + @JsonProperty("project_id") private Long projectId; + + @JsonProperty("project") private EventProject project; + @JsonProperty("changes") private List changes; + + @JsonProperty("refs") private List refs; @Override diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java index 7e5ba0d33..dd1eaa39e 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java @@ -2,6 +2,8 @@ import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; import org.gitlab4j.api.models.Visibility; import org.gitlab4j.models.utils.JacksonJson; @@ -11,20 +13,46 @@ public class TeamMemberSystemHookEvent extends AbstractSystemHookEvent { public static final String NEW_TEAM_MEMBER_EVENT = "user_add_to_team"; public static final String TEAM_MEMBER_REMOVED_EVENT = "user_remove_from_team"; + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("updated_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAt; + + @JsonProperty("event_name") private String eventName; + + @JsonProperty("access_level") private String accessLevel; + + @JsonProperty("project_name") private String projectName; + + @JsonProperty("project_path") private String projectPath; + + @JsonProperty("project_id") private Long projectId; + + @JsonProperty("project_path_with_namespace") private String projectPathWithNamespace; + + @JsonProperty("user_email") private String userEmail; + + @JsonProperty("user_name") private String userName; + + @JsonProperty("user_username") private String userUsername; + + @JsonProperty("user_id") private Long userId; - private Visibility projectVisibility; + @JsonProperty("project_visibility") + private Visibility projectVisibility; public Date getCreatedAt() { return createdAt; } diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/UserSystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/UserSystemHookEvent.java index 854755336..e0d8f6851 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/UserSystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/UserSystemHookEvent.java @@ -2,6 +2,8 @@ import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; import org.gitlab4j.models.utils.JacksonJson; public class UserSystemHookEvent extends AbstractSystemHookEvent { @@ -12,14 +14,33 @@ public class UserSystemHookEvent extends AbstractSystemHookEvent { public static final String USER_RENAME_EVENT = "user_rename"; public static final String USER_FAILED_LOGIN_EVENT = "user_failed_login"; + @JsonProperty("event_name") private String eventName; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("updated_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAt; + + @JsonProperty("email") private String email; + + @JsonProperty("name") private String name; + + @JsonProperty("username") private String username; + + @JsonProperty("user_id") private Long userId; + + @JsonProperty("old_username") private String oldUsername; + + @JsonProperty("state") private String state; @Override From 90a8a9075e7b702a235e561870c236c375388eb2 Mon Sep 17 00:00:00 2001 From: "ben.gould" Date: Sat, 7 Dec 2024 01:12:20 -0500 Subject: [PATCH 06/21] cleanup --- .../org/gitlab4j/api/models/AbstractEpic.java | 42 +++++++++-- .../gitlab4j/api/models/AbstractGroup.java | 12 ++++ .../gitlab4j/api/models/AbstractIssue.java | 72 +++++++++++++++++++ .../api/models/AbstractMinimalEpic.java | 15 ++++ .../org/gitlab4j/api/models/AbstractUser.java | 18 +++++ .../api/models/AcceptMergeRequestParams.java | 13 ++++ .../GroupMemberSystemHookEvent.java | 3 +- .../api/systemhooks/GroupSystemHookEvent.java | 3 +- .../api/systemhooks/KeySystemHookEvent.java | 3 +- .../MergeRequestSystemHookEvent.java | 2 +- .../systemhooks/ProjectSystemHookEvent.java | 5 +- .../api/systemhooks/RepositoryChange.java | 3 +- .../RepositorySystemHookEvent.java | 3 +- .../TeamMemberSystemHookEvent.java | 6 +- .../api/systemhooks/UserSystemHookEvent.java | 3 +- .../gitlab4j/api/webhook/EventChanges.java | 1 - .../gitlab4j/models/TestGitLabApiEvents.java | 2 +- 17 files changed, 189 insertions(+), 17 deletions(-) diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java index d63d37a71..b89c35a84 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java @@ -8,10 +8,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.JacksonJsonEnumHelper; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.*; public class AbstractEpic> extends AbstractMinimalEpic implements Serializable { private static final long serialVersionUID = 1L; @@ -38,21 +35,58 @@ public String toString() { } } + @JsonProperty("parent_iid") private Long parentIid; + + @JsonProperty("description") private String description; + + @JsonProperty("state") private EpicState state; + + @JsonProperty("web_url") private String webUrl; + + @JsonProperty("references") private References references; + + @JsonProperty("author") private Author author; + + @JsonProperty("labels") private List labels; + + @JsonProperty("start_date") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") private Date startDate; + + @JsonProperty("due_date") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") private Date dueDate; + + @JsonProperty("end_date") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") private Date endDate; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("updated_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAt; + + @JsonProperty("closed_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date closedAt; + + @JsonProperty("downvotes") private Integer downvotes; + + @JsonProperty("upvotes") private Integer upvotes; + + @JsonProperty("color") private String color; @JsonProperty("_links") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractGroup.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractGroup.java index 9337dbc4b..73b3ce3c4 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractGroup.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractGroup.java @@ -5,16 +5,28 @@ import org.gitlab4j.models.utils.JacksonJson; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) public abstract class AbstractGroup> implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("id") private Long id; + + @JsonProperty("name") private String name; + + @JsonProperty("avatar_url") private String avatarUrl; + + @JsonProperty("web_url") private String webUrl; + + @JsonProperty("full_name") private String fullName; + + @JsonProperty("full_path") private String fullPath; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractIssue.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractIssue.java index 63166409a..17cd17744 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractIssue.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractIssue.java @@ -7,6 +7,7 @@ import org.gitlab4j.models.Constants.IssueState; import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.node.IntNode; @@ -45,15 +46,38 @@ public String toString() { } } + @JsonProperty("assignee") private Assignee assignee; + + @JsonProperty("assignees") private List assignees; + + @JsonProperty("author") private Author author; + + @JsonProperty("confidential") private Boolean confidential; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("updated_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAt; + + @JsonProperty("closed_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date closedAt; + + @JsonProperty("closed_by") private User closedBy; + + @JsonProperty("description") private String description; + + @JsonProperty("due_date") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") private Date dueDate; @JsonProperty("id") @@ -65,31 +89,79 @@ public String toString() { @JsonIgnore private Long id; + @JsonProperty("iid") private Long iid; + + @JsonProperty("labels") private List labels; + + @JsonProperty("milestone") private Milestone milestone; + + @JsonProperty("project_id") private Long projectId; + + @JsonProperty("state") private IssueState state; + + @JsonProperty("title") private String title; + + @JsonProperty("user_notes_count") private Integer userNotesCount; + + @JsonProperty("web_url") private String webUrl; + + @JsonProperty("references") private References references; + + @JsonProperty("weight") private Integer weight; + + @JsonProperty("discussion_locked") private Boolean discussionLocked; + + @JsonProperty("time_stats") private TimeStats timeStats; + + @JsonProperty("severity") private String severity; + + @JsonProperty("issue_type") private String issueType; + + @JsonProperty("epic") private IssueEpic epic; + @JsonProperty("upvotes") private Integer upvotes; + + @JsonProperty("downvotes") private Integer downvotes; + + @JsonProperty("merge_requests_count") private Integer mergeRequestsCount; + + @JsonProperty("has_tasks") private Boolean hasTasks; + + @JsonProperty("task_status") private String taskStatus; + + @JsonProperty("imported") private Boolean imported; + + @JsonProperty("imported_from") private String importedFrom; + + @JsonProperty("iteration") private Iteration iteration; + + @JsonProperty("task_completion_status") private TaskCompletionStatus taskCompletionStatus; + + @JsonProperty("health_status") private String healthStatus; public Assignee getAssignee() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractMinimalEpic.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractMinimalEpic.java index bdfe2bf27..488d421a7 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractMinimalEpic.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractMinimalEpic.java @@ -4,15 +4,30 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class AbstractMinimalEpic> implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("id") private Long id; + + @JsonProperty("iid") private Long iid; + + @JsonProperty("group_id") private Long groupId; + + @JsonProperty("parent_id") private Long parentId; + + @JsonProperty("title") private String title; + + @JsonProperty("reference") private String reference; + + @JsonProperty("url") private String url; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractUser.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractUser.java index fe22106e5..7ff1101eb 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractUser.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractUser.java @@ -5,19 +5,37 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) public abstract class AbstractUser> implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("avatar_url") private String avatarUrl; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("email") private String email; + + @JsonProperty("id") private Long id; + + @JsonProperty("name") private String name; + + @JsonProperty("state") private String state; + + @JsonProperty("username") private String username; + + @JsonProperty("web_url") private String webUrl; public String getAvatarUrl() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AcceptMergeRequestParams.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AcceptMergeRequestParams.java index 63d63a7b3..45f16bef9 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AcceptMergeRequestParams.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AcceptMergeRequestParams.java @@ -4,14 +4,27 @@ import org.gitlab4j.models.GitLabForm; +import com.fasterxml.jackson.annotation.JsonProperty; + public class AcceptMergeRequestParams implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("merge_commit_message") private String mergeCommitMessage; + + @JsonProperty("merge_when_pipeline_succeeds") private Boolean mergeWhenPipelineSucceeds; + + @JsonProperty("sha") private String sha; + + @JsonProperty("should_remove_source_branch") private Boolean shouldRemoveSourceBranch; + + @JsonProperty("squash") private Boolean squash; + + @JsonProperty("squash_commit_message") private String squashCommitMessage; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupMemberSystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupMemberSystemHookEvent.java index a3a2c95d8..ef5c74f00 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupMemberSystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupMemberSystemHookEvent.java @@ -2,9 +2,10 @@ import java.util.Date; +import org.gitlab4j.models.utils.JacksonJson; + import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; -import org.gitlab4j.models.utils.JacksonJson; public class GroupMemberSystemHookEvent extends AbstractSystemHookEvent { private static final long serialVersionUID = 1L; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupSystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupSystemHookEvent.java index c40bb1de0..d6ed77d27 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupSystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupSystemHookEvent.java @@ -2,9 +2,10 @@ import java.util.Date; +import org.gitlab4j.models.utils.JacksonJson; + import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; -import org.gitlab4j.models.utils.JacksonJson; public class GroupSystemHookEvent extends AbstractSystemHookEvent { private static final long serialVersionUID = 1L; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/KeySystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/KeySystemHookEvent.java index bf111d5a6..632b265f8 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/KeySystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/KeySystemHookEvent.java @@ -2,9 +2,10 @@ import java.util.Date; +import org.gitlab4j.models.utils.JacksonJson; + import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; -import org.gitlab4j.models.utils.JacksonJson; public class KeySystemHookEvent extends AbstractSystemHookEvent { private static final long serialVersionUID = 1L; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/MergeRequestSystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/MergeRequestSystemHookEvent.java index ddcc56c17..41851b012 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/MergeRequestSystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/MergeRequestSystemHookEvent.java @@ -1,9 +1,9 @@ package org.gitlab4j.api.systemhooks; -import com.fasterxml.jackson.annotation.JsonProperty; import org.gitlab4j.api.webhook.MergeRequestEvent; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; public class MergeRequestSystemHookEvent extends MergeRequestEvent implements SystemHookEvent { private static final long serialVersionUID = 1L; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/ProjectSystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/ProjectSystemHookEvent.java index 50cd496ef..6421a7e28 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/ProjectSystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/ProjectSystemHookEvent.java @@ -2,11 +2,12 @@ import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonProperty; import org.gitlab4j.api.models.Visibility; import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class ProjectSystemHookEvent extends AbstractSystemHookEvent { private static final long serialVersionUID = 1L; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/RepositoryChange.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/RepositoryChange.java index fd78f8257..c1c542d0d 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/RepositoryChange.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/RepositoryChange.java @@ -1,8 +1,9 @@ package org.gitlab4j.api.systemhooks; -import com.fasterxml.jackson.annotation.JsonProperty; import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class RepositoryChange { @JsonProperty("after") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/RepositorySystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/RepositorySystemHookEvent.java index 79815bd87..29ca4af8b 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/RepositorySystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/RepositorySystemHookEvent.java @@ -2,10 +2,11 @@ import java.util.List; -import com.fasterxml.jackson.annotation.JsonProperty; import org.gitlab4j.api.webhook.EventProject; import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class RepositorySystemHookEvent extends AbstractSystemHookEvent { public static final String REPOSITORY_UPDATE_EVENT = "repository_update"; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java index dd1eaa39e..3ae05b134 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java @@ -2,11 +2,12 @@ import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonProperty; import org.gitlab4j.api.models.Visibility; import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class TeamMemberSystemHookEvent extends AbstractSystemHookEvent { private static final long serialVersionUID = 1L; @@ -53,6 +54,7 @@ public class TeamMemberSystemHookEvent extends AbstractSystemHookEvent { @JsonProperty("project_visibility") private Visibility projectVisibility; + public Date getCreatedAt() { return createdAt; } diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/UserSystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/UserSystemHookEvent.java index e0d8f6851..4f17abbc4 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/UserSystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/UserSystemHookEvent.java @@ -2,9 +2,10 @@ import java.util.Date; +import org.gitlab4j.models.utils.JacksonJson; + import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; -import org.gitlab4j.models.utils.JacksonJson; public class UserSystemHookEvent extends AbstractSystemHookEvent { private static final long serialVersionUID = 1L; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventChanges.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventChanges.java index 18740abeb..9f14905bc 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventChanges.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventChanges.java @@ -47,7 +47,6 @@ public abstract class EventChanges { @JsonProperty("total_time_spent") private ChangeContainer totalTimeSpent; - @JsonProperty("other_properties") private Map> otherProperties = new LinkedHashMap<>(); public ChangeContainer getAuthorId() { diff --git a/gitlab4j-models/src/test/java/org/gitlab4j/models/TestGitLabApiEvents.java b/gitlab4j-models/src/test/java/org/gitlab4j/models/TestGitLabApiEvents.java index 6887544fe..a4a164b18 100644 --- a/gitlab4j-models/src/test/java/org/gitlab4j/models/TestGitLabApiEvents.java +++ b/gitlab4j-models/src/test/java/org/gitlab4j/models/TestGitLabApiEvents.java @@ -69,7 +69,7 @@ public void testWorkItemEvent() throws Exception { WorkItemEvent workItemEvent = unmarshalResource(WorkItemEvent.class, "workitem-event.json"); assertTrue(compareJson(workItemEvent, "workitem-event.json")); - ChangeContainer change = workItemEvent.getChanges().get("health_status"); + ChangeContainer change = workItemEvent.getChanges().getHealthStatus(); assertNotNull(change); assertEquals("on_track", change.getPrevious()); assertEquals("needs_attention", change.getCurrent()); From 72e86a674eed5469ef3959d79938170e580f5166 Mon Sep 17 00:00:00 2001 From: "ben.gould" Date: Sat, 7 Dec 2024 21:32:56 -0500 Subject: [PATCH 07/21] enriching model annotation metadata with @JsonProperty and @JsonFormat where appropriate --- .../org/gitlab4j/api/models/AbstractEpic.java | 57 +++++++ .../gitlab4j/api/models/AbstractGroup.java | 18 ++ .../gitlab4j/api/models/AbstractIssue.java | 118 +++++++++++++ .../api/models/AbstractMinimalEpic.java | 21 +++ .../org/gitlab4j/api/models/AbstractUser.java | 25 +++ .../api/models/AcceptMergeRequestParams.java | 18 ++ .../gitlab4j/api/models/AccessRequest.java | 14 ++ .../org/gitlab4j/api/models/AllowedTo.java | 16 ++ .../org/gitlab4j/api/models/Application.java | 21 +++ .../api/models/ApplicationSettings.java | 25 +++ .../org/gitlab4j/api/models/ApprovalRule.java | 56 +++++++ .../api/models/ApprovalRuleParams.java | 46 ++++++ .../gitlab4j/api/models/ApprovalState.java | 11 ++ .../org/gitlab4j/api/models/ApprovedBy.java | 10 ++ .../org/gitlab4j/api/models/Artifact.java | 20 +++ .../gitlab4j/api/models/ArtifactsFile.java | 11 ++ .../java/org/gitlab4j/api/models/Assets.java | 49 ++++++ .../org/gitlab4j/api/models/AuditEvent.java | 34 ++++ .../gitlab4j/api/models/AuditEventDetail.java | 56 +++++++ .../org/gitlab4j/api/models/AwardEmoji.java | 40 +++++ .../java/org/gitlab4j/api/models/Badge.java | 35 ++++ .../java/org/gitlab4j/api/models/Blame.java | 11 ++ .../java/org/gitlab4j/api/models/Board.java | 26 +++ .../org/gitlab4j/api/models/BoardList.java | 16 ++ .../java/org/gitlab4j/api/models/Branch.java | 46 ++++++ .../api/models/BranchAccessLevel.java | 26 +++ .../java/org/gitlab4j/api/models/Bridge.java | 105 ++++++++++++ .../gitlab4j/api/models/ChangelogPayload.java | 43 +++++ .../java/org/gitlab4j/api/models/Changes.java | 35 ++++ .../java/org/gitlab4j/api/models/Comment.java | 34 ++++ .../java/org/gitlab4j/api/models/Commit.java | 110 ++++++++++++ .../org/gitlab4j/api/models/CommitAction.java | 35 ++++ .../gitlab4j/api/models/CommitPayload.java | 51 ++++++ .../org/gitlab4j/api/models/CommitRef.java | 10 ++ .../org/gitlab4j/api/models/CommitStats.java | 16 ++ .../org/gitlab4j/api/models/CommitStatus.java | 78 +++++++++ .../api/models/CommitStatusFilter.java | 20 +++ .../gitlab4j/api/models/CompareResults.java | 27 ++- .../org/gitlab4j/api/models/Contributor.java | 16 ++ .../gitlab4j/api/models/CreatedChildEpic.java | 21 +++ .../gitlab4j/api/models/CustomAttribute.java | 11 ++ .../org/gitlab4j/api/models/DeployKey.java | 29 ++++ .../org/gitlab4j/api/models/DeployToken.java | 34 ++++ .../org/gitlab4j/api/models/Deployable.java | 100 +++++++++++ .../org/gitlab4j/api/models/Deployment.java | 56 +++++++ .../gitlab4j/api/models/DeploymentFilter.java | 12 +- .../gitlab4j/api/models/DetailedStatus.java | 46 ++++++ .../java/org/gitlab4j/api/models/Diff.java | 35 ++++ .../java/org/gitlab4j/api/models/DiffRef.java | 16 ++ .../org/gitlab4j/api/models/Discussion.java | 16 ++ .../api/models/DownstreamPipeline.java | 41 +++++ .../org/gitlab4j/api/models/Duration.java | 10 ++ .../java/org/gitlab4j/api/models/Email.java | 11 ++ .../org/gitlab4j/api/models/Environment.java | 43 +++++ .../java/org/gitlab4j/api/models/Epic.java | 24 +++ .../org/gitlab4j/api/models/EpicFilter.java | 77 +++++++++ .../org/gitlab4j/api/models/EpicIssue.java | 12 ++ .../gitlab4j/api/models/EpicIssueLink.java | 21 +++ .../java/org/gitlab4j/api/models/Event.java | 78 +++++++++ .../org/gitlab4j/api/models/EventData.java | 41 +++++ .../java/org/gitlab4j/api/models/Exists.java | 3 + .../org/gitlab4j/api/models/ExportStatus.java | 49 +++++- .../api/models/ExternalStatusCheck.java | 26 +++ .../ExternalStatusCheckProtectedBranch.java | 36 ++++ .../api/models/ExternalStatusCheckResult.java | 16 ++ .../api/models/ExternalStatusCheckStatus.java | 20 +++ .../org/gitlab4j/api/models/FileUpload.java | 16 ++ .../gitlab4j/api/models/GitLabCiTemplate.java | 11 ++ .../api/models/GitLabCiTemplateElement.java | 11 ++ .../java/org/gitlab4j/api/models/GpgKey.java | 19 +++ .../org/gitlab4j/api/models/GpgSignature.java | 31 ++++ .../java/org/gitlab4j/api/models/Group.java | 121 ++++++++++++++ .../gitlab4j/api/models/GroupAccessToken.java | 3 + .../org/gitlab4j/api/models/GroupFilter.java | 56 +++++++ .../org/gitlab4j/api/models/GroupHook.java | 149 +++++++++++++++++ .../gitlab4j/api/models/GroupHookParams.java | 121 ++++++++++++++ .../org/gitlab4j/api/models/GroupParams.java | 106 ++++++++++++ .../api/models/GroupProjectsFilter.java | 66 ++++++++ .../gitlab4j/api/models/HealthCheckInfo.java | 29 ++++ .../gitlab4j/api/models/HealthCheckItem.java | 16 ++ .../org/gitlab4j/api/models/Identity.java | 16 ++ .../api/models/ImpersonationToken.java | 62 +++++++ .../org/gitlab4j/api/models/ImportStatus.java | 48 ++++++ .../java/org/gitlab4j/api/models/Issue.java | 3 + .../org/gitlab4j/api/models/IssueEvent.java | 33 ++++ .../org/gitlab4j/api/models/IssueFilter.java | 26 ++- .../org/gitlab4j/api/models/IssueLink.java | 16 ++ .../gitlab4j/api/models/IssuesStatistics.java | 17 ++ .../api/models/IssuesStatisticsFilter.java | 75 +++++++++ .../org/gitlab4j/api/models/Iteration.java | 69 ++++++++ .../gitlab4j/api/models/IterationFilter.java | 12 +- .../java/org/gitlab4j/api/models/Job.java | 59 +++++++ .../org/gitlab4j/api/models/JobAttribute.java | 5 + .../java/org/gitlab4j/api/models/Key.java | 13 ++ .../java/org/gitlab4j/api/models/Label.java | 22 +++ .../org/gitlab4j/api/models/LabelEvent.java | 14 ++ .../gitlab4j/api/models/LdapGroupLink.java | 6 + .../java/org/gitlab4j/api/models/License.java | 29 ++++ .../gitlab4j/api/models/LicenseTemplate.java | 23 +++ .../java/org/gitlab4j/api/models/Link.java | 7 + .../org/gitlab4j/api/models/LinkedIssue.java | 12 ++ .../org/gitlab4j/api/models/Markdown.java | 3 + .../java/org/gitlab4j/api/models/Member.java | 9 + .../org/gitlab4j/api/models/Membership.java | 9 + .../org/gitlab4j/api/models/MergeRequest.java | 126 +++++++++++++- .../gitlab4j/api/models/MergeRequestDiff.java | 5 + .../api/models/MergeRequestFilter.java | 51 +++++- .../api/models/MergeRequestParams.java | 33 ++++ .../api/models/MergeRequestVersion.java | 19 +++ .../org/gitlab4j/api/models/Metadata.java | 9 + .../org/gitlab4j/api/models/Milestone.java | 26 +++ .../org/gitlab4j/api/models/Namespace.java | 17 ++ .../java/org/gitlab4j/api/models/Note.java | 49 +++++- .../api/models/NotificationSettings.java | 29 ++++ .../api/models/OauthTokenResponse.java | 11 ++ .../java/org/gitlab4j/api/models/Package.java | 13 ++ .../org/gitlab4j/api/models/PackageFile.java | 19 +++ .../gitlab4j/api/models/PackageFilter.java | 17 ++ .../org/gitlab4j/api/models/Permissions.java | 5 + .../api/models/PersonalAccessToken.java | 22 +++ .../org/gitlab4j/api/models/Pipeline.java | 51 ++++++ .../gitlab4j/api/models/PipelineFilter.java | 24 ++- .../gitlab4j/api/models/PipelineSchedule.java | 29 ++++ .../org/gitlab4j/api/models/Position.java | 22 +++ .../java/org/gitlab4j/api/models/Project.java | 156 +++++++++++++++++- .../gitlab4j/api/models/ProjectAccess.java | 5 + .../api/models/ProjectAccessToken.java | 27 +++ .../api/models/ProjectApprovalsConfig.java | 14 ++ .../gitlab4j/api/models/ProjectFetches.java | 7 + .../gitlab4j/api/models/ProjectFilter.java | 56 +++++++ .../api/models/ProjectGroupsFilter.java | 11 ++ .../org/gitlab4j/api/models/ProjectHook.java | 44 +++++ .../gitlab4j/api/models/ProjectLicense.java | 11 ++ .../api/models/ProjectStatistics.java | 29 +++- .../gitlab4j/api/models/ProtectedBranch.java | 15 ++ .../org/gitlab4j/api/models/ProtectedTag.java | 8 + .../org/gitlab4j/api/models/PushData.java | 15 ++ .../org/gitlab4j/api/models/PushRules.java | 33 ++++ .../org/gitlab4j/api/models/References.java | 3 + .../api/models/RegistryRepository.java | 13 ++ .../api/models/RegistryRepositoryTag.java | 19 +++ .../org/gitlab4j/api/models/RelatedEpic.java | 19 +++ .../gitlab4j/api/models/RelatedEpicLink.java | 16 ++ .../java/org/gitlab4j/api/models/Release.java | 28 ++++ .../api/models/ReleaseLinkParams.java | 11 ++ .../gitlab4j/api/models/ReleaseParams.java | 17 ++ .../org/gitlab4j/api/models/RemoteMirror.java | 25 +++ .../org/gitlab4j/api/models/Repository.java | 9 + .../api/models/RepositoryArchiveParams.java | 5 + .../gitlab4j/api/models/RepositoryFile.java | 20 +++ .../api/models/RepositoryFileResponse.java | 5 + .../java/org/gitlab4j/api/models/Runner.java | 17 +- .../org/gitlab4j/api/models/RunnerDetail.java | 20 +++ .../gitlab4j/api/models/SamlGroupLink.java | 5 + .../org/gitlab4j/api/models/SearchBlob.java | 15 ++ .../org/gitlab4j/api/models/SharedGroup.java | 8 + .../java/org/gitlab4j/api/models/Snippet.java | 28 ++++ .../java/org/gitlab4j/api/models/SshKey.java | 14 ++ .../org/gitlab4j/api/models/SystemHook.java | 19 +++ .../java/org/gitlab4j/api/models/Tag.java | 13 ++ .../api/models/TaskCompletionStatus.java | 5 + .../org/gitlab4j/api/models/TimeStats.java | 9 + .../java/org/gitlab4j/api/models/Todo.java | 20 +++ .../java/org/gitlab4j/api/models/Topic.java | 8 + .../org/gitlab4j/api/models/TopicParams.java | 7 + .../org/gitlab4j/api/models/TreeItem.java | 11 ++ .../java/org/gitlab4j/api/models/Trigger.java | 19 +++ .../gitlab4j/api/models/UploadedByUser.java | 7 + .../org/gitlab4j/api/models/UploadedFile.java | 13 ++ .../java/org/gitlab4j/api/models/User.java | 68 ++++++++ .../org/gitlab4j/api/models/Variable.java | 6 + .../java/org/gitlab4j/api/models/Version.java | 5 + .../gitlab4j/api/models/WikiAttachment.java | 9 + .../org/gitlab4j/api/models/WikiPage.java | 9 + 174 files changed, 5130 insertions(+), 36 deletions(-) diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java index b89c35a84..29aa0156b 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java @@ -35,60 +35,117 @@ public String toString() { } } + /** + * The internal identifier of the parent epic. + */ @JsonProperty("parent_iid") private Long parentIid; + /** + * The description of the epic. + */ @JsonProperty("description") private String description; + /** + * The state of the epic (e.g., open, closed). + */ @JsonProperty("state") private EpicState state; + /** + * The web URL of the epic. + */ @JsonProperty("web_url") private String webUrl; + /** + * The references associated with the epic. + */ @JsonProperty("references") private References references; + /** + * The author of the epic. + */ @JsonProperty("author") private Author author; + /** + * The list of labels associated with the epic. + */ @JsonProperty("labels") private List labels; + /** + * The start date of the epic. + * Expected in format "yyyy-MM-dd". + */ @JsonProperty("start_date") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") private Date startDate; + /** + * The due date of the epic. + * Expected in format "yyyy-MM-dd". + */ @JsonProperty("due_date") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") private Date dueDate; + /** + * The end date of the epic. + * Expected in format "yyyy-MM-dd". + */ @JsonProperty("end_date") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") private Date endDate; + /** + * The date when the epic was created. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ @JsonProperty("created_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + /** + * The date when the epic was last updated. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ @JsonProperty("updated_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAt; + /** + * The date when the epic was closed. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ @JsonProperty("closed_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date closedAt; + /** + * The number of downvotes for the epic. + */ @JsonProperty("downvotes") private Integer downvotes; + /** + * The number of upvotes for the epic. + */ @JsonProperty("upvotes") private Integer upvotes; + /** + * The color associated with the epic. + */ @JsonProperty("color") private String color; + /** + * The links associated with the epic. + */ @JsonProperty("_links") private Map links; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractGroup.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractGroup.java index 73b3ce3c4..6c96c9509 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractGroup.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractGroup.java @@ -11,21 +11,39 @@ public abstract class AbstractGroup> implements Serializable { private static final long serialVersionUID = 1L; + /** + * The unique identifier of the group. + */ @JsonProperty("id") private Long id; + /** + * The name of the group. + */ @JsonProperty("name") private String name; + /** + * The avatar URL associated with the group. + */ @JsonProperty("avatar_url") private String avatarUrl; + /** + * The web URL of the group. + */ @JsonProperty("web_url") private String webUrl; + /** + * The full name of the group. + */ @JsonProperty("full_name") private String fullName; + /** + * The full path of the group. + */ @JsonProperty("full_path") private String fullPath; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractIssue.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractIssue.java index 17cd17744..93f4ab0ae 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractIssue.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractIssue.java @@ -46,121 +46,239 @@ public String toString() { } } + /** + * The assignee associated with the issue. + */ @JsonProperty("assignee") private Assignee assignee; + /** + * The list of assignees associated with the issue. + */ @JsonProperty("assignees") private List assignees; + /** + * The author of the issue. + */ @JsonProperty("author") private Author author; + /** + * Indicates whether the issue is confidential. + */ @JsonProperty("confidential") private Boolean confidential; + /** + * The date when the issue was created. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ @JsonProperty("created_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + /** + * The date when the issue was last updated. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ @JsonProperty("updated_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAt; + /** + * The date when the issue was closed. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ @JsonProperty("closed_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date closedAt; + /** + * The user who closed the issue. + */ @JsonProperty("closed_by") private User closedBy; + /** + * The description of the issue. + */ @JsonProperty("description") private String description; + /** + * The due date of the issue. + * Expected in format "yyyy-MM-dd". + */ @JsonProperty("due_date") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") private Date dueDate; + /** + * The actual ID of the issue. + */ @JsonProperty("id") private ValueNode actualId; + /** + * The external ID of the issue (ignored during serialization). + */ @JsonIgnore private String externalId; + /** + * The internal ID of the issue (ignored during serialization). + */ @JsonIgnore private Long id; + /** + * The internal identifier for the issue. + */ @JsonProperty("iid") private Long iid; + /** + * The labels associated with the issue. + */ @JsonProperty("labels") private List labels; + /** + * The milestone associated with the issue. + */ @JsonProperty("milestone") private Milestone milestone; + /** + * The project ID associated with the issue. + */ @JsonProperty("project_id") private Long projectId; + /** + * The state of the issue (e.g., open, closed). + */ @JsonProperty("state") private IssueState state; + /** + * The title of the issue. + */ @JsonProperty("title") private String title; + /** + * The count of user notes on the issue. + */ @JsonProperty("user_notes_count") private Integer userNotesCount; + /** + * The web URL of the issue. + */ @JsonProperty("web_url") private String webUrl; + /** + * The references associated with the issue. + */ @JsonProperty("references") private References references; + /** + * The weight of the issue. + */ @JsonProperty("weight") private Integer weight; + /** + * Indicates whether discussions on the issue are locked. + */ @JsonProperty("discussion_locked") private Boolean discussionLocked; + /** + * The time statistics associated with the issue. + */ @JsonProperty("time_stats") private TimeStats timeStats; + /** + * The severity of the issue. + */ @JsonProperty("severity") private String severity; + /** + * The type of the issue. + */ @JsonProperty("issue_type") private String issueType; + /** + * The epic associated with the issue. + */ @JsonProperty("epic") private IssueEpic epic; + /** + * The upvotes for the issue. + */ @JsonProperty("upvotes") private Integer upvotes; + /** + * The downvotes for the issue. + */ @JsonProperty("downvotes") private Integer downvotes; + /** + * The number of merge requests associated with the issue. + */ @JsonProperty("merge_requests_count") private Integer mergeRequestsCount; + /** + * Indicates whether the issue has tasks. + */ @JsonProperty("has_tasks") private Boolean hasTasks; + /** + * The task status associated with the issue. + */ @JsonProperty("task_status") private String taskStatus; + /** + * Indicates whether the issue has been imported. + */ @JsonProperty("imported") private Boolean imported; + /** + * The source from which the issue was imported. + */ @JsonProperty("imported_from") private String importedFrom; + /** + * The iteration associated with the issue. + */ @JsonProperty("iteration") private Iteration iteration; + /** + * The task completion status associated with the issue. + */ @JsonProperty("task_completion_status") private TaskCompletionStatus taskCompletionStatus; + /** + * The health status associated with the issue. + */ @JsonProperty("health_status") private String healthStatus; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractMinimalEpic.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractMinimalEpic.java index 488d421a7..43ce50c90 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractMinimalEpic.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractMinimalEpic.java @@ -9,24 +9,45 @@ public class AbstractMinimalEpic> implements Serializable { private static final long serialVersionUID = 1L; + /** + * The unique identifier of the epic. + */ @JsonProperty("id") private Long id; + /** + * The internal identifier of the epic. + */ @JsonProperty("iid") private Long iid; + /** + * The ID of the group associated with the epic. + */ @JsonProperty("group_id") private Long groupId; + /** + * The ID of the parent epic. + */ @JsonProperty("parent_id") private Long parentId; + /** + * The title of the epic. + */ @JsonProperty("title") private String title; + /** + * The reference of the epic. + */ @JsonProperty("reference") private String reference; + /** + * The URL of the epic. + */ @JsonProperty("url") private String url; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractUser.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractUser.java index 7ff1101eb..0f9f9ea7c 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractUser.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractUser.java @@ -13,28 +13,53 @@ public abstract class AbstractUser> implements Serializable { private static final long serialVersionUID = 1L; + /** + * The avatar URL associated with the user. + */ @JsonProperty("avatar_url") private String avatarUrl; + /** + * The date when the user was created. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ @JsonProperty("created_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + /** + * The email address associated with the user. + */ @JsonProperty("email") private String email; + /** + * The unique identifier of the user. + */ @JsonProperty("id") private Long id; + /** + * The name of the user. + */ @JsonProperty("name") private String name; + /** + * The state of the user (e.g., active, inactive). + */ @JsonProperty("state") private String state; + /** + * The username associated with the user. + */ @JsonProperty("username") private String username; + /** + * The web URL of the user's profile. + */ @JsonProperty("web_url") private String webUrl; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AcceptMergeRequestParams.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AcceptMergeRequestParams.java index 45f16bef9..1e4242dbb 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AcceptMergeRequestParams.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AcceptMergeRequestParams.java @@ -9,21 +9,39 @@ public class AcceptMergeRequestParams implements Serializable { private static final long serialVersionUID = 1L; + /** + * The commit message for the merge. + */ @JsonProperty("merge_commit_message") private String mergeCommitMessage; + /** + * Indicates whether the merge should occur when the pipeline succeeds. + */ @JsonProperty("merge_when_pipeline_succeeds") private Boolean mergeWhenPipelineSucceeds; + /** + * The SHA associated with the merge request. + */ @JsonProperty("sha") private String sha; + /** + * Indicates whether the source branch should be removed after merging. + */ @JsonProperty("should_remove_source_branch") private Boolean shouldRemoveSourceBranch; + /** + * Indicates whether the merge should be squashed. + */ @JsonProperty("squash") private Boolean squash; + /** + * The commit message for the squash merge. + */ @JsonProperty("squash_commit_message") private String squashCommitMessage; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AccessRequest.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AccessRequest.java index a6eda0b24..980fdf392 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AccessRequest.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AccessRequest.java @@ -2,10 +2,24 @@ import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class AccessRequest extends AbstractUser { private static final long serialVersionUID = 1L; + /** + * The date when the access request was made. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("requested_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date requestedAt; + + /** + * The access level requested. + */ + @JsonProperty("access_level") private AccessLevel accessLevel; public Date getRequestedAt() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AllowedTo.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AllowedTo.java index f42c12bac..93f5bfe53 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AllowedTo.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AllowedTo.java @@ -4,6 +4,8 @@ import org.gitlab4j.models.GitLabForm; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * This class is used by the ProtectedBranchesAPi to set up the * allowed_to_push, allowed_to_merge, and allowed_to_unprotect values. @@ -11,8 +13,22 @@ public class AllowedTo implements Serializable { private static final long serialVersionUID = 1L; + /** + * The access level associated with the user or group. + */ + @JsonProperty("access_level") private AccessLevel accessLevel; + + /** + * The ID of the user associated with the access. + */ + @JsonProperty("user_id") private Long userId; + + /** + * The ID of the group associated with the access. + */ + @JsonProperty("group_id") private Long groupId; public AllowedTo(AccessLevel accessLevel, Long userId, Long groupId) { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Application.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Application.java index 50abe3690..ef323f356 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Application.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Application.java @@ -2,12 +2,33 @@ import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Application implements Serializable { private static final long serialVersionUID = 1L; + /** + * The unique identifier of the application. + */ + @JsonProperty("id") private Long id; + + /** + * The application ID. + */ + @JsonProperty("application_id") private String applicationId; + + /** + * The name of the application. + */ + @JsonProperty("application_name") private String applicationName; + + /** + * The callback URL associated with the application. + */ + @JsonProperty("callback_url") private String callbackUrl; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApplicationSettings.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApplicationSettings.java index 5f62a9cbd..8ae244334 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApplicationSettings.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApplicationSettings.java @@ -10,7 +10,9 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; @@ -25,9 +27,32 @@ public class ApplicationSettings implements Serializable { private static final long serialVersionUID = 1L; + /** + * The unique identifier of the application settings. + */ + @JsonProperty("id") private Long id; + + /** + * The date when the application settings were created. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + /** + * The date when the application settings were last updated. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("updated_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAt; + + /** + * The settings for the application stored as key-value pairs. + */ + @JsonProperty("settings") private Map settings = new HashMap<>(); public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApprovalRule.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApprovalRule.java index f4635e96a..c5854a17f 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApprovalRule.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApprovalRule.java @@ -5,19 +5,75 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class ApprovalRule implements Serializable { private static final long serialVersionUID = 1L; + /** + * The unique identifier of the approval rule. + */ + @JsonProperty("id") private Long id; + + /** + * The name of the approval rule. + */ + @JsonProperty("name") private String name; + + /** + * The type of the approval rule. + */ + @JsonProperty("rule_type") private String ruleType; + + /** + * The list of eligible approvers for the rule. + */ + @JsonProperty("eligible_approvers") private List eligibleApprovers; + + /** + * The number of approvals required for the rule. + */ + @JsonProperty("approvals_required") private Integer approvalsRequired; + + /** + * The source rule from which this approval rule is derived. + */ + @JsonProperty("source_rule") private ApprovalRule sourceRule; + + /** + * The list of users associated with the approval rule. + */ + @JsonProperty("users") private List users; + + /** + * The list of groups associated with the approval rule. + */ + @JsonProperty("groups") private List groups; + + /** + * Indicates whether the rule contains hidden groups. + */ + @JsonProperty("contains_hidden_groups") private Boolean containsHiddenGroups; + + /** + * The list of users who have approved the rule. + */ + @JsonProperty("approved_by") private List approvedBy; + + /** + * Indicates whether the rule has been approved. + */ + @JsonProperty("approved") private Boolean approved; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApprovalRuleParams.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApprovalRuleParams.java index b52ef1a4e..55b32e764 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApprovalRuleParams.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApprovalRuleParams.java @@ -5,17 +5,63 @@ import org.gitlab4j.models.GitLabForm; +import com.fasterxml.jackson.annotation.JsonProperty; + public class ApprovalRuleParams implements Serializable { private static final long serialVersionUID = 1L; + /** + * The number of approvals required. + */ + @JsonProperty("approvals_required") private Integer approvalsRequired; + + /** + * The name of the approval rule. + */ + @JsonProperty("name") private String name; + + /** + * Indicates whether the rule applies to all protected branches. + */ + @JsonProperty("applies_to_all_protected_branches") private Boolean appliesToAllProtectedBranches; + + /** + * The list of group IDs associated with the approval rule. + */ + @JsonProperty("group_ids") private List groupIds; + + /** + * The list of protected branch IDs associated with the approval rule. + */ + @JsonProperty("protected_branch_ids") private List protectedBranchIds; + + /** + * The type of report generated by the approval rule. + */ + @JsonProperty("report_type") private String reportType; + + /** + * The type of rule (e.g., approval rule, merge request rule, etc.). + */ + @JsonProperty("rule_type") private String ruleType; + + /** + * The list of user IDs associated with the approval rule. + */ + @JsonProperty("user_ids") private List userIds; + + /** + * The list of usernames associated with the approval rule. + */ + @JsonProperty("usernames") private List usernames; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApprovalState.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApprovalState.java index 3a8893afa..591bd0e98 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApprovalState.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApprovalState.java @@ -5,10 +5,21 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class ApprovalState implements Serializable { private static final long serialVersionUID = 1L; + /** + * Indicates whether the approval rules have been overwritten. + */ + @JsonProperty("approval_rules_overwritten") private Boolean approvalRulesOverwritten; + + /** + * The list of approval rules associated with the approval state. + */ + @JsonProperty("rules") private List rules; public Boolean getApprovalRulesOverwritten() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApprovedBy.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApprovedBy.java index 0632e0e79..4d6e7ffbe 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApprovedBy.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApprovedBy.java @@ -5,6 +5,7 @@ import org.gitlab4j.models.utils.JacksonJson; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; /** * This class is used by various models to represent the approved_by property, @@ -15,7 +16,16 @@ public class ApprovedBy implements Serializable { private static final long serialVersionUID = 1L; + /** + * The user associated with the approval. + */ + @JsonProperty("user") private User user; + + /** + * The group associated with the approval. + */ + @JsonProperty("group") private Group group; public User getUser() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Artifact.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Artifact.java index bbdbf1eb4..d205cb2d2 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Artifact.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Artifact.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJsonEnumHelper; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; public class Artifact implements Serializable { @@ -35,9 +36,28 @@ public String toString() { } } + /** + * The type of the file associated with the artifact. + */ + @JsonProperty("file_type") private FileType fileType; + + /** + * The size of the artifact. + */ + @JsonProperty("size") private Long size; + + /** + * The filename of the artifact. + */ + @JsonProperty("filename") private String filename; + + /** + * The format of the file associated with the artifact. + */ + @JsonProperty("file_format") private String fileFormat; public FileType getFileType() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ArtifactsFile.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ArtifactsFile.java index 63c7df8b0..31ff0b950 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ArtifactsFile.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ArtifactsFile.java @@ -4,10 +4,21 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class ArtifactsFile implements Serializable { private static final long serialVersionUID = 1L; + /** + * The filename of the artifact file. + */ + @JsonProperty("filename") private String filename; + + /** + * The size of the artifact file. + */ + @JsonProperty("size") private Long size; public String getFilename() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Assets.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Assets.java index d4200dad7..85889e89e 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Assets.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Assets.java @@ -6,6 +6,8 @@ import org.gitlab4j.models.Constants.ArchiveFormat; import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * This class is part of the Release class model. */ @@ -15,7 +17,16 @@ public class Assets implements Serializable { public static class Source implements Serializable { private static final long serialVersionUID = 1L; + /** + * The format of the archive. + */ + @JsonProperty("format") private ArchiveFormat format; + + /** + * The URL of the source. + */ + @JsonProperty("url") private String url; public ArchiveFormat getFormat() { @@ -43,9 +54,28 @@ public String toString() { public static class Link implements Serializable { private static final long serialVersionUID = 1L; + /** + * The unique identifier of the link. + */ + @JsonProperty("id") private Long id; + + /** + * The name of the link. + */ + @JsonProperty("name") private String name; + + /** + * The URL associated with the link. + */ + @JsonProperty("url") private String url; + + /** + * Indicates if the link is external. + */ + @JsonProperty("external") private Boolean external; public Long getId() { @@ -86,9 +116,28 @@ public String toString() { } } + /** + * The count of assets. + */ + @JsonProperty("count") private Integer count; + + /** + * The list of sources associated with the assets. + */ + @JsonProperty("sources") private List sources; + + /** + * The list of links associated with the assets. + */ + @JsonProperty("links") private List links; + + /** + * The file path of the evidence associated with the assets. + */ + @JsonProperty("evidence_file_path") private String evidenceFilePath; public Integer getCount() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AuditEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AuditEvent.java index 001b19bd4..127c91c99 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AuditEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AuditEvent.java @@ -5,14 +5,48 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class AuditEvent implements Serializable { private static final long serialVersionUID = 1L; + /** + * The unique identifier of the audit event. + */ + @JsonProperty("id") private Long id; + + /** + * The ID of the author making the event. + */ + @JsonProperty("author_id") private Long authorId; + + /** + * The ID of the entity involved in the event. + */ + @JsonProperty("entity_id") private Long entityId; + + /** + * The type of the entity involved in the event. + */ + @JsonProperty("entity_type") private String entityType; + + /** + * The details associated with the audit event. + */ + @JsonProperty("details") private AuditEventDetail details; + + /** + * The creation date of the audit event. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AuditEventDetail.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AuditEventDetail.java index 327a4e717..40fb13905 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AuditEventDetail.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AuditEventDetail.java @@ -4,19 +4,75 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class AuditEventDetail implements Serializable { private static final long serialVersionUID = 1L; + /** + * The change associated with the audit event. + */ + @JsonProperty("change") private String change; + + /** + * The previous value of the change. + */ + @JsonProperty("from") private String from; + + /** + * The new value after the change. + */ + @JsonProperty("to") private String to; + + /** + * The added value in the audit event. + */ + @JsonProperty("add") private String add; + + /** + * The custom message associated with the audit event. + */ + @JsonProperty("custom_message") private String customMessage; + + /** + * The name of the author making the change. + */ + @JsonProperty("author_name") private String authorName; + + /** + * The ID of the target of the audit event. + */ + @JsonProperty("target_id") private Object targetId; + + /** + * The type of the target of the audit event. + */ + @JsonProperty("target_type") private String targetType; + + /** + * The details of the target of the audit event. + */ + @JsonProperty("target_details") private String targetDetails; + + /** + * The IP address associated with the audit event. + */ + @JsonProperty("ip_address") private String ipAddress; + + /** + * The path of the entity in the audit event. + */ + @JsonProperty("entity_path") private String entityPath; public String getCustomMessage() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AwardEmoji.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AwardEmoji.java index 9293f5109..42fd639ff 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AwardEmoji.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AwardEmoji.java @@ -7,6 +7,8 @@ import org.gitlab4j.models.utils.JacksonJsonEnumHelper; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; public class AwardEmoji implements Serializable { @@ -37,12 +39,50 @@ public String toString() { } } + /** + * The unique identifier of the award emoji. + */ + @JsonProperty("id") private Long id; + + /** + * The name of the award emoji. + */ + @JsonProperty("name") private String name; + + /** + * The user associated with the award emoji. + */ + @JsonProperty("user") private User user; + + /** + * The date when the award emoji was created. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + /** + * The date when the award emoji was last updated. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("updated_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAt; + + /** + * The ID of the awardable entity. + */ + @JsonProperty("awardable_id") private Long awardableId; + + /** + * The type of the awardable entity. + */ + @JsonProperty("awardable_type") private AwardableType awardableType; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Badge.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Badge.java index fff0edb0a..14361e5b9 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Badge.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Badge.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJsonEnumHelper; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; public class Badge implements Serializable { @@ -33,12 +34,46 @@ public String toString() { } } + /** + * The unique identifier of the badge. + */ + @JsonProperty("id") private Long id; + + /** + * The name of the badge. + */ + @JsonProperty("name") private String name; + + /** + * The URL link associated with the badge. + */ + @JsonProperty("link_url") private String linkUrl; + + /** + * The image URL associated with the badge. + */ + @JsonProperty("image_url") private String imageUrl; + + /** + * The rendered URL link associated with the badge. + */ + @JsonProperty("rendered_link_url") private String renderedLinkUrl; + + /** + * The rendered image URL associated with the badge. + */ + @JsonProperty("rendered_image_url") private String renderedImageUrl; + + /** + * The kind of the badge (e.g., success, failure). + */ + @JsonProperty("kind") private BadgeKind kind; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Blame.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Blame.java index a9b9b7ddb..e6addab37 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Blame.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Blame.java @@ -5,10 +5,21 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Blame implements Serializable { private static final long serialVersionUID = 1L; + /** + * The commit associated with the blame. + */ + @JsonProperty("commit") private Commit commit; + + /** + * The list of lines associated with the blame. + */ + @JsonProperty("lines") private List lines; public Commit getCommit() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Board.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Board.java index 802bd78eb..da848d2de 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Board.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Board.java @@ -5,13 +5,39 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Board implements Serializable { private static final long serialVersionUID = 1L; + /** + * The unique identifier of the board. + */ + @JsonProperty("id") private Long id; + + /** + * The name of the board. + */ + @JsonProperty("name") private String name; + + /** + * The project associated with the board. + */ + @JsonProperty("project") private Project project; + + /** + * The milestone associated with the board. + */ + @JsonProperty("milestone") private Milestone milestone; + + /** + * The list of board lists associated with the board. + */ + @JsonProperty("lists") private List lists; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/BoardList.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/BoardList.java index 5780d2c31..e6e6d7841 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/BoardList.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/BoardList.java @@ -4,11 +4,27 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class BoardList implements Serializable { private static final long serialVersionUID = 1L; + /** + * The unique identifier of the board list. + */ + @JsonProperty("id") private Long id; + + /** + * The label associated with the board list. + */ + @JsonProperty("label") private Label label; + + /** + * The position of the board list. + */ + @JsonProperty("position") private Integer position; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Branch.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Branch.java index 72e6db470..d0a97595c 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Branch.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Branch.java @@ -4,17 +4,63 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Branch implements Serializable { private static final long serialVersionUID = 1L; + /** + * The commit associated with the branch. + */ + @JsonProperty("commit") private Commit commit; + + /** + * Indicates whether developers can merge to this branch. + */ + @JsonProperty("developers_can_merge") private Boolean developersCanMerge; + + /** + * Indicates whether developers can push to this branch. + */ + @JsonProperty("developers_can_push") private Boolean developersCanPush; + + /** + * Indicates whether the branch is merged. + */ + @JsonProperty("merged") private Boolean merged; + + /** + * The name of the branch. + */ + @JsonProperty("name") private String name; + + /** + * Indicates whether the branch is protected. + */ + @JsonProperty("protected") private Boolean isProtected; + + /** + * Indicates whether the branch is the default branch. + */ + @JsonProperty("default") private Boolean isDefault; + + /** + * Indicates whether pushing is allowed on this branch. + */ + @JsonProperty("can_push") private Boolean canPush; + + /** + * The web URL associated with the branch. + */ + @JsonProperty("web_url") private String webUrl; public Commit getCommit() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/BranchAccessLevel.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/BranchAccessLevel.java index 63554fcd3..1f78de4b2 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/BranchAccessLevel.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/BranchAccessLevel.java @@ -4,13 +4,39 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class BranchAccessLevel implements Serializable { private static final long serialVersionUID = 1L; + /** + * The unique identifier of the branch access level. + */ + @JsonProperty("id") private Long id; + + /** + * The access level associated with the branch. + */ + @JsonProperty("access_level") private AccessLevel accessLevel; + + /** + * The description of the access level associated with the branch. + */ + @JsonProperty("access_level_description") private String accessLevelDescription; + + /** + * The user ID associated with the branch access level. + */ + @JsonProperty("user_id") private Long userId; + + /** + * The group ID associated with the branch access level. + */ + @JsonProperty("group_id") private Long groupId; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Bridge.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Bridge.java index b7a4779ca..eba0432c5 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Bridge.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Bridge.java @@ -5,27 +5,132 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Bridge implements Serializable { private static final long serialVersionUID = 1L; + /** + * The commit associated with the bridge. + */ + @JsonProperty("commit") private Commit commit; + + /** + * Indicates whether failure is allowed for the bridge. + */ + @JsonProperty("allow_failure") private boolean allowFailure; + + /** + * The creation date of the bridge. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + /** + * The start date of the bridge. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("started_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date startedAt; + + /** + * The finish date of the bridge. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("finished_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date finishedAt; + + /** + * The date the bridge was erased. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("erased_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date erasedAt; + + /** + * The duration of the bridge. + */ + @JsonProperty("duration") private Double duration; + + /** + * The queued duration of the bridge. + */ + @JsonProperty("queued_duration") private Double queuedDuration; + + /** + * The unique identifier of the bridge. + */ + @JsonProperty("id") private Long id; + + /** + * The name of the bridge. + */ + @JsonProperty("name") private String name; + + /** + * The coverage associated with the bridge. + */ + @JsonProperty("coverage") private String coverage; + + /** + * The pipeline associated with the bridge. + */ + @JsonProperty("pipeline") private Pipeline pipeline; + + /** + * The reference associated with the bridge. + */ + @JsonProperty("ref") private String ref; + + /** + * The stage associated with the bridge. + */ + @JsonProperty("stage") private String stage; + + /** + * The status of the bridge. + */ + @JsonProperty("status") private String status; + + /** + * Indicates whether the bridge is a tag. + */ + @JsonProperty("tag") private boolean tag; + + /** + * The web URL associated with the bridge. + */ + @JsonProperty("web_url") private String webUrl; + + /** + * The user associated with the bridge. + */ + @JsonProperty("user") private User user; + + /** + * The downstream pipeline associated with the bridge. + */ + @JsonProperty("downstream_pipeline") private DownstreamPipeline downstreamPipeline; public Commit getCommit() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ChangelogPayload.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ChangelogPayload.java index f9ce9cea9..b434f701c 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ChangelogPayload.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ChangelogPayload.java @@ -7,18 +7,61 @@ import org.gitlab4j.models.utils.ISO8601; import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; public class ChangelogPayload implements Serializable { private static final long serialVersionUID = 1L; + /** + * The version associated with the changelog. + */ + @JsonProperty("version") private String version; + + /** + * The reference from which the changelog is generated. + */ + @JsonProperty("from") private String from; + + /** + * The reference to which the changelog is generated. + */ + @JsonProperty("to") private String to; + + /** + * The date associated with the changelog. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("date") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date date; + + /** + * The branch associated with the changelog. + */ + @JsonProperty("branch") private String branch; + + /** + * The trailer information associated with the changelog. + */ + @JsonProperty("trailer") private String trailer; + + /** + * The file associated with the changelog. + */ + @JsonProperty("file") private String file; + + /** + * The message associated with the changelog. + */ + @JsonProperty("message") private String message; public ChangelogPayload(String version) { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Changes.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Changes.java index 69f060cbd..e6f9fa7e2 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Changes.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Changes.java @@ -10,19 +10,54 @@ public class Changes implements Serializable { private static final long serialVersionUID = 1L; + /** + * The mode of file A in the change. + */ @JsonInclude(JsonInclude.Include.ALWAYS) @JsonProperty("a_mode") private String a_mode; + /** + * The mode of file B in the change. + */ @JsonInclude(JsonInclude.Include.ALWAYS) @JsonProperty("b_mode") private String b_mode; + /** + * Indicates if the file was deleted in the change. + */ + @JsonProperty("deleted_file") private Boolean deletedFile; + + /** + * The diff content of the file in the change. + */ + @JsonProperty("diff") private String diff; + + /** + * Indicates if the file is a new file in the change. + */ + @JsonProperty("new_file") private Boolean newFile; + + /** + * The new path of the file in the change. + */ + @JsonProperty("new_path") private String newPath; + + /** + * The old path of the file in the change. + */ + @JsonProperty("old_path") private String oldPath; + + /** + * Indicates if the file was renamed in the change. + */ + @JsonProperty("renamed_file") private Boolean renamedFile; @JsonInclude(JsonInclude.Include.ALWAYS) diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Comment.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Comment.java index 13f9fae81..1777ee5ea 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Comment.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Comment.java @@ -6,14 +6,48 @@ import org.gitlab4j.models.Constants.LineType; import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Comment implements Serializable { private static final long serialVersionUID = 1L; + /** + * The author of the comment. + */ + @JsonProperty("author") private Author author; + + /** + * The creation date of the comment. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + /** + * The type of the line (e.g., new or old). + */ + @JsonProperty("line_type") private LineType lineType; + + /** + * The path to the file being commented on. + */ + @JsonProperty("path") private String path; + + /** + * The line number of the comment. + */ + @JsonProperty("line") private Integer line; + + /** + * The content of the comment. + */ + @JsonProperty("note") private String note; public Author getAuthor() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Commit.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Commit.java index b97e976b4..9507327e5 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Commit.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Commit.java @@ -6,28 +6,138 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Commit implements Serializable { private static final long serialVersionUID = 1L; + /** + * The author of the commit. + */ + @JsonProperty("author") private Author author; + + /** + * The date when the commit was authored. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("authored_date") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date authoredDate; + + /** + * The email of the author. + */ + @JsonProperty("author_email") private String authorEmail; + + /** + * The name of the author. + */ + @JsonProperty("author_name") private String authorName; + + /** + * The date when the commit was committed. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("committed_date") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date committedDate; + + /** + * The email of the committer. + */ + @JsonProperty("committer_email") private String committerEmail; + + /** + * The name of the committer. + */ + @JsonProperty("committer_name") private String committerName; + + /** + * The creation date of the commit. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + /** + * The unique identifier of the commit. + */ + @JsonProperty("id") private String id; + + /** + * The commit message. + */ + @JsonProperty("message") private String message; + + /** + * The list of parent commit IDs. + */ + @JsonProperty("parent_ids") private List parentIds; + + /** + * The shortened commit ID. + */ + @JsonProperty("short_id") private String shortId; + + /** + * The statistics associated with the commit. + */ + @JsonProperty("stats") private CommitStats stats; + + /** + * The status of the commit. + */ + @JsonProperty("status") private String status; + + /** + * The timestamp of the commit. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("timestamp") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date timestamp; + + /** + * The title of the commit. + */ + @JsonProperty("title") private String title; + + /** + * The URL of the commit. + */ + @JsonProperty("url") private String url; + + /** + * The web URL of the commit. + */ + @JsonProperty("web_url") private String webUrl; + + /** + * The project ID associated with the commit. + */ + @JsonProperty("project_id") private Long projectId; + + /** + * The pipeline associated with the commit. + */ + @JsonProperty("last_pipeline") private Pipeline lastPipeline; public Author getAuthor() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitAction.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitAction.java index 20c8c8822..48a20a64b 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitAction.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitAction.java @@ -10,6 +10,7 @@ import org.gitlab4j.models.utils.JacksonJsonEnumHelper; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; public class CommitAction implements Serializable { @@ -40,12 +41,46 @@ public String toString() { } } + /** + * The action associated with the commit (e.g., add, modify, delete). + */ + @JsonProperty("action") private Action action; + + /** + * The file path associated with the commit action. + */ + @JsonProperty("file_path") private String filePath; + + /** + * The previous file path before the commit action. + */ + @JsonProperty("previous_path") private String previousPath; + + /** + * The content of the file associated with the commit action. + */ + @JsonProperty("content") private String content; + + /** + * The encoding of the file associated with the commit action. + */ + @JsonProperty("encoding") private Encoding encoding; + + /** + * The last commit ID associated with the commit action. + */ + @JsonProperty("last_commit_id") private String lastCommitId; + + /** + * Indicates if the file mode should be executed in the commit action. + */ + @JsonProperty("execute_filemode") private Boolean executeFilemode; public Action getAction() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitPayload.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitPayload.java index 07e0bc283..ea7b6ecf8 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitPayload.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitPayload.java @@ -6,18 +6,69 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class CommitPayload implements Serializable { private static final long serialVersionUID = 1L; + /** + * The name of the branch for the commit. + */ + @JsonProperty("branch") private String branch; + + /** + * The commit message. + */ + @JsonProperty("commit_message") private String commitMessage; + + /** + * The starting branch for the commit. + */ + @JsonProperty("start_branch") private String startBranch; + + /** + * The starting SHA for the commit. + */ + @JsonProperty("start_sha") private String startSha; + + /** + * The starting project associated with the commit. + */ + @JsonProperty("start_project") private Object startProject; + + /** + * The list of commit actions associated with the commit. + */ + @JsonProperty("actions") private List actions; + + /** + * The email of the commit author. + */ + @JsonProperty("author_email") private String authorEmail; + + /** + * The name of the commit author. + */ + @JsonProperty("author_name") private String authorName; + + /** + * Indicates whether stats are included in the commit. + */ + @JsonProperty("stats") private Boolean stats; + + /** + * Indicates whether the commit is forced. + */ + @JsonProperty("force") private Boolean force; public String getBranch() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitRef.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitRef.java index dbc25c5a9..6ed5ebb18 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitRef.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitRef.java @@ -6,12 +6,22 @@ import org.gitlab4j.models.utils.JacksonJsonEnumHelper; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; public class CommitRef implements Serializable { private static final long serialVersionUID = 1L; + /** + * The type of the reference (e.g., branch, tag). + */ + @JsonProperty("type") private RefType type; + + /** + * The name of the reference (e.g., branch name, tag name). + */ + @JsonProperty("name") private String name; public enum RefType { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitStats.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitStats.java index 1c15bba32..f7b3905e0 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitStats.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitStats.java @@ -4,11 +4,27 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class CommitStats implements Serializable { private static final long serialVersionUID = 1L; + /** + * The number of additions in the commit. + */ + @JsonProperty("additions") private Integer additions; + + /** + * The number of deletions in the commit. + */ + @JsonProperty("deletions") private Integer deletions; + + /** + * The total number of changes in the commit (additions + deletions). + */ + @JsonProperty("total") private Integer total; public Integer getAdditions() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitStatus.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitStatus.java index 544e6e6d4..be5d1bd2a 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitStatus.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitStatus.java @@ -5,22 +5,100 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class CommitStatus implements Serializable { private static final long serialVersionUID = 1L; + /** + * Indicates if failure is allowed for this commit status. + */ + @JsonProperty("allow_failure") private Boolean allowFailure; + + /** + * The author of the commit status. + */ + @JsonProperty("author") private Author author; + + /** + * The coverage percentage associated with the commit status. + */ + @JsonProperty("coverage") private Float coverage; + + /** + * The creation date of the commit status. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + /** + * The description of the commit status. + */ + @JsonProperty("description") private String description; + + /** + * The date the commit status was finished. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("finished_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date finishedAt; + + /** + * The unique identifier of the commit status. + */ + @JsonProperty("id") private Long id; + + /** + * The name of the commit status. + */ + @JsonProperty("name") private String name; + + /** + * The pipeline ID associated with the commit status. + */ + @JsonProperty("pipeline_id") private Long pipelineId; + + /** + * The reference of the commit status (e.g., branch name). + */ + @JsonProperty("ref") private String ref; + + /** + * The SHA associated with the commit status. + */ + @JsonProperty("sha") private String sha; + + /** + * The date the commit status was started. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("started_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date startedAt; + + /** + * The status of the commit (e.g., success, failed). + */ + @JsonProperty("status") private String status; + + /** + * The target URL associated with the commit status. + */ + @JsonProperty("target_url") private String targetUrl; public Boolean isAllowFailure() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitStatusFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitStatusFilter.java index 190fb688f..222dc5b12 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitStatusFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitStatusFilter.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.GitLabForm; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; /** * This class is used to filter commit status when getting lists of them. @@ -13,9 +14,28 @@ public class CommitStatusFilter implements Serializable { private static final long serialVersionUID = 1L; + /** + * The reference associated with the commit status filter. + */ + @JsonProperty("ref") private String ref; + + /** + * The stage associated with the commit status filter. + */ + @JsonProperty("stage") private String stage; + + /** + * The name associated with the commit status filter. + */ + @JsonProperty("name") private String name; + + /** + * Indicates whether all commit statuses are included in the filter. + */ + @JsonProperty("all") private Boolean all; public CommitStatusFilter withRef(String ref) { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CompareResults.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CompareResults.java index 139106375..4351de73e 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CompareResults.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CompareResults.java @@ -5,14 +5,39 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class CompareResults implements Serializable { private static final long serialVersionUID = 1L; + /** + * The commit associated with the comparison. + */ + @JsonProperty("commit") private Commit commit; + + /** + * The list of commits associated with the comparison. + */ + @JsonProperty("commits") private List commits; - ; + + /** + * The list of diffs associated with the comparison. + */ + @JsonProperty("diffs") private List diffs; + + /** + * Indicates if the comparison timed out. + */ + @JsonProperty("compare_timeout") private Boolean compareTimeout; + + /** + * Indicates if the comparison was done on the same ref. + */ + @JsonProperty("compare_same_ref") private Boolean compareSameRef; public Commit getCommit() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Contributor.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Contributor.java index 959ab3a24..23ca9be6b 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Contributor.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Contributor.java @@ -1,5 +1,7 @@ package org.gitlab4j.api.models; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * This class models the object for a repository contributor. * See Contributors at GitLab. @@ -7,8 +9,22 @@ public class Contributor extends AbstractUser { private static final long serialVersionUID = 1L; + /** + * The number of commits by the contributor. + */ + @JsonProperty("commits") private Integer commits; + + /** + * The number of additions made by the contributor. + */ + @JsonProperty("additions") private Integer additions; + + /** + * The number of deletions made by the contributor. + */ + @JsonProperty("deletions") private Integer deletions; public Integer getCommits() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CreatedChildEpic.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CreatedChildEpic.java index fd4ebba81..10dc6fb7a 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CreatedChildEpic.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CreatedChildEpic.java @@ -2,12 +2,33 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class CreatedChildEpic extends AbstractMinimalEpic { private static final long serialVersionUID = 1L; + /** + * Indicates if the child epic has children. + */ + @JsonProperty("has_children") private Boolean hasChildren; + + /** + * Indicates if the child epic has issues. + */ + @JsonProperty("has_issues") private Boolean hasIssues; + + /** + * The URL associated with the child epic. + */ + @JsonProperty("url") private String url; + + /** + * The relation URL associated with the child epic. + */ + @JsonProperty("relation_url") private String relationUrl; public Boolean getHasChildren() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CustomAttribute.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CustomAttribute.java index ec02bd541..0a9ec1ccc 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CustomAttribute.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CustomAttribute.java @@ -2,10 +2,21 @@ import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonProperty; + public class CustomAttribute implements Serializable { private static final long serialVersionUID = 1L; + /** + * The key associated with the custom attribute. + */ + @JsonProperty("key") private String key; + + /** + * The value associated with the custom attribute. + */ + @JsonProperty("value") private String value; public String getKey() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployKey.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployKey.java index 5994075f5..9f93703ec 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployKey.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployKey.java @@ -5,13 +5,42 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class DeployKey implements Serializable { private static final long serialVersionUID = 1L; + /** + * The unique identifier for the deploy key. + */ + @JsonProperty("id") private Long id; + + /** + * The title of the deploy key. + */ + @JsonProperty("title") private String title; + + /** + * The actual deploy key. + */ + @JsonProperty("key") private String key; + + /** + * Indicates whether the deploy key has push permissions. + */ + @JsonProperty("can_push") private Boolean canPush; + + /** + * The creation date of the deploy key. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployToken.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployToken.java index 61b7e38b3..e22aee752 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployToken.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployToken.java @@ -7,14 +7,48 @@ import org.gitlab4j.models.Constants; import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class DeployToken implements Serializable { private static final long serialVersionUID = 1L; + /** + * The unique identifier of the deploy token. + */ + @JsonProperty("id") private Long id; + + /** + * The name of the deploy token. + */ + @JsonProperty("name") private String name; + + /** + * The username associated with the deploy token. + */ + @JsonProperty("username") private String username; + + /** + * The expiration date of the deploy token. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("expires_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date expiresAt; + + /** + * The list of scopes associated with the deploy token. + */ + @JsonProperty("scopes") private List scopes; + + /** + * The token string. + */ + @JsonProperty("token") private String token; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployable.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployable.java index 43358b9c2..6d840605f 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployable.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployable.java @@ -7,26 +7,126 @@ import org.gitlab4j.models.Constants.DeploymentStatus; import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Deployable implements Serializable { private static final long serialVersionUID = 1L; + /** + * The unique identifier of the deployable. + */ + @JsonProperty("id") private Long id; + + /** + * The status of the deployable. + */ + @JsonProperty("status") private DeploymentStatus status; + + /** + * The stage of the deployable. + */ + @JsonProperty("stage") private String stage; + + /** + * The name of the deployable. + */ + @JsonProperty("name") private String name; + + /** + * The reference associated with the deployable. + */ + @JsonProperty("ref") private String ref; + + /** + * Indicates if the deployable is a tag. + */ + @JsonProperty("tag") private Boolean tag; + + /** + * The coverage of the deployable. + */ + @JsonProperty("coverage") private Float coverage; + + /** + * The creation date of the deployable. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + /** + * The date the deployable was started. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("started_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date startedAt; + + /** + * The date the deployable was finished. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("finished_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date finishedAt; + + /** + * The duration of the deployable process. + */ + @JsonProperty("duration") private Double duration; + + /** + * The user associated with the deployable. + */ + @JsonProperty("user") private User user; + + /** + * The commit associated with the deployable. + */ + @JsonProperty("commit") private Commit commit; + + /** + * The pipeline associated with the deployable. + */ + @JsonProperty("pipeline") private Pipeline pipeline; + + /** + * The web URL associated with the deployable. + */ + @JsonProperty("web_url") private String webUrl; + + /** + * The list of artifacts associated with the deployable. + */ + @JsonProperty("artifacts") private List artifacts; + + /** + * The runner associated with the deployable. + */ + @JsonProperty("runner") private Runner runner; + + /** + * The expiration date of the artifacts. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("artifacts_expire_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date artifactsExpireAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployment.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployment.java index dd37155b6..34561f15a 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployment.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployment.java @@ -6,18 +6,74 @@ import org.gitlab4j.models.Constants.DeploymentStatus; import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Deployment implements Serializable { private static final long serialVersionUID = 1L; + /** + * The unique identifier of the deployment. + */ + @JsonProperty("id") private Long id; + + /** + * The internal identifier of the deployment. + */ + @JsonProperty("iid") private Long iid; + + /** + * The reference associated with the deployment (e.g., branch or tag). + */ + @JsonProperty("ref") private String ref; + + /** + * The SHA associated with the deployment. + */ + @JsonProperty("sha") private String sha; + + /** + * The creation date of the deployment. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + /** + * The last updated date of the deployment. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("updated_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAt; + + /** + * The status of the deployment (e.g., success, failed). + */ + @JsonProperty("status") private DeploymentStatus status; + + /** + * The user associated with the deployment. + */ + @JsonProperty("user") private User user; + + /** + * The environment associated with the deployment. + */ + @JsonProperty("environment") private Environment environment; + + /** + * The deployable associated with the deployment. + */ + @JsonProperty("deployable") private Deployable deployable; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeploymentFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeploymentFilter.java index 7989e9128..18cb7dddd 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeploymentFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeploymentFilter.java @@ -10,39 +10,49 @@ import org.gitlab4j.models.GitLabForm; import org.gitlab4j.models.utils.ISO8601; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; public class DeploymentFilter implements Serializable { private static final long serialVersionUID = 1L; /** - * Return deployments ordered by either one of id, iid, created_at, updated_at or ref fields. Default is id. + * Return deployments ordered by either one of id, iid, created_at, updated_at, or ref fields. Default is id. */ + @JsonProperty("order_by") private DeploymentOrderBy orderBy; /** * Return deployments sorted in asc or desc order. Default is asc. */ + @JsonProperty("sort_order") private SortOrder sortOrder; /** * Return deployments updated after the specified date. Expected in ISO 8601 format (2019-03-15T08:00:00Z). */ + @JsonProperty("updated_after") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAfter; /** * Return deployments updated before the specified date. Expected in ISO 8601 format (2019-03-15T08:00:00Z). */ + @JsonProperty("updated_before") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedBefore; /** * The name of the environment to filter deployments by. */ + @JsonProperty("environment") private String environment; /** * The status to filter deployments by. */ + @JsonProperty("status") private DeploymentStatus status; public DeploymentOrderBy getOrderBy() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DetailedStatus.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DetailedStatus.java index ffa57f468..600401253 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DetailedStatus.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DetailedStatus.java @@ -4,20 +4,66 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * This class is part of the Pipeline message. */ public class DetailedStatus implements Serializable { private static final long serialVersionUID = 1L; + /** + * The icon associated with the detailed status. + */ + @JsonProperty("icon") private String icon; + + /** + * The text description of the detailed status. + */ + @JsonProperty("text") private String text; + + /** + * The label associated with the detailed status. + */ + @JsonProperty("label") private String label; + + /** + * The group associated with the detailed status. + */ + @JsonProperty("group") private String group; + + /** + * The tooltip description of the detailed status. + */ + @JsonProperty("tooltip") private String tooltip; + + /** + * Indicates if the detailed status has additional details. + */ + @JsonProperty("has_details") private Boolean hasDetails; + + /** + * The path to the additional details. + */ + @JsonProperty("details_path") private String detailsPath; + + /** + * The illustration associated with the detailed status. + */ + @JsonProperty("illustration") private String illustration; + + /** + * The favicon associated with the detailed status. + */ + @JsonProperty("favicon") private String favicon; public String getIcon() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Diff.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Diff.java index 48285ebf0..a7343b6f7 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Diff.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Diff.java @@ -10,19 +10,54 @@ public class Diff implements Serializable { private static final long serialVersionUID = 1L; + /** + * The mode of file A in the diff. + */ @JsonInclude(JsonInclude.Include.ALWAYS) @JsonProperty("a_mode") private String a_mode; + /** + * The mode of file B in the diff. + */ @JsonInclude(JsonInclude.Include.ALWAYS) @JsonProperty("b_mode") private String b_mode; + /** + * Indicates if the file was deleted. + */ + @JsonProperty("deleted_file") private Boolean deletedFile; + + /** + * The diff content of the file. + */ + @JsonProperty("diff") private String diff; + + /** + * Indicates if the file is a new file. + */ + @JsonProperty("new_file") private Boolean newFile; + + /** + * The new path of the file. + */ + @JsonProperty("new_path") private String newPath; + + /** + * The old path of the file. + */ + @JsonProperty("old_path") private String oldPath; + + /** + * Indicates if the file was renamed. + */ + @JsonProperty("renamed_file") private Boolean renamedFile; @JsonInclude(JsonInclude.Include.ALWAYS) diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DiffRef.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DiffRef.java index 1b5b9052c..f28e76ea4 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DiffRef.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DiffRef.java @@ -4,11 +4,27 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class DiffRef implements Serializable { private static final long serialVersionUID = 1L; + /** + * The base SHA for the diff reference. + */ + @JsonProperty("base_sha") private String baseSha; + + /** + * The head SHA for the diff reference. + */ + @JsonProperty("head_sha") private String headSha; + + /** + * The start SHA for the diff reference. + */ + @JsonProperty("start_sha") private String startSha; public DiffRef() {} diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Discussion.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Discussion.java index 748982e3f..9b2b67c54 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Discussion.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Discussion.java @@ -5,11 +5,27 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Discussion implements Serializable { private static final long serialVersionUID = 1L; + /** + * The unique identifier for the discussion. + */ + @JsonProperty("id") private String id; + + /** + * Indicates if the discussion is an individual note. + */ + @JsonProperty("individual_note") private Boolean individualNote; + + /** + * The list of notes associated with the discussion. + */ + @JsonProperty("notes") private List notes; public String getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java index 466118ffd..9c425b38a 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java @@ -5,15 +5,56 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class DownstreamPipeline implements Serializable { private static final long serialVersionUID = 1L; + /** + * The unique identifier of the downstream pipeline. + */ + @JsonProperty("id") private Long id; + + /** + * The SHA of the downstream pipeline. + */ + @JsonProperty("sha") private String sha; + + /** + * The reference for the downstream pipeline (e.g., branch name). + */ + @JsonProperty("ref") private String ref; + + /** + * The status of the downstream pipeline. + */ + @JsonProperty("status") private String status; + + /** + * The creation date of the downstream pipeline. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + /** + * The last updated date of the downstream pipeline. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("updated_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAt; + + /** + * The web URL of the downstream pipeline. + */ + @JsonProperty("web_url") private String webUrl; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Duration.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Duration.java index f720b2889..db2e7b7c2 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Duration.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Duration.java @@ -5,6 +5,7 @@ import org.gitlab4j.models.utils.DurationUtils; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; /** @@ -13,7 +14,16 @@ public class Duration implements Serializable { private static final long serialVersionUID = 1L; + /** + * The duration in seconds. + */ + @JsonProperty("seconds") private int seconds; + + /** + * The string representation of the duration. + */ + @JsonProperty("duration_string") private String durationString; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Email.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Email.java index 817a79b78..3cb1e3102 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Email.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Email.java @@ -2,10 +2,21 @@ import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Email implements Serializable { private static final long serialVersionUID = 1L; + /** + * The unique identifier for the email. + */ + @JsonProperty("id") private Long id; + + /** + * The email address. + */ + @JsonProperty("email") private String email; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Environment.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Environment.java index b630a1a51..a329c246f 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Environment.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Environment.java @@ -7,6 +7,8 @@ import org.gitlab4j.models.utils.JacksonJsonEnumHelper; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; public class Environment implements Serializable { @@ -35,13 +37,54 @@ public String toString() { } } + /** + * The unique identifier for the environment. + */ + @JsonProperty("id") private Long id; + + /** + * The name of the environment. + */ + @JsonProperty("name") private String name; + + /** + * The slug of the environment. + */ + @JsonProperty("slug") private String slug; + + /** + * The external URL of the environment. + */ + @JsonProperty("external_url") private String externalUrl; + + /** + * The tier of the environment (e.g., production, staging). + */ + @JsonProperty("tier") private String tier; + + /** + * The state of the environment (e.g., active, inactive). + */ + @JsonProperty("state") private EnvironmentState state; + + /** + * The last deployment associated with the environment. + */ + @JsonProperty("last_deployment") private Deployment lastDeployment; + + /** + * The auto stop time for the environment, if any. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("auto_stop_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date autoStopAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Epic.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Epic.java index e73530d73..e2ba9bfbd 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Epic.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Epic.java @@ -4,12 +4,36 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Epic extends AbstractEpic { private static final long serialVersionUID = 1L; + /** + * Indicates if the start date of the epic is fixed. + */ + @JsonProperty("start_date_is_fixed") private Boolean startDateIsFixed; + + /** + * Indicates if the due date of the epic is fixed. + */ + @JsonProperty("due_date_is_fixed") private Boolean dueDateIsFixed; + + /** + * The due date inherited from a source, if applicable. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("due_date_from_inherited_source") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date dueDateFromInheritedSource; + + /** + * Indicates if the epic is subscribed. + */ + @JsonProperty("subscribed") private Boolean subscribed; public Boolean getStartDateIsFixed() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicFilter.java index db191dcb6..15af6edb0 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicFilter.java @@ -13,6 +13,8 @@ import org.gitlab4j.models.utils.JacksonJsonEnumHelper; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; /** @@ -21,19 +23,94 @@ public class EpicFilter implements Serializable { private static final long serialVersionUID = 1L; + /** + * The author ID for filtering epic issues. + */ + @JsonProperty("author_id") private Long authorId; + + /** + * The username of the author for filtering epic issues. + */ + @JsonProperty("author_username") private String authorUsername; + + /** + * The labels associated with epic issues. + */ + @JsonProperty("labels") private String labels; + + /** + * The ordering criteria for the epics. + */ + @JsonProperty("order_by") private EpicOrderBy orderBy; + + /** + * The sorting order for the epics. + */ + @JsonProperty("sort") private SortOrder sort; + + /** + * The search string to filter epics. + */ + @JsonProperty("search") private String search; + + /** + * The state of the epic. + */ + @JsonProperty("state") private EpicState state; + + /** + * The date after which the epic was created. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("created_after") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAfter; + + /** + * The date after which the epic was updated. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("updated_after") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAfter; + + /** + * The date before which the epic was updated. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("updated_before") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedBefore; + + /** + * Indicates if ancestor groups should be included in the filter. + */ + @JsonProperty("include_ancestor_groups") private Boolean includeAncestorGroups; + + /** + * Indicates if descendant groups should be included in the filter. + */ + @JsonProperty("include_descendant_groups") private Boolean includeDescendantGroups; + + /** + * The emoji reaction by the authenticated user to filter epics. + */ + @JsonProperty("my_reaction_emoji") private String myReactionEmoji; + + /** + * A map of epic fields and values to exclude from the filter. + */ + @JsonProperty("not") private Map not; public enum EpicField { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicIssue.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicIssue.java index d485c6069..4d8db48f2 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicIssue.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicIssue.java @@ -9,10 +9,22 @@ public class EpicIssue extends AbstractIssue { + /** + * The links associated with the epic issue. + */ @JsonProperty("_links") private Map links; + /** + * The unique identifier of the epic issue. + */ + @JsonProperty("epic_issue_id") private Long epicIssueId; + + /** + * The relative position of the epic issue in relation to other issues. + */ + @JsonProperty("relative_position") private Integer relativePosition; public Map getLinks() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicIssueLink.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicIssueLink.java index 92df1bae6..87e68dcc6 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicIssueLink.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicIssueLink.java @@ -4,12 +4,33 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class EpicIssueLink implements Serializable { private static final long serialVersionUID = 1L; + /** + * The unique identifier of the epic issue link. + */ + @JsonProperty("id") private Long id; + + /** + * The relative position of the issue in relation to the epic. + */ + @JsonProperty("relative_position") private Integer relativePosition; + + /** + * The epic associated with the issue. + */ + @JsonProperty("epic") private Epic epic; + + /** + * The issue associated with the epic. + */ + @JsonProperty("issue") private Issue issue; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Event.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Event.java index 928fa83d5..72107ba84 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Event.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Event.java @@ -6,24 +6,102 @@ import org.gitlab4j.models.Constants.TargetType; import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Event implements Serializable { private static final long serialVersionUID = 1L; + /** + * The unique identifier of the event. + */ + @JsonProperty("id") private Long id; + + /** + * The name of the action that triggered the event. + */ + @JsonProperty("action_name") private String actionName; + + /** + * The author associated with the event. + */ + @JsonProperty("author") private Author author; + + /** + * The ID of the author associated with the event. + */ + @JsonProperty("author_id") private Long authorId; + + /** + * The username of the author associated with the event. + */ + @JsonProperty("author_username") private String authorUsername; + + /** + * The event data associated with the event. + */ + @JsonProperty("data") private EventData data; + + /** + * The ID of the project associated with the event. + */ + @JsonProperty("project_id") private Long projectId; + + /** + * The target ID associated with the event. + */ + @JsonProperty("target_id") private Long targetId; + + /** + * The target IID associated with the event. + */ + @JsonProperty("target_iid") private Long targetIid; + + /** + * The target title associated with the event. + */ + @JsonProperty("target_title") private String targetTitle; + + /** + * The target type associated with the event. + */ + @JsonProperty("target_type") private TargetType targetType; + + /** + * The title of the event. + */ + @JsonProperty("title") private String title; + + /** + * The creation date of the event. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + /** + * The note associated with the event. + */ + @JsonProperty("note") private Note note; + + /** + * The push data associated with the event. + */ + @JsonProperty("push_data") private PushData pushData; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EventData.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EventData.java index 856203e90..6c92002c3 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EventData.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EventData.java @@ -5,16 +5,57 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class EventData implements Serializable { private static final long serialVersionUID = 1L; + /** + * The state of the data after the event. + */ + @JsonProperty("after") private String after; + + /** + * The state of the data before the event. + */ + @JsonProperty("before") private String before; + + /** + * The list of commits associated with the event. + */ + @JsonProperty("commits") private List commits; + + /** + * The reference for the event (e.g., a branch or tag). + */ + @JsonProperty("ref") private String ref; + + /** + * The repository related to the event. + */ + @JsonProperty("repository") private Repository repository; + + /** + * The total number of commits involved in the event. + */ + @JsonProperty("total_commits_count") private Integer totalCommitsCount; + + /** + * The user ID associated with the event. + */ + @JsonProperty("user_id") private Long userId; + + /** + * The user name associated with the event. + */ + @JsonProperty("user_name") private String userName; public String getAfter() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Exists.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Exists.java index 6375d29bf..22fac35d0 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Exists.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Exists.java @@ -4,9 +4,12 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Exists implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("exists") private Boolean exists; public Boolean getExists() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExportStatus.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExportStatus.java index 42f2c29e9..11b468671 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExportStatus.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExportStatus.java @@ -7,10 +7,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.JacksonJsonEnumHelper; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.*; public class ExportStatus implements Serializable { private static final long serialVersionUID = 1L; @@ -48,15 +45,59 @@ public String toString() { } } + /** + * The unique identifier of the export status. + */ + @JsonProperty("id") private Long id; + + /** + * The description of the export status. + */ + @JsonProperty("description") private String description; + + /** + * The name of the export status. + */ + @JsonProperty("name") private String name; + + /** + * The name of the export status with the namespace. + */ + @JsonProperty("name_with_namespace") private String nameWithNamespace; + + /** + * The path of the export status. + */ + @JsonProperty("path") private String path; + + /** + * The path of the export status with the namespace. + */ + @JsonProperty("path_with_namespace") private String pathWithNamespace; + + /** + * The creation date of the export status. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + /** + * The export status (e.g., in progress, completed, etc.). + */ + @JsonProperty("export_status") private Status exportStatus; + /** + * The links related to the export status. + */ @JsonProperty("_links") private Map links; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheck.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheck.java index 10001419f..83daba085 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheck.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheck.java @@ -5,13 +5,39 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class ExternalStatusCheck implements Serializable { private static final long serialVersionUID = 1L; + /** + * The unique identifier for the external status check details. + */ + @JsonProperty("id") private Long id; + + /** + * The name associated with the external status check details. + */ + @JsonProperty("name") private String name; + + /** + * The project ID associated with the external status check. + */ + @JsonProperty("project_id") private Long projectId; + + /** + * The external URL associated with the status check. + */ + @JsonProperty("external_url") private String externalUrl; + + /** + * The list of protected branches associated with the external status check. + */ + @JsonProperty("protected_branches") private List protectedBranches; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java index 295df08e5..aaa2c104e 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java @@ -5,14 +5,50 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class ExternalStatusCheckProtectedBranch implements Serializable { private static final long serialVersionUID = 1L; + /** + * The unique identifier for the external status check protected branch. + */ + @JsonProperty("id") private Long id; + + /** + * The project ID associated with the external status check. + */ + @JsonProperty("project_id") private Long projectId; + + /** + * The name of the external status check protected branch. + */ + @JsonProperty("name") private String name; + + /** + * The creation date of the external status check protected branch. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + /** + * The last updated date of the external status check protected branch. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("updated_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAt; + + /** + * Indicates if code owner approval is required for the external status check protected branch. + */ + @JsonProperty("code_owner_approval_required") private Boolean codeOwnerApprovalRequired; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckResult.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckResult.java index 1755f6dc5..b6741765c 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckResult.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckResult.java @@ -4,11 +4,27 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class ExternalStatusCheckResult implements Serializable { private static final long serialVersionUID = 1L; + /** + * The unique identifier for the status. + */ + @JsonProperty("id") private Long id; + + /** + * The merge request associated with the status. + */ + @JsonProperty("merge_request") private MergeRequest mergeRequest; + + /** + * The external status check. + */ + @JsonProperty("external_status_check") private ExternalStatusCheck externalStatusCheck; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckStatus.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckStatus.java index 8f0a5de72..269f060cb 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckStatus.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckStatus.java @@ -6,14 +6,34 @@ import org.gitlab4j.models.utils.JacksonJsonEnumHelper; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; public class ExternalStatusCheckStatus implements Serializable { private static final long serialVersionUID = 1L; + /** + * The unique identifier for the status check. + */ + @JsonProperty("id") private Long id; + + /** + * The name associated with the status check. + */ + @JsonProperty("name") private String name; + + /** + * The external URL associated with the status check. + */ + @JsonProperty("external_url") private String externalUrl; + + /** + * The status of the external status check. + */ + @JsonProperty("status") private Status status; public enum Status { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/FileUpload.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/FileUpload.java index 00439ab4d..90871b103 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/FileUpload.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/FileUpload.java @@ -4,11 +4,27 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class FileUpload implements Serializable { private static final long serialVersionUID = 1L; + /** + * The alternate text for the file. + */ + @JsonProperty("alt") private String alt; + + /** + * The URL of the uploaded file. + */ + @JsonProperty("url") private String url; + + /** + * The markdown representation of the file. + */ + @JsonProperty("markdown") private String markdown; public String getAlt() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GitLabCiTemplate.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GitLabCiTemplate.java index ace61c81f..678a89da1 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GitLabCiTemplate.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GitLabCiTemplate.java @@ -4,10 +4,21 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class GitLabCiTemplate implements Serializable { private static final long serialVersionUID = 1L; + /** + * The name associated with the content. + */ + @JsonProperty("name") private String name; + + /** + * The content of the object. + */ + @JsonProperty("content") private String content; public String getName() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GitLabCiTemplateElement.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GitLabCiTemplateElement.java index 072917921..51db0ab75 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GitLabCiTemplateElement.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GitLabCiTemplateElement.java @@ -4,10 +4,21 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class GitLabCiTemplateElement implements Serializable { private static final long serialVersionUID = 1L; + /** + * The key string associated with the key details. + */ + @JsonProperty("key") private String key; + + /** + * The name associated with the key details. + */ + @JsonProperty("name") private String name; public String getKey() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GpgKey.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GpgKey.java index b1025dd07..fa4f167a9 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GpgKey.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GpgKey.java @@ -2,10 +2,29 @@ import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class GpgKey { + /** + * The unique identifier for the key. + */ + @JsonProperty("id") private Long id; + + /** + * The key string associated with the key details. + */ + @JsonProperty("key") private String key; + + /** + * The creation date of the key. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GpgSignature.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GpgSignature.java index acbb887e8..680b0271f 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GpgSignature.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GpgSignature.java @@ -4,14 +4,45 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class GpgSignature implements Serializable { private static final long serialVersionUID = 1L; + /** + * The ID of the GPG key. + */ + @JsonProperty("gpg_key_id") private Long gpgKeyId; + + /** + * The primary key ID of the GPG key. + */ + @JsonProperty("gpg_key_primary_keyid") private String gpgKeyPrimaryKeyid; + + /** + * The username associated with the GPG key. + */ + @JsonProperty("gpg_key_user_name") private String gpgKeyUserName; + + /** + * The email address associated with the GPG key. + */ + @JsonProperty("gpg_key_user_email") private String gpgKeyUserEmail; + + /** + * The verification status of the GPG key. + */ + @JsonProperty("verification_status") private String verificationStatus; + + /** + * The subkey ID of the GPG key. + */ + @JsonProperty("gpg_key_subkey_id") private String gpgKeySubkeyId; public Long getGpgKeyId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Group.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Group.java index bfec0db61..cec22aa5f 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Group.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Group.java @@ -8,15 +8,36 @@ import org.gitlab4j.models.Constants.SubgroupCreationLevel; import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; public class Group extends AbstractGroup { private static final long serialVersionUID = 1L; public class Statistics { + + /** + * The total storage size used by the project. + */ + @JsonProperty("storage_size") private Long storageSize; + + /** + * The repository size for the project. + */ + @JsonProperty("repository_size") private Long repositorySize; + + /** + * The size used by LFS (Large File Storage) objects. + */ + @JsonProperty("lfs_objects_size") private Long lfsObjectsSize; + + /** + * The size of job artifacts associated with the project. + */ + @JsonProperty("job_artifacts_size") private Long jobArtifactsSize; public Long getStorageSize() { @@ -52,26 +73,126 @@ public void setJobArtifactsSize(Long jobArtifactsSize) { } } + /** + * The path of the project. + */ + @JsonProperty("path") private String path; + + /** + * The description of the project. + */ + @JsonProperty("description") private String description; + + /** + * The visibility of the project. + */ + @JsonProperty("visibility") private Visibility visibility; + + /** + * Indicates if LFS (Large File Storage) is enabled for the project. + */ + @JsonProperty("lfs_enabled") private Boolean lfsEnabled; + + /** + * Indicates if request access is enabled for the project. + */ + @JsonProperty("request_access_enabled") private Boolean requestAccessEnabled; + + /** + * The parent project ID, if any. + */ + @JsonProperty("parent_id") private Long parentId; + + /** + * The shared runners minutes limit for the project. + */ + @JsonProperty("shared_runners_minutes_limit") private Integer sharedRunnersMinutesLimit; + + /** + * The statistics related to the project. + */ + @JsonProperty("statistics") private Statistics statistics; + + /** + * The list of projects associated with the current project. + */ + @JsonProperty("projects") private List projects; + + /** + * The list of shared projects. + */ + @JsonProperty("shared_projects") private List sharedProjects; + + /** + * The creation date of the project. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("created_at") private Date createdAt; + + /** + * The groups with which the project is shared. + */ + @JsonProperty("shared_with_groups") private List sharedWithGroups; + + /** + * The custom attributes for the project. + */ + @JsonProperty("custom_attributes") private List customAttributes; + + /** + * The runners token for the project. + */ + @JsonProperty("runners_token") private String runnersToken; + + /** + * Indicates if sharing groups outside the hierarchy is prevented. + */ + @JsonProperty("prevent_sharing_groups_outside_hierarchy") private Boolean preventSharingGroupsOutsideHierarchy; + + /** + * Indicates if forking outside the group is prevented. + */ + @JsonProperty("prevent_forking_outside_group") private Boolean preventForkingOutsideGroup; + + /** + * The project creation level for the project. + */ + @JsonProperty("project_creation_level") private ProjectCreationLevel projectCreationLevel; + + /** + * The subgroup creation level for the project. + */ + @JsonProperty("subgroup_creation_level") private SubgroupCreationLevel subgroupCreationLevel; + + /** + * The default branch protection level for the project. + */ + @JsonProperty("default_branch_protection") private DefaultBranchProtectionLevel defaultBranchProtection; + /** + * The date when the project is marked for deletion. + * Expected in the format (yyyy-MM-dd). + */ + @JsonProperty("marked_for_deletion_on") @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date markedForDeletionOn; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupAccessToken.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupAccessToken.java index b7806911d..5b805707c 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupAccessToken.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupAccessToken.java @@ -2,9 +2,12 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class GroupAccessToken extends ImpersonationToken { private static final long serialVersionUID = 1L; + @JsonProperty("access_level") private AccessLevel accessLevel; public AccessLevel getAccessLevel() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupFilter.java index 9e1654554..c63115527 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupFilter.java @@ -9,22 +9,78 @@ import org.gitlab4j.models.GitLabForm; import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * This class is used to filter Groups when getting lists of groups. */ public class GroupFilter implements Serializable { private static final long serialVersionUID = 1L; + /** + * List of group IDs to skip in the filter. + */ + @JsonProperty("skip_groups") private List skipGroups; + + /** + * Indicates if all available groups should be included in the filter. + */ + @JsonProperty("all_available") private Boolean allAvailable; + + /** + * A search string to filter groups by. + */ + @JsonProperty("search") private String search; + + /** + * The ordering criteria for the groups. + */ + @JsonProperty("order_by") private GroupOrderBy orderBy; + + /** + * The sorting order for the groups. + */ + @JsonProperty("sort") private SortOrder sort; + + /** + * Indicates if statistics should be included for the groups. + */ + @JsonProperty("statistics") private Boolean statistics; + + /** + * Indicates if custom attributes should be included in the filter. + */ + @JsonProperty("with_custom_attributes") private Boolean withCustomAttributes; + + /** + * Indicates if the current user owns the groups. + */ + @JsonProperty("owned") private Boolean owned; + + /** + * The access level required for the groups. + */ + @JsonProperty("access_level") private AccessLevel accessLevel; + + /** + * Indicates if only top-level groups should be included in the filter. + */ + @JsonProperty("top_level_only") private Boolean topLevelOnly; + + /** + * A list of custom attributes to filter by. + */ + @JsonProperty("custom_attributes_filter") private List customAttributesFilter = new ArrayList<>(); /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupHook.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupHook.java index 6182861a6..de3d34603 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupHook.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupHook.java @@ -3,37 +3,186 @@ import java.io.Serializable; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class GroupHook implements Serializable { private static final long serialVersionUID = 1L; + /** + * The unique identifier of the webhook. + */ + @JsonProperty("id") private Long id; + + /** + * The URL of the webhook. + */ + @JsonProperty("url") private String url; + + /** + * The name of the webhook. + */ + @JsonProperty("name") private String name; + + /** + * The description of the webhook. + */ + @JsonProperty("description") private String description; + + /** + * The group ID associated with the webhook. + */ + @JsonProperty("group_id") private Long groupId; + + /** + * Indicates if push events should be sent. + */ + @JsonProperty("push_events") private Boolean pushEvents; + + /** + * The branch filter for push events. + */ + @JsonProperty("push_events_branch_filter") private String pushEventsBranchFilter; + + /** + * The strategy for filtering branches. + */ + @JsonProperty("branch_filter_strategy") private String branchFilterStrategy; + + /** + * Indicates if issue events should be sent. + */ + @JsonProperty("issues_events") private Boolean issuesEvents; + + /** + * Indicates if confidential issues events should be sent. + */ + @JsonProperty("confidential_issues_events") private Boolean confidentialIssuesEvents; + + /** + * Indicates if merge request events should be sent. + */ + @JsonProperty("merge_requests_events") private Boolean mergeRequestsEvents; + + /** + * Indicates if tag push events should be sent. + */ + @JsonProperty("tag_push_events") private Boolean tagPushEvents; + + /** + * Indicates if note events should be sent. + */ + @JsonProperty("note_events") private Boolean noteEvents; + + /** + * Indicates if confidential note events should be sent. + */ + @JsonProperty("confidential_note_events") private Boolean confidentialNoteEvents; + + /** + * Indicates if job events should be sent. + */ + @JsonProperty("job_events") private Boolean jobEvents; + + /** + * Indicates if pipeline events should be sent. + */ + @JsonProperty("pipeline_events") private Boolean pipelineEvents; + + /** + * Indicates if wiki page events should be sent. + */ + @JsonProperty("wiki_page_events") private Boolean wikiPageEvents; + + /** + * Indicates if deployment events should be sent. + */ + @JsonProperty("deployment_events") private Boolean deploymentEvents; + + /** + * Indicates if feature flag events should be sent. + */ + @JsonProperty("feature_flag_events") private Boolean featureFlagEvents; + + /** + * Indicates if release events should be sent. + */ + @JsonProperty("releases_events") private Boolean releasesEvents; + + /** + * Indicates if subgroup events should be sent. + */ + @JsonProperty("subgroup_events") private Boolean subgroupEvents; + + /** + * Indicates if member events should be sent. + */ + @JsonProperty("member_events") private Boolean memberEvents; + + /** + * Indicates if SSL verification should be enabled for the webhook. + */ + @JsonProperty("enable_ssl_verification") private Boolean enableSslVerification; + + /** + * The alert status of the webhook. + */ + @JsonProperty("alert_status") private String alertStatus; + + /** + * The date until the webhook is disabled. Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("disabled_until") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date disabledUntil; + + /** + * Indicates if repository update events should be sent. + */ + @JsonProperty("repository_update_events") private Boolean repositoryUpdateEvents; + + /** + * The creation date of the webhook. Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + /** + * Indicates if resource access token events should be sent. + */ + @JsonProperty("resource_access_token_events") private Boolean resourceAccessTokenEvents; + + /** + * A custom webhook template to use for the webhook. + */ + @JsonProperty("custom_webhook_template") private String customWebhookTemplate; public String getDescription() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupHookParams.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupHookParams.java index e0fcb0019..245710cfc 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupHookParams.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupHookParams.java @@ -4,32 +4,153 @@ import org.gitlab4j.models.GitLabForm; +import com.fasterxml.jackson.annotation.JsonProperty; + public class GroupHookParams implements Serializable { private static final long serialVersionUID = 1L; + /** + * The URL of the webhook. + */ + @JsonProperty("url") private String url; + + /** + * The name of the webhook. + */ + @JsonProperty("name") private String name; + + /** + * The description of the webhook. + */ + @JsonProperty("description") private String description; + + /** + * Indicates if push events should be sent. + */ + @JsonProperty("push_events") private Boolean pushEvents; + + /** + * The branch filter for push events. + */ + @JsonProperty("push_events_branch_filter") private String pushEventsBranchFilter; + + /** + * The strategy for filtering branches. + */ + @JsonProperty("branch_filter_strategy") private String branchFilterStrategy; + + /** + * Indicates if issue events should be sent. + */ + @JsonProperty("issues_events") private Boolean issuesEvents; + + /** + * Indicates if confidential issues events should be sent. + */ + @JsonProperty("confidential_issues_events") private Boolean confidentialIssuesEvents; + + /** + * Indicates if merge request events should be sent. + */ + @JsonProperty("merge_requests_events") private Boolean mergeRequestsEvents; + + /** + * Indicates if tag push events should be sent. + */ + @JsonProperty("tag_push_events") private Boolean tagPushEvents; + + /** + * Indicates if note events should be sent. + */ + @JsonProperty("note_events") private Boolean noteEvents; + + /** + * Indicates if confidential note events should be sent. + */ + @JsonProperty("confidential_note_events") private Boolean confidentialNoteEvents; + + /** + * Indicates if job events should be sent. + */ + @JsonProperty("job_events") private Boolean jobEvents; + + /** + * Indicates if pipeline events should be sent. + */ + @JsonProperty("pipeline_events") private Boolean pipelineEvents; + + /** + * Indicates if wiki page events should be sent. + */ + @JsonProperty("wiki_page_events") private Boolean wikiPageEvents; + + /** + * Indicates if deployment events should be sent. + */ + @JsonProperty("deployment_events") private Boolean deploymentEvents; + + /** + * Indicates if feature flag events should be sent. + */ + @JsonProperty("feature_flag_events") private Boolean featureFlagEvents; + + /** + * Indicates if release events should be sent. + */ + @JsonProperty("releases_events") private Boolean releasesEvents; + + /** + * Indicates if subgroup events should be sent. + */ + @JsonProperty("subgroup_events") private Boolean subgroupEvents; + + /** + * Indicates if member events should be sent. + */ + @JsonProperty("member_events") private Boolean memberEvents; + + /** + * Indicates if SSL verification should be enabled for the webhook. + */ + @JsonProperty("enable_ssl_verification") private Boolean enableSslVerification; + + /** + * The authentication token for the webhook. + */ + @JsonProperty("token") private String token; + + /** + * Indicates if resource access token events should be sent. + */ + @JsonProperty("resource_access_token_events") private Boolean resourceAccessTokenEvents; + + /** + * A custom webhook template to use for the webhook. + */ + @JsonProperty("custom_webhook_template") private String customWebhookTemplate; public GitLabForm getForm() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupParams.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupParams.java index a9cc63cbd..1eb1b8bd1 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupParams.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupParams.java @@ -7,6 +7,8 @@ import org.gitlab4j.models.Constants.SubgroupCreationLevel; import org.gitlab4j.models.GitLabForm; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * This class is utilized by the org.gitlab4j.api.GroupApi#createGroup(GroupParams) * and org.gitlab4j.api.GroupApi#updateGroup(Object, GroupParams) methods to set @@ -15,26 +17,130 @@ public class GroupParams implements Serializable { private static final long serialVersionUID = 1L; + /** + * The name of the project. + */ + @JsonProperty("name") private String name; + + /** + * The path of the project. + */ + @JsonProperty("path") private String path; + + /** + * The description of the project. + */ + @JsonProperty("description") private String description; + + /** + * The visibility of the project. + */ + @JsonProperty("visibility") private String visibility; + + /** + * Indicates if sharing with group is locked. + */ + @JsonProperty("share_with_group_lock") private Boolean shareWithGroupLock; + + /** + * Indicates if two-factor authentication is required. + */ + @JsonProperty("require_two_factor_authentication") private Boolean requireTwoFactorAuthentication; + + /** + * The grace period for two-factor authentication in days. + */ + @JsonProperty("two_factor_grace_period") private Integer twoFactorGracePeriod; + + /** + * The project creation level for the project. + */ + @JsonProperty("project_creation_level") private ProjectCreationLevel projectCreationLevel; + + /** + * Indicates if Auto DevOps is enabled. + */ + @JsonProperty("auto_devops_enabled") private Boolean autoDevopsEnabled; + + /** + * The subgroup creation level for the project. + */ + @JsonProperty("subgroup_creation_level") private SubgroupCreationLevel subgroupCreationLevel; + + /** + * Indicates if emails are disabled for the project. + */ + @JsonProperty("emails_disabled") private Boolean emailsDisabled; + + /** + * Indicates if large file storage (LFS) is enabled for the project. + */ + @JsonProperty("lfs_enabled") private Boolean lfsEnabled; + + /** + * Indicates if access requests are enabled for the project. + */ + @JsonProperty("request_access_enabled") private Boolean requestAccessEnabled; + + /** + * The parent project ID of the project. + */ + @JsonProperty("parent_id") private Long parentId; + + /** + * The shared runners minutes limit for the project. + */ + @JsonProperty("shared_runners_minutes_limit") private Integer sharedRunnersMinutesLimit; + + /** + * The extra shared runners minutes limit for the project. + */ + @JsonProperty("extra_shared_runners_minutes_limit") private Integer extraSharedRunnersMinutesLimit; + + /** + * The default branch protection level for the project. + */ + @JsonProperty("default_branch_protection") private DefaultBranchProtectionLevel defaultBranchProtection; + + /** + * Indicates if sharing groups outside the hierarchy is prevented. + */ + @JsonProperty("prevent_sharing_groups_outside_hierarchy") private Boolean preventSharingGroupsOutsideHierarchy; + + /** + * Indicates if forking outside the group is prevented. + */ + @JsonProperty("prevent_forking_outside_group") private Boolean preventForkingOutsideGroup; + + /** + * Indicates if membership lock is enabled. + */ + @JsonProperty("membership_lock") private Boolean membershipLock; + + /** + * The ID of the file template project. + */ + @JsonProperty("file_template_project_id") private Long fileTemplateProjectId; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupProjectsFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupProjectsFilter.java index f66582c96..8b79a2ca0 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupProjectsFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupProjectsFilter.java @@ -7,24 +7,90 @@ import org.gitlab4j.models.GitLabForm; import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * This class is used to filter Projects when getting lists of projects for a specified group. */ public class GroupProjectsFilter implements Serializable { private static final long serialVersionUID = 1L; + /** + * Indicates if the project is archived. + */ + @JsonProperty("archived") private Boolean archived; + + /** + * The visibility level of the project. + */ + @JsonProperty("visibility") private Visibility visibility; + + /** + * The ordering criteria for the project. + */ + @JsonProperty("order_by") private ProjectOrderBy orderBy; + + /** + * The sorting order for the project. + */ + @JsonProperty("sort") private SortOrder sort; + + /** + * A search string to filter projects by. + */ + @JsonProperty("search") private String search; + + /** + * Indicates if the project filter is simplified. + */ + @JsonProperty("simple") private Boolean simple; + + /** + * Indicates if the current user owns the project. + */ + @JsonProperty("owned") private Boolean owned; + + /** + * Indicates if the project is starred by the current user. + */ + @JsonProperty("starred") private Boolean starred; + + /** + * Indicates if the project has custom attributes. + */ + @JsonProperty("with_custom_attributes") private Boolean withCustomAttributes; + + /** + * Indicates if the project has issues enabled. + */ + @JsonProperty("with_issues_enabled") private Boolean withIssuesEnabled; + + /** + * Indicates if the project has merge requests enabled. + */ + @JsonProperty("with_merge_requests_enabled") private Boolean withMergeRequestsEnabled; + + /** + * Indicates if the project should include shared projects. + */ + @JsonProperty("with_shared") private Boolean withShared; + + /** + * Indicates if the project includes subgroups. + */ + @JsonProperty("include_subgroups") private Boolean includeSubGroups; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/HealthCheckInfo.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/HealthCheckInfo.java index 1dc0f945b..ab6647407 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/HealthCheckInfo.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/HealthCheckInfo.java @@ -5,6 +5,7 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationContext; @@ -16,24 +17,52 @@ public class HealthCheckInfo implements Serializable { private static final long serialVersionUID = 1L; + /** + * The health check for the database. + */ + @JsonProperty("db_check") @JsonDeserialize(using = HealthCheckItemDeserializer.class) private HealthCheckItem dbCheck; + /** + * The health check for Redis. + */ + @JsonProperty("redis_check") @JsonDeserialize(using = HealthCheckItemDeserializer.class) private HealthCheckItem redisCheck; + /** + * The health check for the cache. + */ + @JsonProperty("cache_check") @JsonDeserialize(using = HealthCheckItemDeserializer.class) private HealthCheckItem cacheCheck; + /** + * The health check for queues. + */ + @JsonProperty("queues_check") @JsonDeserialize(using = HealthCheckItemDeserializer.class) private HealthCheckItem queuesCheck; + /** + * The health check for shared state. + */ + @JsonProperty("shared_state_check") @JsonDeserialize(using = HealthCheckItemDeserializer.class) private HealthCheckItem sharedStateCheck; + /** + * The health check for file system shards. + */ + @JsonProperty("fs_shards_check") @JsonDeserialize(using = HealthCheckItemDeserializer.class) private HealthCheckItem fsShardsCheck; + /** + * The health check for Gitaly. + */ + @JsonProperty("gitaly_check") @JsonDeserialize(using = HealthCheckItemDeserializer.class) private HealthCheckItem gitalyCheck; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/HealthCheckItem.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/HealthCheckItem.java index 7126092df..be6f2492d 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/HealthCheckItem.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/HealthCheckItem.java @@ -5,11 +5,27 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class HealthCheckItem implements Serializable { private static final long serialVersionUID = 1L; + /** + * The status of the health check. + */ + @JsonProperty("status") private HealthCheckStatus status; + + /** + * A map of labels associated with the health check. + */ + @JsonProperty("labels") private Map labels; + + /** + * The message associated with the health check status. + */ + @JsonProperty("message") private String message; public HealthCheckStatus getStatus() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Identity.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Identity.java index 3aad9e02b..9f3e74934 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Identity.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Identity.java @@ -4,11 +4,27 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Identity implements Serializable { private static final long serialVersionUID = 1L; + /** + * The provider associated with the SAML configuration. + */ + @JsonProperty("provider") private String provider; + + /** + * The external user ID associated with the SAML provider. + */ + @JsonProperty("extern_uid") private String externUid; + + /** + * The ID of the SAML provider. + */ + @JsonProperty("saml_provider_id") private Integer samlProviderId; public String getProvider() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java index 7b210b7fe..3de4bf670 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java @@ -8,6 +8,8 @@ import org.gitlab4j.models.utils.JacksonJsonEnumHelper; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; public class ImpersonationToken implements Serializable { @@ -42,16 +44,76 @@ public String toString() { } } + /** + * Indicates if the token is active. + */ + @JsonProperty("active") private Boolean active; + + /** + * The token string. + */ + @JsonProperty("token") private String token; + + /** + * List of scopes associated with the token. + */ + @JsonProperty("scopes") private List scopes; + + /** + * The user ID associated with the token. + */ + @JsonProperty("user_id") private Long userId; + + /** + * Indicates if the token has been revoked. + */ + @JsonProperty("revoked") private Boolean revoked; + + /** + * The name of the token. + */ + @JsonProperty("name") private String name; + + /** + * The unique identifier of the token. + */ + @JsonProperty("id") private Long id; + + /** + * The creation date of the token. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + /** + * The last used date of the token. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("last_used_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date lastUsedAt; + + /** + * Indicates if the token is used for impersonation. + */ + @JsonProperty("impersonation") private Boolean impersonation; + + /** + * The expiration date of the token. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("expires_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date expiresAt; public Boolean getActive() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImportStatus.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImportStatus.java index 07c1e1d46..e7591528f 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImportStatus.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImportStatus.java @@ -7,6 +7,8 @@ import org.gitlab4j.models.utils.JacksonJsonEnumHelper; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; public class ImportStatus implements Serializable { @@ -40,14 +42,60 @@ public String toString() { } } + /** + * The unique identifier of the import. + */ + @JsonProperty("id") private Long id; + + /** + * The description of the import. + */ + @JsonProperty("description") private String description; + + /** + * The name of the import. + */ + @JsonProperty("name") private String name; + + /** + * The name of the import with the associated namespace. + */ + @JsonProperty("name_with_namespace") private String nameWithNamespace; + + /** + * The path of the import. + */ + @JsonProperty("path") private String path; + + /** + * The path of the import with the associated namespace. + */ + @JsonProperty("path_with_namespace") private String pathWithNamespace; + + /** + * The creation date of the import. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + /** + * The import status. + */ + @JsonProperty("import_status") private Status importStatus; + + /** + * Any errors associated with the import. + */ + @JsonProperty("import_error") private String importError; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Issue.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Issue.java index 9c895ac70..1e993e02e 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Issue.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Issue.java @@ -2,9 +2,12 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Issue extends AbstractIssue { private static final long serialVersionUID = 1L; + @JsonProperty("subscribed") private Boolean subscribed; public Boolean getSubscribed() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueEvent.java index 22eb7c74a..45ee0eb93 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueEvent.java @@ -6,6 +6,8 @@ import org.gitlab4j.models.utils.JacksonJsonEnumHelper; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; public class IssueEvent implements Serializable { @@ -34,11 +36,42 @@ public String toString() { } } + /** + * The unique identifier of the resource. + */ + @JsonProperty("id") private Long id; + + /** + * The user associated with the resource. + */ + @JsonProperty("user") private User user; + + /** + * The creation date of the resource. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private String createdAt; + + /** + * The type of the resource. + */ + @JsonProperty("resource_type") private ResourceType resourceType; + + /** + * The ID of the resource. + */ + @JsonProperty("resource_id") private Long resourceId; + + /** + * The state of the resource. + */ + @JsonProperty("state") private String state; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueFilter.java index 0e50e8ef0..3e37be9f8 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueFilter.java @@ -15,9 +15,7 @@ import org.gitlab4j.models.utils.ISO8601; import org.gitlab4j.models.utils.JacksonJsonEnumHelper; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.*; /** * This class is used to filter issues when getting lists of them. @@ -28,91 +26,113 @@ public class IssueFilter implements Serializable { /** * Return only the milestone having the given iid. */ + @JsonProperty("iids") private List iids; /** * {@link org.gitlab4j.models.Constants.IssueState} Return all issues or just those that are opened or closed. */ + @JsonProperty("state") private IssueState state; /** * Modify the scope of the search attribute. title, description, or a string joining them with comma. Default is title,description */ + @JsonProperty("in") private List in; /** * Comma-separated list of label names, issues must have all labels to be returned. No+Label lists all issues with no labels. */ + @JsonProperty("labels") private List labels; /** * The milestone title. No+Milestone lists all issues with no milestone. */ + @JsonProperty("milestone") private String milestone; /** * {@link org.gitlab4j.models.Constants.IssueScope} Return issues for the given scope: created_by_me, assigned_to_me or all. For versions before 11.0, use the now deprecated created-by-me or assigned-to-me scopes instead. */ + @JsonProperty("scope") private IssueScope scope; /** * Return issues created by the given user id. */ + @JsonProperty("author_id") private Long authorId; /** * Return issues assigned to the given user id. */ + @JsonProperty("assignee_id") private Long assigneeId; /** * Return issues reacted by the authenticated user by the given emoji. */ + @JsonProperty("my_reaction_emoji") private String myReactionEmoji; /** * {@link org.gitlab4j.models.Constants.IssueOrderBy} Return issues ordered by created_at or updated_at fields. Default is created_at. */ + @JsonProperty("order_by") private IssueOrderBy orderBy; /** * {@link org.gitlab4j.models.Constants.SortOrder} Return issues sorted in asc or desc order. Default is desc. */ + @JsonProperty("sort") private SortOrder sort; /** * Search project issues against their title and description. */ + @JsonProperty("search") private String search; /** * Return issues created on or after the given time. */ + @JsonProperty("created_after") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAfter; /** * Return issues created on or before the given time. */ + @JsonProperty("created_before") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdBefore; /** * Return issues updated on or after the given time. */ + @JsonProperty("updated_after") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAfter; /** * Return issues updated on or before the given time. */ + @JsonProperty("updated_before") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedBefore; /** * Return issues in current iteration. */ + @JsonProperty("iteration_title") private String iterationTitle; /* * Return issues without these parameters */ + @JsonProperty("not") private Map not; public enum IssueField { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueLink.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueLink.java index a62b39830..364c9ab23 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueLink.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueLink.java @@ -4,11 +4,27 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class IssueLink implements Serializable { private static final long serialVersionUID = 1L; + /** + * The source issue in the link. + */ + @JsonProperty("source_issue") private Issue sourceIssue; + + /** + * The target issue in the link. + */ + @JsonProperty("target_issue") private Issue targetIssue; + + /** + * The type of the link between the issues. + */ + @JsonProperty("link_type") private LinkType linkType; public Issue getSourceIssue() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssuesStatistics.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssuesStatistics.java index f547e25fb..495dd2e48 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssuesStatistics.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssuesStatistics.java @@ -5,10 +5,12 @@ import org.gitlab4j.models.utils.JacksonJson; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; public class IssuesStatistics implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("statistics") private Statistics statistics; public Statistics getStatistics() { @@ -27,6 +29,7 @@ public Counts getCounts() { public static class Statistics implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("counts") private Counts counts; public Counts getCounts() { @@ -42,8 +45,22 @@ public static class Counts implements Serializable { private static final long serialVersionUID = 1L; + /** + * The total number of issues. + */ + @JsonProperty("all") private Integer all; + + /** + * The number of closed issues. + */ + @JsonProperty("closed") private Integer closed; + + /** + * The number of opened issues. + */ + @JsonProperty("opened") private Integer opened; public Integer getAll() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssuesStatisticsFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssuesStatisticsFilter.java index ee328e96b..322279126 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssuesStatisticsFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssuesStatisticsFilter.java @@ -8,7 +8,9 @@ import org.gitlab4j.models.GitLabForm; import org.gitlab4j.models.utils.ISO8601; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; /** * This class is used to filter issues when getting issue statistics. of them. @@ -16,19 +18,92 @@ public class IssuesStatisticsFilter implements Serializable { private static final long serialVersionUID = 1L; + /** + * List of labels to filter issues by. + */ + @JsonProperty("labels") private List labels; + + /** + * The milestone associated with the issues. + */ + @JsonProperty("milestone") private String milestone; + + /** + * The scope of the issues, e.g., assigned, created by, etc. + */ + @JsonProperty("scope") private IssueScope scope; + + /** + * The ID of the author of the issues. + */ + @JsonProperty("author_id") private Long authorId; + + /** + * The ID of the assignee of the issues. + */ + @JsonProperty("assignee_id") private Long assigneeId; + + /** + * The emoji reaction to filter by for the issues. + */ + @JsonProperty("my_reaction_emoji") private String myReactionEmoji; + + /** + * List of issue IDs to filter by. + */ + @JsonProperty("iids") private List iids; + + /** + * A search string to filter issues by. + */ + @JsonProperty("search") private String search; + + /** + * The field in which fuzzy search should be performed with the search query. + */ + @JsonProperty("in") private String in; + + /** + * Return issues created after the specified date. Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("created_after") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAfter; + + /** + * Return issues created before the specified date. Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("created_before") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdBefore; + + /** + * Return issues updated after the specified date. Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("updated_after") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAfter; + + /** + * Return issues updated before the specified date. Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("updated_before") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedBefore; + + /** + * Return only confidential issues. + */ + @JsonProperty("confidential") private Boolean confidential; public IssuesStatisticsFilter withLabels(List labels) { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Iteration.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Iteration.java index adcad5805..6be0d4112 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Iteration.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Iteration.java @@ -6,6 +6,8 @@ import org.gitlab4j.models.utils.JacksonJson; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; public class Iteration implements Serializable { @@ -43,17 +45,84 @@ public String toString() { } } + /** + * The unique identifier of the iteration. + */ + @JsonProperty("id") private Long id; + + /** + * The internal identifier of the iteration. + */ + @JsonProperty("iid") private Long iid; + + /** + * The sequence number of the iteration. + */ + @JsonProperty("sequence") private Long sequence; + + /** + * The group ID associated with the iteration. + */ + @JsonProperty("group_id") private Long groupId; + + /** + * The title of the iteration. + */ + @JsonProperty("title") private String title; + + /** + * The description of the iteration. + */ + @JsonProperty("description") private String description; + + /** + * The current state of the iteration. + */ + @JsonProperty("state") private IterationState state; + + /** + * The creation date of the iteration. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + /** + * The last updated date of the iteration. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("updated_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAt; + + /** + * The start date of the iteration. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("start_date") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date startDate; + + /** + * The due date of the iteration. + * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + */ + @JsonProperty("due_date") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date dueDate; + + /** + * The web URL for the iteration. + */ + @JsonProperty("web_url") private String webUrl; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IterationFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IterationFilter.java index bcb5d9176..890ecb8d2 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IterationFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IterationFilter.java @@ -8,9 +8,7 @@ import org.gitlab4j.models.utils.ISO8601; import org.gitlab4j.models.utils.JacksonJsonEnumHelper; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.*; public class IterationFilter implements Serializable { private static final long serialVersionUID = 1L; @@ -67,31 +65,39 @@ public String toString() { /** * Return opened, upcoming, current, closed, or all iterations. */ + @JsonProperty("state") private IterationFilterState state; /** * Return only iterations with a title matching the provided string. */ + @JsonProperty("search") private String search; /** * Fields in which fuzzy search should be performed with the query given in the argument search. */ + @JsonProperty("in") private IterationFilterIn in; /** * Include iterations from parent group and its ancestors. Defaults to true. */ + @JsonProperty("include_ancestors") private Boolean includeAncestors; /** * Return iterations updated after the specified date. Expected in ISO 8601 format (2019-03-15T08:00:00Z). */ + @JsonProperty("updated_after") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAfter; /** * Return iterations updated before the specified date. Expected in ISO 8601 format (2019-03-15T08:00:00Z). */ + @JsonProperty("updated_before") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedBefore; public IterationFilterState getState() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Job.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Job.java index 151321d98..5dfd52287 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Job.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Job.java @@ -6,34 +6,93 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Job implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("id") private Long id; + + @JsonProperty("commit") private Commit commit; + + @JsonProperty("coverage") private String coverage; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("finished_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date finishedAt; + + @JsonProperty("erased_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date erasedAt; + + @JsonProperty("artifacts_expire_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date artifactsExpireAt; + + @JsonProperty("name") private String name; + + @JsonProperty("pipeline") private Pipeline pipeline; + + @JsonProperty("ref") private String ref; + + @JsonProperty("runner") private Runner runner; + + @JsonProperty("user") private User user; + + @JsonProperty("started_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date startedAt; + + @JsonProperty("artifacts_file") private ArtifactsFile artifactsFile; + + @JsonProperty("artifacts") private List artifacts; + + @JsonProperty("tag") private Boolean tag; + + @JsonProperty("web_url") private String webUrl; + + @JsonProperty("stage") private String stage; + + @JsonProperty("status") private JobStatus status; + + @JsonProperty("failure_reason") private String failureReason; + + @JsonProperty("when") private String when; + + @JsonProperty("manual") private Boolean manual; + + @JsonProperty("allow_failure") private Boolean allowFailure; + + @JsonProperty("duration") private Float duration; + + @JsonProperty("queued_duration") private Float queuedDuration; + + @JsonProperty("project") private Project project; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/JobAttribute.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/JobAttribute.java index cd95e2157..bcae0dfd0 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/JobAttribute.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/JobAttribute.java @@ -4,10 +4,15 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class JobAttribute implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("key") private String key; + + @JsonProperty("value") private String value; public JobAttribute(String key, String value) { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Key.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Key.java index 6d936c66c..c6d4c6316 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Key.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Key.java @@ -5,13 +5,26 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Key implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("id") private Long id; + + @JsonProperty("key") private String key; + + @JsonProperty("title") private String title; + + @JsonProperty("user") private User user; public Date getCreatedAt() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Label.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Label.java index e71d6f287..fd85d8730 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Label.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Label.java @@ -6,20 +6,42 @@ import org.gitlab4j.models.utils.JacksonJson; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; public class Label implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("id") private Long id; + + @JsonProperty("name") private String name; + + @JsonProperty("color") private String color; + + @JsonProperty("description") private String description; + + @JsonProperty("description_html") private String descriptionHtml; + + @JsonProperty("open_issues_count") private Integer openIssuesCount; + + @JsonProperty("closed_issues_count") private Integer closedIssuesCount; + + @JsonProperty("open_merge_requests_count") private Integer openMergeRequestsCount; + + @JsonProperty("subscribed") private Boolean subscribed; + + @JsonProperty("priority") private Integer priority; + + @JsonProperty("is_project_label") private Boolean isProjectLabel; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/LabelEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/LabelEvent.java index 3a5f0dbe7..eb0d74cca 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/LabelEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/LabelEvent.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJsonEnumHelper; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; public class LabelEvent implements Serializable { @@ -36,12 +37,25 @@ public String toString() { } } + @JsonProperty("id") private Long id; + + @JsonProperty("user") private User user; + + @JsonProperty("created_at") private String createdAt; + + @JsonProperty("resource_type") private ResourceType resourceType; + + @JsonProperty("resource_id") private Long resourceId; + + @JsonProperty("label") private Label label; + + @JsonProperty("action") private String action; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/LdapGroupLink.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/LdapGroupLink.java index cd782c6c2..6a9e6f5eb 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/LdapGroupLink.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/LdapGroupLink.java @@ -4,15 +4,21 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class LdapGroupLink implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("cn") private String cn; + @JsonProperty("group_access") private AccessLevel groupAccess; + @JsonProperty("provider") private String provider; + @JsonProperty("filter") private String filter; public String getCn() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/License.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/License.java index 7cff0f42f..35a06be49 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/License.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/License.java @@ -6,20 +6,49 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class License implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("id") private Long id; + + @JsonProperty("plan") private String plan; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("starts_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date startsAt; + + @JsonProperty("expires_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date expiresAt; + + @JsonProperty("historical_max") private Integer historicalMax; + + @JsonProperty("expired") private Boolean expired; + + @JsonProperty("overage") private Integer overage; + + @JsonProperty("user_limit") private Integer userLimit; + + @JsonProperty("active_users") private Integer activeUsers; + + @JsonProperty("licensee") private Map licensee; + + @JsonProperty("add_ons") private Map addOns; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/LicenseTemplate.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/LicenseTemplate.java index 4958a030f..5f7e4d5ed 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/LicenseTemplate.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/LicenseTemplate.java @@ -5,19 +5,42 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class LicenseTemplate implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("key") private String key; + + @JsonProperty("name") private String name; + + @JsonProperty("nickname") private String nickname; + + @JsonProperty("featured") private boolean featured; + + @JsonProperty("html_url") private String htmlUrl; + + @JsonProperty("source_url") private String sourceUrl; + + @JsonProperty("description") private String description; + + @JsonProperty("conditions") private List conditions; + + @JsonProperty("permissions") private List permissions; + + @JsonProperty("limitations") private List limitations; + + @JsonProperty("content") private String content; public String getKey() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Link.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Link.java index ba6369af9..83204df19 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Link.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Link.java @@ -4,11 +4,18 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Link implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("id") private Integer id; + + @JsonProperty("name") private String name; + + @JsonProperty("url") private String url; /** * @deprecated deprecated in GitLab 15.9, will be removed in GitLab 16.0. diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/LinkedIssue.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/LinkedIssue.java index 4b668a5aa..c39446877 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/LinkedIssue.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/LinkedIssue.java @@ -4,11 +4,23 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class LinkedIssue extends AbstractIssue { + @JsonProperty("issue_link_id") private Long issueLinkId; + + @JsonProperty("link_type") private LinkType linkType; + + @JsonProperty("link_created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date linkCreatedAt; + + @JsonProperty("link_updated_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date linkUpdatedAt; public Long getIssueLinkId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Markdown.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Markdown.java index c5c6fd1aa..bfa1455eb 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Markdown.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Markdown.java @@ -4,9 +4,12 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Markdown implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("html") private String html; public String getHtml() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Member.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Member.java index 816e7dc3f..4f8e28c81 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Member.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Member.java @@ -4,11 +4,20 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Member extends AbstractUser { private static final long serialVersionUID = 1L; + @JsonProperty("access_level") private AccessLevel accessLevel; + + @JsonProperty("expires_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date expiresAt; + + @JsonProperty("group_saml_identity") private Identity groupSamlIdentity; public AccessLevel getAccessLevel() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Membership.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Membership.java index dfec530e5..4fba6ba55 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Membership.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Membership.java @@ -4,12 +4,21 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Membership implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("source_id") private Long sourceId; + + @JsonProperty("source_name") private String sourceName; + + @JsonProperty("source_type") private MembershipSourceType sourceType; + + @JsonProperty("access_level") private AccessLevel accessLevel; public Long getSourceId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequest.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequest.java index 3020d9447..b4b15fc5a 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequest.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequest.java @@ -6,85 +6,209 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; public class MergeRequest implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("allow_collaboration") private Boolean allowCollaboration; + + @JsonProperty("allow_maintainer_to_push") private Boolean allowMaintainerToPush; + + @JsonProperty("approvals_before_merge") private Integer approvalsBeforeMerge; + + @JsonProperty("assignee") private Assignee assignee; + + @JsonProperty("assignees") private List assignees; + + @JsonProperty("reviewers") private List reviewers; + + @JsonProperty("author") private Author author; + + @JsonProperty("blocking_discussions_resolved") private Boolean blockingDiscussionsResolved; + + @JsonProperty("changes") private List changes; + + @JsonProperty("changes_count") private String changesCount; + + @JsonProperty("closed_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date closedAt; + + @JsonProperty("closed_by") private Participant closedBy; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("description") private String description; + + @JsonProperty("discussion_locked") private Boolean discussionLocked; + + @JsonProperty("diverged_commits_count") private Integer divergedCommitsCount; + + @JsonProperty("downvotes") private Integer downvotes; + + @JsonProperty("force_remove_source_branch") private Boolean forceRemoveSourceBranch; + + @JsonProperty("has_conflicts") private Boolean hasConflicts; + + @JsonProperty("id") private Long id; + + @JsonProperty("iid") private Long iid; + + @JsonProperty("labels") private List labels; + + @JsonProperty("latest_build_finished_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date latestBuildFinishedAt; + + @JsonProperty("latest_build_started_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date latestBuildStartedAt; + + @JsonProperty("merge_commit_sha") private String mergeCommitSha; + + @JsonProperty("squash_commit_sha") private String squashCommitSha; + /** * @deprecated since 15.6, use {@link #detailedMergeStatus} instead. * see https://docs.gitlab.com/ee/update/deprecations.html#merge_status-api-field */ @Deprecated + @JsonProperty("merge_status") private String mergeStatus; + @JsonProperty("detailed_merge_status") private String detailedMergeStatus; + + @JsonProperty("merged_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date mergedAt; + /** * @deprecated since 14.7, use {@link #mergeUser} instead. * see https://docs.gitlab.com/ee/update/deprecations.html#merged_by-api-field */ + @Deprecated + @JsonProperty("merged_by") private Participant mergedBy; + @JsonProperty("merge_user") private Participant mergeUser; + + @JsonProperty("merge_when_pipeline_succeeds") private Boolean mergeWhenPipelineSucceeds; + + @JsonProperty("merge_error") private String mergeError; + + @JsonProperty("milestone") private Milestone milestone; + + @JsonProperty("pipeline") private Pipeline pipeline; + + @JsonProperty("head_pipeline") private Pipeline headPipeline; + + @JsonProperty("project_id") private Long projectId; + + @JsonProperty("sha") private String sha; + + @JsonProperty("should_remove_source_branch") private Boolean shouldRemoveSourceBranch; + + @JsonProperty("source_branch") private String sourceBranch; + + @JsonProperty("source_project_id") private Long sourceProjectId; + + @JsonProperty("squash") private Boolean squash; + + @JsonProperty("state") private String state; + + @JsonProperty("subscribed") private Boolean subscribed; + + @JsonProperty("target_branch") private String targetBranch; + + @JsonProperty("target_project_id") private Long targetProjectId; + + @JsonProperty("task_completion_status") private TaskCompletionStatus taskCompletionStatus; + + @JsonProperty("references") private References references; + + @JsonProperty("time_stats") private TimeStats timeStats; + + @JsonProperty("title") private String title; + + @JsonProperty("updated_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAt; + + @JsonProperty("upvotes") private Integer upvotes; + + @JsonProperty("user_notes_count") private Integer userNotesCount; + + @JsonProperty("web_url") private String webUrl; + + @JsonProperty("work_in_progress") private Boolean workInProgress; + + @JsonProperty("diff_refs") private DiffRef diffRefs; + + @JsonProperty("rebase_in_progress") private Boolean rebaseInProgress; - // The approval fields will only be available when listing approvals, approving or unapproving a merge reuest. + // Approval-specific fields + @JsonProperty("approvals_required") private Integer approvalsRequired; + + @JsonProperty("approvals_left") private Integer approvalsLeft; + @JsonProperty("approved_by") @JsonSerialize(using = JacksonJson.UserListSerializer.class) @JsonDeserialize(using = JacksonJson.UserListDeserializer.class) private List approvedBy; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestDiff.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestDiff.java index 2c3a52f75..0d06cc559 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestDiff.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestDiff.java @@ -4,10 +4,15 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class MergeRequestDiff extends MergeRequestVersion { private static final long serialVersionUID = 1L; + @JsonProperty("commits") private List commits; + + @JsonProperty("diffs") private List diffs; public List getCommits() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestFilter.java index c3d13fab9..d07044b8b 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestFilter.java @@ -19,9 +19,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.JacksonJsonEnumHelper; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.*; /** * This class is used to filter merge requests when getting lists of them. @@ -29,33 +27,80 @@ public class MergeRequestFilter implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("project_id") private Long projectId; + + @JsonProperty("group_id") private Long groupId; + + @JsonProperty("iids") private List iids; + + @JsonProperty("state") private MergeRequestState state; + + @JsonProperty("order_by") private MergeRequestOrderBy orderBy; + + @JsonProperty("sort") private SortOrder sort; + + @JsonProperty("milestone") private String milestone; + + @JsonProperty("simple_view") private Boolean simpleView; + + @JsonProperty("labels") private List labels; + + @JsonProperty("created_after") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAfter; + + @JsonProperty("created_before") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdBefore; + + @JsonProperty("updated_after") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAfter; + + @JsonProperty("updated_before") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedBefore; + + @JsonProperty("scope") private MergeRequestScope scope; /** * Filter MR by created by the given user id. Combine with scope=all or scope=assigned_to_me */ + @JsonProperty("author_id") private Long authorId; + @JsonProperty("assignee_id") private Long assigneeId; + + @JsonProperty("my_reaction_emoji") private String myReactionEmoji; + + @JsonProperty("source_branch") private String sourceBranch; + + @JsonProperty("target_branch") private String targetBranch; + + @JsonProperty("search") private String search; + + @JsonProperty("in") private MergeRequestSearchIn in; + + @JsonProperty("wip") private Boolean wip; + + @JsonProperty("not") private Map not; public enum MergeRequestField { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestParams.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestParams.java index 5d9f93864..f479008c0 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestParams.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestParams.java @@ -7,27 +7,60 @@ import org.gitlab4j.models.Constants.StateEvent; import org.gitlab4j.models.GitLabForm; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * This class provides the form parameters for creating and updating merge requests. */ public class MergeRequestParams implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("source_branch") private String sourceBranch; + + @JsonProperty("target_branch") private String targetBranch; + + @JsonProperty("title") private String title; + + @JsonProperty("assignee_id") private Long assigneeId; + + @JsonProperty("assignee_ids") private List assigneeIds; + + @JsonProperty("reviewer_ids") private List reviewerIds; + + @JsonProperty("milestone_id") private Long milestoneId; + + @JsonProperty("labels") private List labels; + + @JsonProperty("description") private String description; + + @JsonProperty("target_project_id") private Long targetProjectId; + + @JsonProperty("state_event") private StateEvent stateEvent; + + @JsonProperty("remove_source_branch") private Boolean removeSourceBranch; + + @JsonProperty("squash") private Boolean squash; + + @JsonProperty("discussion_locked") private Boolean discussionLocked; + + @JsonProperty("allow_collaboration") private Boolean allowCollaboration; + + @JsonProperty("approvals_before_merge") private Integer approvalsBeforeMerge; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestVersion.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestVersion.java index 3e60b79e3..b72d108f1 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestVersion.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestVersion.java @@ -5,16 +5,35 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class MergeRequestVersion implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("id") private Long id; + + @JsonProperty("head_commit_sha") private String headCommitSha; + + @JsonProperty("base_commit_sha") private String baseCommitSha; + + @JsonProperty("start_commit_sha") private String startCommitSha; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("merge_request_id") private Long mergeRequestId; + + @JsonProperty("state") private String state; + + @JsonProperty("real_size") private String realSize; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Metadata.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Metadata.java index 35d42e878..ceb544b4d 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Metadata.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Metadata.java @@ -9,9 +9,16 @@ public class Metadata implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("version") private String version; + + @JsonProperty("revision") private String revision; + + @JsonProperty("kas") private Kas kas; + + @JsonProperty("enterprise") private Boolean enterprise; public String getVersion() { @@ -53,11 +60,13 @@ public String toString() { private static class Kas { + @JsonProperty("enabled") private Boolean enabled; @JsonProperty("externalUrl") private String externalUrl; + @JsonProperty("version") private String version; public Boolean getEnabled() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Milestone.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Milestone.java index eaeff6293..9ae0f8853 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Milestone.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Milestone.java @@ -5,28 +5,54 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; public class Milestone implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("description") private String description; + @JsonProperty("start_date") @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date startDate; + @JsonProperty("due_date") @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date dueDate; + @JsonProperty("id") private Long id; + + @JsonProperty("iid") private Long iid; + + @JsonProperty("project_id") private Long projectId; + + @JsonProperty("group_id") private Long groupId; + + @JsonProperty("state") private String state; + + @JsonProperty("title") private String title; + + @JsonProperty("updated_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAt; + + @JsonProperty("expired") private Boolean expired; + + @JsonProperty("web_url") private String webUrl; public Date getCreatedAt() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Namespace.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Namespace.java index 4141f50dd..f4314a5f7 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Namespace.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Namespace.java @@ -4,16 +4,33 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Namespace implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("id") private Long id; + + @JsonProperty("name") private String name; + + @JsonProperty("path") private String path; + + @JsonProperty("kind") private String kind; + + @JsonProperty("full_path") private String fullPath; + + @JsonProperty("parent_id") private Long parentId; + + @JsonProperty("avatar_url") private String avatarUrl; + + @JsonProperty("web_url") private String webUrl; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Note.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Note.java index a76ba4ed4..0c47729df 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Note.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Note.java @@ -7,6 +7,8 @@ import org.gitlab4j.models.utils.JacksonJsonEnumHelper; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; public class Note implements Serializable { @@ -83,31 +85,74 @@ public String toString() { } } + @JsonProperty("attachment") private String attachment; + + @JsonProperty("author") private Author author; + + @JsonProperty("body") private String body; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("downvote") private Boolean downvote; + + @JsonProperty("expires_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date expiresAt; + + @JsonProperty("file_name") private String fileName; + + @JsonProperty("id") private Long id; + + @JsonProperty("noteable_id") private Long noteableId; - // Use String for noteableType until the constant is fixed in the GitLab API - private String noteableType; + @JsonProperty("noteable_type") + private String noteableType; // Use String until the constant is fixed in the GitLab API + @JsonProperty("noteable_iid") private Long noteableIid; + + @JsonProperty("system") private Boolean system; + + @JsonProperty("title") private String title; + + @JsonProperty("updated_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAt; + + @JsonProperty("upvote") private Boolean upvote; + + @JsonProperty("resolved") private Boolean resolved; + + @JsonProperty("resolvable") private Boolean resolvable; + + @JsonProperty("resolved_by") private Participant resolvedBy; + + @JsonProperty("resolved_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date resolvedAt; + + @JsonProperty("internal") private Boolean internal; + + @JsonProperty("type") private Type type; + @JsonProperty("position") private Position position; public String getAttachment() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/NotificationSettings.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/NotificationSettings.java index 56d25c0ae..629464199 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/NotificationSettings.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/NotificationSettings.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJsonEnumHelper; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; public class NotificationSettings implements Serializable { @@ -41,17 +42,40 @@ public String toString() { public static class Events implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("new_note") private Boolean newNote; + + @JsonProperty("new_issue") private Boolean newIssue; + + @JsonProperty("reopen_issue") private Boolean reopenIssue; + + @JsonProperty("close_issue") private Boolean closeIssue; + + @JsonProperty("reassign_issue") private Boolean reassignIssue; + + @JsonProperty("new_merge_request") private Boolean newMergeRequest; + + @JsonProperty("reopen_merge_request") private Boolean reopenMergeRequest; + + @JsonProperty("close_merge_request") private Boolean closeMergeRequest; + + @JsonProperty("reassign_merge_request") private Boolean reassignMergeRequest; + + @JsonProperty("merge_merge_request") private Boolean mergeMergeRequest; + + @JsonProperty("failed_pipeline") private Boolean failedPipeline; + + @JsonProperty("success_pipeline") private Boolean successPipeline; public Boolean getNewNote() { @@ -156,8 +180,13 @@ public String toString() { } } + @JsonProperty("level") private Level level; + + @JsonProperty("email") private String email; + + @JsonProperty("events") private Events events; public Level getLevel() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/OauthTokenResponse.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/OauthTokenResponse.java index a4c1049c3..1f9c552a2 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/OauthTokenResponse.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/OauthTokenResponse.java @@ -2,13 +2,24 @@ import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonProperty; + public class OauthTokenResponse implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("access_token") private String accessToken; + + @JsonProperty("token_type") private String tokenType; + + @JsonProperty("refresh_token") private String refreshToken; + + @JsonProperty("scope") private String scope; + + @JsonProperty("created_at") private Long createdAt; public String getAccessToken() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Package.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Package.java index a69e9fde8..9bd347d41 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Package.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Package.java @@ -5,13 +5,26 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Package implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("id") private Long id; + + @JsonProperty("name") private String name; + + @JsonProperty("version") private String version; + + @JsonProperty("package_type") private PackageType packageType; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PackageFile.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PackageFile.java index b9c889561..3cc6cd4b1 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PackageFile.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PackageFile.java @@ -5,16 +5,35 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class PackageFile implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("id") private Long id; + + @JsonProperty("package_id") private Long packageId; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("file_name") private String fileName; + + @JsonProperty("size") private Long size; + + @JsonProperty("file_md5") private String fileMd5; + + @JsonProperty("file_sha1") private String fileSha1; + + @JsonProperty("file_sha256") private String fileSha256; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PackageFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PackageFilter.java index 5efaa2d9b..1d14521f8 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PackageFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PackageFilter.java @@ -7,19 +7,36 @@ import org.gitlab4j.models.Constants.SortOrder; import org.gitlab4j.models.GitLabForm; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * This class is used to filter Projects when getting lists of projects for a specified group. */ public class PackageFilter implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("exclude_subgroups") private Boolean excludeSubgroups; + + @JsonProperty("order_by") private PackageOrderBy orderBy; + + @JsonProperty("sort") private SortOrder sort; + + @JsonProperty("package_type") private PackageType packageType; + + @JsonProperty("package_name") private String packageName; + + @JsonProperty("include_versionless") private Boolean includeVersionless; + + @JsonProperty("status") private PackageStatus status; + + @JsonProperty("package_version") private String packageVersion; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Permissions.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Permissions.java index f925f6cd7..405c72ed8 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Permissions.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Permissions.java @@ -4,10 +4,15 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Permissions implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("project_access") private ProjectAccess projectAccess; + + @JsonProperty("group_access") private ProjectAccess groupAccess; public ProjectAccess getProjectAccess() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PersonalAccessToken.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PersonalAccessToken.java index 46b53a3ef..55a242e20 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PersonalAccessToken.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PersonalAccessToken.java @@ -7,23 +7,45 @@ import org.gitlab4j.models.Constants; import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; public class PersonalAccessToken implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("user_id") private Long userId; + + @JsonProperty("scopes") private List scopes; + + @JsonProperty("name") private String name; + @JsonProperty("expires_at") @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") private Date expiresAt; + @JsonProperty("id") private Long id; + + @JsonProperty("active") private Boolean active; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("revoked") private Boolean revoked; + + @JsonProperty("last_used_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date lastUsedAt; + + @JsonProperty("token") private String token; public Long getUserId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Pipeline.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Pipeline.java index 682c28743..1b9b596cc 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Pipeline.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Pipeline.java @@ -5,30 +5,81 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Pipeline implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("id") private Long id; + + @JsonProperty("iid") private Long iid; + + @JsonProperty("project_id") private Long projectId; + + @JsonProperty("status") private PipelineStatus status; + + @JsonProperty("source") private String source; + + @JsonProperty("ref") private String ref; + + @JsonProperty("sha") private String sha; + + @JsonProperty("before_sha") private String beforeSha; + + @JsonProperty("tag") private Boolean tag; + + @JsonProperty("yaml_errors") private String yamlErrors; + + @JsonProperty("user") private User user; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("updated_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAt; + + @JsonProperty("started_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date startedAt; + + @JsonProperty("finished_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date finishedAt; + + @JsonProperty("committed_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date committedAt; + + @JsonProperty("coverage") private String coverage; + + @JsonProperty("duration") private Integer duration; + + @JsonProperty("queued_duration") private Float queuedDuration; + + @JsonProperty("web_url") private String webUrl; + + @JsonProperty("detailed_status") private DetailedStatus detailedStatus; + + @JsonProperty("name") private String name; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineFilter.java index 0f87fd6ef..ed27f67b7 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineFilter.java @@ -10,7 +10,9 @@ import org.gitlab4j.models.GitLabForm; import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; /** * This class is used to filter Pipelines when getting lists of them. @@ -19,43 +21,53 @@ public class PipelineFilter implements Serializable { private static final long serialVersionUID = 1L; /** {@link org.gitlab4j.models.Constants.PipelineScope} The scope of pipelines, one of: running, pending, finished, branches, tags */ + @JsonProperty("scope") private PipelineScope scope; /** {@link org.gitlab4j.models.Constants.PipelineScope} The status of pipelines, one of: running, pending, success, failed, canceled, skipped, created */ + @JsonProperty("status") private PipelineStatus status; /** {@link org.gitlab4j.models.Constants.PipelineSource} The source of pipelines */ + @JsonProperty("source") private PipelineSource source; /** The ref of pipelines. */ + @JsonProperty("ref") private String ref; /** The SHA of pipelines. */ + @JsonProperty("sha") private String sha; /** If true, returns pipelines with invalid configurations. */ + @JsonProperty("yaml_errors") private Boolean yamlErrors; /** The name of the user who triggered pipelines. */ + @JsonProperty("name") private String name; /** The username of the user who triggered pipelines */ + @JsonProperty("username") private String username; /** Return pipelines updated after the specified date. */ + @JsonProperty("updated_after") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAfter; /** Return pipelines updated before the specified date. */ + @JsonProperty("updated_before") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedBefore; - /** - * {@link org.gitlab4j.models.Constants.PipelineOrderBy} Order pipelines by id, status, ref, updated_at or user_id (default: id). - */ + /** {@link org.gitlab4j.models.Constants.PipelineOrderBy} Order pipelines by id, status, ref, updated_at or user_id (default: id). */ + @JsonProperty("order_by") private PipelineOrderBy orderBy; - /** - * {@link org.gitlab4j.models.Constants.SortOrder} Return issues sorted in asc or desc order. Default is desc. - */ + /** {@link org.gitlab4j.models.Constants.SortOrder} Return issues sorted in asc or desc order. Default is desc. */ + @JsonProperty("sort") private SortOrder sort; public void setScope(PipelineScope scope) { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineSchedule.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineSchedule.java index b5f2e9909..e7ae57cb3 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineSchedule.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineSchedule.java @@ -6,20 +6,49 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class PipelineSchedule implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("id") private Long id; + + @JsonProperty("description") private String description; + + @JsonProperty("ref") private String ref; + + @JsonProperty("cron") private String cron; + + @JsonProperty("cron_timezone") private String cronTimezone; + + @JsonProperty("next_run_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date nextRunAt; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("updated_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAt; + + @JsonProperty("active") private Boolean active; + + @JsonProperty("last_pipeline") private Pipeline lastPipeline; + + @JsonProperty("owner") private Owner owner; + + @JsonProperty("variables") private List variables; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Position.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Position.java index f68446611..bbb4ca9a1 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Position.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Position.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJsonEnumHelper; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; public class Position implements Serializable { @@ -34,19 +35,40 @@ public String toString() { } } + @JsonProperty("base_sha") private String baseSha; + + @JsonProperty("start_sha") private String startSha; + + @JsonProperty("head_sha") private String headSha; + + @JsonProperty("old_path") private String oldPath; + + @JsonProperty("new_path") private String newPath; + + @JsonProperty("position_type") private PositionType positionType; + @JsonProperty("old_line") private Integer oldLine; + + @JsonProperty("new_line") private Integer newLine; + @JsonProperty("width") private Integer width; + + @JsonProperty("height") private Integer height; + + @JsonProperty("x") private Double x; + + @JsonProperty("y") private Double y; public String getBaseSha() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java index 89d1d52ff..a24ec189d 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java @@ -12,10 +12,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.JacksonJsonEnumHelper; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.annotation.JsonSerialize; public class Project implements Serializable { @@ -45,86 +42,237 @@ public String toString() { } } + @JsonProperty("approvals_before_merge") private Integer approvalsBeforeMerge; + + @JsonProperty("archived") private Boolean archived; + + @JsonProperty("avatar_url") private String avatarUrl; + + @JsonProperty("container_registry_enabled") private Boolean containerRegistryEnabled; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("creator_id") private Long creatorId; + + @JsonProperty("default_branch") private String defaultBranch; + + @JsonProperty("description") private String description; + + @JsonProperty("forks_count") private Integer forksCount; + + @JsonProperty("forked_from_project") private Project forkedFromProject; + + @JsonProperty("http_url_to_repo") private String httpUrlToRepo; + + @JsonProperty("id") private Long id; + + @JsonProperty("public") private Boolean isPublic; + + @JsonProperty("issues_enabled") private Boolean issuesEnabled; + + @JsonProperty("jobs_enabled") private Boolean jobsEnabled; + + @JsonProperty("last_activity_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date lastActivityAt; + + @JsonProperty("lfs_enabled") private Boolean lfsEnabled; + + @JsonProperty("merge_method") private MergeMethod mergeMethod; + + @JsonProperty("merge_requests_enabled") private Boolean mergeRequestsEnabled; + + @JsonProperty("name") private String name; + + @JsonProperty("namespace") private Namespace namespace; + + @JsonProperty("name_with_namespace") private String nameWithNamespace; + + @JsonProperty("only_allow_merge_if_pipeline_succeeds") private Boolean onlyAllowMergeIfPipelineSucceeds; + + @JsonProperty("allow_merge_on_skipped_pipeline") private Boolean allowMergeOnSkippedPipeline; + + @JsonProperty("only_allow_merge_if_all_discussions_are_resolved") private Boolean onlyAllowMergeIfAllDiscussionsAreResolved; + + @JsonProperty("open_issues_count") private Integer openIssuesCount; + + @JsonProperty("owner") private Owner owner; + + @JsonProperty("path") private String path; + + @JsonProperty("path_with_namespace") private String pathWithNamespace; + + @JsonProperty("permissions") private Permissions permissions; + + @JsonProperty("public_jobs") private Boolean publicJobs; + + @JsonProperty("repository_storage") private String repositoryStorage; + + @JsonProperty("request_access_enabled") private Boolean requestAccessEnabled; + + @JsonProperty("runners_token") private String runnersToken; + + @JsonProperty("shared_runners_enabled") private Boolean sharedRunnersEnabled; + + @JsonProperty("shared_with_groups") private List sharedWithGroups; + + @JsonProperty("snippets_enabled") private Boolean snippetsEnabled; + + @JsonProperty("ssh_url_to_repo") private String sshUrlToRepo; + + @JsonProperty("star_count") private Integer starCount; + @JsonProperty("tag_list") private List tagList; + + @JsonProperty("topics") private List topics; + + @JsonProperty("visibility_level") private Integer visibilityLevel; + + @JsonProperty("visibility") private Visibility visibility; + + @JsonProperty("wall_enabled") private Boolean wallEnabled; + + @JsonProperty("web_url") private String webUrl; + + @JsonProperty("wiki_enabled") private Boolean wikiEnabled; + + @JsonProperty("printing_merge_request_link_enabled") private Boolean printingMergeRequestLinkEnabled; + + @JsonProperty("resolve_outdated_diff_discussions") private Boolean resolveOutdatedDiffDiscussions; + + @JsonProperty("statistics") private ProjectStatistics statistics; + + @JsonProperty("initialize_with_readme") private Boolean initializeWithReadme; + + @JsonProperty("packages_enabled") private Boolean packagesEnabled; + + @JsonProperty("empty_repo") private Boolean emptyRepo; + + @JsonProperty("license_url") private String licenseUrl; + + @JsonProperty("license") private ProjectLicense license; + + @JsonProperty("custom_attributes") private List customAttributes; + + @JsonProperty("build_coverage_regex") private String buildCoverageRegex; + + @JsonProperty("build_git_strategy") private BuildGitStrategy buildGitStrategy; + + @JsonProperty("readme_url") private String readmeUrl; + + @JsonProperty("can_create_merge_request_in") private Boolean canCreateMergeRequestIn; + + @JsonProperty("import_status") private Status importStatus; + + @JsonProperty("ci_default_git_depth") private Integer ciDefaultGitDepth; + + @JsonProperty("ci_forward_deployment_enabled") private Boolean ciForwardDeploymentEnabled; + + @JsonProperty("ci_config_path") private String ciConfigPath; + + @JsonProperty("remove_source_branch_after_merge") private Boolean removeSourceBranchAfterMerge; + + @JsonProperty("auto_devops_enabled") private Boolean autoDevopsEnabled; + + @JsonProperty("auto_devops_deploy_strategy") private AutoDevopsDeployStrategy autoDevopsDeployStrategy; + + @JsonProperty("autoclose_referenced_issues") private Boolean autocloseReferencedIssues; + + @JsonProperty("emails_disabled") private Boolean emailsDisabled; + + @JsonProperty("suggestion_commit_message") private String suggestionCommitMessage; + + @JsonProperty("squash_option") private SquashOption squashOption; + + @JsonProperty("merge_commit_template") private String mergeCommitTemplate; + + @JsonProperty("squash_commit_template") private String squashCommitTemplate; + + @JsonProperty("issue_branch_template") private String issueBranchTemplate; + + @JsonProperty("merge_requests_template") private String mergeRequestsTemplate; + + @JsonProperty("issues_template") private String issuesTemplate; @JsonProperty("_links") private Map links; + @JsonProperty("marked_for_deletion_on") @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date markedForDeletionOn; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectAccess.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectAccess.java index 40d952863..cbb4e69ab 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectAccess.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectAccess.java @@ -4,10 +4,15 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class ProjectAccess implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("access_level") private AccessLevel accessLevel; + + @JsonProperty("notification_level") private int notificationLevel; public AccessLevel getAccessLevel() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java index 44b6c93e8..4ee2c2bd8 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java @@ -7,19 +7,46 @@ import org.gitlab4j.models.Constants; import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class ProjectAccessToken implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("user_id") private Long userId; + + @JsonProperty("scopes") private List scopes; + + @JsonProperty("name") private String name; + + @JsonProperty("expires_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date expiresAt; + + @JsonProperty("id") private Long id; + + @JsonProperty("active") private Boolean active; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("revoked") private Boolean revoked; + + @JsonProperty("access_level") private Long accessLevel; + + @JsonProperty("last_used_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date lastUsedAt; + + @JsonProperty("token") private String token; public Long getUserId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectApprovalsConfig.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectApprovalsConfig.java index 25b14bc56..01f99b569 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectApprovalsConfig.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectApprovalsConfig.java @@ -5,16 +5,30 @@ import org.gitlab4j.models.GitLabForm; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; public class ProjectApprovalsConfig implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("approvals_before_merge") private Integer approvalsBeforeMerge; + + @JsonProperty("reset_approvals_on_push") private Boolean resetApprovalsOnPush; + + @JsonProperty("selective_code_owner_removals") private Boolean selectiveCodeOwnerRemovals; + + @JsonProperty("disable_overriding_approvers_per_merge_request") private Boolean disableOverridingApproversPerMergeRequest; + + @JsonProperty("merge_requests_author_approval") private Boolean mergeRequestsAuthorApproval; + + @JsonProperty("merge_requests_disable_committers_approval") private Boolean mergeRequestsDisableCommittersApproval; + + @JsonProperty("require_password_to_approve") private Boolean requirePasswordToApprove; public Integer getApprovalsBeforeMerge() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectFetches.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectFetches.java index 0ff707fd5..830835ac5 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectFetches.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectFetches.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; public class ProjectFetches implements Serializable { @@ -15,8 +16,10 @@ public static class DateCount implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("count") private Integer count; + @JsonProperty("date") @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date date; @@ -40,7 +43,10 @@ public void setDate(Date date) { public static class Fetches implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("total") private Integer total; + + @JsonProperty("days") private List days; public Integer getTotal() { @@ -60,6 +66,7 @@ public void setDays(List days) { } } + @JsonProperty("fetches") private Fetches fetches; public Fetches getFetches() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectFilter.java index 94cec0ca2..98f379879 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectFilter.java @@ -9,37 +9,93 @@ import org.gitlab4j.models.GitLabForm; import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * This class is used to filter Projects when getting lists of projects for a specified user. */ public class ProjectFilter implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("archived") private Boolean archived; + + @JsonProperty("visibility") private Visibility visibility; + + @JsonProperty("order_by") private ProjectOrderBy orderBy; + + @JsonProperty("sort") private SortOrder sort; + + @JsonProperty("search") private String search; + + @JsonProperty("search_namespaces") private Boolean searchNamespaces; + + @JsonProperty("simple") private Boolean simple; + + @JsonProperty("owned") private Boolean owned; + + @JsonProperty("membership") private Boolean membership; + + @JsonProperty("starred") private Boolean starred; + + @JsonProperty("statistics") private Boolean statistics; + + @JsonProperty("with_custom_attributes") private Boolean withCustomAttributes; + + @JsonProperty("with_issues_enabled") private Boolean withIssuesEnabled; + + @JsonProperty("with_merge_requests_enabled") private Boolean withMergeRequestsEnabled; + + @JsonProperty("with_programming_language") private String withProgrammingLanguage; + + @JsonProperty("wiki_checksum_failed") private Boolean wikiChecksumFailed; + + @JsonProperty("repository_checksum_failed") private Boolean repositoryChecksumFailed; + + @JsonProperty("min_access_level") private AccessLevel minAccessLevel; + + @JsonProperty("id_after") private Long idAfter; + + @JsonProperty("id_before") private Long idBefore; + + @JsonProperty("last_activity_after") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date lastActivityAfter; + + @JsonProperty("last_activity_before") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date lastActivityBefore; + + @JsonProperty("repository_storage") private String repositoryStorage; + + @JsonProperty("imported") private Boolean imported; + + @JsonProperty("topic") private String topic; + + @JsonProperty("topic_id") private Integer topic_id; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectGroupsFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectGroupsFilter.java index 44b21913e..c5fbf0f93 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectGroupsFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectGroupsFilter.java @@ -5,16 +5,27 @@ import org.gitlab4j.models.GitLabForm; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * This class is used to filter Groups when getting lists of groups for a specified project. */ public class ProjectGroupsFilter implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("search") private String search; + + @JsonProperty("shared_min_access_level") private AccessLevel sharedMinAccessLevel; + + @JsonProperty("shared_visible_only") private Boolean sharedVisibleOnly; + + @JsonProperty("skip_groups") private List skipGroups; + + @JsonProperty("with_shared") private Boolean withShared; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectHook.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectHook.java index c3ce5f293..e4613eaed 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectHook.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectHook.java @@ -5,33 +5,77 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class ProjectHook implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("build_events") private Boolean buildEvents; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("enable_ssl_verification") private Boolean enableSslVerification; + + @JsonProperty("id") private Long id; + + @JsonProperty("issues_events") private Boolean issuesEvents; + + @JsonProperty("merge_requests_events") private Boolean mergeRequestsEvents; + + @JsonProperty("note_events") private Boolean noteEvents; + + @JsonProperty("job_events") private Boolean jobEvents; + + @JsonProperty("pipeline_events") private Boolean pipelineEvents; + + @JsonProperty("project_id") private Long projectId; + + @JsonProperty("push_events") private Boolean pushEvents; + + @JsonProperty("tag_push_events") private Boolean tagPushEvents; + + @JsonProperty("url") private String url; + + @JsonProperty("wiki_page_events") private Boolean wikiPageEvents; + + @JsonProperty("token") private String token; + @JsonProperty("repository_update_events") private Boolean repositoryUpdateEvents; + + @JsonProperty("confidential_issues_events") private Boolean confidentialIssuesEvents; + + @JsonProperty("confidential_note_events") private Boolean confidentialNoteEvents; + + @JsonProperty("push_events_branch_filter") private String pushEventsBranchFilter; + @JsonProperty("deployment_events") private Boolean deploymentEvents; + + @JsonProperty("releases_events") private Boolean releasesEvents; + @JsonProperty("description") private String description; public Boolean getBuildEvents() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectLicense.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectLicense.java index 553d9f181..a31762359 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectLicense.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectLicense.java @@ -2,12 +2,23 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class ProjectLicense { + @JsonProperty("key") private String key; + + @JsonProperty("name") private String name; + + @JsonProperty("nickname") private String nickname; + + @JsonProperty("html_url") private String htmlUrl; + + @JsonProperty("source_url") private String sourceUrl; public String getKey() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectStatistics.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectStatistics.java index d622a229a..9cd90d61b 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectStatistics.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectStatistics.java @@ -4,6 +4,8 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * This class contains the sizing information from the project. To get this information, * ProjectApi.getProject() has to be called with parameter statistics=true @@ -12,13 +14,26 @@ public class ProjectStatistics implements Serializable { private static final long serialVersionUID = 1L; - long commitCount; - long storageSize; - long repositorySize; - long wikiSize; - long lfsObjectsSize; - long jobArtifactsSize; - long packagesSize; + @JsonProperty("commit_count") + private long commitCount; + + @JsonProperty("storage_size") + private long storageSize; + + @JsonProperty("repository_size") + private long repositorySize; + + @JsonProperty("wiki_size") + private long wikiSize; + + @JsonProperty("lfs_objects_size") + private long lfsObjectsSize; + + @JsonProperty("job_artifacts_size") + private long jobArtifactsSize; + + @JsonProperty("packages_size") + private long packagesSize; public long getCommitCount() { return commitCount; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProtectedBranch.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProtectedBranch.java index 947fecf16..28e055acf 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProtectedBranch.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProtectedBranch.java @@ -5,15 +5,30 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class ProtectedBranch implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("id") private Long id; + + @JsonProperty("name") private String name; + + @JsonProperty("push_access_levels") private List pushAccessLevels; + + @JsonProperty("merge_access_levels") private List mergeAccessLevels; + + @JsonProperty("unprotect_access_levels") private List unprotectAccessLevels; + + @JsonProperty("code_owner_approval_required") private Boolean codeOwnerApprovalRequired; + + @JsonProperty("allow_force_push") private Boolean allowForcePush; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProtectedTag.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProtectedTag.java index 46760a060..725a64fb2 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProtectedTag.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProtectedTag.java @@ -5,13 +5,18 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class ProtectedTag implements Serializable { private static final long serialVersionUID = 1L; public static class CreateAccessLevel implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("access_level") private AccessLevel access_level; + + @JsonProperty("access_level_description") private String accessLevelDescription; public AccessLevel getAccess_level() { @@ -31,7 +36,10 @@ public void setAccessLevelDescription(String accessLevelDescription) { } } + @JsonProperty("name") private String name; + + @JsonProperty("create_access_levels") private List createAccessLevels; public String getName() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PushData.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PushData.java index e0c14876e..06aea8878 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PushData.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PushData.java @@ -3,14 +3,29 @@ import org.gitlab4j.models.Constants.ActionType; import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class PushData { + @JsonProperty("commit_count") private Integer commitCount; + + @JsonProperty("action") private ActionType action; + + @JsonProperty("ref_type") private String refType; + + @JsonProperty("commit_from") private String commitFrom; + + @JsonProperty("commit_to") private String commitTo; + + @JsonProperty("ref") private String ref; + + @JsonProperty("commit_title") private String commitTitle; public Integer getCommitCount() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PushRules.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PushRules.java index b94b4af74..5ce298c93 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PushRules.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PushRules.java @@ -5,23 +5,56 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class PushRules implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("id") private Long id; + + @JsonProperty("project_id") private Long projectId; + + @JsonProperty("commit_message_regex") private String commitMessageRegex; + + @JsonProperty("commit_message_negative_regex") private String commitMessageNegativeRegex; + + @JsonProperty("branch_name_regex") private String branchNameRegex; + + @JsonProperty("deny_delete_tag") private Boolean denyDeleteTag; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("member_check") private Boolean memberCheck; + + @JsonProperty("prevent_secrets") private Boolean preventSecrets; + + @JsonProperty("author_email_regex") private String authorEmailRegex; + + @JsonProperty("file_name_regex") private String fileNameRegex; + + @JsonProperty("max_file_size") private Integer maxFileSize; + + @JsonProperty("commit_committer_check") private Boolean commitCommitterCheck; + + @JsonProperty("commit_committer_name_check") private Boolean commitCommitterNameCheck; + + @JsonProperty("reject_unsigned_commits") private Boolean rejectUnsignedCommits; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/References.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/References.java index c20841dbc..a7d49d4fd 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/References.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/References.java @@ -12,7 +12,10 @@ public class References implements Serializable { @JsonProperty("short") private String _short; + @JsonProperty("relative") private String relative; + + @JsonProperty("full") private String full; public String getShort() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepository.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepository.java index c6d79e794..b77ec4834 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepository.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepository.java @@ -5,13 +5,26 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class RegistryRepository implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("id") private Long id; + + @JsonProperty("name") private String name; + + @JsonProperty("path") private String path; + + @JsonProperty("location") private String location; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepositoryTag.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepositoryTag.java index 721df1243..d905fb172 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepositoryTag.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepositoryTag.java @@ -5,16 +5,35 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class RegistryRepositoryTag implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("name") private String name; + + @JsonProperty("path") private String path; + + @JsonProperty("location") private String location; + + @JsonProperty("revision") private String revision; + + @JsonProperty("short_revision") private String shortRevision; + + @JsonProperty("digest") private String digest; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("total_size") private Long totalSize; public String getName() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpic.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpic.java index 92671519f..2e81d313d 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpic.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpic.java @@ -4,15 +4,34 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class RelatedEpic extends AbstractEpic { private static final long serialVersionUID = 1L; + @JsonProperty("start_date_is_fixed") private Boolean startDateIsFixed; + + @JsonProperty("due_date_is_fixed") private Boolean dueDateIsFixed; + + @JsonProperty("due_date_from_inherited_source") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date dueDateFromInheritedSource; + + @JsonProperty("related_epic_link_id") private Long relatedEpicLinkId; + + @JsonProperty("link_type") private LinkType linkType; + + @JsonProperty("link_created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date linkCreatedAt; + + @JsonProperty("link_updated_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date linkUpdatedAt; public Boolean getStartDateIsFixed() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java index 319c3cc1a..39e6225f3 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java @@ -5,14 +5,30 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class RelatedEpicLink implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("id") private Long id; + + @JsonProperty("source_epic") private EpicInLink sourceEpic; + + @JsonProperty("target_epic") private EpicInLink targetEpic; + + @JsonProperty("link_type") private LinkType linkType; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("updated_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Release.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Release.java index 1df5d272c..39365bd44 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Release.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Release.java @@ -7,24 +7,52 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; public class Release implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("name") private String name; + + @JsonProperty("tag_name") private String tagName; + + @JsonProperty("description") private String description; + + @JsonProperty("description_html") private String descriptionHtml; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("released_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date releasedAt; + + @JsonProperty("author") private Author author; + + @JsonProperty("commit") private Commit commit; + + @JsonProperty("milestones") private List milestones; + + @JsonProperty("commit_path") private String commitPath; + + @JsonProperty("tag_path") private String tagPath; + + @JsonProperty("evidence_sha") private String evidenceSha; + + @JsonProperty("assets") private Assets assets; @JsonProperty("_links") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ReleaseLinkParams.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ReleaseLinkParams.java index a308cca96..cb3956edf 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ReleaseLinkParams.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ReleaseLinkParams.java @@ -2,12 +2,23 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class ReleaseLinkParams { + @JsonProperty("name") private String name; + + @JsonProperty("tag_name") private String tagName; + + @JsonProperty("url") private String url; + + @JsonProperty("filepath") private String filepath; + + @JsonProperty("link_type") private String linkType; public String getName() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ReleaseParams.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ReleaseParams.java index 00e7c339a..1f92b9a82 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ReleaseParams.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ReleaseParams.java @@ -6,15 +6,32 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class ReleaseParams implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("name") private String name; + + @JsonProperty("tag_name") private String tagName; + + @JsonProperty("description") private String description; + + @JsonProperty("ref") private String ref; + + @JsonProperty("milestones") private List milestones; + + @JsonProperty("assets") private Assets assets; + + @JsonProperty("released_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date releasedAt; public String getName() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RemoteMirror.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RemoteMirror.java index 3075ac680..6aa2724bf 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RemoteMirror.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RemoteMirror.java @@ -5,18 +5,43 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class RemoteMirror implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("id") private Long id; + + @JsonProperty("enabled") private Boolean enabled; + + @JsonProperty("last_error") private String lastError; + + @JsonProperty("last_successful_update_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date lastSuccessfulUpdateAt; + + @JsonProperty("last_update_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date lastUpdateAt; + + @JsonProperty("last_update_started_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date lastUpdateStartedAt; + + @JsonProperty("only_protected_branches") private Boolean onlyProtectedBranches; + + @JsonProperty("keep_divergent_refs") private Boolean keepDivergentRefs; + + @JsonProperty("update_status") private String updateStatus; + + @JsonProperty("url") private String url; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Repository.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Repository.java index 133c5b65a..4c292fa2b 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Repository.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Repository.java @@ -4,12 +4,21 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Repository implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("description") private String description; + + @JsonProperty("homepage") private String homepage; + + @JsonProperty("name") private String name; + + @JsonProperty("url") private String url; public String getDescription() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RepositoryArchiveParams.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RepositoryArchiveParams.java index f241de6cd..59db66acf 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RepositoryArchiveParams.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RepositoryArchiveParams.java @@ -2,12 +2,17 @@ import org.gitlab4j.models.GitLabForm; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * Params for getting file archive of the repository. */ public class RepositoryArchiveParams { + @JsonProperty("sha") private String sha; + + @JsonProperty("path") private String path; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RepositoryFile.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RepositoryFile.java index 87c7e7db7..1823dd669 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RepositoryFile.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RepositoryFile.java @@ -7,19 +7,39 @@ import org.gitlab4j.models.utils.JacksonJson; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; public class RepositoryFile implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("file_name") private String fileName; // file name only, Ex. class.rb + + @JsonProperty("file_path") private String filePath; // full path to file. Ex. lib/class.rb + + @JsonProperty("size") private Integer size; + + @JsonProperty("encoding") private Encoding encoding; + + @JsonProperty("content") private String content; + + @JsonProperty("content_sha256") private String contentSha256; + + @JsonProperty("ref") private String ref; + + @JsonProperty("blob_id") private String blobId; + + @JsonProperty("commit_id") private String commitId; + + @JsonProperty("last_commit_id") private String lastCommitId; public String getFileName() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RepositoryFileResponse.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RepositoryFileResponse.java index 92387e9ef..809f6e524 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RepositoryFileResponse.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RepositoryFileResponse.java @@ -4,10 +4,15 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class RepositoryFileResponse implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("file_path") private String filePath; // full path to file. Ex. lib/class.rb + + @JsonProperty("branch") private String branch; public String getFilePath() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Runner.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Runner.java index 78c50a4e4..b8790f777 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Runner.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Runner.java @@ -6,20 +6,35 @@ import org.gitlab4j.models.utils.JacksonJsonEnumHelper; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; public class Runner implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("id") private Long id; + + @JsonProperty("description") private String description; + + @JsonProperty("active") private Boolean active; + + @JsonProperty("is_shared") private Boolean isShared; + + @JsonProperty("name") private String name; + + @JsonProperty("online") private Boolean online; + + @JsonProperty("status") private RunnerStatus status; - private String ipAddress; + @JsonProperty("ip_address") + private String ipAddress; /** * Enum to use for RunnersApi filtering on status. */ diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RunnerDetail.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RunnerDetail.java index 1d88fb014..d20f12fcc 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RunnerDetail.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RunnerDetail.java @@ -7,19 +7,39 @@ import org.gitlab4j.models.utils.JacksonJsonEnumHelper; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; public class RunnerDetail extends Runner { private static final long serialVersionUID = 1L; + @JsonProperty("architecture") private String architecture; + + @JsonProperty("platform") private String platform; + + @JsonProperty("contacted_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date contactedAt; + + @JsonProperty("projects") private List projects; + + @JsonProperty("token") private String token; + + @JsonProperty("revision") private String revision; + + @JsonProperty("tag_list") private List tagList; + + @JsonProperty("version") private String version; + + @JsonProperty("access_level") private RunnerAccessLevel accessLevel; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SamlGroupLink.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SamlGroupLink.java index 72f80a4f6..3ad178e69 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SamlGroupLink.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SamlGroupLink.java @@ -4,13 +4,18 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class SamlGroupLink implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("name") private String name; + @JsonProperty("access_level") private AccessLevel accessLevel; + @JsonProperty("member_role_id") private int memberRoleId; public String getName() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SearchBlob.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SearchBlob.java index ecbc6dd93..8c07bb386 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SearchBlob.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SearchBlob.java @@ -4,15 +4,30 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class SearchBlob implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("basename") private String basename; + + @JsonProperty("data") private String data; + + @JsonProperty("filename") private String filename; + + @JsonProperty("id") private String id; + + @JsonProperty("ref") private String ref; + + @JsonProperty("startline") private Integer startline; + + @JsonProperty("project_id") private Long projectId; public String getBasename() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SharedGroup.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SharedGroup.java index 033812eb6..297402f74 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SharedGroup.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SharedGroup.java @@ -5,14 +5,22 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; public class SharedGroup implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("group_id") private Long groupId; + + @JsonProperty("group_name") private String groupName; + + @JsonProperty("group_full_path") private String groupFullPath; + + @JsonProperty("group_access_level") private AccessLevel groupAccessLevel; @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Snippet.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Snippet.java index 93e03c908..8598c9d35 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Snippet.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Snippet.java @@ -28,20 +28,48 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Snippet implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("author") private Author author; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("expires_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date expiresAt; + + @JsonProperty("file_name") private String fileName; + + @JsonProperty("id") private Long id; + + @JsonProperty("title") private String title; + + @JsonProperty("updated_at") private String updatedAt; + + @JsonProperty("web_url") private String webUrl; + + @JsonProperty("content") private String content; + + @JsonProperty("raw_url") private String rawUrl; + + @JsonProperty("visibility") private Visibility visibility; + + @JsonProperty("description") private String description; public Snippet() {} diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SshKey.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SshKey.java index 971cbf43e..3e62a1c30 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SshKey.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SshKey.java @@ -5,17 +5,31 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; public class SshKey implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("id") private Long id; + + @JsonProperty("title") private String title; + + @JsonProperty("key") private String key; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("expires_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date expiresAt; + @JsonProperty("user_id") private Long userId; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SystemHook.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SystemHook.java index c04e51054..42887cb88 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SystemHook.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SystemHook.java @@ -5,16 +5,35 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class SystemHook implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("id") private Long id; + + @JsonProperty("url") private String url; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("push_events") private Boolean pushEvents; + + @JsonProperty("tag_push_events") private Boolean tagPushEvents; + + @JsonProperty("enable_ssl_verification") private Boolean enableSslVerification; + + @JsonProperty("repository_update_events") private Boolean repositoryUpdateEvents; + + @JsonProperty("merge_requests_events") private Boolean mergeRequestsEvents; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Tag.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Tag.java index d391ac8a2..a88be54b1 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Tag.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Tag.java @@ -5,13 +5,26 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Tag implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("commit") private Commit commit; + + @JsonProperty("message") private String message; + + @JsonProperty("name") private String name; + + @JsonProperty("release") private Release release; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; public Commit getCommit() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/TaskCompletionStatus.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/TaskCompletionStatus.java index 112679978..95b547337 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/TaskCompletionStatus.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/TaskCompletionStatus.java @@ -4,10 +4,15 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class TaskCompletionStatus implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("count") private Integer count; + + @JsonProperty("completed_count") private Integer completedCount; public Integer getCount() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/TimeStats.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/TimeStats.java index 83bf7b3bc..96d68edce 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/TimeStats.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/TimeStats.java @@ -4,12 +4,21 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class TimeStats implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("time_estimate") private Integer timeEstimate; + + @JsonProperty("total_time_spent") private Integer totalTimeSpent; + + @JsonProperty("human_time_estimate") private Duration humanTimeEstimate; + + @JsonProperty("human_total_time_spent") private Duration humanTotalTimeSpent; public Integer getTimeEstimate() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Todo.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Todo.java index 31dd036f2..c95be0e22 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Todo.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Todo.java @@ -9,7 +9,9 @@ import org.gitlab4j.models.Constants.TodoType; import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationContext; @@ -21,18 +23,36 @@ public class Todo implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("id") private Long id; + + @JsonProperty("project") private Project project; + + @JsonProperty("author") private Author author; + + @JsonProperty("action_name") private TodoAction actionName; + + @JsonProperty("target_type") private TodoType targetType; + @JsonProperty("target") @JsonDeserialize(using = TargetDeserializer.class) private Object target; + @JsonProperty("target_url") private String targetUrl; + + @JsonProperty("body") private String body; + + @JsonProperty("state") private TodoState state; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Topic.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Topic.java index 9bcdfbbd8..512a3e046 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Topic.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Topic.java @@ -4,19 +4,27 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Topic implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("id") private Integer id; + @JsonProperty("name") private String name; + @JsonProperty("title") private String title; + @JsonProperty("description") private String description; + @JsonProperty("total_projects_count") private int totalProjectsCount; + @JsonProperty("avatar_url") private String avatarUrl; public Integer getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/TopicParams.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/TopicParams.java index 4acf16ab5..a47a5bf13 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/TopicParams.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/TopicParams.java @@ -4,6 +4,8 @@ import org.gitlab4j.models.GitLabForm; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * This class is utilized by the org.gitlab4j.api.TopicsApi#createTopic(TopicParams) * and org.gitlab4j.api.TopicsApi#updateTopic(Integer, TopicParams) methods to set @@ -14,8 +16,13 @@ public class TopicParams implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("name") private String name; + + @JsonProperty("title") private String title; + + @JsonProperty("description") private String description; public TopicParams withName(String name) { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/TreeItem.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/TreeItem.java index 89745a61c..3bdb1fe9a 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/TreeItem.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/TreeItem.java @@ -4,6 +4,8 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class TreeItem implements Serializable { private static final long serialVersionUID = 1L; @@ -17,10 +19,19 @@ public String toString() { } } + @JsonProperty("id") private String id; + + @JsonProperty("mode") private String mode; + + @JsonProperty("name") private String name; + + @JsonProperty("path") private String path; + + @JsonProperty("type") private Type type; public String getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Trigger.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Trigger.java index ebb37d019..acbc1eeb9 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Trigger.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Trigger.java @@ -3,15 +3,34 @@ import java.io.Serializable; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Trigger implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("id") private Long id; + + @JsonProperty("description") private String description; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("last_used") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date lastUsed; + + @JsonProperty("token") private String token; + + @JsonProperty("updated_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date updatedAt; + + @JsonProperty("owner") private User owner; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/UploadedByUser.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/UploadedByUser.java index f97d29002..c567b0cb8 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/UploadedByUser.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/UploadedByUser.java @@ -4,11 +4,18 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class UploadedByUser implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("id") private Long id; + + @JsonProperty("username") private String username; + + @JsonProperty("name") private String name; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/UploadedFile.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/UploadedFile.java index f0a594179..29f39d120 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/UploadedFile.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/UploadedFile.java @@ -5,13 +5,26 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class UploadedFile implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("id") private Long id; + + @JsonProperty("size") private Long size; + + @JsonProperty("filename") private String filename; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date createdAt; + + @JsonProperty("uploaded_by") private UploadedByUser uploadedBy; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/User.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/User.java index 04d28ab88..aa7ff7491 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/User.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/User.java @@ -5,39 +5,107 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class User extends AbstractUser { private static final long serialVersionUID = 1L; + @JsonProperty("bio") private String bio; + + @JsonProperty("bot") private Boolean bot; + + @JsonProperty("can_create_group") private Boolean canCreateGroup; + + @JsonProperty("can_create_project") private Boolean canCreateProject; + + @JsonProperty("color_scheme_id") private Integer colorSchemeId; + + @JsonProperty("confirmed_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date confirmedAt; + + @JsonProperty("current_sign_in_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date currentSignInAt; + + @JsonProperty("custom_attributes") private List customAttributes; + + @JsonProperty("external") private Boolean external; + + @JsonProperty("extern_uid") private String externUid; + + @JsonProperty("extra_shared_runners_minutes_limit") private Integer extraSharedRunnersMinutesLimit; + + @JsonProperty("identities") private List identities; + + @JsonProperty("is_admin") private Boolean isAdmin; + + @JsonProperty("last_activity_on") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date lastActivityOn; + + @JsonProperty("last_sign_in_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date lastSignInAt; + + @JsonProperty("linkedin") private String linkedin; + + @JsonProperty("location") private String location; + + @JsonProperty("namespace_id") private Long namespaceId; + + @JsonProperty("organization") private String organization; + + @JsonProperty("private_profile") private Boolean privateProfile; + + @JsonProperty("projects_limit") private Integer projectsLimit; + + @JsonProperty("provider") private String provider; + + @JsonProperty("public_email") private String publicEmail; + + @JsonProperty("shared_runners_minutes_limit") private Integer sharedRunnersMinutesLimit; + + @JsonProperty("skype") private String skype; + + @JsonProperty("state") private String state; + + @JsonProperty("theme_id") private Integer themeId; + + @JsonProperty("twitter") private String twitter; + + @JsonProperty("two_factor_enabled") private Boolean twoFactorEnabled; + + @JsonProperty("website_url") private String websiteUrl; + + @JsonProperty("skip_confirmation") private Boolean skipConfirmation; public String getBio() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Variable.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Variable.java index 3c7160572..f765a67fe 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Variable.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Variable.java @@ -40,8 +40,13 @@ public String toString() { } } + @JsonProperty("key") private String key; + + @JsonProperty("value") private String value; + + @JsonProperty("variable_type") private Type variableType; @JsonProperty("protected") @@ -50,6 +55,7 @@ public String toString() { @JsonProperty("masked") private Boolean isMasked; + @JsonProperty("environment_scope") private String environmentScope; public Variable() {} diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Version.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Version.java index e2e60644e..5426e132b 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Version.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Version.java @@ -4,10 +4,15 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Version implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("version") private String version; + + @JsonProperty("revision") private String revision; public String getVersion() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/WikiAttachment.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/WikiAttachment.java index c4b386459..784903f8a 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/WikiAttachment.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/WikiAttachment.java @@ -4,6 +4,8 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class WikiAttachment implements Serializable { private static final long serialVersionUID = 1L; @@ -35,9 +37,16 @@ public String toString() { } } + @JsonProperty("file_name") private String fileName; + + @JsonProperty("file_path") private String filePath; + + @JsonProperty("branch") private String branch; + + @JsonProperty("link") private Link link; public String getFileName() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/WikiPage.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/WikiPage.java index f645e5e1b..8472b8664 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/WikiPage.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/WikiPage.java @@ -27,12 +27,21 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class WikiPage implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("title") private String title; + + @JsonProperty("content") private String content; + + @JsonProperty("slug") private String slug; + + @JsonProperty("format") private String format; public WikiPage() {} From caa9359acd913545b87c7daa6e2cd4950192e4de Mon Sep 17 00:00:00 2001 From: "ben.gould" Date: Wed, 11 Dec 2024 16:00:30 -0500 Subject: [PATCH 08/21] updated to reflect testing date time stamps --- .../main/java/org/gitlab4j/api/webhook/EventMergeRequest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java index 461390fdb..7eff4ed62 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java @@ -134,7 +134,7 @@ public class EventMergeRequest { private Long mergeUserId; @JsonProperty("deleted_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") private Date deletedAt; @JsonProperty("in_progress_merge_commit_sha") @@ -144,7 +144,7 @@ public class EventMergeRequest { private Integer lockVersion; @JsonProperty("last_edited_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") private Date lastEditedAt; @JsonProperty("last_edited_by_id") From 3f704cf4a917cce2182b636ff76f54053140ccad Mon Sep 17 00:00:00 2001 From: ksaleschus Date: Thu, 28 Aug 2025 13:55:00 +0200 Subject: [PATCH 09/21] fix merge --- .../java/org/gitlab4j/api/models/AbstractEpic.java | 4 ++++ .../org/gitlab4j/api/models/AbstractIssue.java | 2 ++ .../java/org/gitlab4j/api/models/Application.java | 4 ++-- .../java/org/gitlab4j/api/models/ApprovalRule.java | 1 + .../java/org/gitlab4j/api/models/BoardList.java | 14 ++++++++++++++ .../main/java/org/gitlab4j/api/models/Epic.java | 2 ++ .../gitlab4j/api/models/ImpersonationToken.java | 2 ++ .../java/org/gitlab4j/api/models/Iteration.java | 3 +++ .../gitlab4j/api/models/OauthTokenResponse.java | 4 ++-- .../gitlab4j/api/models/PersonalAccessToken.java | 2 ++ .../gitlab4j/api/models/ProjectAccessToken.java | 2 ++ .../java/org/gitlab4j/api/models/RelatedEpic.java | 2 ++ .../java/org/gitlab4j/api/webhook/BuildCommit.java | 1 + .../java/org/gitlab4j/api/webhook/BuildEvent.java | 1 + 14 files changed, 40 insertions(+), 4 deletions(-) diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java index d6fd8417f..c8103c45e 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java @@ -9,6 +9,7 @@ import org.gitlab4j.models.utils.JacksonJsonEnumHelper; import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; public class AbstractEpic> extends AbstractMinimalEpic implements Serializable { private static final long serialVersionUID = 1L; @@ -84,6 +85,7 @@ public String toString() { */ @JsonProperty("start_date") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date startDate; /** @@ -92,6 +94,7 @@ public String toString() { */ @JsonProperty("due_date") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date dueDate; /** @@ -100,6 +103,7 @@ public String toString() { */ @JsonProperty("end_date") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date endDate; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractIssue.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractIssue.java index 93f4ab0ae..3338cbf08 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractIssue.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractIssue.java @@ -10,6 +10,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.node.IntNode; import com.fasterxml.jackson.databind.node.LongNode; import com.fasterxml.jackson.databind.node.TextNode; @@ -112,6 +113,7 @@ public String toString() { */ @JsonProperty("due_date") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date dueDate; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Application.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Application.java index 470066306..2a164b5ef 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Application.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Application.java @@ -2,10 +2,10 @@ import java.io.Serializable; -import com.fasterxml.jackson.annotation.JsonProperty; - import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Application implements Serializable { private static final long serialVersionUID = 1L; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApprovalRule.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApprovalRule.java index 2dfdd2f96..fb988e3a5 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApprovalRule.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApprovalRule.java @@ -27,6 +27,7 @@ public class ApprovalRule implements Serializable { */ @JsonProperty("rule_type") private String ruleType; + @JsonProperty("report_type") private String reportType; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/BoardList.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/BoardList.java index 6d53ad500..1d0270e19 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/BoardList.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/BoardList.java @@ -26,12 +26,26 @@ public class BoardList implements Serializable { */ @JsonProperty("position") private Integer position; + + @JsonProperty("assignee") private Assignee assignee; + + @JsonProperty("milestone") private Milestone milestone; + + @JsonProperty("iteration") private Iteration iteration; + + @JsonProperty("max_issue_count") private Integer maxIssueCount; + + @JsonProperty("max_issue_weight") private Integer maxIssueWeight; + + @JsonProperty("limit_metric") private Integer limitMetric; + + @JsonProperty("list_type") private String listType; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Epic.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Epic.java index acbb8192b..aaa433409 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Epic.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Epic.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; public class Epic extends AbstractEpic { private static final long serialVersionUID = 1L; @@ -28,6 +29,7 @@ public class Epic extends AbstractEpic { */ @JsonProperty("due_date_from_inherited_source") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date dueDateFromInheritedSource; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java index 54fa01d73..9e04ce034 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java @@ -11,6 +11,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; public class ImpersonationToken implements Serializable { private static final long serialVersionUID = 1L; @@ -121,6 +122,7 @@ public String toString() { */ @JsonProperty("expires_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date expiresAt; public Boolean getActive() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Iteration.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Iteration.java index be36efa7d..96af44a38 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Iteration.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Iteration.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; public class Iteration implements Serializable { private static final long serialVersionUID = 1L; @@ -109,6 +110,7 @@ public String toString() { */ @JsonProperty("start_date") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date startDate; /** @@ -117,6 +119,7 @@ public String toString() { */ @JsonProperty("due_date") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date dueDate; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/OauthTokenResponse.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/OauthTokenResponse.java index 82b182668..d8823c0a7 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/OauthTokenResponse.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/OauthTokenResponse.java @@ -2,10 +2,10 @@ import java.io.Serializable; -import com.fasterxml.jackson.annotation.JsonProperty; - import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class OauthTokenResponse implements Serializable { private static final long serialVersionUID = 1L; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PersonalAccessToken.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PersonalAccessToken.java index b24b803ab..17cbd74e1 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PersonalAccessToken.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PersonalAccessToken.java @@ -22,6 +22,8 @@ public class PersonalAccessToken implements Serializable { @JsonProperty("name") private String name; + + @JsonProperty("description") private String description; @JsonProperty("expires_at") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java index be924e5c4..e61f8c619 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; public class ProjectAccessToken implements Serializable { private static final long serialVersionUID = 1L; @@ -24,6 +25,7 @@ public class ProjectAccessToken implements Serializable { @JsonProperty("expires_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date expiresAt; @JsonProperty("id") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpic.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpic.java index b05ee5aef..0b14c5cae 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpic.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpic.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; public class RelatedEpic extends AbstractEpic { private static final long serialVersionUID = 1L; @@ -18,6 +19,7 @@ public class RelatedEpic extends AbstractEpic { @JsonProperty("due_date_from_inherited_source") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date dueDateFromInheritedSource; @JsonProperty("related_epic_link_id") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/BuildCommit.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/BuildCommit.java index a8b3e2c8e..90d3bfa37 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/BuildCommit.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/BuildCommit.java @@ -11,6 +11,7 @@ public class BuildCommit { @JsonProperty("id") private Long id; + @JsonProperty("name") private String name; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/BuildEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/BuildEvent.java index 0229c403d..56d0f33c1 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/BuildEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/BuildEvent.java @@ -29,6 +29,7 @@ public class BuildEvent extends AbstractEvent { @JsonProperty("sha") private String sha; + @JsonProperty("retries_count") private Integer retriesCount; From 128136343f048acb922b00465d5b0a2ab4737fe4 Mon Sep 17 00:00:00 2001 From: ksaleschus Date: Thu, 28 Aug 2025 14:35:09 +0200 Subject: [PATCH 10/21] add JsonAnnotations to new Classes --- .../org/gitlab4j/api/models/Associations.java | 9 +++++ .../java/org/gitlab4j/api/models/Build.java | 37 +++++++++++++++++++ .../api/models/ContainerExpirationPolicy.java | 14 +++++++ .../api/models/CreateRunnerParams.java | 23 ++++++++++++ .../api/models/CreateRunnerResponse.java | 9 +++++ 5 files changed, 92 insertions(+) diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Associations.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Associations.java index ee0834d70..3791315d2 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Associations.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Associations.java @@ -4,12 +4,21 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class Associations implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("groups_count") private int groupsCount; + + @JsonProperty("projects_count") private int projectsCount; + + @JsonProperty("issues_count") private int issuesCount; + + @JsonProperty("merge_requests_count") private int mergeRequestsCount; public int getGroupsCount() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Build.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Build.java index 1bc55b233..fe5a31661 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Build.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Build.java @@ -4,26 +4,63 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * @author Yaris van Thiel */ public class Build { + @JsonProperty("id") private Long id; + + @JsonProperty("stage") private String stage; + + @JsonProperty("name") private String name; + + @JsonProperty("status") private BuildStatus status; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") private Date createdAt; + + @JsonProperty("started_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") private Date startedAt; + + @JsonProperty("finished_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") private Date finishedAt; + + @JsonProperty("duration") private Float duration; + + @JsonProperty("queued_duration") private Float queuedDuration; + + @JsonProperty("failure_reason") private String failureReason; + + @JsonProperty("when") private String when; + + @JsonProperty("manual") private Boolean manual; + + @JsonProperty("allow_failure") private Boolean allowFailure; + + @JsonProperty("user") private User user; + + @JsonProperty("runner") private Runner runner; + + @JsonProperty("artifacts_file") private ArtifactsFile artifactsFile; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ContainerExpirationPolicy.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ContainerExpirationPolicy.java index 181916c67..bfd3f722c 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ContainerExpirationPolicy.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ContainerExpirationPolicy.java @@ -4,16 +4,30 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class ContainerExpirationPolicy implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("cadence") private String cadence; + + @JsonProperty("enabled") private Boolean enabled; + + @JsonProperty("keep_n") private Integer keepN; + + @JsonProperty("older_than") private String olderThan; + + @JsonProperty("name_regex") private String nameRegex; + + @JsonProperty("name_regex_keep") private String nameRegexKeep; + @JsonProperty("next_run_at") private String nextRunAt; public String getCadence() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CreateRunnerParams.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CreateRunnerParams.java index c4d23a75a..0f84e50ab 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CreateRunnerParams.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CreateRunnerParams.java @@ -7,19 +7,42 @@ import org.gitlab4j.models.GitLabForm; import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class CreateRunnerParams implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("runner_type") private RunnerType runnerType; + + @JsonProperty("group_id") private Long groupId; + + @JsonProperty("project_id") private Long projectId; + + @JsonProperty("description") private String description; + + @JsonProperty("paused") private Boolean paused; + + @JsonProperty("locked") private Boolean locked; + + @JsonProperty("run_untagged") private Boolean runUntagged; + + @JsonProperty("tag_list") private List tagList; + + @JsonProperty("access_level") private String accessLevel; + + @JsonProperty("maximum_timeout") private Integer maximumTimeout; + + @JsonProperty("maintenance_note") private String maintenanceNote; public GitLabForm getForm() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CreateRunnerResponse.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CreateRunnerResponse.java index 145cf1400..dd3c43192 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CreateRunnerResponse.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CreateRunnerResponse.java @@ -5,11 +5,20 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + public class CreateRunnerResponse implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("id") private Long id; + + @JsonProperty("token") private String token; + + @JsonProperty("token_expires_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") private Date tokenExpiresAt; public Long getId() { From c4839f14cb327c596c78e76675e157d3491ae6cd Mon Sep 17 00:00:00 2001 From: ksaleschus Date: Thu, 28 Aug 2025 16:44:40 +0200 Subject: [PATCH 11/21] add JsonAnnotations to missed attributes --- .../java/org/gitlab4j/api/models/Build.java | 6 +-- .../org/gitlab4j/api/webhook/EventIssue.java | 43 +++++++++++++++++++ .../gitlab4j/api/webhook/PipelineEvent.java | 36 ++++++++++++++++ .../gitlab4j/api/webhook/WikiPageEvent.java | 26 +++++++++++ 4 files changed, 108 insertions(+), 3 deletions(-) diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Build.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Build.java index fe5a31661..5b9c1b3de 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Build.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Build.java @@ -25,15 +25,15 @@ public class Build { private BuildStatus status; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("started_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date startedAt; @JsonProperty("finished_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date finishedAt; @JsonProperty("duration") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventIssue.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventIssue.java index f75312382..178fe52eb 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventIssue.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventIssue.java @@ -57,27 +57,70 @@ public class EventIssue { @JsonProperty("action") private String action; + @JsonProperty("assignee_ids") private List assigneeIds; + + @JsonProperty("updated_by_id") private Long updatedById; + + @JsonProperty("last_edited_at") private Date lastEditedAt; + + @JsonProperty("last_edited_by_id") private Long lastEditedById; + + @JsonProperty("relative_position") private Long relativePosition; + + @JsonProperty("state_id") private Long stateId; + + @JsonProperty("confidential") private Boolean confidential; + + @JsonProperty("discussion_locked") private Boolean discussionLocked; + + @JsonProperty("due_date") private Date dueDate; + + @JsonProperty("moved_to_id") private Long movedToId; + + @JsonProperty("duplicated_to_id") private Long duplicatedToId; + + @JsonProperty("time_estimate") private Long timeEstimate; + + @JsonProperty("total_time_spent") private Long totalTimeSpent; + + @JsonProperty("time_change") private Long timeChange; + + @JsonProperty("human_time_estimate") private String humanTimeEstimate; + + @JsonProperty("human_total_time_spent") private String humanTotalTimeSpent; + + @JsonProperty("human_time_change") private String humanTimeChange; + + @JsonProperty("weight") private Long weight; + + @JsonProperty("health_status") private String healthStatus; + + @JsonProperty("type") private String type; + + @JsonProperty("severity") private String severity; + + @JsonProperty("labels") private List labels; public Long getAssigneeId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/PipelineEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/PipelineEvent.java index 235d45d7e..23657dca6 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/PipelineEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/PipelineEvent.java @@ -8,6 +8,7 @@ import org.gitlab4j.api.models.Variable; import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; public class PipelineEvent extends AbstractEvent { @@ -104,22 +105,57 @@ public void setBuilds(List builds) { public static class ObjectAttributes { + @JsonProperty("id") private Long id; + + @JsonProperty("iid") private Long iid; + + @JsonProperty("name") private String name; + + @JsonProperty("ref") private String ref; + + @JsonProperty("tag") private Boolean tag; + + @JsonProperty("sha") private String sha; + + @JsonProperty("before_sha") private String beforeSha; + + @JsonProperty("source") private String source; + + @JsonProperty("status") private String status; + + @JsonProperty("detailed_status") private String detailedStatus; + + @JsonProperty("stages") private List stages; + + @JsonProperty("created_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; + + @JsonProperty("finished_at") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date finishedAt; + + @JsonProperty("duration") private Integer duration; + + @JsonProperty("queued_duration") private Float queuedDuration; + + @JsonProperty("variables") private List variables; + + @JsonProperty("url") private String url; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/WikiPageEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/WikiPageEvent.java index 93f07b20c..2e8ca7390 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/WikiPageEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/WikiPageEvent.java @@ -65,10 +65,19 @@ public void setObjectAttributes(ObjectAttributes objectAttributes) { public static class Wiki { + @JsonProperty("web_url") private String webUrl; + + @JsonProperty("git_http_url") private String git_http_url; + + @JsonProperty("git_ssh_url") private String git_ssh_url; + + @JsonProperty("path_with_namespace") private String pathWithNamespace; + + @JsonProperty("default_branch") private String defaultBranch; public String getWebUrl() { @@ -114,14 +123,31 @@ public void setDefaultBranch(String defaultBranch) { public static class ObjectAttributes { + @JsonProperty("title") private String title; + + @JsonProperty("content") private String content; + + @JsonProperty("format") private String format; + + @JsonProperty("message") private String message; + + @JsonProperty("slug") private String slug; + + @JsonProperty("url") private String url; + + @JsonProperty("action") private String action; + + @JsonProperty("diff_url") private String diffUrl; + + @JsonProperty("version_id") private String versionId; public String getTitle() { From 7dc5cf5e06a804573d34037dffb2b38f73a41cf4 Mon Sep 17 00:00:00 2001 From: ksaleschus Date: Mon, 1 Sep 2025 08:54:51 +0200 Subject: [PATCH 12/21] add milliseconds to date format --- .../org/gitlab4j/api/models/AbstractEpic.java | 12 ++++++------ .../org/gitlab4j/api/models/AbstractIssue.java | 12 ++++++------ .../org/gitlab4j/api/models/AbstractUser.java | 4 ++-- .../org/gitlab4j/api/models/AccessRequest.java | 4 ++-- .../gitlab4j/api/models/ApplicationSettings.java | 8 ++++---- .../java/org/gitlab4j/api/models/AuditEvent.java | 4 ++-- .../java/org/gitlab4j/api/models/AwardEmoji.java | 8 ++++---- .../java/org/gitlab4j/api/models/Bridge.java | 16 ++++++++-------- .../gitlab4j/api/models/ChangelogPayload.java | 4 ++-- .../java/org/gitlab4j/api/models/Comment.java | 4 ++-- .../java/org/gitlab4j/api/models/Commit.java | 16 ++++++++-------- .../org/gitlab4j/api/models/CommitStatus.java | 12 ++++++------ .../api/models/CreateRunnerResponse.java | 2 +- .../java/org/gitlab4j/api/models/DeployKey.java | 4 ++-- .../org/gitlab4j/api/models/DeployToken.java | 4 ++-- .../java/org/gitlab4j/api/models/Deployable.java | 16 ++++++++-------- .../java/org/gitlab4j/api/models/Deployment.java | 8 ++++---- .../gitlab4j/api/models/DeploymentFilter.java | 8 ++++---- .../gitlab4j/api/models/DownstreamPipeline.java | 8 ++++---- .../org/gitlab4j/api/models/Environment.java | 4 ++-- .../java/org/gitlab4j/api/models/EpicFilter.java | 12 ++++++------ .../main/java/org/gitlab4j/api/models/Event.java | 4 ++-- .../org/gitlab4j/api/models/ExportStatus.java | 4 ++-- .../ExternalStatusCheckProtectedBranch.java | 8 ++++---- .../java/org/gitlab4j/api/models/GpgKey.java | 4 ++-- .../main/java/org/gitlab4j/api/models/Group.java | 2 +- .../java/org/gitlab4j/api/models/GroupHook.java | 8 ++++---- .../gitlab4j/api/models/ImpersonationToken.java | 8 ++++---- .../org/gitlab4j/api/models/ImportStatus.java | 4 ++-- .../java/org/gitlab4j/api/models/IssueEvent.java | 4 ++-- .../org/gitlab4j/api/models/IssueFilter.java | 8 ++++---- .../api/models/IssuesStatisticsFilter.java | 16 ++++++++-------- .../java/org/gitlab4j/api/models/Iteration.java | 8 ++++---- .../org/gitlab4j/api/models/IterationFilter.java | 8 ++++---- .../main/java/org/gitlab4j/api/models/Job.java | 10 +++++----- .../main/java/org/gitlab4j/api/models/Key.java | 2 +- .../java/org/gitlab4j/api/models/License.java | 6 +++--- .../org/gitlab4j/api/models/LinkedIssue.java | 4 ++-- .../java/org/gitlab4j/api/models/Member.java | 2 +- .../org/gitlab4j/api/models/MergeRequest.java | 12 ++++++------ .../gitlab4j/api/models/MergeRequestFilter.java | 8 ++++---- .../gitlab4j/api/models/MergeRequestVersion.java | 2 +- .../java/org/gitlab4j/api/models/Milestone.java | 4 ++-- .../main/java/org/gitlab4j/api/models/Note.java | 8 ++++---- .../java/org/gitlab4j/api/models/Package.java | 2 +- .../org/gitlab4j/api/models/PackageFile.java | 2 +- .../gitlab4j/api/models/PersonalAccessToken.java | 4 ++-- .../java/org/gitlab4j/api/models/Pipeline.java | 10 +++++----- .../org/gitlab4j/api/models/PipelineFilter.java | 4 ++-- .../gitlab4j/api/models/PipelineSchedule.java | 6 +++--- .../java/org/gitlab4j/api/models/Project.java | 4 ++-- .../gitlab4j/api/models/ProjectAccessToken.java | 4 ++-- .../org/gitlab4j/api/models/ProjectFilter.java | 4 ++-- .../org/gitlab4j/api/models/ProjectHook.java | 2 +- .../java/org/gitlab4j/api/models/PushRules.java | 2 +- .../gitlab4j/api/models/RegistryRepository.java | 2 +- .../api/models/RegistryRepositoryTag.java | 2 +- .../org/gitlab4j/api/models/RelatedEpic.java | 4 ++-- .../org/gitlab4j/api/models/RelatedEpicLink.java | 4 ++-- .../java/org/gitlab4j/api/models/Release.java | 4 ++-- .../org/gitlab4j/api/models/ReleaseParams.java | 2 +- .../org/gitlab4j/api/models/RemoteMirror.java | 6 +++--- .../org/gitlab4j/api/models/RunnerDetail.java | 2 +- .../java/org/gitlab4j/api/models/Snippet.java | 4 ++-- .../java/org/gitlab4j/api/models/SshKey.java | 4 ++-- .../java/org/gitlab4j/api/models/SystemHook.java | 2 +- .../main/java/org/gitlab4j/api/models/Tag.java | 2 +- .../main/java/org/gitlab4j/api/models/Todo.java | 2 +- .../java/org/gitlab4j/api/models/Trigger.java | 6 +++--- .../org/gitlab4j/api/models/UploadedFile.java | 2 +- .../main/java/org/gitlab4j/api/models/User.java | 8 ++++---- .../systemhooks/GroupMemberSystemHookEvent.java | 4 ++-- .../api/systemhooks/GroupSystemHookEvent.java | 4 ++-- .../api/systemhooks/KeySystemHookEvent.java | 4 ++-- .../api/systemhooks/ProjectSystemHookEvent.java | 4 ++-- .../systemhooks/TeamMemberSystemHookEvent.java | 4 ++-- .../api/systemhooks/UserSystemHookEvent.java | 4 ++-- .../org/gitlab4j/api/webhook/EventCommit.java | 2 +- .../org/gitlab4j/api/webhook/EventIssue.java | 4 ++-- .../org/gitlab4j/api/webhook/EventLabel.java | 4 ++-- .../org/gitlab4j/api/webhook/EventSnippet.java | 6 +++--- 81 files changed, 227 insertions(+), 227 deletions(-) diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java index c8103c45e..0807f9407 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java @@ -108,26 +108,26 @@ public String toString() { /** * The date when the epic was created. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** * The date when the epic was last updated. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; /** * The date when the epic was closed. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("closed_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date closedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractIssue.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractIssue.java index 3338cbf08..10aeb4345 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractIssue.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractIssue.java @@ -73,26 +73,26 @@ public String toString() { /** * The date when the issue was created. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** * The date when the issue was last updated. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; /** * The date when the issue was closed. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("closed_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date closedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractUser.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractUser.java index 3bb684f27..90bedee6e 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractUser.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractUser.java @@ -21,10 +21,10 @@ public abstract class AbstractUser> implements Seriali /** * The date when the user was created. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AccessRequest.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AccessRequest.java index 980fdf392..14d8ce51c 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AccessRequest.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AccessRequest.java @@ -10,10 +10,10 @@ public class AccessRequest extends AbstractUser { /** * The date when the access request was made. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("requested_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date requestedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApplicationSettings.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApplicationSettings.java index 8ae244334..5c8183b59 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApplicationSettings.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApplicationSettings.java @@ -35,18 +35,18 @@ public class ApplicationSettings implements Serializable { /** * The date when the application settings were created. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** * The date when the application settings were last updated. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AuditEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AuditEvent.java index 127c91c99..45aab4903 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AuditEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AuditEvent.java @@ -43,10 +43,10 @@ public class AuditEvent implements Serializable { /** * The creation date of the audit event. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AwardEmoji.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AwardEmoji.java index 42fd639ff..69d237a27 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AwardEmoji.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AwardEmoji.java @@ -59,18 +59,18 @@ public String toString() { /** * The date when the award emoji was created. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** * The date when the award emoji was last updated. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Bridge.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Bridge.java index eba0432c5..956d96932 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Bridge.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Bridge.java @@ -25,34 +25,34 @@ public class Bridge implements Serializable { /** * The creation date of the bridge. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** * The start date of the bridge. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("started_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date startedAt; /** * The finish date of the bridge. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("finished_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date finishedAt; /** * The date the bridge was erased. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("erased_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date erasedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ChangelogPayload.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ChangelogPayload.java index b434f701c..a330bee38 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ChangelogPayload.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ChangelogPayload.java @@ -34,10 +34,10 @@ public class ChangelogPayload implements Serializable { /** * The date associated with the changelog. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("date") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date date; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Comment.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Comment.java index 1777ee5ea..6b728f394 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Comment.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Comment.java @@ -20,10 +20,10 @@ public class Comment implements Serializable { /** * The creation date of the comment. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Commit.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Commit.java index 9507327e5..86e3f1ed9 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Commit.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Commit.java @@ -20,10 +20,10 @@ public class Commit implements Serializable { /** * The date when the commit was authored. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("authored_date") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date authoredDate; /** @@ -40,10 +40,10 @@ public class Commit implements Serializable { /** * The date when the commit was committed. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("committed_date") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date committedDate; /** @@ -60,10 +60,10 @@ public class Commit implements Serializable { /** * The creation date of the commit. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** @@ -104,10 +104,10 @@ public class Commit implements Serializable { /** * The timestamp of the commit. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("timestamp") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date timestamp; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitStatus.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitStatus.java index be5d1bd2a..c75525fbb 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitStatus.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitStatus.java @@ -31,10 +31,10 @@ public class CommitStatus implements Serializable { /** * The creation date of the commit status. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** @@ -45,10 +45,10 @@ public class CommitStatus implements Serializable { /** * The date the commit status was finished. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("finished_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date finishedAt; /** @@ -83,10 +83,10 @@ public class CommitStatus implements Serializable { /** * The date the commit status was started. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("started_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date startedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CreateRunnerResponse.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CreateRunnerResponse.java index dd3c43192..de237ab7a 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CreateRunnerResponse.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CreateRunnerResponse.java @@ -18,7 +18,7 @@ public class CreateRunnerResponse implements Serializable { private String token; @JsonProperty("token_expires_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date tokenExpiresAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployKey.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployKey.java index 9f93703ec..1bbdada7a 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployKey.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployKey.java @@ -37,10 +37,10 @@ public class DeployKey implements Serializable { /** * The creation date of the deploy key. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployToken.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployToken.java index e22aee752..b5262f680 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployToken.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployToken.java @@ -33,10 +33,10 @@ public class DeployToken implements Serializable { /** * The expiration date of the deploy token. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("expires_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date expiresAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployable.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployable.java index 6d840605f..3178a086e 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployable.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployable.java @@ -57,26 +57,26 @@ public class Deployable implements Serializable { /** * The creation date of the deployable. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** * The date the deployable was started. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("started_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date startedAt; /** * The date the deployable was finished. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("finished_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date finishedAt; /** @@ -123,10 +123,10 @@ public class Deployable implements Serializable { /** * The expiration date of the artifacts. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("artifacts_expire_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date artifactsExpireAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployment.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployment.java index 34561f15a..9fd17a0a0 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployment.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployment.java @@ -38,18 +38,18 @@ public class Deployment implements Serializable { /** * The creation date of the deployment. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** * The last updated date of the deployment. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeploymentFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeploymentFilter.java index 18cb7dddd..b50876370 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeploymentFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeploymentFilter.java @@ -30,17 +30,17 @@ public class DeploymentFilter implements Serializable { private SortOrder sortOrder; /** - * Return deployments updated after the specified date. Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Return deployments updated after the specified date. Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_after") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAfter; /** - * Return deployments updated before the specified date. Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Return deployments updated before the specified date. Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_before") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedBefore; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java index 9c425b38a..df8423df0 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java @@ -37,18 +37,18 @@ public class DownstreamPipeline implements Serializable { /** * The creation date of the downstream pipeline. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** * The last updated date of the downstream pipeline. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Environment.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Environment.java index a329c246f..2e5055cc1 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Environment.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Environment.java @@ -81,10 +81,10 @@ public String toString() { /** * The auto stop time for the environment, if any. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("auto_stop_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date autoStopAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicFilter.java index 15af6edb0..cbe37db31 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicFilter.java @@ -67,26 +67,26 @@ public class EpicFilter implements Serializable { /** * The date after which the epic was created. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_after") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAfter; /** * The date after which the epic was updated. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_after") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAfter; /** * The date before which the epic was updated. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_before") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedBefore; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Event.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Event.java index 72107ba84..eca27b41c 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Event.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Event.java @@ -86,10 +86,10 @@ public class Event implements Serializable { /** * The creation date of the event. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExportStatus.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExportStatus.java index 11b468671..892a32a6a 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExportStatus.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExportStatus.java @@ -83,10 +83,10 @@ public String toString() { /** * The creation date of the export status. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java index aaa2c104e..34182ee0f 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java @@ -31,18 +31,18 @@ public class ExternalStatusCheckProtectedBranch implements Serializable { /** * The creation date of the external status check protected branch. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** * The last updated date of the external status check protected branch. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GpgKey.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GpgKey.java index fa4f167a9..4612f58e6 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GpgKey.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GpgKey.java @@ -21,10 +21,10 @@ public class GpgKey { /** * The creation date of the key. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Group.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Group.java index cec22aa5f..2ace1503c 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Group.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Group.java @@ -135,7 +135,7 @@ public void setJobArtifactsSize(Long jobArtifactsSize) { /** * The creation date of the project. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") private Date createdAt; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupHook.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupHook.java index de3d34603..10e05aac9 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupHook.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupHook.java @@ -154,10 +154,10 @@ public class GroupHook implements Serializable { private String alertStatus; /** - * The date until the webhook is disabled. Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * The date until the webhook is disabled. Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("disabled_until") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date disabledUntil; /** @@ -167,10 +167,10 @@ public class GroupHook implements Serializable { private Boolean repositoryUpdateEvents; /** - * The creation date of the webhook. Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * The creation date of the webhook. Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java index 9e04ce034..7b8731a8d 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java @@ -96,18 +96,18 @@ public String toString() { /** * The creation date of the token. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** * The last used date of the token. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("last_used_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date lastUsedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImportStatus.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImportStatus.java index e7591528f..61a1680a1 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImportStatus.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImportStatus.java @@ -80,10 +80,10 @@ public String toString() { /** * The creation date of the import. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueEvent.java index 45ee0eb93..e08f4a1eb 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueEvent.java @@ -50,10 +50,10 @@ public String toString() { /** * The creation date of the resource. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private String createdAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueFilter.java index 8ff456b62..63d7e29ce 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueFilter.java @@ -99,28 +99,28 @@ public class IssueFilter implements Serializable { * Return issues created on or after the given time. */ @JsonProperty("created_after") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAfter; /** * Return issues created on or before the given time. */ @JsonProperty("created_before") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdBefore; /** * Return issues updated on or after the given time. */ @JsonProperty("updated_after") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAfter; /** * Return issues updated on or before the given time. */ @JsonProperty("updated_before") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedBefore; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssuesStatisticsFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssuesStatisticsFilter.java index 322279126..682e1b877 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssuesStatisticsFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssuesStatisticsFilter.java @@ -73,31 +73,31 @@ public class IssuesStatisticsFilter implements Serializable { private String in; /** - * Return issues created after the specified date. Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Return issues created after the specified date. Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_after") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAfter; /** - * Return issues created before the specified date. Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Return issues created before the specified date. Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_before") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdBefore; /** - * Return issues updated after the specified date. Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Return issues updated after the specified date. Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_after") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAfter; /** - * Return issues updated before the specified date. Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Return issues updated before the specified date. Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_before") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedBefore; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Iteration.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Iteration.java index 96af44a38..98cf93de8 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Iteration.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Iteration.java @@ -90,18 +90,18 @@ public String toString() { /** * The creation date of the iteration. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** * The last updated date of the iteration. - * Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IterationFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IterationFilter.java index 890ecb8d2..cb653b412 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IterationFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IterationFilter.java @@ -87,17 +87,17 @@ public String toString() { private Boolean includeAncestors; /** - * Return iterations updated after the specified date. Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Return iterations updated after the specified date. Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_after") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAfter; /** - * Return iterations updated before the specified date. Expected in ISO 8601 format (2019-03-15T08:00:00Z). + * Return iterations updated before the specified date. Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_before") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedBefore; public IterationFilterState getState() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Job.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Job.java index 0033dae3f..dde880eab 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Job.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Job.java @@ -22,19 +22,19 @@ public class Job implements Serializable { private String coverage; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("finished_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date finishedAt; @JsonProperty("erased_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date erasedAt; @JsonProperty("artifacts_expire_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date artifactsExpireAt; @JsonProperty("name") @@ -53,7 +53,7 @@ public class Job implements Serializable { private User user; @JsonProperty("started_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date startedAt; @JsonProperty("artifacts_file") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Key.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Key.java index c6d4c6316..7c360db71 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Key.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Key.java @@ -12,7 +12,7 @@ public class Key implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("id") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/License.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/License.java index 35a06be49..f564795ea 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/License.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/License.java @@ -19,15 +19,15 @@ public class License implements Serializable { private String plan; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("starts_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date startsAt; @JsonProperty("expires_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date expiresAt; @JsonProperty("historical_max") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/LinkedIssue.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/LinkedIssue.java index 0e63f1697..1e3eaaf28 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/LinkedIssue.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/LinkedIssue.java @@ -17,11 +17,11 @@ public class LinkedIssue extends AbstractIssue { private LinkType linkType; @JsonProperty("link_created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date linkCreatedAt; @JsonProperty("link_updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date linkUpdatedAt; public Long getIssueLinkId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Member.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Member.java index 4f8e28c81..96c8d1e5d 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Member.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Member.java @@ -14,7 +14,7 @@ public class Member extends AbstractUser { private AccessLevel accessLevel; @JsonProperty("expires_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date expiresAt; @JsonProperty("group_saml_identity") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequest.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequest.java index 224bcffbe..2dbe99691 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequest.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequest.java @@ -45,14 +45,14 @@ public class MergeRequest implements Serializable { private String changesCount; @JsonProperty("closed_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date closedAt; @JsonProperty("closed_by") private Participant closedBy; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("description") @@ -86,11 +86,11 @@ public class MergeRequest implements Serializable { private List labels; @JsonProperty("latest_build_finished_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date latestBuildFinishedAt; @JsonProperty("latest_build_started_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date latestBuildStartedAt; @JsonProperty("merge_commit_sha") @@ -111,7 +111,7 @@ public class MergeRequest implements Serializable { private String detailedMergeStatus; @JsonProperty("merged_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date mergedAt; /** @@ -183,7 +183,7 @@ public class MergeRequest implements Serializable { private String title; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("upvotes") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestFilter.java index 5cfd48893..89789fa54 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestFilter.java @@ -55,19 +55,19 @@ public class MergeRequestFilter implements Serializable { private List labels; @JsonProperty("created_after") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAfter; @JsonProperty("created_before") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdBefore; @JsonProperty("updated_after") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAfter; @JsonProperty("updated_before") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedBefore; @JsonProperty("scope") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestVersion.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestVersion.java index b72d108f1..76befe335 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestVersion.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestVersion.java @@ -24,7 +24,7 @@ public class MergeRequestVersion implements Serializable { private String startCommitSha; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("merge_request_id") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Milestone.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Milestone.java index 9ae0f8853..087de89d7 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Milestone.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Milestone.java @@ -13,7 +13,7 @@ public class Milestone implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("description") @@ -46,7 +46,7 @@ public class Milestone implements Serializable { private String title; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("expired") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Note.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Note.java index 0c47729df..3ae8082ce 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Note.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Note.java @@ -95,14 +95,14 @@ public String toString() { private String body; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("downvote") private Boolean downvote; @JsonProperty("expires_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date expiresAt; @JsonProperty("file_name") @@ -127,7 +127,7 @@ public String toString() { private String title; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("upvote") @@ -143,7 +143,7 @@ public String toString() { private Participant resolvedBy; @JsonProperty("resolved_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date resolvedAt; @JsonProperty("internal") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Package.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Package.java index 9bd347d41..70ed9992c 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Package.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Package.java @@ -24,7 +24,7 @@ public class Package implements Serializable { private PackageType packageType; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PackageFile.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PackageFile.java index 3cc6cd4b1..e42ae3d46 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PackageFile.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PackageFile.java @@ -18,7 +18,7 @@ public class PackageFile implements Serializable { private Long packageId; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("file_name") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PersonalAccessToken.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PersonalAccessToken.java index 17cbd74e1..1a7576e8c 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PersonalAccessToken.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PersonalAccessToken.java @@ -38,14 +38,14 @@ public class PersonalAccessToken implements Serializable { private Boolean active; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("revoked") private Boolean revoked; @JsonProperty("last_used_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date lastUsedAt; @JsonProperty("token") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Pipeline.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Pipeline.java index 1b9b596cc..b56417d7f 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Pipeline.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Pipeline.java @@ -45,23 +45,23 @@ public class Pipeline implements Serializable { private User user; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("started_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date startedAt; @JsonProperty("finished_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date finishedAt; @JsonProperty("committed_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date committedAt; @JsonProperty("coverage") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineFilter.java index ed27f67b7..4d5eb90bf 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineFilter.java @@ -54,12 +54,12 @@ public class PipelineFilter implements Serializable { /** Return pipelines updated after the specified date. */ @JsonProperty("updated_after") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAfter; /** Return pipelines updated before the specified date. */ @JsonProperty("updated_before") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedBefore; /** {@link org.gitlab4j.models.Constants.PipelineOrderBy} Order pipelines by id, status, ref, updated_at or user_id (default: id). */ diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineSchedule.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineSchedule.java index e7ae57cb3..f34d37a9b 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineSchedule.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineSchedule.java @@ -28,15 +28,15 @@ public class PipelineSchedule implements Serializable { private String cronTimezone; @JsonProperty("next_run_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date nextRunAt; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("active") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java index 15e1133bc..8fcc6b635 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java @@ -57,7 +57,7 @@ public String toString() { private Boolean containerRegistryEnabled; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("creator_id") @@ -91,7 +91,7 @@ public String toString() { private Boolean jobsEnabled; @JsonProperty("last_activity_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date lastActivityAt; @JsonProperty("lfs_enabled") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java index e61f8c619..0779f007a 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java @@ -35,7 +35,7 @@ public class ProjectAccessToken implements Serializable { private Boolean active; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("revoked") @@ -45,7 +45,7 @@ public class ProjectAccessToken implements Serializable { private Long accessLevel; @JsonProperty("last_used_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date lastUsedAt; @JsonProperty("token") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectFilter.java index 98f379879..03a74d191 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectFilter.java @@ -79,11 +79,11 @@ public class ProjectFilter implements Serializable { private Long idBefore; @JsonProperty("last_activity_after") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date lastActivityAfter; @JsonProperty("last_activity_before") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date lastActivityBefore; @JsonProperty("repository_storage") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectHook.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectHook.java index e4613eaed..a9c1ac822 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectHook.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectHook.java @@ -15,7 +15,7 @@ public class ProjectHook implements Serializable { private Boolean buildEvents; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("enable_ssl_verification") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PushRules.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PushRules.java index 5ce298c93..9bca876de 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PushRules.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PushRules.java @@ -30,7 +30,7 @@ public class PushRules implements Serializable { private Boolean denyDeleteTag; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("member_check") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepository.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepository.java index b77ec4834..566a352c0 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepository.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepository.java @@ -24,7 +24,7 @@ public class RegistryRepository implements Serializable { private String location; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepositoryTag.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepositoryTag.java index d905fb172..e6f369fe1 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepositoryTag.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepositoryTag.java @@ -30,7 +30,7 @@ public class RegistryRepositoryTag implements Serializable { private String digest; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("total_size") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpic.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpic.java index 0b14c5cae..403013e7c 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpic.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpic.java @@ -29,11 +29,11 @@ public class RelatedEpic extends AbstractEpic { private LinkType linkType; @JsonProperty("link_created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date linkCreatedAt; @JsonProperty("link_updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date linkUpdatedAt; public Boolean getStartDateIsFixed() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java index 27fbf6aa0..91922cf0a 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java @@ -24,11 +24,11 @@ public class RelatedEpicLink implements Serializable { private LinkType linkType; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Release.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Release.java index 39365bd44..bf63f3c0f 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Release.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Release.java @@ -27,11 +27,11 @@ public class Release implements Serializable { private String descriptionHtml; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("released_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date releasedAt; @JsonProperty("author") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ReleaseParams.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ReleaseParams.java index 1f92b9a82..5f7d17ff5 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ReleaseParams.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ReleaseParams.java @@ -31,7 +31,7 @@ public class ReleaseParams implements Serializable { private Assets assets; @JsonProperty("released_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date releasedAt; public String getName() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RemoteMirror.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RemoteMirror.java index 6aa2724bf..c13c5d4e1 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RemoteMirror.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RemoteMirror.java @@ -21,15 +21,15 @@ public class RemoteMirror implements Serializable { private String lastError; @JsonProperty("last_successful_update_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date lastSuccessfulUpdateAt; @JsonProperty("last_update_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date lastUpdateAt; @JsonProperty("last_update_started_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date lastUpdateStartedAt; @JsonProperty("only_protected_branches") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RunnerDetail.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RunnerDetail.java index d20f12fcc..5e5222f13 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RunnerDetail.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RunnerDetail.java @@ -21,7 +21,7 @@ public class RunnerDetail extends Runner { private String platform; @JsonProperty("contacted_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date contactedAt; @JsonProperty("projects") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Snippet.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Snippet.java index 8598c9d35..4c53c8a08 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Snippet.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Snippet.java @@ -38,11 +38,11 @@ public class Snippet implements Serializable { private Author author; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("expires_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date expiresAt; @JsonProperty("file_name") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SshKey.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SshKey.java index 3e62a1c30..57149af5a 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SshKey.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SshKey.java @@ -22,11 +22,11 @@ public class SshKey implements Serializable { private String key; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("expires_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date expiresAt; @JsonProperty("user_id") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SystemHook.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SystemHook.java index f4d800ae4..f28cc3dd7 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SystemHook.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SystemHook.java @@ -25,7 +25,7 @@ public class SystemHook implements Serializable { private String url; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("push_events") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Tag.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Tag.java index a88be54b1..ed3cf3eee 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Tag.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Tag.java @@ -24,7 +24,7 @@ public class Tag implements Serializable { private Release release; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; public Commit getCommit() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Todo.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Todo.java index c95be0e22..7e8b2b3f3 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Todo.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Todo.java @@ -52,7 +52,7 @@ public class Todo implements Serializable { private TodoState state; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Trigger.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Trigger.java index acbc1eeb9..f5c9545f1 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Trigger.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Trigger.java @@ -16,18 +16,18 @@ public class Trigger implements Serializable { private String description; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("last_used") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date lastUsed; @JsonProperty("token") private String token; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("owner") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/UploadedFile.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/UploadedFile.java index 29f39d120..d3e7f93ad 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/UploadedFile.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/UploadedFile.java @@ -21,7 +21,7 @@ public class UploadedFile implements Serializable { private String filename; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("uploaded_by") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/User.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/User.java index 7bcb593d9..c39c5f0f4 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/User.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/User.java @@ -27,11 +27,11 @@ public class User extends AbstractUser { private Integer colorSchemeId; @JsonProperty("confirmed_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date confirmedAt; @JsonProperty("current_sign_in_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date currentSignInAt; @JsonProperty("custom_attributes") @@ -53,11 +53,11 @@ public class User extends AbstractUser { private Boolean isAdmin; @JsonProperty("last_activity_on") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date lastActivityOn; @JsonProperty("last_sign_in_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date lastSignInAt; @JsonProperty("linkedin") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupMemberSystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupMemberSystemHookEvent.java index ef5c74f00..fd4dd35f2 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupMemberSystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupMemberSystemHookEvent.java @@ -14,11 +14,11 @@ public class GroupMemberSystemHookEvent extends AbstractSystemHookEvent { public static final String GROUP_MEMBER_REMOVED_EVENT = "user_remove_from_group"; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("event_name") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupSystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupSystemHookEvent.java index d6ed77d27..70c1f9fe9 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupSystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupSystemHookEvent.java @@ -15,11 +15,11 @@ public class GroupSystemHookEvent extends AbstractSystemHookEvent { public static final String GROUP_RENAME_EVENT = "group_rename"; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("event_name") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/KeySystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/KeySystemHookEvent.java index 632b265f8..31a3d6cbc 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/KeySystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/KeySystemHookEvent.java @@ -14,11 +14,11 @@ public class KeySystemHookEvent extends AbstractSystemHookEvent { public static final String KEY_DESTROY_EVENT = "key_destroy"; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("event_name") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/ProjectSystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/ProjectSystemHookEvent.java index 6421a7e28..0e6dfa378 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/ProjectSystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/ProjectSystemHookEvent.java @@ -18,11 +18,11 @@ public class ProjectSystemHookEvent extends AbstractSystemHookEvent { public static final String PROJECT_UPDATE_EVENT = "project_update"; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("event_name") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java index 3ae05b134..681174371 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java @@ -15,11 +15,11 @@ public class TeamMemberSystemHookEvent extends AbstractSystemHookEvent { public static final String TEAM_MEMBER_REMOVED_EVENT = "user_remove_from_team"; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("event_name") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/UserSystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/UserSystemHookEvent.java index 4f17abbc4..180082def 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/UserSystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/UserSystemHookEvent.java @@ -19,11 +19,11 @@ public class UserSystemHookEvent extends AbstractSystemHookEvent { private String eventName; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("email") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventCommit.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventCommit.java index d7dbebc62..a6b5811f0 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventCommit.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventCommit.java @@ -21,7 +21,7 @@ public class EventCommit { private String title; @JsonProperty("timestamp") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date timestamp; @JsonProperty("url") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventIssue.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventIssue.java index 178fe52eb..9fc5d711a 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventIssue.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventIssue.java @@ -20,7 +20,7 @@ public class EventIssue { private String branchName; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("description") @@ -48,7 +48,7 @@ public class EventIssue { private String title; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("url") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventLabel.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventLabel.java index 48f6c2c21..f0713ec30 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventLabel.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventLabel.java @@ -50,11 +50,11 @@ public String toString() { private Long projectId; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("template") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventSnippet.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventSnippet.java index b06da1ea8..76f17755e 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventSnippet.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventSnippet.java @@ -26,18 +26,18 @@ public class EventSnippet { private Long projectId; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("file_name") private String fileName; @JsonProperty("expires_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date expiresAt; @JsonProperty("type") From 58032e3a60a6817626a1c756870df0ee6d7c1ced Mon Sep 17 00:00:00 2001 From: ksaleschus Date: Mon, 1 Sep 2025 09:57:00 +0200 Subject: [PATCH 13/21] update test data date format --- .../resources/org/gitlab4j/api/commit.json | 6 +- .../api/merge-request-system-hook-event.json | 2 +- .../org/gitlab4j/api/merge-request.json | 10 +- .../resources/org/gitlab4j/api/user-list.json | 200 +++++++++--------- .../java/org/gitlab4j/models/TestISO8601.java | 2 +- .../org/gitlab4j/models/access-request.json | 6 +- .../org/gitlab4j/models/bad-branch.json | 4 +- .../resources/org/gitlab4j/models/blame.json | 6 +- .../resources/org/gitlab4j/models/branch.json | 4 +- .../resources/org/gitlab4j/models/bridge.json | 10 +- .../org/gitlab4j/models/build-event.json | 6 +- .../resources/org/gitlab4j/models/commit.json | 6 +- .../org/gitlab4j/models/compare-results.json | 6 +- .../org/gitlab4j/models/deploy-keys.json | 6 +- .../org/gitlab4j/models/deployment.json | 4 +- .../org/gitlab4j/models/environment.json | 6 +- .../org/gitlab4j/models/event-object.json | 4 +- .../resources/org/gitlab4j/models/event.json | 4 +- .../models/external-status-check-event.json | 8 +- .../org/gitlab4j/models/group-hook.json | 4 +- .../group-member-system-hook-event.json | 6 +- .../models/group-system-hook-event.json | 6 +- .../resources/org/gitlab4j/models/hook.json | 2 +- .../org/gitlab4j/models/issue-event.json | 28 +-- .../resources/org/gitlab4j/models/job.json | 4 +- .../models/key-system-hook-event.json | 4 +- .../org/gitlab4j/models/members.json | 8 +- .../models/merge-request-comment.json | 2 +- .../gitlab4j/models/merge-request-diff.json | 8 +- .../gitlab4j/models/merge-request-event.json | 30 +-- .../gitlab4j/models/merge-request-note.json | 8 +- .../merge-request-system-hook-event.json | 2 +- .../org/gitlab4j/models/merge-request.json | 10 +- .../org/gitlab4j/models/milestone-group.json | 4 +- .../org/gitlab4j/models/milestone.json | 4 +- .../gitlab4j/models/note-commit-event.json | 8 +- .../org/gitlab4j/models/note-issue-event.json | 10 +- .../models/note-merge-request-event.json | 12 +- .../gitlab4j/models/note-snippet-event.json | 10 +- .../resources/org/gitlab4j/models/note.json | 4 +- .../org/gitlab4j/models/packages.json | 6 +- .../models/personal-access-token.json | 6 +- .../org/gitlab4j/models/pipeline-event.json | 48 ++--- .../models/project-system-hook-event.json | 6 +- .../org/gitlab4j/models/project.json | 8 +- .../org/gitlab4j/models/push-event.json | 4 +- .../org/gitlab4j/models/push-rule.json | 2 +- .../models/push-system-hook-event.json | 4 +- .../org/gitlab4j/models/related-epics.json | 6 +- .../org/gitlab4j/models/releases.json | 14 +- .../org/gitlab4j/models/snippet.json | 6 +- .../resources/org/gitlab4j/models/tag.json | 6 +- .../models/team-member-system-hook-event.json | 6 +- .../org/gitlab4j/models/uploaded-file.json | 4 +- .../user-failed-login-system-hook-event.json | 6 +- .../org/gitlab4j/models/user-list.json | 200 +++++++++--------- .../models/user-system-hook-event.json | 6 +- .../resources/org/gitlab4j/models/user.json | 12 +- .../org/gitlab4j/models/workitem-event.json | 26 +-- 59 files changed, 425 insertions(+), 425 deletions(-) diff --git a/gitlab4j-api/src/test/resources/org/gitlab4j/api/commit.json b/gitlab4j-api/src/test/resources/org/gitlab4j/api/commit.json index 7923fadd6..f1dafa85a 100644 --- a/gitlab4j-api/src/test/resources/org/gitlab4j/api/commit.json +++ b/gitlab4j-api/src/test/resources/org/gitlab4j/api/commit.json @@ -6,10 +6,10 @@ "author_email": "dmitriy.zaporozhets@gmail.com", "committer_name": "Dmitriy", "committer_email": "dmitriy.zaporozhets@gmail.com", - "created_at": "2012-09-20T06:06:12Z", + "created_at": "2012-09-20T06:06:12.248Z", "message": "Sanitize for network graph", - "committed_date": "2012-09-20T06:06:12Z", - "authored_date": "2012-09-20T06:06:12Z", + "committed_date": "2012-09-20T06:06:12.248Z", + "authored_date": "2012-09-20T06:06:12.248Z", "parent_ids": [ "ae1d9fb46aa2b07ee9836d49862ec4e2c46fbbba" ], diff --git a/gitlab4j-api/src/test/resources/org/gitlab4j/api/merge-request-system-hook-event.json b/gitlab4j-api/src/test/resources/org/gitlab4j/api/merge-request-system-hook-event.json index 076a61fdd..f5dac6a5b 100644 --- a/gitlab4j-api/src/test/resources/org/gitlab4j/api/merge-request-system-hook-event.json +++ b/gitlab4j-api/src/test/resources/org/gitlab4j/api/merge-request-system-hook-event.json @@ -84,7 +84,7 @@ "last_commit": { "id": "ba3e0d8ff79c80d5b0bbb4f3e2e343e0aaa662b7", "message": "fixed readme", - "timestamp": "2017-09-26T16:12:57Z", + "timestamp": "2017-09-26T16:12:57.248Z", "url": "http://example.com/awesome_space/awesome_project/commits/da1560886d4f094c3e6c9ef40349f7d38b5d27d7", "author": { "name": "GitLab dev user", diff --git a/gitlab4j-api/src/test/resources/org/gitlab4j/api/merge-request.json b/gitlab4j-api/src/test/resources/org/gitlab4j/api/merge-request.json index a59e46c09..7a08304b3 100644 --- a/gitlab4j-api/src/test/resources/org/gitlab4j/api/merge-request.json +++ b/gitlab4j-api/src/test/resources/org/gitlab4j/api/merge-request.json @@ -9,9 +9,9 @@ "detailed_merge_status": "can_be_merged", "upvotes":0, "downvotes":0, - "created_at": "2016-12-03T17:23:34Z", - "updated_at": "2016-12-03T17:23:34Z", - "merged_at": "2016-12-03T17:23:34Z", + "created_at": "2016-12-03T17:23:34.248Z", + "updated_at": "2016-12-03T17:23:34.248Z", + "merged_at": "2016-12-03T17:23:34.248Z", "squash_commit_sha": "37a1f246848c3dc2bb82964a183417e2e72fe1a7", "merged_by": { "id": 7, @@ -36,7 +36,7 @@ "email":"admin@local.host", "name":"Administrator", "state":"active", - "created_at":"2012-04-29T08:46:00Z" + "created_at":"2012-04-29T08:46:00.248Z" }, "assignee":{ "id":1, @@ -44,7 +44,7 @@ "email":"admin@local.host", "name":"Administrator", "state":"active", - "created_at":"2012-04-29T08:46:00Z" + "created_at":"2012-04-29T08:46:00.248Z" }, "allow_collaboration": false, "allow_maintainer_to_push": false, diff --git a/gitlab4j-api/src/test/resources/org/gitlab4j/api/user-list.json b/gitlab4j-api/src/test/resources/org/gitlab4j/api/user-list.json index f77c21244..44dc1272d 100644 --- a/gitlab4j-api/src/test/resources/org/gitlab4j/api/user-list.json +++ b/gitlab4j-api/src/test/resources/org/gitlab4j/api/user-list.json @@ -7,20 +7,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith1"}, @@ -40,20 +40,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith2"}, @@ -73,20 +73,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith3"}, @@ -106,20 +106,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith4"}, @@ -139,20 +139,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith5"}, @@ -172,20 +172,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith6"}, @@ -205,20 +205,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith7"}, @@ -238,20 +238,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith8"}, @@ -271,20 +271,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith9"}, @@ -304,20 +304,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith10"}, @@ -337,20 +337,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith11"}, @@ -370,20 +370,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith2"}, @@ -403,20 +403,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith13"}, @@ -436,20 +436,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith14"}, @@ -469,20 +469,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith15"}, @@ -502,20 +502,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith16"}, @@ -535,20 +535,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith17"}, @@ -568,20 +568,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith18"}, @@ -601,20 +601,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith19"}, @@ -634,20 +634,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith20"}, diff --git a/gitlab4j-models/src/test/java/org/gitlab4j/models/TestISO8601.java b/gitlab4j-models/src/test/java/org/gitlab4j/models/TestISO8601.java index e6feeea18..1eb30eb7c 100644 --- a/gitlab4j-models/src/test/java/org/gitlab4j/models/TestISO8601.java +++ b/gitlab4j-models/src/test/java/org/gitlab4j/models/TestISO8601.java @@ -15,7 +15,7 @@ public class TestISO8601 { private static final String SPACEY_GITLAB_UTC_DATE = "2018-03-12 03:16:46 UTC"; private static final String DATE_ONLY = "2018-03-12"; - private static final String DATE_AT_MIDNIGHT = "2018-03-12T00:00:00Z"; + private static final String DATE_AT_MIDNIGHT = "2018-03-12T00:00:00.000Z"; private static final String SPACEY_GITLAB_DATE_WITH_MSEC = "2018-03-12 10:16:46.123 +0700"; private static final String ISO8601_GITLAB_DATE_WITH_MSEC = "2018-03-12T10:16:46.123+0700"; diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/access-request.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/access-request.json index a6ddccca3..76bbd54cb 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/access-request.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/access-request.json @@ -3,7 +3,7 @@ "username": "raymond_smith", "name": "Raymond Smith", "state": "active", - "created_at": "2012-10-22T14:13:35Z", - "requested_at": "2012-10-22T14:13:35Z", + "created_at": "2012-10-22T14:13:35.248Z", + "requested_at": "2012-10-22T14:13:35.248Z", "access_level": 20 -} \ No newline at end of file +} diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/bad-branch.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/bad-branch.json index 0ffc475e1..1a36f11be 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/bad-branch.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/bad-branch.json @@ -2,8 +2,8 @@ "commit": { "author_email": "john@example.com", "author_name": "John Smith", - "authored_date": "2012-06-27T05:51:39Z", - "committed_date": "2012-06-28T03:44:20Z", + "authored_date": "2012-06-27T05:51:39.248Z", + "committed_date": "2012-06-28T03:44:20.248Z", "committer_email": "john@example.com", "committer_name": "John Smith", "id": "7b5c3cc8be40ee161ae89a06bba6229da1032a0c", diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/blame.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/blame.json index f4949464a..d575cca9b 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/blame.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/blame.json @@ -6,10 +6,10 @@ "parent_ids": [ "cc6e14f9328fa6d7b5a0d3c30dc2002a3f2a3822" ], - "authored_date": "2015-12-18T08:12:22Z", + "authored_date": "2015-12-18T08:12:22.248Z", "author_name": "John Doe", "author_email": "john.doe@example.com", - "committed_date": "2015-12-18T08:12:22Z", + "committed_date": "2015-12-18T08:12:22.248Z", "committer_name": "John Doe", "committer_email": "john.doe@example.com" }, @@ -19,4 +19,4 @@ "" ] } -] \ No newline at end of file +] diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/branch.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/branch.json index 303e5e15d..0f4d7fef6 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/branch.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/branch.json @@ -10,8 +10,8 @@ "commit": { "author_email": "john@example.com", "author_name": "John Smith", - "authored_date": "2012-06-27T05:51:39Z", - "committed_date": "2012-06-28T03:44:20Z", + "authored_date": "2012-06-27T05:51:39.248Z", + "committed_date": "2012-06-28T03:44:20.248Z", "committer_email": "john@example.com", "committer_name": "John Smith", "id": "7b5c3cc8be40ee161ae89a06bba6229da1032a0c", diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/bridge.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/bridge.json index 38c5ab467..9fcb5a727 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/bridge.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/bridge.json @@ -22,8 +22,8 @@ "ref": "main", "sha": "0ff3ae198f8601a285adcf5c0fff204ee6fba5fd", "status": "pending", - "created_at": "2012-09-20T06:06:12Z", - "updated_at": "2012-09-20T06:06:12Z", + "created_at": "2012-09-20T06:06:12.248Z", + "updated_at": "2012-09-20T06:06:12.248Z", "web_url": "https://example.com/foo/bar/pipelines/6" }, "ref": "main", @@ -38,7 +38,7 @@ "state": "active", "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon", "web_url": "http://gitlab.dev/root", - "created_at": "2012-09-20T06:06:12Z", + "created_at": "2012-09-20T06:06:12.248Z", "bio": "some bio", "location": "any location", "public_email": "", @@ -53,8 +53,8 @@ "sha": "f62a4b2fb89754372a346f24659212eb8da13601", "ref": "main", "status": "pending", - "created_at": "2012-09-20T06:06:12Z", - "updated_at": "2012-09-20T06:06:12Z", + "created_at": "2012-09-20T06:06:12.248Z", + "updated_at": "2012-09-20T06:06:12.248Z", "web_url": "https://example.com/diaspora/diaspora-client/pipelines/5" } } diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/build-event.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/build-event.json index dff8db041..740cae1cf 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/build-event.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/build-event.json @@ -9,9 +9,9 @@ "build_name": "build1", "build_stage": "build", "build_status": "running", - "build_created_at": "2019-05-17T17:09:21Z", - "build_started_at": "2019-05-17T18:09:21Z", - "build_finished_at": "2019-05-17T19:09:21Z", + "build_created_at": "2019-05-17T17:09:21.248Z", + "build_started_at": "2019-05-17T18:09:21.248Z", + "build_finished_at": "2019-05-17T19:09:21.248Z", "build_duration": 0.05880817, "build_queued_duration": 1095.5887, "build_allow_failure": false, diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/commit.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/commit.json index 7923fadd6..f1dafa85a 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/commit.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/commit.json @@ -6,10 +6,10 @@ "author_email": "dmitriy.zaporozhets@gmail.com", "committer_name": "Dmitriy", "committer_email": "dmitriy.zaporozhets@gmail.com", - "created_at": "2012-09-20T06:06:12Z", + "created_at": "2012-09-20T06:06:12.248Z", "message": "Sanitize for network graph", - "committed_date": "2012-09-20T06:06:12Z", - "authored_date": "2012-09-20T06:06:12Z", + "committed_date": "2012-09-20T06:06:12.248Z", + "authored_date": "2012-09-20T06:06:12.248Z", "parent_ids": [ "ae1d9fb46aa2b07ee9836d49862ec4e2c46fbbba" ], diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/compare-results.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/compare-results.json index f6b87cb84..b1bcaa384 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/compare-results.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/compare-results.json @@ -5,7 +5,7 @@ "title": "JS fix", "author_name": "Dmitriy Zaporozhets", "author_email": "dmitriy.zaporozhets@gmail.com", - "created_at": "2014-02-27T10:27:00Z" + "created_at": "2014-02-27T10:27:00.248Z" }, "commits": [{ "id": "12d65c8dd2b2676fa3ac47d955accc085a37a9c1", @@ -13,7 +13,7 @@ "title": "JS fix", "author_name": "Dmitriy Zaporozhets", "author_email": "dmitriy.zaporozhets@gmail.com", - "created_at": "2014-02-27T10:27:00Z" + "created_at": "2014-02-27T10:27:00.248Z" }], "diffs": [{ "old_path": "files/js/application.js", @@ -27,4 +27,4 @@ }], "compare_timeout": false, "compare_same_ref": false -} \ No newline at end of file +} diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/deploy-keys.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/deploy-keys.json index 2b5931fc6..e1059735f 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/deploy-keys.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/deploy-keys.json @@ -4,13 +4,13 @@ "title": "Public key", "key": "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0=", "can_push": false, - "created_at": "2013-10-02T10:12:29Z" + "created_at": "2013-10-02T10:12:29.248Z" }, { "id": 3, "title": "Another Public key", "key": "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0=", "can_push": true, - "created_at": "2013-10-02T11:12:29Z" + "created_at": "2013-10-02T11:12:29.248Z" } -] \ No newline at end of file +] diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/deployment.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/deployment.json index 34bb7c295..57aa848b1 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/deployment.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/deployment.json @@ -47,8 +47,8 @@ "title": "Merge branch 'rename-readme' into 'master'\r", "author_name": "Administrator", "author_email": "admin@example.com", - "created_at": "2016-08-11T13:28:26Z", + "created_at": "2016-08-11T13:28:26.248Z", "message": "Merge branch 'rename-readme' into 'master'\r\n\r\nRename README\r\n\r\n\r\n\r\nSee merge request !2" } } -} \ No newline at end of file +} diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/environment.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/environment.json index 2472c9549..86a8be4e8 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/environment.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/environment.json @@ -50,7 +50,7 @@ "commit": { "id": "416d8ea11849050d3d1f5104cf8cf51053e790ab", "short_id": "416d8ea1", - "created_at": "2016-01-02T15:39:18Z", + "created_at": "2016-01-02T15:39:18.248Z", "parent_ids": [ "e9a4449c95c64358840902508fc827f1a2eab7df" ], @@ -58,10 +58,10 @@ "message": "Removed fabric to fix #40\n", "author_name": "Administrator", "author_email": "admin@example.com", - "authored_date": "2016-01-02T15:39:18Z", + "authored_date": "2016-01-02T15:39:18.248Z", "committer_name": "Administrator", "committer_email": "admin@example.com", - "committed_date": "2016-01-02T15:39:18Z" + "committed_date": "2016-01-02T15:39:18.248Z" }, "pipeline": { "id": 34, diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/event-object.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/event-object.json index 335415ce9..51db320ef 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/event-object.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/event-object.json @@ -9,8 +9,8 @@ "assignee_id":51, "author_id":51, "project_id":14, - "created_at":"2013-12-03T17:15:43Z", - "updated_at":"2013-12-03T17:15:43Z", + "created_at":"2013-12-03T17:15:43.248Z", + "updated_at":"2013-12-03T17:15:43.248Z", "position":0, "description":"Create new API for manipulations with repository", "state":"opened", diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/event.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/event.json index 06d44cc17..90b58fa03 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/event.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/event.json @@ -31,7 +31,7 @@ { "id": "c5feabde2d8cd023215af4d2ceeb7a64839fc428", "message": "Add simple search to projects in public area", - "timestamp": "2013-05-13T18:18:08Z", + "timestamp": "2013-05-13T18:18:08.248Z", "url": "https://dev.gitlab.org/gitlab/gitlabhq/commit/c5feabde2d8cd023215af4d2ceeb7a64839fc428", "author": { "name": "Dmitriy Zaporozhets", @@ -51,4 +51,4 @@ "commit_title": "Add simple search to projects in public area" }, "target_title": "target title" -} \ No newline at end of file +} diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/external-status-check-event.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/external-status-check-event.json index 2e09b8fd5..17687542d 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/external-status-check-event.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/external-status-check-event.json @@ -27,7 +27,7 @@ "object_attributes": { "assignee_id": 37, "author_id": 37, - "created_at": "2023-03-14T12:50:14Z", + "created_at": "2023-03-14T12:50:14.248Z", "description": "A description", "id": 8440, "iid": 20, @@ -42,7 +42,7 @@ "target_project_id": 499, "time_estimate": 0, "title": "Update readme.adoc Test", - "updated_at": "2023-03-14T12:50:14Z", + "updated_at": "2023-03-14T12:50:14.248Z", "url": "https://gitlab.example.com/a_group/a_project/-/merge_requests/20", "source": { "id": 499, @@ -79,7 +79,7 @@ "last_commit": { "id": "93bcabc3d474e18a8c744139be0d2dea45ebb3a3", "message": "Update readme.adoc", - "timestamp": "2023-03-14T12:49:55Z", + "timestamp": "2023-03-14T12:49:55.248Z", "url": "https://gitlab.example.com/a_group/a_project/-/commit/93bcabc3d474e18a8c744139be0d2dea45ebb3a3", "author": { "name": "John Smith", @@ -119,4 +119,4 @@ "name": "a_test", "external_url": "https://external.io/a-check" } -} \ No newline at end of file +} diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/group-hook.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/group-hook.json index 15294b13f..e6a0feabc 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/group-hook.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/group-hook.json @@ -24,8 +24,8 @@ "enable_ssl_verification": true, "repository_update_events": false, "alert_status": "executable", - "disabled_until": "2012-10-12T17:04:47Z", - "created_at": "2012-10-12T17:04:47Z", + "disabled_until": "2012-10-12T17:04:47.248Z", + "created_at": "2012-10-12T17:04:47.248Z", "resource_access_token_events": true, "custom_webhook_template": "{\"event\":\"{{object_kind}}\"}" } diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/group-member-system-hook-event.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/group-member-system-hook-event.json index 4fa4db3ae..c92872bbb 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/group-member-system-hook-event.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/group-member-system-hook-event.json @@ -1,6 +1,6 @@ { - "created_at": "2012-07-21T07:30:56Z", - "updated_at": "2012-07-21T07:38:22Z", + "created_at": "2012-07-21T07:30:56.248Z", + "updated_at": "2012-07-21T07:38:22.248Z", "event_name": "user_add_to_group", "group_access": "Master", "group_id": 78, @@ -10,4 +10,4 @@ "user_name": "John Smith", "user_username": "johnsmith", "user_id": 41 -} \ No newline at end of file +} diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/group-system-hook-event.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/group-system-hook-event.json index 01daf04fc..39d5d4b88 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/group-system-hook-event.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/group-system-hook-event.json @@ -1,11 +1,11 @@ { "event_name": "group_rename", - "created_at": "2017-10-30T15:09:00Z", - "updated_at": "2017-11-01T10:23:52Z", + "created_at": "2017-10-30T15:09:00.248Z", + "updated_at": "2017-11-01T10:23:52.248Z", "name": "Better Name", "path": "better-name", "full_path": "parent-group/better-name", "group_id": 64, "old_path": "old-name", "old_full_path": "parent-group/old-name" -} \ No newline at end of file +} diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/hook.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/hook.json index ce56a489e..1095425b9 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/hook.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/hook.json @@ -15,6 +15,6 @@ "pipeline_events": true, "wiki_page_events": true, "enable_ssl_verification": true, - "created_at": "2012-10-12T17:04:47Z", + "created_at": "2012-10-12T17:04:47.248Z", "description": "hook description" } diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/issue-event.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/issue-event.json index a589d7e45..07e07aac3 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/issue-event.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/issue-event.json @@ -33,11 +33,11 @@ "assignee_id": 51, "author_id": 51, "project_id": 14, - "created_at": "2013-12-03T17:15:43Z", - "updated_at": "2013-12-03T17:15:43Z", + "created_at": "2013-12-03T17:15:43.248Z", + "updated_at": "2013-12-03T17:15:43.248Z", "position": 0, "updated_by_id": 1, - "last_edited_at": "2013-12-03T18:15:43Z", + "last_edited_at": "2013-12-03T18:15:43.248Z", "last_edited_by_id": 1, "relative_position": 0, "description": "Create new API for manipulations with repository", @@ -46,7 +46,7 @@ "state_id": 1, "confidential": false, "discussion_locked": true, - "due_date": "2014-12-03T18:15:43Z", + "due_date": "2014-12-03T18:15:43.248Z", "moved_to_id": 1, "duplicated_to_id": 1, "time_estimate": 1800, @@ -68,8 +68,8 @@ "title": "API", "color": "#ffffff", "project_id": 14, - "created_at": "2013-12-03T17:15:43Z", - "updated_at": "2013-12-03T17:15:43Z", + "created_at": "2013-12-03T17:15:43.248Z", + "updated_at": "2013-12-03T17:15:43.248Z", "template": false, "description": "API related issues", "type": "ProjectLabel", @@ -90,16 +90,16 @@ "labels":[], "changes": { "due_date":{ - "previous": "2020-06-01T08:00:00Z", - "current": "2020-02-04T08:00:00Z" + "previous": "2020-06-01T08:00:00.248Z", + "current": "2020-02-04T08:00:00.248Z" }, "confidential": { "previous": false, "current": true }, "updated_at": { - "previous":"2019-04-12T01:10:28Z", - "current":"2019-04-12T01:11:33Z" + "previous":"2019-04-12T01:10:28.248Z", + "current":"2019-04-12T01:11:33.248Z" }, "updated_by_id": { "previous": 2, @@ -123,8 +123,8 @@ "title": "API", "color": "#ffffff", "project_id": 14, - "created_at": "2013-12-03T17:15:43Z", - "updated_at": "2013-12-03T17:15:43Z", + "created_at": "2013-12-03T17:15:43.248Z", + "updated_at": "2013-12-03T17:15:43.248Z", "template": false, "description": "API related issues", "type": "ProjectLabel", @@ -135,8 +135,8 @@ "title": "Platform", "color": "#123123", "project_id": 14, - "created_at": "2013-12-03T17:15:43Z", - "updated_at": "2013-12-03T17:15:43Z", + "created_at": "2013-12-03T17:15:43.248Z", + "updated_at": "2013-12-03T17:15:43.248Z", "template": false, "description": "Platform related issues", "type": "ProjectLabel", diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/job.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/job.json index f15ae36cc..d4045397b 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/job.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/job.json @@ -2,7 +2,7 @@ "commit": { "author_email": "admin@example.com", "author_name": "Administrator", - "created_at": "2015-12-24T16:51:14Z", + "created_at": "2015-12-24T16:51:14.248Z", "id": "0ff3ae198f8601a285adcf5c0fff204ee6fba5fd", "message": "Test the CI integration.", "short_id": "0ff3ae19", @@ -65,7 +65,7 @@ "name_with_namespace": "Diaspora / Diaspora Project Site", "path": "diaspora-project-site", "path_with_namespace": "diaspora/diaspora-project-site", - "created_at": "2013-09-30T13:46:02Z" + "created_at": "2013-09-30T13:46:02.248Z" } } diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/key-system-hook-event.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/key-system-hook-event.json index 5ab24e1d7..46a14bae0 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/key-system-hook-event.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/key-system-hook-event.json @@ -1,8 +1,8 @@ { "event_name": "key_destroy", "created_at": "2014-08-18 18:45:16Z", - "updated_at": "2012-07-21T07:38:22Z", + "updated_at": "2012-07-21T07:38:22.248Z", "username": "root", "key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC58FwqHUbebw2SdT7SP4FxZ0w+lAO/erhy2ylhlcW/tZ3GY3mBu9VeeiSGoGz8hCx80Zrz+aQv28xfFfKlC8XQFpCWwsnWnQqO2Lv9bS8V1fIHgMxOHIt5Vs+9CAWGCCvUOAurjsUDoE2ALIXLDMKnJxcxD13XjWdK54j6ZXDB4syLF0C2PnAQSVY9X7MfCYwtuFmhQhKaBussAXpaVMRHltie3UYSBUUuZaB3J4cg/7TxlmxcNd+ppPRIpSZAB0NI6aOnqoBCpimscO/VpQRJMVLr3XiSYeT6HBiDXWHnIVPfQc03OGcaFqOit6p8lYKMaP/iUQLm+pgpZqrXZ9vB john@localhost", "id": 4 -} \ No newline at end of file +} diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/members.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/members.json index 22f8a4536..eb0d46c04 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/members.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/members.json @@ -6,7 +6,7 @@ "state": "active", "avatar_url": "https://www.gravatar.com/avatar/c2525a7f58ae3776070e44c106c48e15?s=80&d=identicon", "web_url": "http://192.168.1.8:3000/root", - "expires_at": "2012-10-22T14:13:35Z", + "expires_at": "2012-10-22T14:13:35.248Z", "access_level": 30 }, { @@ -16,7 +16,7 @@ "state": "active", "avatar_url": "https://www.gravatar.com/avatar/c2525a7f58ae3776070e44c106c48e15?s=80&d=identicon", "web_url": "http://192.168.1.8:3000/root", - "expires_at": "2012-10-22T14:13:35Z", + "expires_at": "2012-10-22T14:13:35.248Z", "access_level": 30 }, { @@ -26,7 +26,7 @@ "state": "active", "avatar_url": "https://www.gravatar.com/avatar/c2525a7f58ae3776070e44c106c48e15?s=80&d=identicon", "web_url": "http://192.168.1.8:3000/root", - "expires_at": "2012-10-22T14:13:35Z", + "expires_at": "2012-10-22T14:13:35.248Z", "access_level": 30, "group_saml_identity": { "extern_uid":"ABC-1234567890", @@ -34,4 +34,4 @@ "saml_provider_id": 10 } } -] \ No newline at end of file +] diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/merge-request-comment.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/merge-request-comment.json index 5bdff26ed..0087573e0 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/merge-request-comment.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/merge-request-comment.json @@ -5,7 +5,7 @@ "email":"admin@local.host", "name":"Administrator", "blocked":false, - "created_at":"2012-04-29T08:46:00Z" + "created_at":"2012-04-29T08:46:00.248Z" }, "note":"text1" } diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/merge-request-diff.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/merge-request-diff.json index 43c04ccb5..39fe8d80c 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/merge-request-diff.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/merge-request-diff.json @@ -13,7 +13,7 @@ "title": "Change year to 2018", "author_name": "Administrator", "author_email": "admin@example.com", - "created_at": "2016-07-26T17:44:29Z", + "created_at": "2016-07-26T17:44:29.248Z", "message": "Change year to 2018" }, { "id": "aa24655de48b36335556ac8a3cd8bb521f977cbd", @@ -21,7 +21,7 @@ "title": "Update LICENSE", "author_name": "Administrator", "author_email": "admin@example.com", - "created_at": "2016-07-25T17:21:53Z", + "created_at": "2016-07-25T17:21:53.248Z", "message": "Update LICENSE" }, { "id": "3eed087b29835c48015768f839d76e5ea8f07a24", @@ -29,7 +29,7 @@ "title": "Add license", "author_name": "Administrator", "author_email": "admin@example.com", - "created_at": "2016-07-25T17:21:20Z", + "created_at": "2016-07-25T17:21:20.248Z", "message": "Add license" }], "diffs": [{ @@ -42,4 +42,4 @@ "renamed_file": false, "deleted_file": false }] -} \ No newline at end of file +} diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/merge-request-event.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/merge-request-event.json index 10525b4ee..ae879fee4 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/merge-request-event.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/merge-request-event.json @@ -45,8 +45,8 @@ 6 ], "title": "MS-Viewport", - "created_at": "2013-12-03T17:23:34Z", - "updated_at": "2013-12-03T17:23:34Z", + "created_at": "2013-12-03T17:23:34.248Z", + "updated_at": "2013-12-03T17:23:34.248Z", "milestone_id": 1, "state": "opened", "blocking_discussions_resolved": true, @@ -91,7 +91,7 @@ "last_commit": { "id": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7", "message": "fixed readme", - "timestamp": "2012-01-03T23:36:29Z", + "timestamp": "2012-01-03T23:36:29.248Z", "url": "http://example.com/awesome_space/awesome_project/commits/da1560886d4f094c3e6c9ef40349f7d38b5d27d7", "author": { "name": "GitLab dev user", @@ -104,8 +104,8 @@ "title": "API", "color": "#ffffff", "project_id": 14, - "created_at": "2013-12-03T17:15:43Z", - "updated_at": "2013-12-03T17:15:43Z", + "created_at": "2013-12-03T17:15:43.248Z", + "updated_at": "2013-12-03T17:15:43.248Z", "template": false, "description": "API related issues", "type": "ProjectLabel", @@ -113,7 +113,7 @@ } ], "head_pipeline_id": 848574, - "last_edited_at": "2014-04-03T17:23:34Z", + "last_edited_at": "2014-04-03T17:23:34.248Z", "last_edited_by_id": 59, "merge_commit_sha": "e3b7e97417fd6318a5c31b21b29d2acc5c86c3ae", "merge_user_id": 59, @@ -136,8 +136,8 @@ "title": "API", "color": "#ffffff", "project_id": 14, - "created_at": "2013-12-03T17:15:43Z", - "updated_at": "2013-12-03T17:15:43Z", + "created_at": "2013-12-03T17:15:43.248Z", + "updated_at": "2013-12-03T17:15:43.248Z", "template": false, "description": "API related issues", "type": "ProjectLabel", @@ -149,8 +149,8 @@ "current": 2 }, "updated_at": { - "previous": "2013-09-15T16:50:55Z", - "current": "2013-12-03T17:23:34Z" + "previous": "2013-09-15T16:50:55.248Z", + "current": "2013-12-03T17:23:34.248Z" }, "updated_by_id": { "previous": 2, @@ -178,8 +178,8 @@ "title": "API", "color": "#ffffff", "project_id": 14, - "created_at": "2013-12-03T17:15:43Z", - "updated_at": "2013-12-03T17:15:43Z", + "created_at": "2013-12-03T17:15:43.248Z", + "updated_at": "2013-12-03T17:15:43.248Z", "template": false, "description": "API related issues", "type": "ProjectLabel", @@ -192,8 +192,8 @@ "title": "Platform", "color": "#123123", "project_id": 14, - "created_at": "2013-12-03T17:15:43Z", - "updated_at": "2013-12-03T17:15:43Z", + "created_at": "2013-12-03T17:15:43.248Z", + "updated_at": "2013-12-03T17:15:43.248Z", "template": false, "description": "Platform related issues", "type": "ProjectLabel", @@ -238,4 +238,4 @@ "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon" } ] -} \ No newline at end of file +} diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/merge-request-note.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/merge-request-note.json index 6928400ee..ad8550d36 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/merge-request-note.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/merge-request-note.json @@ -7,12 +7,12 @@ "email": "admin@example.com", "name": "Pip", "state": "active", - "created_at": "2013-09-30T13:46:01Z" + "created_at": "2013-09-30T13:46:01.248Z" }, - "created_at": "2013-10-02T08:57:14Z", - "updated_at": "2013-10-02T08:57:14Z", + "created_at": "2013-10-02T08:57:14.248Z", + "updated_at": "2013-10-02T08:57:14.248Z", "system": false, "noteable_id": 2, "noteable_type": "MergeRequest", "noteable_iid": 2 -} \ No newline at end of file +} diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/merge-request-system-hook-event.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/merge-request-system-hook-event.json index 076a61fdd..f5dac6a5b 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/merge-request-system-hook-event.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/merge-request-system-hook-event.json @@ -84,7 +84,7 @@ "last_commit": { "id": "ba3e0d8ff79c80d5b0bbb4f3e2e343e0aaa662b7", "message": "fixed readme", - "timestamp": "2017-09-26T16:12:57Z", + "timestamp": "2017-09-26T16:12:57.248Z", "url": "http://example.com/awesome_space/awesome_project/commits/da1560886d4f094c3e6c9ef40349f7d38b5d27d7", "author": { "name": "GitLab dev user", diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/merge-request.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/merge-request.json index 666425ba2..103c3e9ed 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/merge-request.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/merge-request.json @@ -9,9 +9,9 @@ "detailed_merge_status": "can_be_merged", "upvotes":0, "downvotes":0, - "created_at": "2016-12-03T17:23:34Z", - "updated_at": "2016-12-03T17:23:34Z", - "merged_at": "2016-12-03T17:23:34Z", + "created_at": "2016-12-03T17:23:34.248Z", + "updated_at": "2016-12-03T17:23:34.248Z", + "merged_at": "2016-12-03T17:23:34.248Z", "squash_commit_sha": "37a1f246848c3dc2bb82964a183417e2e72fe1a7", "merged_by": { "id": 7, @@ -36,7 +36,7 @@ "email":"admin@local.host", "name":"Administrator", "state":"active", - "created_at":"2012-04-29T08:46:00Z" + "created_at":"2012-04-29T08:46:00.248Z" }, "assignee":{ "id":1, @@ -44,7 +44,7 @@ "email":"admin@local.host", "name":"Administrator", "state":"active", - "created_at":"2012-04-29T08:46:00Z" + "created_at":"2012-04-29T08:46:00.248Z" }, "draft": false, "allow_collaboration": false, diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/milestone-group.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/milestone-group.json index 9ed4f1953..c09c062b0 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/milestone-group.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/milestone-group.json @@ -7,6 +7,6 @@ "start_date":"2013-11-01", "due_date":"2013-11-29", "state":"active", - "updated_at":"2013-10-02T09:24:18Z", - "created_at":"2013-10-02T09:24:18Z" + "updated_at":"2013-10-02T09:24:18.248Z", + "created_at":"2013-10-02T09:24:18.248Z" } diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/milestone.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/milestone.json index a10791205..2e7fe9d81 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/milestone.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/milestone.json @@ -5,8 +5,8 @@ "title": "1.0", "description": "Version", "state": "active", - "created_at": "2013-10-02T09:24:18Z", - "updated_at": "2013-10-02T09:24:18Z", + "created_at": "2013-10-02T09:24:18.248Z", + "updated_at": "2013-10-02T09:24:18.248Z", "due_date": "2013-11-29", "start_date": "2013-11-01", "expired": false, diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/note-commit-event.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/note-commit-event.json index d36b7f6a0..229270ce1 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/note-commit-event.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/note-commit-event.json @@ -34,8 +34,8 @@ "type": "DiscussionNote", "noteable_type": "Commit", "author_id": 1, - "created_at": "2015-05-17T18:08:09Z", - "updated_at": "2015-05-17T18:08:09Z", + "created_at": "2015-05-17T18:08:09.248Z", + "updated_at": "2015-05-17T18:08:09.248Z", "project_id": 5, "line_code": "bec9703f7a456cd2b4ab5fb3220ae016e3e394e3_0_1", "commit_id": "cfe32cf61b73a0d5e9f13e774abde7ff789b1660", @@ -55,11 +55,11 @@ "commit": { "id": "cfe32cf61b73a0d5e9f13e774abde7ff789b1660", "message": "Add submodule\n\nSigned-off-by: Dmitriy Zaporozhets \u003cdmitriy.zaporozhets@gmail.com\u003e\n", - "timestamp": "2014-02-27T10:06:20Z", + "timestamp": "2014-02-27T10:06:20.248Z", "url": "http://example.com/gitlab-org/gitlab-test/commit/cfe32cf61b73a0d5e9f13e774abde7ff789b1660", "author": { "name": "Dmitriy Zaporozhets", "email": "dmitriy.zaporozhets@gmail.com" } } -} \ No newline at end of file +} diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/note-issue-event.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/note-issue-event.json index 0870f00c8..0b2acfb7b 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/note-issue-event.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/note-issue-event.json @@ -33,8 +33,8 @@ "type": "DiscussionNote", "noteable_type": "Issue", "author_id": 1, - "created_at": "2015-05-17T17:06:40Z", - "updated_at": "2015-05-17T17:06:40Z", + "created_at": "2015-05-17T17:06:40.248Z", + "updated_at": "2015-05-17T17:06:40.248Z", "project_id": 5, "noteable_id": 92, "system": false, @@ -45,11 +45,11 @@ "title": "test", "author_id": 1, "project_id": 5, - "created_at": "2015-04-12T14:53:17Z", - "updated_at": "2015-04-26T08:28:42Z", + "created_at": "2015-04-12T14:53:17.248Z", + "updated_at": "2015-04-26T08:28:42.248Z", "position": 0, "description": "test", "state": "closed", "iid": 17 } -} \ No newline at end of file +} diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/note-merge-request-event.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/note-merge-request-event.json index 4f7389d88..f165306be 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/note-merge-request-event.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/note-merge-request-event.json @@ -34,8 +34,8 @@ "type": "DiscussionNote", "noteable_type": "MergeRequest", "author_id": 1, - "created_at": "2015-05-17T18:21:36Z", - "updated_at": "2015-05-17T18:21:36Z", + "created_at": "2015-05-17T18:21:36.248Z", + "updated_at": "2015-05-17T18:21:36.248Z", "project_id": 5, "commit_id": "", "noteable_id": 7, @@ -50,8 +50,8 @@ "author_id": 8, "assignee_id": 28, "title": "Tempora et eos debitis quae laborum et.", - "created_at": "2015-03-01T20:12:53Z", - "updated_at": "2015-03-21T18:27:27Z", + "created_at": "2015-03-01T20:12:53.248Z", + "updated_at": "2015-03-21T18:27:27.248Z", "milestone_id": 11, "state": "opened", "merge_status": "cannot_be_merged", @@ -92,7 +92,7 @@ "last_commit": { "id": "562e173be03b8ff2efb05345d12df18815438a4b", "message": "Merge branch 'another-branch' into 'master'\n\nCheck in this test\n", - "timestamp": "2015-04-08T21:00:25Z", + "timestamp": "2015-04-08T21:00:25.248Z", "url": "http://example.com/gitlab-org/gitlab-test/commit/562e173be03b8ff2efb05345d12df18815438a4b", "author": { "name": "John Smith", @@ -106,4 +106,4 @@ "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon" } } -} \ No newline at end of file +} diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/note-snippet-event.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/note-snippet-event.json index b1e328075..bb122673d 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/note-snippet-event.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/note-snippet-event.json @@ -34,8 +34,8 @@ "type": "DiscussionNote", "noteable_type": "Snippet", "author_id": 1, - "created_at": "2015-05-17T18:35:50Z", - "updated_at": "2015-05-17T18:35:50Z", + "created_at": "2015-05-17T18:35:50.248Z", + "updated_at": "2015-05-17T18:35:50.248Z", "project_id": 5, "commit_id": "", "noteable_id": 53, @@ -48,10 +48,10 @@ "content": "puts 'Hello world'", "author_id": 1, "project_id": 5, - "created_at": "2015-04-09T02:40:38Z", - "updated_at": "2015-04-09T02:40:38Z", + "created_at": "2015-04-09T02:40:38.248Z", + "updated_at": "2015-04-09T02:40:38.248Z", "file_name": "test.rb", "type": "ProjectSnippet", "visibility_level": 0 } -} \ No newline at end of file +} diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/note.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/note.json index af3f46196..08fb97fef 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/note.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/note.json @@ -7,7 +7,7 @@ "email": "admin@example.com", "name": "Pip", "state": "active", - "created_at": "2013-09-30T13:46:01Z", + "created_at": "2013-09-30T13:46:01.248Z", "avatar_url": "http://www.gravatar.com/avatar/5224fd70153710e92fb8bcf79ac29d67?s=80&d=identicon", "web_url": "https://gitlab.example.com/pipin" }, @@ -22,4 +22,4 @@ "noteable_type": "Snippet", "upvote": false, "downvote": false -} \ No newline at end of file +} diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/packages.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/packages.json index 029e5bcd9..2495a557a 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/packages.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/packages.json @@ -4,13 +4,13 @@ "name": "com/mycompany/my-app", "version": "1.0-SNAPSHOT", "package_type": "maven", - "created_at": "2012-10-22T14:13:35Z" + "created_at": "2012-10-22T14:13:35.248Z" }, { "id": 2, "name": "@foo/bar", "version": "1.0.3", "package_type": "npm", - "created_at": "2012-10-22T14:13:35Z" + "created_at": "2012-10-22T14:13:35.248Z" } -] \ No newline at end of file +] diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/personal-access-token.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/personal-access-token.json index 2b8abb208..883472c58 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/personal-access-token.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/personal-access-token.json @@ -3,11 +3,11 @@ "name": "Rotated Token", "description": "Test Token description", "revoked": false, - "created_at": "2023-08-01T15:00:00Z", + "created_at": "2023-08-01T15:00:00.248Z", "scopes": ["api"], "user_id": 1337, - "last_used_at": "2021-10-06T17:58:37Z", + "last_used_at": "2021-10-06T17:58:37.248Z", "active": true, "expires_at": "2023-08-15", "token": "s3cr3t" -} \ No newline at end of file +} diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/pipeline-event.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/pipeline-event.json index ad5b4ae58..dc030a257 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/pipeline-event.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/pipeline-event.json @@ -15,8 +15,8 @@ "test", "deploy" ], - "created_at": "2016-08-12T15:23:28Z", - "finished_at": "2016-08-12T15:26:29Z", + "created_at": "2016-08-12T15:23:28.248Z", + "finished_at": "2016-08-12T15:26:29.248Z", "duration": 63, "queued_duration": 0.010, "variables": [ @@ -61,7 +61,7 @@ "commit":{ "id": "bcbb5ec396a2c0f828686f14fac9b80b780504f2", "message": "test\n", - "timestamp": "2016-08-12T17:23:21Z", + "timestamp": "2016-08-12T17:23:21.248Z", "url": "http://example.com/gitlab-org/gitlab-test/commit/bcbb5ec396a2c0f828686f14fac9b80b780504f2", "author":{ "name": "User", @@ -74,7 +74,7 @@ "stage": "deploy", "name": "production", "status": "skipped", - "created_at": "2016-08-12T15:23:28Z", + "created_at": "2016-08-12T15:23:28.248Z", "when": "manual", "manual": true, "user":{ @@ -90,8 +90,8 @@ "stage": "test", "name": "test-image", "status": "success", - "created_at": "2016-08-12T15:23:28Z", - "started_at": "2016-08-12T15:26:12Z", + "created_at": "2016-08-12T15:23:28.248Z", + "started_at": "2016-08-12T15:26:12.248Z", "when": "on_success", "manual": false, "user":{ @@ -113,9 +113,9 @@ "stage": "test", "name": "test-build", "status": "success", - "created_at": "2016-08-12T15:23:28Z", - "started_at": "2016-08-12T15:26:12Z", - "finished_at": "2016-08-12T15:26:29Z", + "created_at": "2016-08-12T15:23:28.248Z", + "started_at": "2016-08-12T15:26:12.248Z", + "finished_at": "2016-08-12T15:26:29.248Z", "when": "on_success", "manual": false, "user":{ @@ -137,9 +137,9 @@ "stage": "build", "name": "build-image", "status": "success", - "created_at": "2016-08-12T15:23:28Z", - "started_at": "2016-08-12T15:24:56Z", - "finished_at": "2016-08-12T15:25:26Z", + "created_at": "2016-08-12T15:23:28.248Z", + "started_at": "2016-08-12T15:24:56.248Z", + "finished_at": "2016-08-12T15:25:26.248Z", "when": "on_success", "manual": false, "user":{ @@ -161,7 +161,7 @@ "stage": "deploy", "name": "staging", "status": "created", - "created_at": "2016-08-12T15:23:28Z", + "created_at": "2016-08-12T15:23:28.248Z", "when": "on_success", "manual": false, "user":{ @@ -179,7 +179,7 @@ "stage": "deploy", "name": "production", "status": "skipped", - "created_at": "2016-08-12T15:23:28Z", + "created_at": "2016-08-12T15:23:28.248Z", "when": "manual", "manual": true, "allow_failure": false, @@ -196,9 +196,9 @@ "stage": "test", "name": "test-image", "status": "success", - "created_at": "2016-08-12T15:23:28Z", - "started_at": "2016-08-12T15:26:12Z", - "finished_at": "2016-08-12T15:26:29Z", + "created_at": "2016-08-12T15:23:28.248Z", + "started_at": "2016-08-12T15:26:12.248Z", + "finished_at": "2016-08-12T15:26:29.248Z", "duration": 17.0, "queued_duration": 196.0, "when": "on_success", @@ -229,9 +229,9 @@ "stage": "test", "name": "test-build", "status": "failed", - "created_at": "2016-08-12T15:23:28Z", - "started_at": "2016-08-12T15:26:12Z", - "finished_at": "2016-08-12T15:26:29Z", + "created_at": "2016-08-12T15:23:28.248Z", + "started_at": "2016-08-12T15:26:12.248Z", + "finished_at": "2016-08-12T15:26:29.248Z", "duration": 17.0, "queued_duration": 196.0, "failure_reason": "script_failure", @@ -262,9 +262,9 @@ "stage": "build", "name": "build-image", "status": "success", - "created_at": "2016-08-12T15:23:28Z", - "started_at": "2016-08-12T15:24:56Z", - "finished_at": "2016-08-12T15:25:26Z", + "created_at": "2016-08-12T15:23:28.248Z", + "started_at": "2016-08-12T15:24:56.248Z", + "finished_at": "2016-08-12T15:25:26.248Z", "duration": 17.0, "queued_duration": 196.0, "when": "on_success", @@ -294,7 +294,7 @@ "stage": "deploy", "name": "staging", "status": "created", - "created_at": "2016-08-12T15:23:28Z", + "created_at": "2016-08-12T15:23:28.248Z", "when": "on_success", "manual": false, "allow_failure": false, diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/project-system-hook-event.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/project-system-hook-event.json index c80be4953..835d1751b 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/project-system-hook-event.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/project-system-hook-event.json @@ -1,6 +1,6 @@ { - "created_at": "2012-07-21T07:30:54Z", - "updated_at": "2012-07-21T07:38:22Z", + "created_at": "2012-07-21T07:30:54.248Z", + "updated_at": "2012-07-21T07:38:22.248Z", "event_name": "project_create", "name": "StoreCloud", "owner_email": "johnsmith@gmail.com", @@ -9,4 +9,4 @@ "path_with_namespace": "jsmith/storecloud", "project_id": 74, "project_visibility": "private" -} \ No newline at end of file +} diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/project.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/project.json index 8e2dc2683..3550a5ee0 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/project.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/project.json @@ -6,8 +6,8 @@ "name_with_namespace" : "Diaspora / Diaspora Project Site", "path" : "diaspora-project-site", "path_with_namespace" : "diaspora/diaspora-project-site", - "created_at" : "2013-09-30T13:46:02Z", - "updated_at" : "2013-09-30T13:46:02Z", + "created_at" : "2013-09-30T13:46:02.248Z", + "updated_at" : "2013-09-30T13:46:02.248Z", "default_branch" : "master", "tag_list" : [ "example", "disapora project" ], "topics" : [ "example", "disapora project" ], @@ -18,7 +18,7 @@ "forks_count" : 0, "avatar_url" : "http://example.com/uploads/project/avatar/3/uploads/avatar.png", "star_count" : 0, - "last_activity_at" : "2013-09-30T13:46:02Z", + "last_activity_at" : "2013-09-30T13:46:02.248Z", "namespace" : { "id" : 3, "name" : "Diaspora", @@ -51,7 +51,7 @@ "state" : "active", "avatar_url" : "https://secure.gravatar.com/avatar/9b7126c28ab977c4c4a351df3a1d1d24?s=80&d=identicon", "web_url" : "https://example.com/user1234", - "created_at" : "2013-09-30T13:46:02Z" + "created_at" : "2013-09-30T13:46:02.248Z" }, "resolve_outdated_diff_discussions" : false, "container_expiration_policy" : { diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/push-event.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/push-event.json index 70598e2c7..faeda0ada 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/push-event.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/push-event.json @@ -42,7 +42,7 @@ "id": "b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327", "message": "Update Catalan translation to e38cb41.\n\nSee https://gitlab.com/gitlab-org/gitlab for more information", "title": "Update Catalan translation to e38cb41.", - "timestamp": "2011-12-12T14:27:31Z", + "timestamp": "2011-12-12T14:27:31.248Z", "url": "http://example.com/mike/diaspora/commit/b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327", "author": { "name": "Jordi Mallach", @@ -56,7 +56,7 @@ "id": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7", "message": "fixed readme", "title": "fixed readme", - "timestamp": "2012-01-03T23:36:29Z", + "timestamp": "2012-01-03T23:36:29.248Z", "url": "http://example.com/mike/diaspora/commit/da1560886d4f094c3e6c9ef40349f7d38b5d27d7", "author": { "name": "GitLab dev user", diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/push-rule.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/push-rule.json index dd0e5d5c7..2e159b3ce 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/push-rule.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/push-rule.json @@ -5,7 +5,7 @@ "commit_message_negative_regex": "ssh\\:\/\/", "branch_name_regex": "", "deny_delete_tag": false, - "created_at": "2012-10-12T17:04:47Z", + "created_at": "2012-10-12T17:04:47.248Z", "member_check": false, "prevent_secrets": false, "author_email_regex": "", diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/push-system-hook-event.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/push-system-hook-event.json index 1050d8843..04554f319 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/push-system-hook-event.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/push-system-hook-event.json @@ -37,7 +37,7 @@ { "id": "c5feabde2d8cd023215af4d2ceeb7a64839fc428", "message": "Add simple search to projects in public area", - "timestamp": "2013-05-13T18:18:08Z", + "timestamp": "2013-05-13T18:18:08.248Z", "url": "https://dev.gitlab.org/gitlab/gitlabhq/commit/c5feabde2d8cd023215af4d2ceeb7a64839fc428", "author": { "name": "Dmitriy Zaporozhets", @@ -46,4 +46,4 @@ } ], "total_commits_count": 1 -} \ No newline at end of file +} diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/related-epics.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/related-epics.json index dc25acc40..3dd8179b8 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/related-epics.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/related-epics.json @@ -42,7 +42,7 @@ }, "related_epic_link_id": 1, "link_type": "relates_to", - "link_created_at": "2022-08-23T13:53:37Z", - "link_updated_at": "2022-08-23T13:53:37Z" + "link_created_at": "2022-08-23T13:53:37.248Z", + "link_updated_at": "2022-08-23T13:53:37.248Z" } -] \ No newline at end of file +] diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/releases.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/releases.json index ca4aeae3f..e7345a83a 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/releases.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/releases.json @@ -18,17 +18,17 @@ "id":"079e90101242458910cccd35eab0e211dfc359c0", "short_id":"079e9010", "title":"Update README.md", - "created_at":"2019-01-03T01:55:38Z", + "created_at":"2019-01-03T01:55:38.248Z", "parent_ids":[ "f8d3d94cbd347e924aa7b715845e439d00e80ca4" ], "message":"Update README.md", "author_name":"Administrator", "author_email":"admin@example.com", - "authored_date":"2019-01-03T01:55:38Z", + "authored_date":"2019-01-03T01:55:38.248Z", "committer_name":"Administrator", "committer_email":"admin@example.com", - "committed_date":"2019-01-03T01:55:38Z" + "committed_date":"2019-01-03T01:55:38.248Z" }, "milestones": [ { @@ -124,17 +124,17 @@ "id":"f8d3d94cbd347e924aa7b715845e439d00e80ca4", "short_id":"f8d3d94c", "title":"Initial commit", - "created_at":"2019-01-03T01:53:28Z", + "created_at":"2019-01-03T01:53:28.248Z", "parent_ids":[ ], "message":"Initial commit", "author_name":"Administrator", "author_email":"admin@example.com", - "authored_date":"2019-01-03T01:53:28Z", + "authored_date":"2019-01-03T01:53:28.248Z", "committer_name":"Administrator", "committer_email":"admin@example.com", - "committed_date":"2019-01-03T01:53:28Z" + "committed_date":"2019-01-03T01:53:28.248Z" }, "evidence_sha":"760d6cdfb0879c3ffedec13af470e0f71cf52c6cde4d", "assets":{ @@ -172,4 +172,4 @@ "self": "https://gitlab.example.com/root/awesome-app/-/releases/v0.1" } } -] \ No newline at end of file +] diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/snippet.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/snippet.json index a5c585f71..09095ed33 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/snippet.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/snippet.json @@ -8,9 +8,9 @@ "email": "john@example.com", "name": "John Smith", "state": "active", - "created_at": "2012-05-23T08:00:58Z" + "created_at": "2012-05-23T08:00:58.248Z" }, - "updated_at": "2012-06-28T10:52:04Z", - "created_at": "2012-06-28T10:52:04Z", + "updated_at": "2012-06-28T10:52:04.248Z", + "created_at": "2012-06-28T10:52:04.248Z", "web_url": "http://example.com/example/example/snippets/1" } diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/tag.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/tag.json index 99045b841..024ea2752 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/tag.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/tag.json @@ -2,8 +2,8 @@ "commit": { "author_name": "John Smith", "author_email": "john@example.com", - "authored_date": "2012-05-28T04:42:42Z", - "committed_date": "2012-05-28T04:42:42Z", + "authored_date": "2012-05-28T04:42:42.248Z", + "committed_date": "2012-05-28T04:42:42.248Z", "committer_name": "Jack Smith", "committer_email": "jack@example.com", "id": "2695effb5807a22ff3d138d593fd856244e155e7", @@ -17,5 +17,5 @@ "description": "Amazing release. Wow" }, "name": "v1.0.0", - "created_at": "2024-08-13T16:53:30Z" + "created_at": "2024-08-13T16:53:30.248Z" } diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/team-member-system-hook-event.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/team-member-system-hook-event.json index e3867f374..189b76df2 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/team-member-system-hook-event.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/team-member-system-hook-event.json @@ -1,6 +1,6 @@ { - "created_at": "2012-07-21T07:30:56Z", - "updated_at": "2012-07-21T07:38:22Z", + "created_at": "2012-07-21T07:30:56.248Z", + "updated_at": "2012-07-21T07:38:22.248Z", "event_name": "user_add_to_team", "access_level": "Master", "project_id": 74, @@ -12,4 +12,4 @@ "user_username": "johnsmith", "user_id": 41, "project_visibility": "private" -} \ No newline at end of file +} diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/uploaded-file.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/uploaded-file.json index 7ac48b4db..c5143ff2d 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/uploaded-file.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/uploaded-file.json @@ -2,10 +2,10 @@ "id": 1623, "size": 435, "filename": "some-feature.png", - "created_at": "2024-09-23T13:52:15Z", + "created_at": "2024-09-23T13:52:15.248Z", "uploaded_by": { "id": 54, "username": "john.smith", "name": "John Smith" } -} \ No newline at end of file +} diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/user-failed-login-system-hook-event.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/user-failed-login-system-hook-event.json index a4e16d920..048723e4e 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/user-failed-login-system-hook-event.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/user-failed-login-system-hook-event.json @@ -1,10 +1,10 @@ { "event_name": "user_failed_login", - "created_at": "2017-10-03T06:08:48Z", - "updated_at": "2018-01-15T04:52:06Z", + "created_at": "2017-10-03T06:08:48.248Z", + "updated_at": "2018-01-15T04:52:06.248Z", "name": "John Smith", "email": "user4@example.com", "user_id": 26, "username": "user4", "state": "blocked" -} \ No newline at end of file +} diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/user-list.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/user-list.json index f77c21244..44dc1272d 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/user-list.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/user-list.json @@ -7,20 +7,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith1"}, @@ -40,20 +40,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith2"}, @@ -73,20 +73,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith3"}, @@ -106,20 +106,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith4"}, @@ -139,20 +139,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith5"}, @@ -172,20 +172,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith6"}, @@ -205,20 +205,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith7"}, @@ -238,20 +238,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith8"}, @@ -271,20 +271,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith9"}, @@ -304,20 +304,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith10"}, @@ -337,20 +337,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith11"}, @@ -370,20 +370,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith2"}, @@ -403,20 +403,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith13"}, @@ -436,20 +436,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith14"}, @@ -469,20 +469,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith15"}, @@ -502,20 +502,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith16"}, @@ -535,20 +535,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith17"}, @@ -568,20 +568,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith18"}, @@ -601,20 +601,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith19"}, @@ -634,20 +634,20 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "skype": "", "linkedin": "", "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith20"}, diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/user-system-hook-event.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/user-system-hook-event.json index 2689a7ea0..423de25f3 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/user-system-hook-event.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/user-system-hook-event.json @@ -1,10 +1,10 @@ { "event_name": "user_rename", - "created_at": "2017-11-01T11:21:04Z", - "updated_at": "2017-11-01T14:04:47Z", + "created_at": "2017-11-01T11:21:04.248Z", + "updated_at": "2017-11-01T14:04:47.248Z", "name": "new-name", "email": "best-email@example.tld", "user_id": 58, "username": "new-exciting-name", "old_username": "old-boring-name" -} \ No newline at end of file +} diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/user.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/user.json index a2dde8755..b841afe40 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/user.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/user.json @@ -6,7 +6,7 @@ "state": "active", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", - "created_at": "2012-05-23T08:00:58Z", + "created_at": "2012-05-23T08:00:58.248Z", "is_admin": false, "bio": "", "location": "", @@ -16,13 +16,13 @@ "twitter": "", "website_url": "", "organization": "", - "last_sign_in_at": "2012-06-01T11:41:01Z", - "confirmed_at": "2012-05-23T09:05:22Z", - "last_activity_on": "2012-05-23T07:00:00Z", + "last_sign_in_at": "2012-06-01T11:41:01.248Z", + "confirmed_at": "2012-05-23T09:05:22.248Z", + "last_activity_on": "2012-05-23T07:00:00.248Z", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, - "current_sign_in_at": "2012-06-02T06:36:55Z", + "current_sign_in_at": "2012-06-02T06:36:55.248Z", "identities": [ {"provider": "github", "extern_uid": "2435223452345"}, {"provider": "bitbucket", "extern_uid": "john_smith"}, @@ -36,4 +36,4 @@ "shared_runners_minutes_limit": 133, "extra_shared_runners_minutes_limit": 133, "namespace_id": 1 -} \ No newline at end of file +} diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/workitem-event.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/workitem-event.json index 241559be7..eebc028e5 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/workitem-event.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/workitem-event.json @@ -10,19 +10,19 @@ }, "object_attributes": { "author_id": 1245, - "closed_at": "2024-09-20T16:53:38Z", + "closed_at": "2024-09-20T16:53:38.248Z", "confidential": false, - "created_at": "2024-09-20T16:53:38Z", + "created_at": "2024-09-20T16:53:38.248Z", "description": "This is a test.\n\nThis is a test.", "id": 93843, "iid": 1, - "last_edited_at": "2024-10-17T06:47:37Z", + "last_edited_at": "2024-10-17T06:47:37.248Z", "last_edited_by_id": 1245, "relative_position": 147, "state_id": 1, "time_estimate": 0, "title": "Test Epic item", - "updated_at": "2024-10-17T06:47:37Z", + "updated_at": "2024-10-17T06:47:37.248Z", "updated_by_id": 1245, "weight": 23, "health_status": "on_track", @@ -37,8 +37,8 @@ "id": 15466, "title": "status::RequirementsAndSpecification", "color": "#808080", - "created_at": "2024-08-14T08:37:44Z", - "updated_at": "2024-08-14T08:37:44Z", + "created_at": "2024-08-14T08:37:44.248Z", + "updated_at": "2024-08-14T08:37:44.248Z", "template": false, "description": "RequirementsAndSpecification", "type": "GroupLabel", @@ -54,8 +54,8 @@ "id": 15466, "title": "status::RequirementsAndSpecification", "color": "#808080", - "created_at": "2024-08-14T08:37:44Z", - "updated_at": "2024-08-14T08:37:44Z", + "created_at": "2024-08-14T08:37:44.248Z", + "updated_at": "2024-08-14T08:37:44.248Z", "template": false, "description": "RequirementsAndSpecification", "type": "GroupLabel", @@ -68,16 +68,16 @@ "current": "This is a test.\n\nThis is a test." }, "last_edited_at": { - "previous": "2024-09-20T16:53:38Z", - "current": "2024-10-17T06:47:37Z" + "previous": "2024-09-20T16:53:38.248Z", + "current": "2024-10-17T06:47:37.248Z" }, "updated_at": { - "previous": "2024-09-24T08:54:43Z", - "current": "2024-10-17T06:47:37Z" + "previous": "2024-09-24T08:54:43.248Z", + "current": "2024-10-17T06:47:37.248Z" }, "health_status": { "previous":"on_track", "current":"needs_attention" } } -} \ No newline at end of file +} From 2fa7d691d952c8ea8ac91b8e048b556ddd9b697d Mon Sep 17 00:00:00 2001 From: ksaleschus Date: Mon, 1 Sep 2025 16:48:57 +0200 Subject: [PATCH 14/21] add annotations to new attributes --- .../java/org/gitlab4j/api/models/Link.java | 1 + .../java/org/gitlab4j/api/models/Project.java | 120 ++++++++++++++++++ .../org/gitlab4j/api/models/PullMirror.java | 24 ++++ 3 files changed, 145 insertions(+) diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Link.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Link.java index 83204df19..543d26d5a 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Link.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Link.java @@ -23,6 +23,7 @@ public class Link implements Serializable { @Deprecated private Boolean external; + @JsonProperty("link_type") private String linkType; public Integer getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java index 8fcc6b635..afc580371 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java @@ -271,72 +271,192 @@ public String toString() { @JsonProperty("issues_template") private String issuesTemplate; + @JsonProperty("use_custom_template") private Boolean useCustomTemplate; + + @JsonProperty("external_authorization_classification_label") private String externalAuthorizationClassificationLabel; + + @JsonProperty("group_runners_enabled") private Boolean groupRunnersEnabled; + + @JsonProperty("show_default_award_emojis") private Boolean showDefaultAwardEmojis; + + @JsonProperty("warn_about_potentially_unwanted_characters") private Boolean warnAboutPotentiallyUnwantedCharacters; + + @JsonProperty("mirror_trigger_builds") private Boolean mirrorTriggerBuilds; + + @JsonProperty("auto_cancel_pending_pipelines") private AutoCancelPendingPipelines autoCancelPendingPipelines; + + @JsonProperty("repository_object_format") private String repositoryObjectFormat; + + @JsonProperty("only_allow_merge_if_all_status_checks_passed") private Boolean onlyAllowMergeIfAllStatusChecksPassed; + + @JsonProperty("group_with_project_templates_id") private Integer groupWithProjectTemplatesId; + + @JsonProperty("public_builds") private Boolean publicBuilds; + + @JsonProperty("build_timeout") private Integer buildTimeout; + + @JsonProperty("template_name") private String templateName; + + @JsonProperty("emails_enabled") private Boolean emailsEnabled; + + @JsonProperty("mirror") private Boolean mirror; + + @JsonProperty("updated_at") private Date updatedAt; + + @JsonProperty("description_html") private String descriptionHtml; + + @JsonProperty("container_registry_image_prefix") private String containerRegistryImagePrefix; + + @JsonProperty("container_expiration_policy") private ContainerExpirationPolicy containerExpirationPolicy; + + @JsonProperty("service_desk_enabled") private Boolean serviceDeskEnabled; + + @JsonProperty("import_url") private String importUrl; + + @JsonProperty("import_type") private String importType; + + @JsonProperty("import_error") private String importError; + + @JsonProperty("ci_forward_deployment_rollback_allowed") private Boolean ciForwardDeploymentRollbackAllowed; + + @JsonProperty("ci_allow_fork_pipelines_to_run_in_parent_project") private Boolean ciAllowForkPipelinesToRunInParentProject; + + @JsonProperty("ci_id_token_sub_claim_components") private List ciIdTokenSubClaimComponents; + + @JsonProperty("ci_job_token_scope_enabled") private Boolean ciJobTokenScopeEnabled; + + @JsonProperty("ci_separated_caches") private Boolean ciSeparatedCaches; + + @JsonProperty("ci_restrict_pipeline_cancellation_role") private String ciRestrictPipelineCancellationRole; + + @JsonProperty("ci_pipeline_variables_minimum_override_role") private String ciPipelineVariablesMinimumOverrideRole; + + @JsonProperty("ci_push_repository_for_job_token_allowed") private Boolean ciPushRepositoryForJobTokenAllowed; + + @JsonProperty("ci_delete_pipelines_in_seconds") private Integer ciDeletePipelinesInSeconds; + + @JsonProperty("allow_pipeline_trigger_approve_deployment") private Boolean allowPipelineTriggerApproveDeployment; + + @JsonProperty("restrict_user_defined_variables") private Boolean restrictUserDefinedVariables; + + @JsonProperty("enforce_auth_checks_on_uploads") private Boolean enforceAuthChecksOnUploads; + + @JsonProperty("keep_latest_artifact") private Boolean keepLatestArtifact; + + @JsonProperty("runner_token_expiration_interval") private Integer runnerTokenExpirationInterval; + + @JsonProperty("requirements_enabled") private Boolean requirementsEnabled; + + @JsonProperty("security_and_compliance_enabled") private Boolean securityAndComplianceEnabled; + + @JsonProperty("secret_push_protection_enabled") private Boolean secretPushProtectionEnabled; + + @JsonProperty("compliance_frameworks") private List complianceFrameworks; + @JsonProperty("analytics_access_level") private ProjectFeatureVisibilityAccessLevel analyticsAccessLevel; + + @JsonProperty("builds_access_level") private ProjectFeatureVisibilityAccessLevel buildsAccessLevel; + + @JsonProperty("container_registry_access_level") private ProjectFeatureVisibilityAccessLevel containerRegistryAccessLevel; + + @JsonProperty("environments_access_level") private ProjectFeatureVisibilityAccessLevel environmentsAccessLevel; + + @JsonProperty("feature_flags_access_level") private ProjectFeatureVisibilityAccessLevel featureFlagsAccessLevel; + + @JsonProperty("forking_access_level") private ProjectFeatureVisibilityAccessLevel forkingAccessLevel; + + @JsonProperty("infrastructure_access_level") private ProjectFeatureVisibilityAccessLevel infrastructureAccessLevel; + + @JsonProperty("issues_access_level") private ProjectFeatureVisibilityAccessLevel issuesAccessLevel; + + @JsonProperty("merge_requests_access_level") private ProjectFeatureVisibilityAccessLevel mergeRequestsAccessLevel; + + @JsonProperty("model_experiments_access_level") private ProjectFeatureVisibilityAccessLevel modelExperimentsAccessLevel; + + @JsonProperty("model_registry_access_level") private ProjectFeatureVisibilityAccessLevel modelRegistryAccessLevel; + + @JsonProperty("monitor_access_level") private ProjectFeatureVisibilityAccessLevel monitorAccessLevel; + + @JsonProperty("pages_access_level") private ProjectFeatureVisibilityAccessLevel pagesAccessLevel; + + @JsonProperty("releases_access_level") private ProjectFeatureVisibilityAccessLevel releasesAccessLevel; + + @JsonProperty("repository_access_level") private ProjectFeatureVisibilityAccessLevel repositoryAccessLevel; + + @JsonProperty("requirements_access_level") private ProjectFeatureVisibilityAccessLevel requirementsAccessLevel; + + @JsonProperty("security_and_compliance_access_level") private ProjectFeatureVisibilityAccessLevel securityAndComplianceAccessLevel; + + @JsonProperty("snippets_access_level") private ProjectFeatureVisibilityAccessLevel snippetsAccessLevel; + + @JsonProperty("wiki_access_level") private ProjectFeatureVisibilityAccessLevel wikiAccessLevel; + @JsonProperty("_links") private Map links; @JsonProperty("marked_for_deletion_on") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date markedForDeletionOn; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PullMirror.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PullMirror.java index e1b459ead..806fb9eb6 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PullMirror.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PullMirror.java @@ -3,22 +3,46 @@ import java.io.Serializable; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonProperty; import org.gitlab4j.models.utils.JacksonJson; public class PullMirror implements Serializable { private static final long serialVersionUID = 1L; + @JsonProperty("id") private Long id; + + @JsonProperty("last_error") private String lastError; + + @JsonProperty("last_successful_update_at") private Date lastSuccessfulUpdateAt; + + @JsonProperty("last_update_at") private Date lastUpdateAt; + + @JsonProperty("last_update_started_at") private Date lastUpdateStartedAt; + + @JsonProperty("update_status") private String updateStatus; + + @JsonProperty("url") private String url; + + @JsonProperty("enabled") private Boolean enabled; + + @JsonProperty("mirror_trigger_builds") private Boolean mirrorTriggerBuilds; + + @JsonProperty("only_mirror_protected_branches") private Boolean onlyMirrorProtectedBranches; + + @JsonProperty("mirror_overwrites_diverged_branches") private Boolean mirrorOverwritesDivergedBranches; + + @JsonProperty("mirror_branch_regex") private String mirrorBranchRegex; public Long getId() { From 78e3387201244cac45de64bad0b44d95bcdeada1 Mon Sep 17 00:00:00 2001 From: ksaleschus Date: Tue, 2 Sep 2025 10:11:13 +0200 Subject: [PATCH 15/21] fixup! add annotations to new attributes --- .../src/main/java/org/gitlab4j/api/models/Project.java | 1 - .../src/main/java/org/gitlab4j/api/models/PullMirror.java | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java index afc580371..1190404b3 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java @@ -451,7 +451,6 @@ public String toString() { @JsonProperty("wiki_access_level") private ProjectFeatureVisibilityAccessLevel wikiAccessLevel; - @JsonProperty("_links") private Map links; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PullMirror.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PullMirror.java index 806fb9eb6..01c4ff9a8 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PullMirror.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PullMirror.java @@ -3,9 +3,10 @@ import java.io.Serializable; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonProperty; import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + public class PullMirror implements Serializable { private static final long serialVersionUID = 1L; From 84eaf1a007a61fba4f219b11a0e62f51642ecedd Mon Sep 17 00:00:00 2001 From: ksaleschus Date: Wed, 3 Sep 2025 08:31:37 +0200 Subject: [PATCH 16/21] remove dateformat information --- .../main/java/org/gitlab4j/api/models/AbstractEpic.java | 9 --------- .../main/java/org/gitlab4j/api/models/AbstractIssue.java | 5 ----- .../main/java/org/gitlab4j/api/models/AbstractUser.java | 1 - .../main/java/org/gitlab4j/api/models/AccessRequest.java | 1 - .../org/gitlab4j/api/models/ApplicationSettings.java | 2 -- .../main/java/org/gitlab4j/api/models/AuditEvent.java | 1 - .../main/java/org/gitlab4j/api/models/AwardEmoji.java | 2 -- .../src/main/java/org/gitlab4j/api/models/Bridge.java | 4 ---- .../java/org/gitlab4j/api/models/ChangelogPayload.java | 1 - .../src/main/java/org/gitlab4j/api/models/Comment.java | 1 - .../src/main/java/org/gitlab4j/api/models/Commit.java | 4 ---- .../main/java/org/gitlab4j/api/models/CommitStatus.java | 3 --- .../src/main/java/org/gitlab4j/api/models/DeployKey.java | 1 - .../main/java/org/gitlab4j/api/models/DeployToken.java | 1 - .../main/java/org/gitlab4j/api/models/Deployable.java | 4 ---- .../main/java/org/gitlab4j/api/models/Deployment.java | 2 -- .../java/org/gitlab4j/api/models/DownstreamPipeline.java | 2 -- .../main/java/org/gitlab4j/api/models/Environment.java | 1 - .../src/main/java/org/gitlab4j/api/models/Epic.java | 2 -- .../main/java/org/gitlab4j/api/models/EpicFilter.java | 3 --- .../src/main/java/org/gitlab4j/api/models/Event.java | 1 - .../main/java/org/gitlab4j/api/models/ExportStatus.java | 1 - .../api/models/ExternalStatusCheckProtectedBranch.java | 2 -- .../src/main/java/org/gitlab4j/api/models/GpgKey.java | 1 - .../src/main/java/org/gitlab4j/api/models/Group.java | 1 - .../java/org/gitlab4j/api/models/ImpersonationToken.java | 4 ---- .../main/java/org/gitlab4j/api/models/ImportStatus.java | 1 - .../main/java/org/gitlab4j/api/models/IssueEvent.java | 1 - .../src/main/java/org/gitlab4j/api/models/Iteration.java | 6 ------ .../org/gitlab4j/api/models/PersonalAccessToken.java | 1 - .../src/main/java/org/gitlab4j/api/models/Project.java | 1 - .../java/org/gitlab4j/api/models/ProjectAccessToken.java | 1 - .../main/java/org/gitlab4j/api/models/RelatedEpic.java | 1 - 33 files changed, 72 deletions(-) diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java index 0807f9407..7705c3e32 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java @@ -81,34 +81,27 @@ public String toString() { /** * The start date of the epic. - * Expected in format "yyyy-MM-dd". */ @JsonProperty("start_date") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date startDate; /** * The due date of the epic. - * Expected in format "yyyy-MM-dd". */ @JsonProperty("due_date") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date dueDate; /** * The end date of the epic. - * Expected in format "yyyy-MM-dd". */ @JsonProperty("end_date") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date endDate; /** * The date when the epic was created. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") @@ -116,7 +109,6 @@ public String toString() { /** * The date when the epic was last updated. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") @@ -124,7 +116,6 @@ public String toString() { /** * The date when the epic was closed. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("closed_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractIssue.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractIssue.java index 10aeb4345..df5db6783 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractIssue.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractIssue.java @@ -73,7 +73,6 @@ public String toString() { /** * The date when the issue was created. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") @@ -81,7 +80,6 @@ public String toString() { /** * The date when the issue was last updated. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") @@ -89,7 +87,6 @@ public String toString() { /** * The date when the issue was closed. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("closed_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") @@ -109,10 +106,8 @@ public String toString() { /** * The due date of the issue. - * Expected in format "yyyy-MM-dd". */ @JsonProperty("due_date") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date dueDate; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractUser.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractUser.java index 90bedee6e..390e0c793 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractUser.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractUser.java @@ -21,7 +21,6 @@ public abstract class AbstractUser> implements Seriali /** * The date when the user was created. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AccessRequest.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AccessRequest.java index 14d8ce51c..3c557031d 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AccessRequest.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AccessRequest.java @@ -10,7 +10,6 @@ public class AccessRequest extends AbstractUser { /** * The date when the access request was made. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("requested_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApplicationSettings.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApplicationSettings.java index 5c8183b59..f1e8919aa 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApplicationSettings.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApplicationSettings.java @@ -35,7 +35,6 @@ public class ApplicationSettings implements Serializable { /** * The date when the application settings were created. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") @@ -43,7 +42,6 @@ public class ApplicationSettings implements Serializable { /** * The date when the application settings were last updated. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AuditEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AuditEvent.java index 45aab4903..8c6b06529 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AuditEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AuditEvent.java @@ -43,7 +43,6 @@ public class AuditEvent implements Serializable { /** * The creation date of the audit event. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AwardEmoji.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AwardEmoji.java index 69d237a27..bc72ecdc7 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AwardEmoji.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AwardEmoji.java @@ -59,7 +59,6 @@ public String toString() { /** * The date when the award emoji was created. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") @@ -67,7 +66,6 @@ public String toString() { /** * The date when the award emoji was last updated. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Bridge.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Bridge.java index 956d96932..e5afc4392 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Bridge.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Bridge.java @@ -25,7 +25,6 @@ public class Bridge implements Serializable { /** * The creation date of the bridge. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") @@ -33,7 +32,6 @@ public class Bridge implements Serializable { /** * The start date of the bridge. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("started_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") @@ -41,7 +39,6 @@ public class Bridge implements Serializable { /** * The finish date of the bridge. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("finished_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") @@ -49,7 +46,6 @@ public class Bridge implements Serializable { /** * The date the bridge was erased. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("erased_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ChangelogPayload.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ChangelogPayload.java index a330bee38..319f997b3 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ChangelogPayload.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ChangelogPayload.java @@ -34,7 +34,6 @@ public class ChangelogPayload implements Serializable { /** * The date associated with the changelog. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("date") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Comment.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Comment.java index 6b728f394..d0a19373d 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Comment.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Comment.java @@ -20,7 +20,6 @@ public class Comment implements Serializable { /** * The creation date of the comment. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Commit.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Commit.java index 86e3f1ed9..c1472a1fe 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Commit.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Commit.java @@ -20,7 +20,6 @@ public class Commit implements Serializable { /** * The date when the commit was authored. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("authored_date") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") @@ -40,7 +39,6 @@ public class Commit implements Serializable { /** * The date when the commit was committed. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("committed_date") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") @@ -60,7 +58,6 @@ public class Commit implements Serializable { /** * The creation date of the commit. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") @@ -104,7 +101,6 @@ public class Commit implements Serializable { /** * The timestamp of the commit. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("timestamp") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitStatus.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitStatus.java index c75525fbb..84c54d075 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitStatus.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitStatus.java @@ -31,7 +31,6 @@ public class CommitStatus implements Serializable { /** * The creation date of the commit status. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") @@ -45,7 +44,6 @@ public class CommitStatus implements Serializable { /** * The date the commit status was finished. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("finished_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") @@ -83,7 +81,6 @@ public class CommitStatus implements Serializable { /** * The date the commit status was started. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("started_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployKey.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployKey.java index 1bbdada7a..f8c46642e 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployKey.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployKey.java @@ -37,7 +37,6 @@ public class DeployKey implements Serializable { /** * The creation date of the deploy key. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployToken.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployToken.java index b5262f680..a98d75d2d 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployToken.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployToken.java @@ -33,7 +33,6 @@ public class DeployToken implements Serializable { /** * The expiration date of the deploy token. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("expires_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployable.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployable.java index 3178a086e..9126e55ad 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployable.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployable.java @@ -57,7 +57,6 @@ public class Deployable implements Serializable { /** * The creation date of the deployable. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") @@ -65,7 +64,6 @@ public class Deployable implements Serializable { /** * The date the deployable was started. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("started_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") @@ -73,7 +71,6 @@ public class Deployable implements Serializable { /** * The date the deployable was finished. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("finished_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") @@ -123,7 +120,6 @@ public class Deployable implements Serializable { /** * The expiration date of the artifacts. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("artifacts_expire_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployment.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployment.java index 9fd17a0a0..9a5ae5b0f 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployment.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployment.java @@ -38,7 +38,6 @@ public class Deployment implements Serializable { /** * The creation date of the deployment. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") @@ -46,7 +45,6 @@ public class Deployment implements Serializable { /** * The last updated date of the deployment. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java index df8423df0..e337bb558 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java @@ -37,7 +37,6 @@ public class DownstreamPipeline implements Serializable { /** * The creation date of the downstream pipeline. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") @@ -45,7 +44,6 @@ public class DownstreamPipeline implements Serializable { /** * The last updated date of the downstream pipeline. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Environment.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Environment.java index 2e5055cc1..c2a65060a 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Environment.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Environment.java @@ -81,7 +81,6 @@ public String toString() { /** * The auto stop time for the environment, if any. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("auto_stop_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Epic.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Epic.java index aaa433409..3e25c9fc1 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Epic.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Epic.java @@ -25,10 +25,8 @@ public class Epic extends AbstractEpic { /** * The due date inherited from a source, if applicable. - * Expected in format "yyyy-MM-dd". */ @JsonProperty("due_date_from_inherited_source") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date dueDateFromInheritedSource; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicFilter.java index cbe37db31..afe86b106 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicFilter.java @@ -67,7 +67,6 @@ public class EpicFilter implements Serializable { /** * The date after which the epic was created. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_after") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") @@ -75,7 +74,6 @@ public class EpicFilter implements Serializable { /** * The date after which the epic was updated. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_after") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") @@ -83,7 +81,6 @@ public class EpicFilter implements Serializable { /** * The date before which the epic was updated. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_before") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Event.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Event.java index eca27b41c..5a84690e3 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Event.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Event.java @@ -86,7 +86,6 @@ public class Event implements Serializable { /** * The creation date of the event. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExportStatus.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExportStatus.java index 892a32a6a..9d8f498b1 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExportStatus.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExportStatus.java @@ -83,7 +83,6 @@ public String toString() { /** * The creation date of the export status. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java index 34182ee0f..6ed83e058 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java @@ -31,7 +31,6 @@ public class ExternalStatusCheckProtectedBranch implements Serializable { /** * The creation date of the external status check protected branch. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") @@ -39,7 +38,6 @@ public class ExternalStatusCheckProtectedBranch implements Serializable { /** * The last updated date of the external status check protected branch. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GpgKey.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GpgKey.java index 4612f58e6..81d78d42b 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GpgKey.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GpgKey.java @@ -21,7 +21,6 @@ public class GpgKey { /** * The creation date of the key. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Group.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Group.java index 2ace1503c..a3052d720 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Group.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Group.java @@ -135,7 +135,6 @@ public void setJobArtifactsSize(Long jobArtifactsSize) { /** * The creation date of the project. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") private Date createdAt; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java index 7b8731a8d..9d0668b56 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java @@ -96,7 +96,6 @@ public String toString() { /** * The creation date of the token. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") @@ -104,7 +103,6 @@ public String toString() { /** * The last used date of the token. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("last_used_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") @@ -118,10 +116,8 @@ public String toString() { /** * The expiration date of the token. - * Expected in format "yyyy-MM-dd". */ @JsonProperty("expires_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date expiresAt; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImportStatus.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImportStatus.java index 61a1680a1..4897acfe8 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImportStatus.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImportStatus.java @@ -80,7 +80,6 @@ public String toString() { /** * The creation date of the import. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueEvent.java index e08f4a1eb..e31a3f6ad 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueEvent.java @@ -50,7 +50,6 @@ public String toString() { /** * The creation date of the resource. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Iteration.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Iteration.java index 98cf93de8..42e1e70aa 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Iteration.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Iteration.java @@ -90,7 +90,6 @@ public String toString() { /** * The creation date of the iteration. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") @@ -98,7 +97,6 @@ public String toString() { /** * The last updated date of the iteration. - * Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_at") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") @@ -106,19 +104,15 @@ public String toString() { /** * The start date of the iteration. - * Expected in format "yyyy-MM-dd". */ @JsonProperty("start_date") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date startDate; /** * The due date of the iteration. - * Expected in format "yyyy-MM-dd". */ @JsonProperty("due_date") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date dueDate; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PersonalAccessToken.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PersonalAccessToken.java index 1a7576e8c..086dfcbfd 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PersonalAccessToken.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PersonalAccessToken.java @@ -28,7 +28,6 @@ public class PersonalAccessToken implements Serializable { @JsonProperty("expires_at") @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") private Date expiresAt; @JsonProperty("id") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java index 1190404b3..cade80f94 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java @@ -455,7 +455,6 @@ public String toString() { private Map links; @JsonProperty("marked_for_deletion_on") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date markedForDeletionOn; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java index 0779f007a..dfcb5050f 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java @@ -24,7 +24,6 @@ public class ProjectAccessToken implements Serializable { private String name; @JsonProperty("expires_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date expiresAt; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpic.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpic.java index 403013e7c..12dfdc7e8 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpic.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpic.java @@ -18,7 +18,6 @@ public class RelatedEpic extends AbstractEpic { private Boolean dueDateIsFixed; @JsonProperty("due_date_from_inherited_source") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date dueDateFromInheritedSource; From c0a485d62df29855bf084d80ad7fc896bbc5fd88 Mon Sep 17 00:00:00 2001 From: ksaleschus Date: Wed, 3 Sep 2025 09:23:40 +0200 Subject: [PATCH 17/21] handle different Date formats --- .../org/gitlab4j/api/models/AbstractEpic.java | 8 +-- .../gitlab4j/api/models/AbstractIssue.java | 9 ++-- .../org/gitlab4j/api/models/AbstractUser.java | 5 +- .../gitlab4j/api/models/AccessRequest.java | 6 ++- .../api/models/ApplicationSettings.java | 22 +++----- .../org/gitlab4j/api/models/AuditEvent.java | 5 +- .../org/gitlab4j/api/models/AwardEmoji.java | 7 +-- .../java/org/gitlab4j/api/models/Bridge.java | 11 ++-- .../java/org/gitlab4j/api/models/Build.java | 9 ++-- .../gitlab4j/api/models/ChangelogPayload.java | 5 +- .../java/org/gitlab4j/api/models/Comment.java | 5 +- .../java/org/gitlab4j/api/models/Commit.java | 11 ++-- .../org/gitlab4j/api/models/CommitStatus.java | 9 ++-- .../api/models/CreateRunnerResponse.java | 5 +- .../org/gitlab4j/api/models/DeployKey.java | 5 +- .../org/gitlab4j/api/models/DeployToken.java | 5 +- .../org/gitlab4j/api/models/Deployable.java | 11 ++-- .../org/gitlab4j/api/models/Deployment.java | 7 +-- .../gitlab4j/api/models/DeploymentFilter.java | 7 +-- .../api/models/DownstreamPipeline.java | 7 +-- .../org/gitlab4j/api/models/Environment.java | 5 +- .../java/org/gitlab4j/api/models/Epic.java | 1 - .../org/gitlab4j/api/models/EpicFilter.java | 9 ++-- .../java/org/gitlab4j/api/models/Event.java | 5 +- .../org/gitlab4j/api/models/ExportStatus.java | 9 +++- .../ExternalStatusCheckProtectedBranch.java | 7 +-- .../java/org/gitlab4j/api/models/GpgKey.java | 6 ++- .../org/gitlab4j/api/models/GroupHook.java | 8 +-- .../api/models/ImpersonationToken.java | 7 +-- .../org/gitlab4j/api/models/ImportStatus.java | 5 +- .../org/gitlab4j/api/models/IssueEvent.java | 5 +- .../org/gitlab4j/api/models/IssueFilter.java | 15 ++++-- .../api/models/IssuesStatisticsFilter.java | 11 ++-- .../org/gitlab4j/api/models/Iteration.java | 7 +-- .../gitlab4j/api/models/IterationFilter.java | 11 ++-- .../java/org/gitlab4j/api/models/Job.java | 13 ++--- .../java/org/gitlab4j/api/models/Key.java | 5 +- .../java/org/gitlab4j/api/models/License.java | 9 ++-- .../org/gitlab4j/api/models/LinkedIssue.java | 7 +-- .../java/org/gitlab4j/api/models/Member.java | 5 +- .../org/gitlab4j/api/models/MergeRequest.java | 14 ++--- .../api/models/MergeRequestFilter.java | 21 ++++---- .../api/models/MergeRequestVersion.java | 5 +- .../org/gitlab4j/api/models/Milestone.java | 7 +-- .../java/org/gitlab4j/api/models/Note.java | 11 ++-- .../java/org/gitlab4j/api/models/Package.java | 5 +- .../org/gitlab4j/api/models/PackageFile.java | 5 +- .../api/models/PersonalAccessToken.java | 7 +-- .../org/gitlab4j/api/models/Pipeline.java | 13 ++--- .../gitlab4j/api/models/PipelineFilter.java | 7 +-- .../gitlab4j/api/models/PipelineSchedule.java | 9 ++-- .../java/org/gitlab4j/api/models/Project.java | 17 +++--- .../api/models/ProjectAccessToken.java | 7 +-- .../gitlab4j/api/models/ProjectFilter.java | 7 +-- .../org/gitlab4j/api/models/ProjectHook.java | 5 +- .../org/gitlab4j/api/models/PushRules.java | 5 +- .../api/models/RegistryRepository.java | 5 +- .../api/models/RegistryRepositoryTag.java | 5 +- .../org/gitlab4j/api/models/RelatedEpic.java | 7 +-- .../gitlab4j/api/models/RelatedEpicLink.java | 7 +-- .../java/org/gitlab4j/api/models/Release.java | 7 +-- .../gitlab4j/api/models/ReleaseParams.java | 5 +- .../org/gitlab4j/api/models/RemoteMirror.java | 9 ++-- .../org/gitlab4j/api/models/RunnerDetail.java | 5 +- .../java/org/gitlab4j/api/models/Snippet.java | 7 +-- .../java/org/gitlab4j/api/models/SshKey.java | 7 +-- .../org/gitlab4j/api/models/SystemHook.java | 5 +- .../java/org/gitlab4j/api/models/Tag.java | 5 +- .../java/org/gitlab4j/api/models/Todo.java | 4 +- .../java/org/gitlab4j/api/models/Trigger.java | 10 ++-- .../org/gitlab4j/api/models/UploadedFile.java | 5 +- .../java/org/gitlab4j/api/models/User.java | 11 ++-- .../GroupMemberSystemHookEvent.java | 7 +-- .../api/systemhooks/GroupSystemHookEvent.java | 10 ++-- .../api/systemhooks/KeySystemHookEvent.java | 10 ++-- .../systemhooks/ProjectSystemHookEvent.java | 10 ++-- .../TeamMemberSystemHookEvent.java | 10 ++-- .../api/systemhooks/UserSystemHookEvent.java | 7 +-- .../org/gitlab4j/api/webhook/EventCommit.java | 5 +- .../org/gitlab4j/api/webhook/EventIssue.java | 7 +-- .../org/gitlab4j/api/webhook/EventLabel.java | 53 ++++++++++--------- .../gitlab4j/api/webhook/EventSnippet.java | 9 ++-- .../gitlab4j/api/webhook/PipelineEvent.java | 20 +++---- 83 files changed, 393 insertions(+), 313 deletions(-) diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java index 7705c3e32..bd80109cb 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java @@ -7,8 +7,10 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.JacksonJsonEnumHelper; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; public class AbstractEpic> extends AbstractMinimalEpic implements Serializable { @@ -104,21 +106,21 @@ public String toString() { * The date when the epic was created. */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; /** * The date when the epic was last updated. */ @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAt; /** * The date when the epic was closed. */ @JsonProperty("closed_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date closedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractIssue.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractIssue.java index df5db6783..adb48d7a5 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractIssue.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractIssue.java @@ -6,10 +6,11 @@ import org.gitlab4j.models.Constants.IssueState; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.node.IntNode; import com.fasterxml.jackson.databind.node.LongNode; @@ -75,21 +76,21 @@ public String toString() { * The date when the issue was created. */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; /** * The date when the issue was last updated. */ @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAt; /** * The date when the issue was closed. */ @JsonProperty("closed_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date closedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractUser.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractUser.java index 390e0c793..f7da3a8cc 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractUser.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractUser.java @@ -4,10 +4,11 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @JsonIgnoreProperties(ignoreUnknown = true) public abstract class AbstractUser> implements Serializable { @@ -23,7 +24,7 @@ public abstract class AbstractUser> implements Seriali * The date when the user was created. */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AccessRequest.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AccessRequest.java index 3c557031d..b2cc8c9b3 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AccessRequest.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AccessRequest.java @@ -2,8 +2,10 @@ import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; + import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class AccessRequest extends AbstractUser { private static final long serialVersionUID = 1L; @@ -12,7 +14,7 @@ public class AccessRequest extends AbstractUser { * The date when the access request was made. */ @JsonProperty("requested_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date requestedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApplicationSettings.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApplicationSettings.java index f1e8919aa..dd7947bdf 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApplicationSettings.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApplicationSettings.java @@ -2,27 +2,17 @@ import java.io.Serializable; import java.lang.reflect.Array; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.BooleanNode; -import com.fasterxml.jackson.databind.node.DoubleNode; -import com.fasterxml.jackson.databind.node.FloatNode; -import com.fasterxml.jackson.databind.node.IntNode; -import com.fasterxml.jackson.databind.node.NullNode; -import com.fasterxml.jackson.databind.node.ObjectNode; -import com.fasterxml.jackson.databind.node.TextNode; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.node.*; public class ApplicationSettings implements Serializable { private static final long serialVersionUID = 1L; @@ -37,14 +27,14 @@ public class ApplicationSettings implements Serializable { * The date when the application settings were created. */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; /** * The date when the application settings were last updated. */ @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AuditEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AuditEvent.java index 8c6b06529..1d78e872d 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AuditEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AuditEvent.java @@ -4,9 +4,10 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class AuditEvent implements Serializable { private static final long serialVersionUID = 1L; @@ -45,7 +46,7 @@ public class AuditEvent implements Serializable { * The creation date of the audit event. */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AwardEmoji.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AwardEmoji.java index bc72ecdc7..bc0a0407b 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AwardEmoji.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AwardEmoji.java @@ -5,11 +5,12 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.JacksonJsonEnumHelper; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class AwardEmoji implements Serializable { private static final long serialVersionUID = 1L; @@ -61,14 +62,14 @@ public String toString() { * The date when the award emoji was created. */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; /** * The date when the award emoji was last updated. */ @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Bridge.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Bridge.java index e5afc4392..217bb1125 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Bridge.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Bridge.java @@ -4,9 +4,10 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class Bridge implements Serializable { private static final long serialVersionUID = 1L; @@ -27,28 +28,28 @@ public class Bridge implements Serializable { * The creation date of the bridge. */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; /** * The start date of the bridge. */ @JsonProperty("started_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date startedAt; /** * The finish date of the bridge. */ @JsonProperty("finished_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date finishedAt; /** * The date the bridge was erased. */ @JsonProperty("erased_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date erasedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Build.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Build.java index 5b9c1b3de..7db8509ca 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Build.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Build.java @@ -3,9 +3,10 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; /** * @author Yaris van Thiel @@ -25,15 +26,15 @@ public class Build { private BuildStatus status; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("started_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date startedAt; @JsonProperty("finished_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date finishedAt; @JsonProperty("duration") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ChangelogPayload.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ChangelogPayload.java index 319f997b3..eb85c7998 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ChangelogPayload.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ChangelogPayload.java @@ -6,10 +6,11 @@ import org.gitlab4j.models.GitLabForm; import org.gitlab4j.models.utils.ISO8601; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class ChangelogPayload implements Serializable { private static final long serialVersionUID = 1L; @@ -36,7 +37,7 @@ public class ChangelogPayload implements Serializable { * The date associated with the changelog. */ @JsonProperty("date") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date date; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Comment.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Comment.java index d0a19373d..1ab1664c8 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Comment.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Comment.java @@ -5,9 +5,10 @@ import org.gitlab4j.models.Constants.LineType; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class Comment implements Serializable { private static final long serialVersionUID = 1L; @@ -22,7 +23,7 @@ public class Comment implements Serializable { * The creation date of the comment. */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Commit.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Commit.java index c1472a1fe..4411d696a 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Commit.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Commit.java @@ -5,9 +5,10 @@ import java.util.List; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class Commit implements Serializable { private static final long serialVersionUID = 1L; @@ -22,7 +23,7 @@ public class Commit implements Serializable { * The date when the commit was authored. */ @JsonProperty("authored_date") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date authoredDate; /** @@ -41,7 +42,7 @@ public class Commit implements Serializable { * The date when the commit was committed. */ @JsonProperty("committed_date") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date committedDate; /** @@ -60,7 +61,7 @@ public class Commit implements Serializable { * The creation date of the commit. */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; /** @@ -103,7 +104,7 @@ public class Commit implements Serializable { * The timestamp of the commit. */ @JsonProperty("timestamp") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date timestamp; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitStatus.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitStatus.java index 84c54d075..114356fa2 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitStatus.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitStatus.java @@ -4,9 +4,10 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class CommitStatus implements Serializable { private static final long serialVersionUID = 1L; @@ -33,7 +34,7 @@ public class CommitStatus implements Serializable { * The creation date of the commit status. */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; /** @@ -46,7 +47,7 @@ public class CommitStatus implements Serializable { * The date the commit status was finished. */ @JsonProperty("finished_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date finishedAt; /** @@ -83,7 +84,7 @@ public class CommitStatus implements Serializable { * The date the commit status was started. */ @JsonProperty("started_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date startedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CreateRunnerResponse.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CreateRunnerResponse.java index de237ab7a..bec012bb3 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CreateRunnerResponse.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CreateRunnerResponse.java @@ -4,9 +4,10 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class CreateRunnerResponse implements Serializable { private static final long serialVersionUID = 1L; @@ -18,7 +19,7 @@ public class CreateRunnerResponse implements Serializable { private String token; @JsonProperty("token_expires_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date tokenExpiresAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployKey.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployKey.java index f8c46642e..73277e45a 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployKey.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployKey.java @@ -4,9 +4,10 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class DeployKey implements Serializable { private static final long serialVersionUID = 1L; @@ -39,7 +40,7 @@ public class DeployKey implements Serializable { * The creation date of the deploy key. */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployToken.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployToken.java index a98d75d2d..ec089a03c 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployToken.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployToken.java @@ -6,9 +6,10 @@ import org.gitlab4j.models.Constants; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class DeployToken implements Serializable { private static final long serialVersionUID = 1L; @@ -35,7 +36,7 @@ public class DeployToken implements Serializable { * The expiration date of the deploy token. */ @JsonProperty("expires_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date expiresAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployable.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployable.java index 9126e55ad..ef1c5a2a3 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployable.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployable.java @@ -6,9 +6,10 @@ import org.gitlab4j.models.Constants.DeploymentStatus; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class Deployable implements Serializable { private static final long serialVersionUID = 1L; @@ -59,21 +60,21 @@ public class Deployable implements Serializable { * The creation date of the deployable. */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; /** * The date the deployable was started. */ @JsonProperty("started_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date startedAt; /** * The date the deployable was finished. */ @JsonProperty("finished_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date finishedAt; /** @@ -122,7 +123,7 @@ public class Deployable implements Serializable { * The expiration date of the artifacts. */ @JsonProperty("artifacts_expire_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date artifactsExpireAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployment.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployment.java index 9a5ae5b0f..bc3f9c6ed 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployment.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployment.java @@ -5,9 +5,10 @@ import org.gitlab4j.models.Constants.DeploymentStatus; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class Deployment implements Serializable { private static final long serialVersionUID = 1L; @@ -40,14 +41,14 @@ public class Deployment implements Serializable { * The creation date of the deployment. */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; /** * The last updated date of the deployment. */ @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeploymentFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeploymentFilter.java index b50876370..5acf6db4c 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeploymentFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeploymentFilter.java @@ -9,10 +9,11 @@ import org.gitlab4j.models.Constants.SortOrder; import org.gitlab4j.models.GitLabForm; import org.gitlab4j.models.utils.ISO8601; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class DeploymentFilter implements Serializable { private static final long serialVersionUID = 1L; @@ -33,14 +34,14 @@ public class DeploymentFilter implements Serializable { * Return deployments updated after the specified date. Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_after") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAfter; /** * Return deployments updated before the specified date. Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_before") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedBefore; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java index e337bb558..5e89ec326 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java @@ -4,9 +4,10 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class DownstreamPipeline implements Serializable { private static final long serialVersionUID = 1L; @@ -39,14 +40,14 @@ public class DownstreamPipeline implements Serializable { * The creation date of the downstream pipeline. */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; /** * The last updated date of the downstream pipeline. */ @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Environment.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Environment.java index c2a65060a..953255f19 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Environment.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Environment.java @@ -5,11 +5,12 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.JacksonJsonEnumHelper; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class Environment implements Serializable { private static final long serialVersionUID = 1L; @@ -83,7 +84,7 @@ public String toString() { * The auto stop time for the environment, if any. */ @JsonProperty("auto_stop_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date autoStopAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Epic.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Epic.java index 3e25c9fc1..2aefd6a51 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Epic.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Epic.java @@ -4,7 +4,6 @@ import org.gitlab4j.models.utils.JacksonJson; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicFilter.java index afe86b106..6435b7c58 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicFilter.java @@ -11,11 +11,12 @@ import org.gitlab4j.models.GitLabForm; import org.gitlab4j.models.utils.ISO8601; import org.gitlab4j.models.utils.JacksonJsonEnumHelper; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; /** * This class is used to filter Groups when getting lists of epics. @@ -69,21 +70,21 @@ public class EpicFilter implements Serializable { * The date after which the epic was created. */ @JsonProperty("created_after") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAfter; /** * The date after which the epic was updated. */ @JsonProperty("updated_after") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAfter; /** * The date before which the epic was updated. */ @JsonProperty("updated_before") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedBefore; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Event.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Event.java index 5a84690e3..7f7ef0d51 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Event.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Event.java @@ -5,9 +5,10 @@ import org.gitlab4j.models.Constants.TargetType; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class Event implements Serializable { private static final long serialVersionUID = 1L; @@ -88,7 +89,7 @@ public class Event implements Serializable { * The creation date of the event. */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExportStatus.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExportStatus.java index 9d8f498b1..81eed1c55 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExportStatus.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExportStatus.java @@ -6,8 +6,13 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.JacksonJsonEnumHelper; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class ExportStatus implements Serializable { private static final long serialVersionUID = 1L; @@ -85,7 +90,7 @@ public String toString() { * The creation date of the export status. */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java index 6ed83e058..b70d03b72 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java @@ -4,9 +4,10 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class ExternalStatusCheckProtectedBranch implements Serializable { private static final long serialVersionUID = 1L; @@ -33,14 +34,14 @@ public class ExternalStatusCheckProtectedBranch implements Serializable { * The creation date of the external status check protected branch. */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; /** * The last updated date of the external status check protected branch. */ @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GpgKey.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GpgKey.java index 81d78d42b..3c9e38526 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GpgKey.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GpgKey.java @@ -2,8 +2,10 @@ import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; + import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class GpgKey { @@ -23,7 +25,7 @@ public class GpgKey { * The creation date of the key. */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupHook.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupHook.java index 10e05aac9..99e406b8e 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupHook.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupHook.java @@ -3,8 +3,10 @@ import java.io.Serializable; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; + import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class GroupHook implements Serializable { private static final long serialVersionUID = 1L; @@ -157,7 +159,7 @@ public class GroupHook implements Serializable { * The date until the webhook is disabled. Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("disabled_until") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date disabledUntil; /** @@ -170,7 +172,7 @@ public class GroupHook implements Serializable { * The creation date of the webhook. Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java index 9d0668b56..41ff1b977 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java @@ -6,11 +6,12 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.JacksonJsonEnumHelper; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; public class ImpersonationToken implements Serializable { @@ -98,14 +99,14 @@ public String toString() { * The creation date of the token. */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; /** * The last used date of the token. */ @JsonProperty("last_used_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date lastUsedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImportStatus.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImportStatus.java index 4897acfe8..dd24ab30c 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImportStatus.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImportStatus.java @@ -5,11 +5,12 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.JacksonJsonEnumHelper; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class ImportStatus implements Serializable { private static final long serialVersionUID = 1L; @@ -82,7 +83,7 @@ public String toString() { * The creation date of the import. */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueEvent.java index e31a3f6ad..47bf9a8bc 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueEvent.java @@ -4,11 +4,12 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.JacksonJsonEnumHelper; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class IssueEvent implements Serializable { private static final long serialVersionUID = 1L; @@ -52,7 +53,7 @@ public String toString() { * The creation date of the resource. */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private String createdAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueFilter.java index 63d7e29ce..eb941e927 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueFilter.java @@ -14,8 +14,13 @@ import org.gitlab4j.models.GitLabForm; import org.gitlab4j.models.utils.ISO8601; import org.gitlab4j.models.utils.JacksonJsonEnumHelper; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; /** * This class is used to filter issues when getting lists of them. @@ -99,28 +104,28 @@ public class IssueFilter implements Serializable { * Return issues created on or after the given time. */ @JsonProperty("created_after") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAfter; /** * Return issues created on or before the given time. */ @JsonProperty("created_before") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdBefore; /** * Return issues updated on or after the given time. */ @JsonProperty("updated_after") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAfter; /** * Return issues updated on or before the given time. */ @JsonProperty("updated_before") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedBefore; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssuesStatisticsFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssuesStatisticsFilter.java index 682e1b877..8a0b4c9b1 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssuesStatisticsFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssuesStatisticsFilter.java @@ -7,10 +7,11 @@ import org.gitlab4j.models.Constants.IssueScope; import org.gitlab4j.models.GitLabForm; import org.gitlab4j.models.utils.ISO8601; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; /** * This class is used to filter issues when getting issue statistics. of them. @@ -76,28 +77,28 @@ public class IssuesStatisticsFilter implements Serializable { * Return issues created after the specified date. Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_after") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAfter; /** * Return issues created before the specified date. Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("created_before") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdBefore; /** * Return issues updated after the specified date. Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_after") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAfter; /** * Return issues updated before the specified date. Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_before") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedBefore; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Iteration.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Iteration.java index 42e1e70aa..13ac7025e 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Iteration.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Iteration.java @@ -4,11 +4,12 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; public class Iteration implements Serializable { @@ -92,14 +93,14 @@ public String toString() { * The creation date of the iteration. */ @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; /** * The last updated date of the iteration. */ @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IterationFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IterationFilter.java index cb653b412..0c8ba8636 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IterationFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IterationFilter.java @@ -7,8 +7,13 @@ import org.gitlab4j.models.GitLabForm; import org.gitlab4j.models.utils.ISO8601; import org.gitlab4j.models.utils.JacksonJsonEnumHelper; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class IterationFilter implements Serializable { private static final long serialVersionUID = 1L; @@ -90,14 +95,14 @@ public String toString() { * Return iterations updated after the specified date. Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_after") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAfter; /** * Return iterations updated before the specified date. Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_before") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedBefore; public IterationFilterState getState() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Job.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Job.java index dde880eab..50a62e53e 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Job.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Job.java @@ -5,9 +5,10 @@ import java.util.List; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class Job implements Serializable { private static final long serialVersionUID = 1L; @@ -22,19 +23,19 @@ public class Job implements Serializable { private String coverage; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("finished_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date finishedAt; @JsonProperty("erased_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date erasedAt; @JsonProperty("artifacts_expire_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date artifactsExpireAt; @JsonProperty("name") @@ -53,7 +54,7 @@ public class Job implements Serializable { private User user; @JsonProperty("started_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date startedAt; @JsonProperty("artifacts_file") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Key.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Key.java index 7c360db71..11b94b24d 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Key.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Key.java @@ -4,15 +4,16 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class Key implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("id") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/License.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/License.java index f564795ea..f92f41b12 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/License.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/License.java @@ -5,9 +5,10 @@ import java.util.Map; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class License implements Serializable { private static final long serialVersionUID = 1L; @@ -19,15 +20,15 @@ public class License implements Serializable { private String plan; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("starts_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date startsAt; @JsonProperty("expires_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date expiresAt; @JsonProperty("historical_max") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/LinkedIssue.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/LinkedIssue.java index 1e3eaaf28..a39b75be3 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/LinkedIssue.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/LinkedIssue.java @@ -3,9 +3,10 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class LinkedIssue extends AbstractIssue { private static final long serialVersionUID = 1L; @@ -17,11 +18,11 @@ public class LinkedIssue extends AbstractIssue { private LinkType linkType; @JsonProperty("link_created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date linkCreatedAt; @JsonProperty("link_updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date linkUpdatedAt; public Long getIssueLinkId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Member.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Member.java index 96c8d1e5d..2e0ab3575 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Member.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Member.java @@ -3,9 +3,10 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class Member extends AbstractUser { private static final long serialVersionUID = 1L; @@ -14,7 +15,7 @@ public class Member extends AbstractUser { private AccessLevel accessLevel; @JsonProperty("expires_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date expiresAt; @JsonProperty("group_saml_identity") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequest.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequest.java index 2dbe99691..a3a0c9536 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequest.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequest.java @@ -5,8 +5,8 @@ import java.util.List; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -45,14 +45,14 @@ public class MergeRequest implements Serializable { private String changesCount; @JsonProperty("closed_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date closedAt; @JsonProperty("closed_by") private Participant closedBy; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("description") @@ -86,11 +86,11 @@ public class MergeRequest implements Serializable { private List labels; @JsonProperty("latest_build_finished_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date latestBuildFinishedAt; @JsonProperty("latest_build_started_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date latestBuildStartedAt; @JsonProperty("merge_commit_sha") @@ -111,7 +111,7 @@ public class MergeRequest implements Serializable { private String detailedMergeStatus; @JsonProperty("merged_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date mergedAt; /** @@ -183,7 +183,7 @@ public class MergeRequest implements Serializable { private String title; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAt; @JsonProperty("upvotes") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestFilter.java index 89789fa54..cc4bce049 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestFilter.java @@ -10,16 +10,17 @@ import java.util.Map; import org.gitlab4j.models.Constants; -import org.gitlab4j.models.Constants.MergeRequestOrderBy; -import org.gitlab4j.models.Constants.MergeRequestScope; -import org.gitlab4j.models.Constants.MergeRequestSearchIn; -import org.gitlab4j.models.Constants.MergeRequestState; -import org.gitlab4j.models.Constants.SortOrder; +import org.gitlab4j.models.Constants.*; import org.gitlab4j.models.GitLabForm; import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.JacksonJsonEnumHelper; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; /** * This class is used to filter merge requests when getting lists of them. @@ -55,19 +56,19 @@ public class MergeRequestFilter implements Serializable { private List labels; @JsonProperty("created_after") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAfter; @JsonProperty("created_before") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdBefore; @JsonProperty("updated_after") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAfter; @JsonProperty("updated_before") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedBefore; @JsonProperty("scope") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestVersion.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestVersion.java index 76befe335..ff08d5464 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestVersion.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestVersion.java @@ -4,9 +4,10 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class MergeRequestVersion implements Serializable { private static final long serialVersionUID = 1L; @@ -24,7 +25,7 @@ public class MergeRequestVersion implements Serializable { private String startCommitSha; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("merge_request_id") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Milestone.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Milestone.java index 087de89d7..5fd0879d4 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Milestone.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Milestone.java @@ -4,16 +4,17 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; public class Milestone implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("description") @@ -46,7 +47,7 @@ public class Milestone implements Serializable { private String title; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAt; @JsonProperty("expired") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Note.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Note.java index 3ae8082ce..b855b9af6 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Note.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Note.java @@ -5,11 +5,12 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.JacksonJsonEnumHelper; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class Note implements Serializable { private static final long serialVersionUID = 1L; @@ -95,14 +96,14 @@ public String toString() { private String body; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("downvote") private Boolean downvote; @JsonProperty("expires_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date expiresAt; @JsonProperty("file_name") @@ -127,7 +128,7 @@ public String toString() { private String title; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAt; @JsonProperty("upvote") @@ -143,7 +144,7 @@ public String toString() { private Participant resolvedBy; @JsonProperty("resolved_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date resolvedAt; @JsonProperty("internal") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Package.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Package.java index 70ed9992c..8d5eba106 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Package.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Package.java @@ -4,9 +4,10 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class Package implements Serializable { private static final long serialVersionUID = 1L; @@ -24,7 +25,7 @@ public class Package implements Serializable { private PackageType packageType; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PackageFile.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PackageFile.java index e42ae3d46..9e4d5a297 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PackageFile.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PackageFile.java @@ -4,9 +4,10 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class PackageFile implements Serializable { private static final long serialVersionUID = 1L; @@ -18,7 +19,7 @@ public class PackageFile implements Serializable { private Long packageId; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("file_name") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PersonalAccessToken.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PersonalAccessToken.java index 086dfcbfd..2c9c4f852 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PersonalAccessToken.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PersonalAccessToken.java @@ -6,9 +6,10 @@ import org.gitlab4j.models.Constants; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; public class PersonalAccessToken implements Serializable { @@ -37,14 +38,14 @@ public class PersonalAccessToken implements Serializable { private Boolean active; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("revoked") private Boolean revoked; @JsonProperty("last_used_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date lastUsedAt; @JsonProperty("token") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Pipeline.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Pipeline.java index b56417d7f..0b11e8d6e 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Pipeline.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Pipeline.java @@ -4,9 +4,10 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class Pipeline implements Serializable { private static final long serialVersionUID = 1L; @@ -45,23 +46,23 @@ public class Pipeline implements Serializable { private User user; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAt; @JsonProperty("started_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date startedAt; @JsonProperty("finished_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date finishedAt; @JsonProperty("committed_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date committedAt; @JsonProperty("coverage") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineFilter.java index 4d5eb90bf..a12c8fda6 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineFilter.java @@ -9,10 +9,11 @@ import org.gitlab4j.models.Constants.SortOrder; import org.gitlab4j.models.GitLabForm; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; /** * This class is used to filter Pipelines when getting lists of them. @@ -54,12 +55,12 @@ public class PipelineFilter implements Serializable { /** Return pipelines updated after the specified date. */ @JsonProperty("updated_after") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAfter; /** Return pipelines updated before the specified date. */ @JsonProperty("updated_before") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedBefore; /** {@link org.gitlab4j.models.Constants.PipelineOrderBy} Order pipelines by id, status, ref, updated_at or user_id (default: id). */ diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineSchedule.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineSchedule.java index f34d37a9b..eb29fa3e5 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineSchedule.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineSchedule.java @@ -5,9 +5,10 @@ import java.util.List; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class PipelineSchedule implements Serializable { private static final long serialVersionUID = 1L; @@ -28,15 +29,15 @@ public class PipelineSchedule implements Serializable { private String cronTimezone; @JsonProperty("next_run_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date nextRunAt; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAt; @JsonProperty("active") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java index cade80f94..ea7f8f5d6 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java @@ -6,15 +6,16 @@ import java.util.Map; import org.gitlab4j.api.models.ImportStatus.Status; -import org.gitlab4j.models.Constants.AutoCancelPendingPipelines; -import org.gitlab4j.models.Constants.AutoDevopsDeployStrategy; -import org.gitlab4j.models.Constants.BuildGitStrategy; -import org.gitlab4j.models.Constants.ProjectFeatureVisibilityAccessLevel; -import org.gitlab4j.models.Constants.SquashOption; +import org.gitlab4j.models.Constants.*; import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.JacksonJsonEnumHelper; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; public class Project implements Serializable { @@ -57,7 +58,7 @@ public String toString() { private Boolean containerRegistryEnabled; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("creator_id") @@ -91,7 +92,7 @@ public String toString() { private Boolean jobsEnabled; @JsonProperty("last_activity_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date lastActivityAt; @JsonProperty("lfs_enabled") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java index dfcb5050f..583c7ba66 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java @@ -6,9 +6,10 @@ import org.gitlab4j.models.Constants; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; public class ProjectAccessToken implements Serializable { @@ -34,7 +35,7 @@ public class ProjectAccessToken implements Serializable { private Boolean active; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("revoked") @@ -44,7 +45,7 @@ public class ProjectAccessToken implements Serializable { private Long accessLevel; @JsonProperty("last_used_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date lastUsedAt; @JsonProperty("token") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectFilter.java index 03a74d191..af264f7f9 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectFilter.java @@ -8,9 +8,10 @@ import org.gitlab4j.models.Constants.SortOrder; import org.gitlab4j.models.GitLabForm; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; /** * This class is used to filter Projects when getting lists of projects for a specified user. @@ -79,11 +80,11 @@ public class ProjectFilter implements Serializable { private Long idBefore; @JsonProperty("last_activity_after") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date lastActivityAfter; @JsonProperty("last_activity_before") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date lastActivityBefore; @JsonProperty("repository_storage") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectHook.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectHook.java index a9c1ac822..ac2ebd579 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectHook.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectHook.java @@ -4,9 +4,10 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class ProjectHook implements Serializable { private static final long serialVersionUID = 1L; @@ -15,7 +16,7 @@ public class ProjectHook implements Serializable { private Boolean buildEvents; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("enable_ssl_verification") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PushRules.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PushRules.java index 9bca876de..1843256ba 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PushRules.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PushRules.java @@ -4,9 +4,10 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class PushRules implements Serializable { private static final long serialVersionUID = 1L; @@ -30,7 +31,7 @@ public class PushRules implements Serializable { private Boolean denyDeleteTag; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("member_check") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepository.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepository.java index 566a352c0..9544161f7 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepository.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepository.java @@ -4,9 +4,10 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class RegistryRepository implements Serializable { private static final long serialVersionUID = 1L; @@ -24,7 +25,7 @@ public class RegistryRepository implements Serializable { private String location; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepositoryTag.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepositoryTag.java index e6f369fe1..5178dc3e5 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepositoryTag.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepositoryTag.java @@ -4,9 +4,10 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class RegistryRepositoryTag implements Serializable { private static final long serialVersionUID = 1L; @@ -30,7 +31,7 @@ public class RegistryRepositoryTag implements Serializable { private String digest; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("total_size") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpic.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpic.java index 12dfdc7e8..dab44695c 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpic.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpic.java @@ -3,9 +3,10 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; public class RelatedEpic extends AbstractEpic { @@ -28,11 +29,11 @@ public class RelatedEpic extends AbstractEpic { private LinkType linkType; @JsonProperty("link_created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date linkCreatedAt; @JsonProperty("link_updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date linkUpdatedAt; public Boolean getStartDateIsFixed() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java index 91922cf0a..fa340a307 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java @@ -4,9 +4,10 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class RelatedEpicLink implements Serializable { private static final long serialVersionUID = 1L; @@ -24,11 +25,11 @@ public class RelatedEpicLink implements Serializable { private LinkType linkType; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Release.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Release.java index bf63f3c0f..2f5335258 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Release.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Release.java @@ -6,10 +6,11 @@ import java.util.Map; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class Release implements Serializable { private static final long serialVersionUID = 1L; @@ -27,11 +28,11 @@ public class Release implements Serializable { private String descriptionHtml; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("released_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date releasedAt; @JsonProperty("author") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ReleaseParams.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ReleaseParams.java index 5f7d17ff5..776057aa0 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ReleaseParams.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ReleaseParams.java @@ -5,9 +5,10 @@ import java.util.List; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class ReleaseParams implements Serializable { private static final long serialVersionUID = 1L; @@ -31,7 +32,7 @@ public class ReleaseParams implements Serializable { private Assets assets; @JsonProperty("released_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date releasedAt; public String getName() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RemoteMirror.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RemoteMirror.java index c13c5d4e1..8d12202d9 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RemoteMirror.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RemoteMirror.java @@ -4,9 +4,10 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class RemoteMirror implements Serializable { private static final long serialVersionUID = 1L; @@ -21,15 +22,15 @@ public class RemoteMirror implements Serializable { private String lastError; @JsonProperty("last_successful_update_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date lastSuccessfulUpdateAt; @JsonProperty("last_update_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date lastUpdateAt; @JsonProperty("last_update_started_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date lastUpdateStartedAt; @JsonProperty("only_protected_branches") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RunnerDetail.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RunnerDetail.java index 5e5222f13..0a2e133d7 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RunnerDetail.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RunnerDetail.java @@ -5,11 +5,12 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.JacksonJsonEnumHelper; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class RunnerDetail extends Runner { private static final long serialVersionUID = 1L; @@ -21,7 +22,7 @@ public class RunnerDetail extends Runner { private String platform; @JsonProperty("contacted_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date contactedAt; @JsonProperty("projects") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Snippet.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Snippet.java index 4c53c8a08..62e675ca1 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Snippet.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Snippet.java @@ -27,9 +27,10 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class Snippet implements Serializable { private static final long serialVersionUID = 1L; @@ -38,11 +39,11 @@ public class Snippet implements Serializable { private Author author; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("expires_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date expiresAt; @JsonProperty("file_name") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SshKey.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SshKey.java index 57149af5a..a10d74ed5 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SshKey.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SshKey.java @@ -4,10 +4,11 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class SshKey implements Serializable { private static final long serialVersionUID = 1L; @@ -22,11 +23,11 @@ public class SshKey implements Serializable { private String key; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("expires_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date expiresAt; @JsonProperty("user_id") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SystemHook.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SystemHook.java index f28cc3dd7..a52448258 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SystemHook.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SystemHook.java @@ -5,9 +5,10 @@ import java.util.List; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class SystemHook implements Serializable { private static final long serialVersionUID = 1L; @@ -25,7 +26,7 @@ public class SystemHook implements Serializable { private String url; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("push_events") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Tag.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Tag.java index ed3cf3eee..6374e1592 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Tag.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Tag.java @@ -4,9 +4,10 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class Tag implements Serializable { private static final long serialVersionUID = 1L; @@ -24,7 +25,7 @@ public class Tag implements Serializable { private Release release; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; public Commit getCommit() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Todo.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Todo.java index 7e8b2b3f3..0416719cc 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Todo.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Todo.java @@ -8,8 +8,8 @@ import org.gitlab4j.models.Constants.TodoState; import org.gitlab4j.models.Constants.TodoType; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonParser; @@ -52,7 +52,7 @@ public class Todo implements Serializable { private TodoState state; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Trigger.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Trigger.java index f5c9545f1..5376e5700 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Trigger.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Trigger.java @@ -3,8 +3,10 @@ import java.io.Serializable; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; + import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class Trigger implements Serializable { private static final long serialVersionUID = 1L; @@ -16,18 +18,18 @@ public class Trigger implements Serializable { private String description; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("last_used") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date lastUsed; @JsonProperty("token") private String token; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAt; @JsonProperty("owner") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/UploadedFile.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/UploadedFile.java index d3e7f93ad..0a048d4fe 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/UploadedFile.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/UploadedFile.java @@ -4,9 +4,10 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class UploadedFile implements Serializable { private static final long serialVersionUID = 1L; @@ -21,7 +22,7 @@ public class UploadedFile implements Serializable { private String filename; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("uploaded_by") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/User.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/User.java index c39c5f0f4..dd343f94f 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/User.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/User.java @@ -4,9 +4,10 @@ import java.util.List; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class User extends AbstractUser { private static final long serialVersionUID = 1L; @@ -27,11 +28,11 @@ public class User extends AbstractUser { private Integer colorSchemeId; @JsonProperty("confirmed_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date confirmedAt; @JsonProperty("current_sign_in_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date currentSignInAt; @JsonProperty("custom_attributes") @@ -53,11 +54,11 @@ public class User extends AbstractUser { private Boolean isAdmin; @JsonProperty("last_activity_on") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date lastActivityOn; @JsonProperty("last_sign_in_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date lastSignInAt; @JsonProperty("linkedin") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupMemberSystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupMemberSystemHookEvent.java index fd4dd35f2..852bcfacf 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupMemberSystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupMemberSystemHookEvent.java @@ -3,9 +3,10 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class GroupMemberSystemHookEvent extends AbstractSystemHookEvent { private static final long serialVersionUID = 1L; @@ -14,11 +15,11 @@ public class GroupMemberSystemHookEvent extends AbstractSystemHookEvent { public static final String GROUP_MEMBER_REMOVED_EVENT = "user_remove_from_group"; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAt; @JsonProperty("event_name") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupSystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupSystemHookEvent.java index 70c1f9fe9..37087cedf 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupSystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupSystemHookEvent.java @@ -3,23 +3,23 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class GroupSystemHookEvent extends AbstractSystemHookEvent { - private static final long serialVersionUID = 1L; - public static final String GROUP_CREATE_EVENT = "group_create"; public static final String GROUP_DESTROY_EVENT = "group_destroy"; public static final String GROUP_RENAME_EVENT = "group_rename"; + private static final long serialVersionUID = 1L; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAt; @JsonProperty("event_name") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/KeySystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/KeySystemHookEvent.java index 31a3d6cbc..e1404b140 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/KeySystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/KeySystemHookEvent.java @@ -3,22 +3,22 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class KeySystemHookEvent extends AbstractSystemHookEvent { - private static final long serialVersionUID = 1L; - public static final String KEY_CREATE_EVENT = "key_create"; public static final String KEY_DESTROY_EVENT = "key_destroy"; + private static final long serialVersionUID = 1L; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAt; @JsonProperty("event_name") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/ProjectSystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/ProjectSystemHookEvent.java index 0e6dfa378..e7c076b48 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/ProjectSystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/ProjectSystemHookEvent.java @@ -4,25 +4,25 @@ import org.gitlab4j.api.models.Visibility; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class ProjectSystemHookEvent extends AbstractSystemHookEvent { - private static final long serialVersionUID = 1L; - public static final String PROJECT_CREATE_EVENT = "project_create"; public static final String PROJECT_DESTROY_EVENT = "project_destroy"; public static final String PROJECT_RENAME_EVENT = "project_rename"; public static final String PROJECT_TRANSFER_EVENT = "project_transfer"; public static final String PROJECT_UPDATE_EVENT = "project_update"; + private static final long serialVersionUID = 1L; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAt; @JsonProperty("event_name") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java index 681174371..84abe9df7 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java @@ -4,22 +4,22 @@ import org.gitlab4j.api.models.Visibility; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class TeamMemberSystemHookEvent extends AbstractSystemHookEvent { - private static final long serialVersionUID = 1L; - public static final String NEW_TEAM_MEMBER_EVENT = "user_add_to_team"; public static final String TEAM_MEMBER_REMOVED_EVENT = "user_remove_from_team"; + private static final long serialVersionUID = 1L; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAt; @JsonProperty("event_name") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/UserSystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/UserSystemHookEvent.java index 180082def..02fdc2b06 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/UserSystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/UserSystemHookEvent.java @@ -3,9 +3,10 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class UserSystemHookEvent extends AbstractSystemHookEvent { private static final long serialVersionUID = 1L; @@ -19,11 +20,11 @@ public class UserSystemHookEvent extends AbstractSystemHookEvent { private String eventName; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAt; @JsonProperty("email") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventCommit.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventCommit.java index a6b5811f0..2a6509f94 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventCommit.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventCommit.java @@ -5,9 +5,10 @@ import org.gitlab4j.api.models.Author; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class EventCommit { @@ -21,7 +22,7 @@ public class EventCommit { private String title; @JsonProperty("timestamp") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date timestamp; @JsonProperty("url") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventIssue.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventIssue.java index 9fc5d711a..6b44ad619 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventIssue.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventIssue.java @@ -4,9 +4,10 @@ import java.util.List; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class EventIssue { @@ -20,7 +21,7 @@ public class EventIssue { private String branchName; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("description") @@ -48,7 +49,7 @@ public class EventIssue { private String title; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAt; @JsonProperty("url") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventLabel.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventLabel.java index f0713ec30..ed0a28d95 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventLabel.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventLabel.java @@ -5,38 +5,16 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.JacksonJsonEnumHelper; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class EventLabel implements Serializable { private static final long serialVersionUID = 1L; - public enum LabelType { - PROJECT_LABEL, - GROUP_LABEL; - - private static JacksonJsonEnumHelper enumHelper = - new JacksonJsonEnumHelper<>(LabelType.class, true, true); - - @JsonCreator - public static LabelType forValue(String value) { - return enumHelper.forValue(value); - } - - @JsonValue - public String toValue() { - return (enumHelper.toString(this)); - } - - @Override - public String toString() { - return (enumHelper.toString(this)); - } - } - @JsonProperty("id") private Long id; @@ -50,11 +28,11 @@ public String toString() { private Long projectId; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAt; @JsonProperty("template") @@ -153,4 +131,27 @@ public void setGroupId(Long groupId) { public String toString() { return (JacksonJson.toJsonString(this)); } + + public enum LabelType { + PROJECT_LABEL, + GROUP_LABEL; + + private static JacksonJsonEnumHelper enumHelper = + new JacksonJsonEnumHelper<>(LabelType.class, true, true); + + @JsonCreator + public static LabelType forValue(String value) { + return enumHelper.forValue(value); + } + + @JsonValue + public String toValue() { + return (enumHelper.toString(this)); + } + + @Override + public String toString() { + return (enumHelper.toString(this)); + } + } } diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventSnippet.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventSnippet.java index 76f17755e..97d4d0910 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventSnippet.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventSnippet.java @@ -4,9 +4,10 @@ import org.gitlab4j.api.models.AccessLevel; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class EventSnippet { @@ -26,18 +27,18 @@ public class EventSnippet { private Long projectId; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAt; @JsonProperty("file_name") private String fileName; @JsonProperty("expires_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date expiresAt; @JsonProperty("type") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/PipelineEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/PipelineEvent.java index 23657dca6..8736677f2 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/PipelineEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/PipelineEvent.java @@ -7,15 +7,15 @@ import org.gitlab4j.api.models.Job; import org.gitlab4j.api.models.Variable; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class PipelineEvent extends AbstractEvent { - private static final long serialVersionUID = 1L; - public static final String X_GITLAB_EVENT = "Pipeline Hook"; public static final String OBJECT_KIND = "pipeline"; + private static final long serialVersionUID = 1L; @JsonProperty("object_attributes") private ObjectAttributes objectAttributes; @@ -103,6 +103,11 @@ public void setBuilds(List builds) { this.builds = builds; } + @Override + public String toString() { + return (JacksonJson.toJsonString(this)); + } + public static class ObjectAttributes { @JsonProperty("id") @@ -139,11 +144,11 @@ public static class ObjectAttributes { private List stages; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("finished_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date finishedAt; @JsonProperty("duration") @@ -294,9 +299,4 @@ public void setUrl(String url) { this.url = url; } } - - @Override - public String toString() { - return (JacksonJson.toJsonString(this)); - } } From fa99228f3cb26ac96079b0267f44b79eccdf3890 Mon Sep 17 00:00:00 2001 From: ksaleschus Date: Wed, 3 Sep 2025 09:29:59 +0200 Subject: [PATCH 18/21] fixup! handle different Date formats --- .../utils/MultiDateFormatDeserializer.java | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 gitlab4j-models/src/main/java/org/gitlab4j/models/utils/MultiDateFormatDeserializer.java diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/models/utils/MultiDateFormatDeserializer.java b/gitlab4j-models/src/main/java/org/gitlab4j/models/utils/MultiDateFormatDeserializer.java new file mode 100644 index 000000000..2e2728e4c --- /dev/null +++ b/gitlab4j-models/src/main/java/org/gitlab4j/models/utils/MultiDateFormatDeserializer.java @@ -0,0 +1,47 @@ +package org.gitlab4j.models.utils; + +import java.io.IOException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.Date; + +import com.fasterxml.jackson.core.JsonParseException; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.deser.std.StdDeserializer; + +public class MultiDateFormatDeserializer extends StdDeserializer { + public static final String[] DATE_FORMATS = + new String[] {"yyyy-MM-dd HH:mm:ss Z", "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", "yyyy-MM-dd'T'HH:mm:ssXXX"}; + private static final long serialVersionUID = 1L; + + public MultiDateFormatDeserializer() { + this(null); + } + + public MultiDateFormatDeserializer(Class vc) { + super(vc); + } + + @Override + /** + * Deserializes a custom date in several international date formats + */ + public Date deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException { + final String date = ((JsonNode) jp.getCodec().readTree(jp)).textValue(); + if (date == null || date.isEmpty()) { + return null; + } + for (String dateFormat : DATE_FORMATS) { + try { + SimpleDateFormat formatter = new SimpleDateFormat(dateFormat); + return formatter.parse(date); + } catch (ParseException e) { + } + } + throw new JsonParseException( + jp, "Unparseable date: \"" + date + "\". Supported formats: " + Arrays.toString(DATE_FORMATS)); + } +} From 4f7408b93b4cf08a6bd50186fbb0281cb26d3e1e Mon Sep 17 00:00:00 2001 From: ksaleschus Date: Wed, 3 Sep 2025 11:52:58 +0200 Subject: [PATCH 19/21] add missing date annotations --- .../src/main/java/org/gitlab4j/api/models/Group.java | 3 +++ .../src/main/java/org/gitlab4j/api/models/Project.java | 1 + .../src/main/java/org/gitlab4j/api/models/PullMirror.java | 5 +++++ .../src/main/java/org/gitlab4j/api/webhook/EventIssue.java | 3 +++ .../src/main/java/org/gitlab4j/api/webhook/NoteEvent.java | 4 ++++ .../src/test/resources/org/gitlab4j/models/issue-event.json | 2 +- 6 files changed, 17 insertions(+), 1 deletion(-) diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Group.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Group.java index a3052d720..60de9e4cd 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Group.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Group.java @@ -7,8 +7,10 @@ import org.gitlab4j.models.Constants.ProjectCreationLevel; import org.gitlab4j.models.Constants.SubgroupCreationLevel; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; public class Group extends AbstractGroup { @@ -137,6 +139,7 @@ public void setJobArtifactsSize(Long jobArtifactsSize) { * The creation date of the project. */ @JsonProperty("created_at") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java index ea7f8f5d6..b9f41b60f 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java @@ -318,6 +318,7 @@ public String toString() { private Boolean mirror; @JsonProperty("updated_at") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAt; @JsonProperty("description_html") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PullMirror.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PullMirror.java index 01c4ff9a8..3f099c32a 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PullMirror.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PullMirror.java @@ -4,8 +4,10 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class PullMirror implements Serializable { private static final long serialVersionUID = 1L; @@ -17,12 +19,15 @@ public class PullMirror implements Serializable { private String lastError; @JsonProperty("last_successful_update_at") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date lastSuccessfulUpdateAt; @JsonProperty("last_update_at") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date lastUpdateAt; @JsonProperty("last_update_started_at") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date lastUpdateStartedAt; @JsonProperty("update_status") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventIssue.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventIssue.java index 6b44ad619..ef8ae0c23 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventIssue.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventIssue.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; public class EventIssue { @@ -65,6 +66,7 @@ public class EventIssue { private Long updatedById; @JsonProperty("last_edited_at") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date lastEditedAt; @JsonProperty("last_edited_by_id") @@ -83,6 +85,7 @@ public class EventIssue { private Boolean discussionLocked; @JsonProperty("due_date") + @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date dueDate; @JsonProperty("moved_to_id") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/NoteEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/NoteEvent.java index 9ae04846d..b3254fbb3 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/NoteEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/NoteEvent.java @@ -5,10 +5,12 @@ import org.gitlab4j.api.models.Diff; import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.JacksonJsonEnumHelper; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class NoteEvent extends AbstractEvent { private static final long serialVersionUID = 1L; @@ -170,9 +172,11 @@ public static class ObjectAttributes { private Long authorId; @JsonProperty("created_at") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date createdAt; @JsonProperty("updated_at") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private Date updatedAt; @JsonProperty("project_id") diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/issue-event.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/issue-event.json index 07e07aac3..5f9e8957e 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/issue-event.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/issue-event.json @@ -46,7 +46,7 @@ "state_id": 1, "confidential": false, "discussion_locked": true, - "due_date": "2014-12-03T18:15:43.248Z", + "due_date": "2014-12-03", "moved_to_id": 1, "duplicated_to_id": 1, "time_estimate": 1800, From dfc01ca36c321d0df7d08a10aa111fd14c8ad75a Mon Sep 17 00:00:00 2001 From: ksaleschus Date: Wed, 3 Sep 2025 13:01:51 +0200 Subject: [PATCH 20/21] add correct deserializers --- .../src/main/java/org/gitlab4j/api/models/User.java | 3 ++- .../src/main/java/org/gitlab4j/api/webhook/EventChanges.java | 4 ++++ .../src/main/java/org/gitlab4j/api/webhook/IssueChanges.java | 4 ++++ .../main/java/org/gitlab4j/api/webhook/WorkItemChanges.java | 4 ++++ 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/User.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/User.java index dd343f94f..4197c2cad 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/User.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/User.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; public class User extends AbstractUser { private static final long serialVersionUID = 1L; @@ -54,7 +55,7 @@ public class User extends AbstractUser { private Boolean isAdmin; @JsonProperty("last_activity_on") - @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date lastActivityOn; @JsonProperty("last_sign_in_at") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventChanges.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventChanges.java index 9f14905bc..1cbcd46c7 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventChanges.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventChanges.java @@ -7,10 +7,12 @@ import org.gitlab4j.api.models.Assignee; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public abstract class EventChanges { @@ -18,9 +20,11 @@ public abstract class EventChanges { private ChangeContainer authorId; @JsonProperty("created_at") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private ChangeContainer createdAt; @JsonProperty("updated_at") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private ChangeContainer updatedAt; @JsonProperty("updated_by_id") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/IssueChanges.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/IssueChanges.java index 5908f07a8..c1bae9a81 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/IssueChanges.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/IssueChanges.java @@ -2,11 +2,15 @@ import java.util.Date; +import org.gitlab4j.models.utils.JacksonJson; + import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; public class IssueChanges extends EventChanges { @JsonProperty("due_date") + @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private ChangeContainer dueDate; @JsonProperty("confidential") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/WorkItemChanges.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/WorkItemChanges.java index 11c2567de..8cde4c287 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/WorkItemChanges.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/WorkItemChanges.java @@ -2,13 +2,17 @@ import java.util.Date; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; + import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class WorkItemChanges extends EventChanges { @JsonProperty("health_status") private ChangeContainer healthStatus; @JsonProperty("last_edited_at") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) private ChangeContainer lastEditedAt; public ChangeContainer getHealthStatus() { From be2e1b6038fa29ca6061e3407b95d7aa1d95b07f Mon Sep 17 00:00:00 2001 From: ksaleschus Date: Wed, 3 Sep 2025 15:06:02 +0200 Subject: [PATCH 21/21] reapply format and add ChangeContainerSerialization --- .../org/gitlab4j/api/models/AbstractEpic.java | 3 + .../gitlab4j/api/models/AbstractIssue.java | 4 + .../org/gitlab4j/api/models/AbstractUser.java | 2 + .../gitlab4j/api/models/AccessRequest.java | 2 + .../api/models/ApplicationSettings.java | 3 + .../org/gitlab4j/api/models/AuditEvent.java | 2 + .../org/gitlab4j/api/models/AwardEmoji.java | 3 + .../java/org/gitlab4j/api/models/Bridge.java | 5 + .../java/org/gitlab4j/api/models/Build.java | 4 + .../gitlab4j/api/models/ChangelogPayload.java | 2 + .../java/org/gitlab4j/api/models/Comment.java | 2 + .../java/org/gitlab4j/api/models/Commit.java | 5 + .../org/gitlab4j/api/models/CommitStatus.java | 4 + .../api/models/CreateRunnerResponse.java | 2 + .../org/gitlab4j/api/models/DeployKey.java | 2 + .../org/gitlab4j/api/models/DeployToken.java | 2 + .../org/gitlab4j/api/models/Deployable.java | 5 + .../org/gitlab4j/api/models/Deployment.java | 3 + .../gitlab4j/api/models/DeploymentFilter.java | 3 + .../api/models/DownstreamPipeline.java | 3 + .../org/gitlab4j/api/models/Environment.java | 2 + .../org/gitlab4j/api/models/EpicFilter.java | 4 + .../java/org/gitlab4j/api/models/Event.java | 2 + .../org/gitlab4j/api/models/ExportStatus.java | 6 +- .../ExternalStatusCheckProtectedBranch.java | 3 + .../java/org/gitlab4j/api/models/GpgKey.java | 2 + .../java/org/gitlab4j/api/models/Group.java | 2 + .../org/gitlab4j/api/models/GroupHook.java | 3 + .../api/models/ImpersonationToken.java | 3 + .../org/gitlab4j/api/models/ImportStatus.java | 2 + .../org/gitlab4j/api/models/IssueEvent.java | 2 + .../org/gitlab4j/api/models/IssueFilter.java | 9 +- .../api/models/IssuesStatisticsFilter.java | 7 +- .../org/gitlab4j/api/models/Iteration.java | 79 ++++------ .../gitlab4j/api/models/IterationFilter.java | 111 ++++++------- .../java/org/gitlab4j/api/models/Job.java | 8 +- .../java/org/gitlab4j/api/models/Key.java | 2 + .../java/org/gitlab4j/api/models/License.java | 4 + .../org/gitlab4j/api/models/LinkedIssue.java | 3 + .../java/org/gitlab4j/api/models/Member.java | 2 + .../org/gitlab4j/api/models/MergeRequest.java | 27 ++-- .../api/models/MergeRequestFilter.java | 69 ++++---- .../api/models/MergeRequestVersion.java | 2 + .../org/gitlab4j/api/models/Milestone.java | 3 + .../java/org/gitlab4j/api/models/Note.java | 149 +++++++++--------- .../java/org/gitlab4j/api/models/Package.java | 2 + .../org/gitlab4j/api/models/PackageFile.java | 2 + .../api/models/PersonalAccessToken.java | 3 + .../org/gitlab4j/api/models/Pipeline.java | 6 + .../gitlab4j/api/models/PipelineFilter.java | 53 +++++-- .../gitlab4j/api/models/PipelineSchedule.java | 4 + .../java/org/gitlab4j/api/models/Project.java | 8 +- .../api/models/ProjectAccessToken.java | 3 + .../gitlab4j/api/models/ProjectFilter.java | 3 + .../org/gitlab4j/api/models/ProjectHook.java | 2 + .../org/gitlab4j/api/models/PullMirror.java | 4 + .../org/gitlab4j/api/models/PushRules.java | 2 + .../api/models/RegistryRepository.java | 2 + .../api/models/RegistryRepositoryTag.java | 2 + .../org/gitlab4j/api/models/RelatedEpic.java | 3 + .../gitlab4j/api/models/RelatedEpicLink.java | 3 + .../java/org/gitlab4j/api/models/Release.java | 3 + .../gitlab4j/api/models/ReleaseParams.java | 2 + .../org/gitlab4j/api/models/RemoteMirror.java | 4 + .../org/gitlab4j/api/models/RunnerDetail.java | 2 + .../java/org/gitlab4j/api/models/Snippet.java | 3 + .../java/org/gitlab4j/api/models/SshKey.java | 3 + .../org/gitlab4j/api/models/SystemHook.java | 2 + .../java/org/gitlab4j/api/models/Tag.java | 2 + .../java/org/gitlab4j/api/models/Todo.java | 2 + .../java/org/gitlab4j/api/models/Trigger.java | 4 + .../org/gitlab4j/api/models/UploadedFile.java | 2 + .../java/org/gitlab4j/api/models/User.java | 4 + .../GroupMemberSystemHookEvent.java | 3 + .../api/systemhooks/GroupSystemHookEvent.java | 3 + .../api/systemhooks/KeySystemHookEvent.java | 3 + .../systemhooks/ProjectSystemHookEvent.java | 3 + .../TeamMemberSystemHookEvent.java | 3 + .../api/systemhooks/UserSystemHookEvent.java | 3 + .../org/gitlab4j/api/webhook/BuildCommit.java | 8 +- .../org/gitlab4j/api/webhook/BuildEvent.java | 11 +- .../gitlab4j/api/webhook/DeploymentEvent.java | 2 - .../gitlab4j/api/webhook/EventChanges.java | 13 +- .../org/gitlab4j/api/webhook/EventCommit.java | 2 + .../org/gitlab4j/api/webhook/EventIssue.java | 4 + .../org/gitlab4j/api/webhook/EventLabel.java | 3 + .../api/webhook/EventMergeRequest.java | 17 +- .../gitlab4j/api/webhook/EventSnippet.java | 4 + .../gitlab4j/api/webhook/EventWorkItem.java | 17 +- .../gitlab4j/api/webhook/IssueChanges.java | 7 +- .../org/gitlab4j/api/webhook/JobEvent.java | 8 +- .../org/gitlab4j/api/webhook/NoteEvent.java | 3 + .../gitlab4j/api/webhook/PipelineEvent.java | 3 + .../gitlab4j/api/webhook/WorkItemChanges.java | 7 +- .../DateChangeContainerDeserializer.java | 69 ++++++++ ...DateWithTimeChangeContainerSerializer.java | 36 +++++ .../utils/MultiDateFormatDeserializer.java | 6 +- .../OnlyDateChangeContainerSerializer.java | 36 +++++ .../org/gitlab4j/models/issue-event.json | 4 +- .../org/gitlab4j/models/user-list.json | 40 ++--- .../resources/org/gitlab4j/models/user.json | 2 +- 101 files changed, 724 insertions(+), 298 deletions(-) create mode 100644 gitlab4j-models/src/main/java/org/gitlab4j/models/utils/DateChangeContainerDeserializer.java create mode 100644 gitlab4j-models/src/main/java/org/gitlab4j/models/utils/DateWithTimeChangeContainerSerializer.java create mode 100644 gitlab4j-models/src/main/java/org/gitlab4j/models/utils/OnlyDateChangeContainerSerializer.java diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java index bd80109cb..9df9c77d4 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java @@ -107,6 +107,7 @@ public String toString() { */ @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** @@ -114,6 +115,7 @@ public String toString() { */ @JsonProperty("updated_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; /** @@ -121,6 +123,7 @@ public String toString() { */ @JsonProperty("closed_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date closedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractIssue.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractIssue.java index adb48d7a5..01d3c031e 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractIssue.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractIssue.java @@ -8,6 +8,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -77,6 +78,7 @@ public String toString() { */ @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** @@ -84,6 +86,7 @@ public String toString() { */ @JsonProperty("updated_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; /** @@ -91,6 +94,7 @@ public String toString() { */ @JsonProperty("closed_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date closedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractUser.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractUser.java index f7da3a8cc..bf9c3e6cf 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractUser.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractUser.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -25,6 +26,7 @@ public abstract class AbstractUser> implements Seriali */ @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AccessRequest.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AccessRequest.java index b2cc8c9b3..2cdf17eaf 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AccessRequest.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AccessRequest.java @@ -4,6 +4,7 @@ import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -15,6 +16,7 @@ public class AccessRequest extends AbstractUser { */ @JsonProperty("requested_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date requestedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApplicationSettings.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApplicationSettings.java index dd7947bdf..b70925f1d 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApplicationSettings.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApplicationSettings.java @@ -7,6 +7,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.JsonNode; @@ -28,6 +29,7 @@ public class ApplicationSettings implements Serializable { */ @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** @@ -35,6 +37,7 @@ public class ApplicationSettings implements Serializable { */ @JsonProperty("updated_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AuditEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AuditEvent.java index 1d78e872d..25e28dc53 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AuditEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AuditEvent.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -47,6 +48,7 @@ public class AuditEvent implements Serializable { */ @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AwardEmoji.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AwardEmoji.java index bc0a0407b..0954b060c 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AwardEmoji.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AwardEmoji.java @@ -8,6 +8,7 @@ import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -63,6 +64,7 @@ public String toString() { */ @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** @@ -70,6 +72,7 @@ public String toString() { */ @JsonProperty("updated_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Bridge.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Bridge.java index 217bb1125..14ac8967c 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Bridge.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Bridge.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -29,6 +30,7 @@ public class Bridge implements Serializable { */ @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** @@ -36,6 +38,7 @@ public class Bridge implements Serializable { */ @JsonProperty("started_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date startedAt; /** @@ -43,6 +46,7 @@ public class Bridge implements Serializable { */ @JsonProperty("finished_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date finishedAt; /** @@ -50,6 +54,7 @@ public class Bridge implements Serializable { */ @JsonProperty("erased_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date erasedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Build.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Build.java index 7db8509ca..24bbd3cf1 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Build.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Build.java @@ -5,6 +5,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -27,14 +28,17 @@ public class Build { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("started_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date startedAt; @JsonProperty("finished_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date finishedAt; @JsonProperty("duration") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ChangelogPayload.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ChangelogPayload.java index eb85c7998..3e2f28bff 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ChangelogPayload.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ChangelogPayload.java @@ -8,6 +8,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -38,6 +39,7 @@ public class ChangelogPayload implements Serializable { */ @JsonProperty("date") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date date; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Comment.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Comment.java index 1ab1664c8..aac11efc9 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Comment.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Comment.java @@ -7,6 +7,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -24,6 +25,7 @@ public class Comment implements Serializable { */ @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Commit.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Commit.java index 4411d696a..43e74508f 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Commit.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Commit.java @@ -7,6 +7,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -24,6 +25,7 @@ public class Commit implements Serializable { */ @JsonProperty("authored_date") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date authoredDate; /** @@ -43,6 +45,7 @@ public class Commit implements Serializable { */ @JsonProperty("committed_date") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date committedDate; /** @@ -62,6 +65,7 @@ public class Commit implements Serializable { */ @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** @@ -105,6 +109,7 @@ public class Commit implements Serializable { */ @JsonProperty("timestamp") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date timestamp; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitStatus.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitStatus.java index 114356fa2..49335b806 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitStatus.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CommitStatus.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -35,6 +36,7 @@ public class CommitStatus implements Serializable { */ @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** @@ -48,6 +50,7 @@ public class CommitStatus implements Serializable { */ @JsonProperty("finished_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date finishedAt; /** @@ -85,6 +88,7 @@ public class CommitStatus implements Serializable { */ @JsonProperty("started_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date startedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CreateRunnerResponse.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CreateRunnerResponse.java index bec012bb3..ade06b6ea 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CreateRunnerResponse.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CreateRunnerResponse.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -20,6 +21,7 @@ public class CreateRunnerResponse implements Serializable { @JsonProperty("token_expires_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date tokenExpiresAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployKey.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployKey.java index 73277e45a..ed4fa5a18 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployKey.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployKey.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -41,6 +42,7 @@ public class DeployKey implements Serializable { */ @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployToken.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployToken.java index ec089a03c..d2355411d 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployToken.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeployToken.java @@ -8,6 +8,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -37,6 +38,7 @@ public class DeployToken implements Serializable { */ @JsonProperty("expires_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date expiresAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployable.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployable.java index ef1c5a2a3..833e48409 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployable.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployable.java @@ -8,6 +8,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -61,6 +62,7 @@ public class Deployable implements Serializable { */ @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** @@ -68,6 +70,7 @@ public class Deployable implements Serializable { */ @JsonProperty("started_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date startedAt; /** @@ -75,6 +78,7 @@ public class Deployable implements Serializable { */ @JsonProperty("finished_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date finishedAt; /** @@ -124,6 +128,7 @@ public class Deployable implements Serializable { */ @JsonProperty("artifacts_expire_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date artifactsExpireAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployment.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployment.java index bc3f9c6ed..087549e69 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployment.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Deployment.java @@ -7,6 +7,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -42,6 +43,7 @@ public class Deployment implements Serializable { */ @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** @@ -49,6 +51,7 @@ public class Deployment implements Serializable { */ @JsonProperty("updated_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeploymentFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeploymentFilter.java index 5acf6db4c..a040c0896 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeploymentFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DeploymentFilter.java @@ -11,6 +11,7 @@ import org.gitlab4j.models.utils.ISO8601; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -35,6 +36,7 @@ public class DeploymentFilter implements Serializable { */ @JsonProperty("updated_after") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAfter; /** @@ -42,6 +44,7 @@ public class DeploymentFilter implements Serializable { */ @JsonProperty("updated_before") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedBefore; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java index 5e89ec326..a6ed031b8 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -41,6 +42,7 @@ public class DownstreamPipeline implements Serializable { */ @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** @@ -48,6 +50,7 @@ public class DownstreamPipeline implements Serializable { */ @JsonProperty("updated_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Environment.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Environment.java index 953255f19..a7fa80224 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Environment.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Environment.java @@ -8,6 +8,7 @@ import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -85,6 +86,7 @@ public String toString() { */ @JsonProperty("auto_stop_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date autoStopAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicFilter.java index 6435b7c58..d70259d7d 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicFilter.java @@ -14,6 +14,7 @@ import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -71,6 +72,7 @@ public class EpicFilter implements Serializable { */ @JsonProperty("created_after") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAfter; /** @@ -78,6 +80,7 @@ public class EpicFilter implements Serializable { */ @JsonProperty("updated_after") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAfter; /** @@ -85,6 +88,7 @@ public class EpicFilter implements Serializable { */ @JsonProperty("updated_before") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedBefore; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Event.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Event.java index 7f7ef0d51..d89a9ecfc 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Event.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Event.java @@ -7,6 +7,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -90,6 +91,7 @@ public class Event implements Serializable { */ @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExportStatus.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExportStatus.java index 81eed1c55..72ed580b8 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExportStatus.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExportStatus.java @@ -8,10 +8,7 @@ import org.gitlab4j.models.utils.JacksonJsonEnumHelper; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class ExportStatus implements Serializable { @@ -91,6 +88,7 @@ public String toString() { */ @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java index b70d03b72..bb34e3c04 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -35,6 +36,7 @@ public class ExternalStatusCheckProtectedBranch implements Serializable { */ @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** @@ -42,6 +44,7 @@ public class ExternalStatusCheckProtectedBranch implements Serializable { */ @JsonProperty("updated_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GpgKey.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GpgKey.java index 3c9e38526..ecac6c350 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GpgKey.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GpgKey.java @@ -4,6 +4,7 @@ import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -26,6 +27,7 @@ public class GpgKey { */ @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Group.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Group.java index 60de9e4cd..3aec449f3 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Group.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Group.java @@ -9,6 +9,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -140,6 +141,7 @@ public void setJobArtifactsSize(Long jobArtifactsSize) { */ @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupHook.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupHook.java index 99e406b8e..fd72a7bef 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupHook.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupHook.java @@ -5,6 +5,7 @@ import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -160,6 +161,7 @@ public class GroupHook implements Serializable { */ @JsonProperty("disabled_until") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date disabledUntil; /** @@ -173,6 +175,7 @@ public class GroupHook implements Serializable { */ @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java index 41ff1b977..ca447c6a7 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java @@ -9,6 +9,7 @@ import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -100,6 +101,7 @@ public String toString() { */ @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** @@ -107,6 +109,7 @@ public String toString() { */ @JsonProperty("last_used_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date lastUsedAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImportStatus.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImportStatus.java index dd24ab30c..3e7454b40 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImportStatus.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ImportStatus.java @@ -8,6 +8,7 @@ import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -84,6 +85,7 @@ public String toString() { */ @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueEvent.java index 47bf9a8bc..44ba83a2a 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueEvent.java @@ -7,6 +7,7 @@ import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -54,6 +55,7 @@ public String toString() { */ @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private String createdAt; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueFilter.java index eb941e927..4ea6ca389 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueFilter.java @@ -16,10 +16,7 @@ import org.gitlab4j.models.utils.JacksonJsonEnumHelper; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; /** @@ -105,6 +102,7 @@ public class IssueFilter implements Serializable { */ @JsonProperty("created_after") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAfter; /** @@ -112,6 +110,7 @@ public class IssueFilter implements Serializable { */ @JsonProperty("created_before") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdBefore; /** @@ -119,6 +118,7 @@ public class IssueFilter implements Serializable { */ @JsonProperty("updated_after") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAfter; /** @@ -126,6 +126,7 @@ public class IssueFilter implements Serializable { */ @JsonProperty("updated_before") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedBefore; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssuesStatisticsFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssuesStatisticsFilter.java index 8a0b4c9b1..87d3e3f23 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssuesStatisticsFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssuesStatisticsFilter.java @@ -9,12 +9,13 @@ import org.gitlab4j.models.utils.ISO8601; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; /** - * This class is used to filter issues when getting issue statistics. of them. + * This class is used to filter issues when getting issue statistics. of them. */ public class IssuesStatisticsFilter implements Serializable { private static final long serialVersionUID = 1L; @@ -78,6 +79,7 @@ public class IssuesStatisticsFilter implements Serializable { */ @JsonProperty("created_after") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAfter; /** @@ -85,6 +87,7 @@ public class IssuesStatisticsFilter implements Serializable { */ @JsonProperty("created_before") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdBefore; /** @@ -92,6 +95,7 @@ public class IssuesStatisticsFilter implements Serializable { */ @JsonProperty("updated_after") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAfter; /** @@ -99,6 +103,7 @@ public class IssuesStatisticsFilter implements Serializable { */ @JsonProperty("updated_before") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedBefore; /** diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Iteration.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Iteration.java index 13ac7025e..0b495b1f5 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Iteration.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Iteration.java @@ -7,6 +7,7 @@ import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -14,109 +15,67 @@ public class Iteration implements Serializable { private static final long serialVersionUID = 1L; - - public enum IterationState { - UPCOMMING(1), - CURRENT(2), - CLOSED(3); - - private int value; - - IterationState(int value) { - this.value = value; - } - - @JsonCreator - public static IterationState fromIntValue(int value) { - for (IterationState it : values()) { - if (it.value == value) { - return it; - } - } - throw new IllegalArgumentException("No enum found for value: " + value); - } - - @JsonValue - public int toIntValue() { - return this.value; - } - - @Override - public String toString() { - return name(); - } - } - /** * The unique identifier of the iteration. */ @JsonProperty("id") private Long id; - /** * The internal identifier of the iteration. */ @JsonProperty("iid") private Long iid; - /** * The sequence number of the iteration. */ @JsonProperty("sequence") private Long sequence; - /** * The group ID associated with the iteration. */ @JsonProperty("group_id") private Long groupId; - /** * The title of the iteration. */ @JsonProperty("title") private String title; - /** * The description of the iteration. */ @JsonProperty("description") private String description; - /** * The current state of the iteration. */ @JsonProperty("state") private IterationState state; - /** * The creation date of the iteration. */ @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; - /** * The last updated date of the iteration. */ @JsonProperty("updated_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; - /** * The start date of the iteration. */ @JsonProperty("start_date") @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date startDate; - /** * The due date of the iteration. */ @JsonProperty("due_date") @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date dueDate; - /** * The web URL for the iteration. */ @@ -223,4 +182,36 @@ public void setWebUrl(String webUrl) { public String toString() { return (JacksonJson.toJsonString(this)); } + + public enum IterationState { + UPCOMMING(1), + CURRENT(2), + CLOSED(3); + + private int value; + + IterationState(int value) { + this.value = value; + } + + @JsonCreator + public static IterationState fromIntValue(int value) { + for (IterationState it : values()) { + if (it.value == value) { + return it; + } + } + throw new IllegalArgumentException("No enum found for value: " + value); + } + + @JsonValue + public int toIntValue() { + return this.value; + } + + @Override + public String toString() { + return name(); + } + } } diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IterationFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IterationFilter.java index 0c8ba8636..1649305bf 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IterationFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IterationFilter.java @@ -9,100 +9,44 @@ import org.gitlab4j.models.utils.JacksonJsonEnumHelper; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class IterationFilter implements Serializable { private static final long serialVersionUID = 1L; - - public enum IterationFilterState { - OPENED, - UPCOMING, - CURRENT, - CLOSED, - ALL; - - private static JacksonJsonEnumHelper enumHelper = - new JacksonJsonEnumHelper<>(IterationFilterState.class, false, true); - - @JsonCreator - public static IterationFilterState forValue(String value) { - return enumHelper.forValue(value); - } - - @JsonValue - public String toValue() { - return (enumHelper.toString(this)); - } - - @Override - public String toString() { - return (enumHelper.toString(this)); - } - } - - public enum IterationFilterIn { - TITLE, - CADENCE_TITLE; - - private static JacksonJsonEnumHelper enumHelper = - new JacksonJsonEnumHelper<>(IterationFilterIn.class, false, false, true); - - @JsonCreator - public static IterationFilterIn forValue(String value) { - return enumHelper.forValue(value); - } - - @JsonValue - public String toValue() { - return (enumHelper.toString(this)); - } - - @Override - public String toString() { - return (enumHelper.toString(this)); - } - } - /** * Return opened, upcoming, current, closed, or all iterations. */ @JsonProperty("state") private IterationFilterState state; - /** * Return only iterations with a title matching the provided string. */ @JsonProperty("search") private String search; - /** * Fields in which fuzzy search should be performed with the query given in the argument search. */ @JsonProperty("in") private IterationFilterIn in; - /** * Include iterations from parent group and its ancestors. Defaults to true. */ @JsonProperty("include_ancestors") private Boolean includeAncestors; - /** * Return iterations updated after the specified date. Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_after") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAfter; - /** * Return iterations updated before the specified date. Expected in format "2019-03-15T08:00:00.000Z". */ @JsonProperty("updated_before") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedBefore; public IterationFilterState getState() { @@ -198,4 +142,53 @@ public GitLabForm getQueryParams() { .withParam("updated_after", ISO8601.toString(updatedAfter, false)) .withParam("updated_before", ISO8601.toString(updatedBefore, false)); } + + public enum IterationFilterState { + OPENED, + UPCOMING, + CURRENT, + CLOSED, + ALL; + + private static JacksonJsonEnumHelper enumHelper = + new JacksonJsonEnumHelper<>(IterationFilterState.class, false, true); + + @JsonCreator + public static IterationFilterState forValue(String value) { + return enumHelper.forValue(value); + } + + @JsonValue + public String toValue() { + return (enumHelper.toString(this)); + } + + @Override + public String toString() { + return (enumHelper.toString(this)); + } + } + + public enum IterationFilterIn { + TITLE, + CADENCE_TITLE; + + private static JacksonJsonEnumHelper enumHelper = + new JacksonJsonEnumHelper<>(IterationFilterIn.class, false, false, true); + + @JsonCreator + public static IterationFilterIn forValue(String value) { + return enumHelper.forValue(value); + } + + @JsonValue + public String toValue() { + return (enumHelper.toString(this)); + } + + @Override + public String toString() { + return (enumHelper.toString(this)); + } + } } diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Job.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Job.java index 50a62e53e..6fc0a08fa 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Job.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Job.java @@ -7,6 +7,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -24,18 +25,22 @@ public class Job implements Serializable { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("finished_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date finishedAt; @JsonProperty("erased_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date erasedAt; @JsonProperty("artifacts_expire_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date artifactsExpireAt; @JsonProperty("name") @@ -55,6 +60,7 @@ public class Job implements Serializable { @JsonProperty("started_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date startedAt; @JsonProperty("artifacts_file") @@ -136,7 +142,7 @@ public void setFinishedAt(Date finishedAt) { * job erase api, you can * detect it using this field. Normally erasing job does mean only that job artifacts and * a job logs gets removed. Job metadata (started_at, duration, ....) stays in place. - * + *

* You can use this attribute to filter out such jobs, that have erased at non-null if you need * to. */ diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Key.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Key.java index 11b94b24d..71c91b6b5 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Key.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Key.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -14,6 +15,7 @@ public class Key implements Serializable { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("id") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/License.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/License.java index f92f41b12..ffc7cba5c 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/License.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/License.java @@ -7,6 +7,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -21,14 +22,17 @@ public class License implements Serializable { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("starts_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date startsAt; @JsonProperty("expires_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date expiresAt; @JsonProperty("historical_max") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/LinkedIssue.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/LinkedIssue.java index a39b75be3..002467935 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/LinkedIssue.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/LinkedIssue.java @@ -5,6 +5,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -19,10 +20,12 @@ public class LinkedIssue extends AbstractIssue { @JsonProperty("link_created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date linkCreatedAt; @JsonProperty("link_updated_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date linkUpdatedAt; public Long getIssueLinkId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Member.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Member.java index 2e0ab3575..bce59241b 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Member.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Member.java @@ -5,6 +5,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -16,6 +17,7 @@ public class Member extends AbstractUser { @JsonProperty("expires_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date expiresAt; @JsonProperty("group_saml_identity") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequest.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequest.java index a3a0c9536..40a07f963 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequest.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequest.java @@ -7,6 +7,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -46,6 +47,7 @@ public class MergeRequest implements Serializable { @JsonProperty("closed_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date closedAt; @JsonProperty("closed_by") @@ -53,6 +55,7 @@ public class MergeRequest implements Serializable { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("description") @@ -87,10 +90,12 @@ public class MergeRequest implements Serializable { @JsonProperty("latest_build_finished_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date latestBuildFinishedAt; @JsonProperty("latest_build_started_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date latestBuildStartedAt; @JsonProperty("merge_commit_sha") @@ -112,6 +117,7 @@ public class MergeRequest implements Serializable { @JsonProperty("merged_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date mergedAt; /** @@ -184,6 +190,7 @@ public class MergeRequest implements Serializable { @JsonProperty("updated_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("upvotes") @@ -216,6 +223,10 @@ public class MergeRequest implements Serializable { @JsonDeserialize(using = JacksonJson.UserListDeserializer.class) private List approvedBy; + public static final boolean isValid(MergeRequest mergeRequest) { + return (mergeRequest != null && mergeRequest.getId() != null); + } + public Boolean getAllowCollaboration() { return allowCollaboration; } @@ -676,7 +687,7 @@ public void setWorkInProgress(Boolean workInProgress) { /** * Get the number of approvals required for the merge request. - * + *

* NOTE: This property will only be used when listing, approiving, or unapproving a merge request. * * @return the number of approvals required for the merge request @@ -687,7 +698,7 @@ public Integer getApprovalsRequired() { /** * Set the number of approvals required for the merge request. - * + *

* NOTE: This property will only be used when listing, approiving, or unapproving a merge request. * * @param approvalsRequired the number of approvals required for the merge request @@ -698,7 +709,7 @@ public void setApprovalsRequired(Integer approvalsRequired) { /** * Get the number of approvals left for the merge request. - * + *

* NOTE: This property will only be used when listing, approiving, or unapproving a merge request. * * @return the number of approvals left for the merge request @@ -709,7 +720,7 @@ public Integer getApprovalsLeft() { /** * Set the number of approvals missing for the merge request. - * + *

* NOTE: This property will only be used when listing, approiving, or unapproving a merge request. * * @param approvalsLeft the number of approvals missing for the merge request @@ -720,7 +731,7 @@ public void setApprovalsLeft(Integer approvalsLeft) { /** * Get the list of users that have approved the merge request. - * + *

* NOTE: This property will only be used when listing, approiving, or unapproving a merge request. * * @return the list of users that have approved the merge request @@ -731,7 +742,7 @@ public List getApprovedBy() { /** * Set the list of users that have approved the merge request. - * + *

* NOTE: This property will only be used when listing, approiving, or unapproving a merge request. * * @param approvedBy the list of users that have approved the merge request @@ -756,10 +767,6 @@ public void setRebaseInProgress(Boolean rebaseInProgress) { this.rebaseInProgress = rebaseInProgress; } - public static final boolean isValid(MergeRequest mergeRequest) { - return (mergeRequest != null && mergeRequest.getId() != null); - } - public List getReviewers() { return reviewers; } diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestFilter.java index cc4bce049..c215b1a44 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestFilter.java @@ -16,10 +16,7 @@ import org.gitlab4j.models.utils.JacksonJsonEnumHelper; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; /** @@ -57,18 +54,22 @@ public class MergeRequestFilter implements Serializable { @JsonProperty("created_after") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAfter; @JsonProperty("created_before") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdBefore; @JsonProperty("updated_after") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAfter; @JsonProperty("updated_before") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedBefore; @JsonProperty("scope") @@ -107,36 +108,6 @@ public class MergeRequestFilter implements Serializable { @JsonProperty("not") private Map not; - public enum MergeRequestField { - LABELS, - MILESTONE, - AUTHOR_ID, - AUTHOR_USERNAME, - ASSIGNEE_ID, - ASSIGNEE_USERNAME, - REVIEWER_ID, - REVIEWER_USERNAME, - MY_REACTION_EMOJI; - - private static JacksonJsonEnumHelper enumHelper = - new JacksonJsonEnumHelper<>(MergeRequestField.class); - - @JsonCreator - public static MergeRequestField forValue(String value) { - return enumHelper.forValue(value); - } - - @JsonValue - public String toValue() { - return (enumHelper.toString(this)); - } - - @Override - public String toString() { - return (enumHelper.toString(this)); - } - } - public Long getProjectId() { return projectId; } @@ -603,4 +574,34 @@ private Map toStringMap(Map map) { public String toString() { return (JacksonJson.toJsonString(this)); } + + public enum MergeRequestField { + LABELS, + MILESTONE, + AUTHOR_ID, + AUTHOR_USERNAME, + ASSIGNEE_ID, + ASSIGNEE_USERNAME, + REVIEWER_ID, + REVIEWER_USERNAME, + MY_REACTION_EMOJI; + + private static JacksonJsonEnumHelper enumHelper = + new JacksonJsonEnumHelper<>(MergeRequestField.class); + + @JsonCreator + public static MergeRequestField forValue(String value) { + return enumHelper.forValue(value); + } + + @JsonValue + public String toValue() { + return (enumHelper.toString(this)); + } + + @Override + public String toString() { + return (enumHelper.toString(this)); + } + } } diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestVersion.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestVersion.java index ff08d5464..f95e0ecaf 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestVersion.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestVersion.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -26,6 +27,7 @@ public class MergeRequestVersion implements Serializable { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("merge_request_id") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Milestone.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Milestone.java index 5fd0879d4..138452a0a 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Milestone.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Milestone.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -15,6 +16,7 @@ public class Milestone implements Serializable { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("description") @@ -48,6 +50,7 @@ public class Milestone implements Serializable { @JsonProperty("updated_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("expired") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Note.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Note.java index b855b9af6..a09adcc53 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Note.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Note.java @@ -8,6 +8,7 @@ import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -15,77 +16,6 @@ public class Note implements Serializable { private static final long serialVersionUID = 1L; - /** Enum to use for ordering the results. */ - public static enum OrderBy { - CREATED_AT, - UPDATED_AT; - private static JacksonJsonEnumHelper enumHelper = new JacksonJsonEnumHelper<>(OrderBy.class); - - @JsonCreator - public static OrderBy forValue(String value) { - return enumHelper.forValue(value); - } - - @JsonValue - public String toValue() { - return (enumHelper.toString(this)); - } - - @Override - public String toString() { - return (enumHelper.toString(this)); - } - } - - // This is not used because the GitLab example JSON is using a funny string for the MERGE_REQUEST notable_type - // ("Merge request"). - // Once they fix the bug, the notableType field can be changed from String to NotableType. - public static enum NoteableType { - COMMIT, - EPIC, - ISSUE, - MERGE_REQUEST, - SNIPPET; - private static JacksonJsonEnumHelper enumHelper = - new JacksonJsonEnumHelper<>(NoteableType.class, true, true); - - @JsonCreator - public static NoteableType forValue(String value) { - return enumHelper.forValue(value); - } - - @JsonValue - public String toValue() { - return (enumHelper.toString(this)); - } - - @Override - public String toString() { - return (enumHelper.toString(this)); - } - } - - public static enum Type { - DISCUSSION_NOTE, - DIFF_NOTE; - private static JacksonJsonEnumHelper enumHelper = new JacksonJsonEnumHelper<>(Type.class, true, true); - - @JsonCreator - public static Type forValue(String value) { - return enumHelper.forValue(value); - } - - @JsonValue - public String toValue() { - return (enumHelper.toString(this)); - } - - @Override - public String toString() { - return (enumHelper.toString(this)); - } - } - @JsonProperty("attachment") private String attachment; @@ -97,6 +27,7 @@ public String toString() { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("downvote") @@ -104,6 +35,7 @@ public String toString() { @JsonProperty("expires_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date expiresAt; @JsonProperty("file_name") @@ -129,6 +61,7 @@ public String toString() { @JsonProperty("updated_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("upvote") @@ -145,6 +78,7 @@ public String toString() { @JsonProperty("resolved_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date resolvedAt; @JsonProperty("internal") @@ -336,4 +270,77 @@ public void setInternal(Boolean internal) { public String toString() { return (JacksonJson.toJsonString(this)); } + + /** + * Enum to use for ordering the results. + */ + public static enum OrderBy { + CREATED_AT, + UPDATED_AT; + private static JacksonJsonEnumHelper enumHelper = new JacksonJsonEnumHelper<>(OrderBy.class); + + @JsonCreator + public static OrderBy forValue(String value) { + return enumHelper.forValue(value); + } + + @JsonValue + public String toValue() { + return (enumHelper.toString(this)); + } + + @Override + public String toString() { + return (enumHelper.toString(this)); + } + } + + // This is not used because the GitLab example JSON is using a funny string for the MERGE_REQUEST notable_type + // ("Merge request"). + // Once they fix the bug, the notableType field can be changed from String to NotableType. + public static enum NoteableType { + COMMIT, + EPIC, + ISSUE, + MERGE_REQUEST, + SNIPPET; + private static JacksonJsonEnumHelper enumHelper = + new JacksonJsonEnumHelper<>(NoteableType.class, true, true); + + @JsonCreator + public static NoteableType forValue(String value) { + return enumHelper.forValue(value); + } + + @JsonValue + public String toValue() { + return (enumHelper.toString(this)); + } + + @Override + public String toString() { + return (enumHelper.toString(this)); + } + } + + public static enum Type { + DISCUSSION_NOTE, + DIFF_NOTE; + private static JacksonJsonEnumHelper enumHelper = new JacksonJsonEnumHelper<>(Type.class, true, true); + + @JsonCreator + public static Type forValue(String value) { + return enumHelper.forValue(value); + } + + @JsonValue + public String toValue() { + return (enumHelper.toString(this)); + } + + @Override + public String toString() { + return (enumHelper.toString(this)); + } + } } diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Package.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Package.java index 8d5eba106..33ae397f3 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Package.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Package.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -26,6 +27,7 @@ public class Package implements Serializable { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PackageFile.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PackageFile.java index 9e4d5a297..c7c1f5853 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PackageFile.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PackageFile.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -20,6 +21,7 @@ public class PackageFile implements Serializable { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("file_name") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PersonalAccessToken.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PersonalAccessToken.java index 2c9c4f852..866367fa9 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PersonalAccessToken.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PersonalAccessToken.java @@ -8,6 +8,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -39,6 +40,7 @@ public class PersonalAccessToken implements Serializable { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("revoked") @@ -46,6 +48,7 @@ public class PersonalAccessToken implements Serializable { @JsonProperty("last_used_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date lastUsedAt; @JsonProperty("token") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Pipeline.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Pipeline.java index 0b11e8d6e..dc1060d08 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Pipeline.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Pipeline.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -47,22 +48,27 @@ public class Pipeline implements Serializable { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("updated_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("started_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date startedAt; @JsonProperty("finished_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date finishedAt; @JsonProperty("committed_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date committedAt; @JsonProperty("coverage") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineFilter.java index a12c8fda6..c0a9afe85 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineFilter.java @@ -11,63 +11,90 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; /** - * This class is used to filter Pipelines when getting lists of them. + * This class is used to filter Pipelines when getting lists of them. */ public class PipelineFilter implements Serializable { private static final long serialVersionUID = 1L; - /** {@link org.gitlab4j.models.Constants.PipelineScope} The scope of pipelines, one of: running, pending, finished, branches, tags */ + /** + * {@link org.gitlab4j.models.Constants.PipelineScope} The scope of pipelines, one of: running, pending, finished, branches, tags + */ @JsonProperty("scope") private PipelineScope scope; - /** {@link org.gitlab4j.models.Constants.PipelineScope} The status of pipelines, one of: running, pending, success, failed, canceled, skipped, created */ + /** + * {@link org.gitlab4j.models.Constants.PipelineScope} The status of pipelines, one of: running, pending, success, failed, canceled, skipped, created + */ @JsonProperty("status") private PipelineStatus status; - /** {@link org.gitlab4j.models.Constants.PipelineSource} The source of pipelines */ + /** + * {@link org.gitlab4j.models.Constants.PipelineSource} The source of pipelines + */ @JsonProperty("source") private PipelineSource source; - /** The ref of pipelines. */ + /** + * The ref of pipelines. + */ @JsonProperty("ref") private String ref; - /** The SHA of pipelines. */ + /** + * The SHA of pipelines. + */ @JsonProperty("sha") private String sha; - /** If true, returns pipelines with invalid configurations. */ + /** + * If true, returns pipelines with invalid configurations. + */ @JsonProperty("yaml_errors") private Boolean yamlErrors; - /** The name of the user who triggered pipelines. */ + /** + * The name of the user who triggered pipelines. + */ @JsonProperty("name") private String name; - /** The username of the user who triggered pipelines */ + /** + * The username of the user who triggered pipelines + */ @JsonProperty("username") private String username; - /** Return pipelines updated after the specified date. */ + /** + * Return pipelines updated after the specified date. + */ @JsonProperty("updated_after") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAfter; - /** Return pipelines updated before the specified date. */ + /** + * Return pipelines updated before the specified date. + */ @JsonProperty("updated_before") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedBefore; - /** {@link org.gitlab4j.models.Constants.PipelineOrderBy} Order pipelines by id, status, ref, updated_at or user_id (default: id). */ + /** + * {@link org.gitlab4j.models.Constants.PipelineOrderBy} Order pipelines by id, status, ref, updated_at or user_id (default: id). + */ @JsonProperty("order_by") private PipelineOrderBy orderBy; - /** {@link org.gitlab4j.models.Constants.SortOrder} Return issues sorted in asc or desc order. Default is desc. */ + /** + * {@link org.gitlab4j.models.Constants.SortOrder} Return issues sorted in asc or desc order. Default is desc. + */ @JsonProperty("sort") private SortOrder sort; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineSchedule.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineSchedule.java index eb29fa3e5..5e499ea33 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineSchedule.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PipelineSchedule.java @@ -7,6 +7,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -30,14 +31,17 @@ public class PipelineSchedule implements Serializable { @JsonProperty("next_run_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date nextRunAt; @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("updated_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("active") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java index b9f41b60f..97f7706a2 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java @@ -11,10 +11,7 @@ import org.gitlab4j.models.utils.JacksonJsonEnumHelper; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -59,6 +56,7 @@ public String toString() { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("creator_id") @@ -93,6 +91,7 @@ public String toString() { @JsonProperty("last_activity_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date lastActivityAt; @JsonProperty("lfs_enabled") @@ -319,6 +318,7 @@ public String toString() { @JsonProperty("updated_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("description_html") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java index 583c7ba66..4b3ff3fd2 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java @@ -8,6 +8,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -36,6 +37,7 @@ public class ProjectAccessToken implements Serializable { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("revoked") @@ -46,6 +48,7 @@ public class ProjectAccessToken implements Serializable { @JsonProperty("last_used_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date lastUsedAt; @JsonProperty("token") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectFilter.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectFilter.java index af264f7f9..3c351c267 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectFilter.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectFilter.java @@ -10,6 +10,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -81,10 +82,12 @@ public class ProjectFilter implements Serializable { @JsonProperty("last_activity_after") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date lastActivityAfter; @JsonProperty("last_activity_before") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date lastActivityBefore; @JsonProperty("repository_storage") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectHook.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectHook.java index ac2ebd579..66097af4f 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectHook.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ProjectHook.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -17,6 +18,7 @@ public class ProjectHook implements Serializable { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("enable_ssl_verification") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PullMirror.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PullMirror.java index 3f099c32a..cd6e8d9d2 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PullMirror.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PullMirror.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -20,14 +21,17 @@ public class PullMirror implements Serializable { @JsonProperty("last_successful_update_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date lastSuccessfulUpdateAt; @JsonProperty("last_update_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date lastUpdateAt; @JsonProperty("last_update_started_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date lastUpdateStartedAt; @JsonProperty("update_status") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PushRules.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PushRules.java index 1843256ba..6997d73f4 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PushRules.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/PushRules.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -32,6 +33,7 @@ public class PushRules implements Serializable { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("member_check") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepository.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepository.java index 9544161f7..784566586 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepository.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepository.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -26,6 +27,7 @@ public class RegistryRepository implements Serializable { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepositoryTag.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepositoryTag.java index 5178dc3e5..9cfaeecfd 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepositoryTag.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RegistryRepositoryTag.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -32,6 +33,7 @@ public class RegistryRepositoryTag implements Serializable { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("total_size") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpic.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpic.java index dab44695c..c643b7734 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpic.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpic.java @@ -5,6 +5,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -30,10 +31,12 @@ public class RelatedEpic extends AbstractEpic { @JsonProperty("link_created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date linkCreatedAt; @JsonProperty("link_updated_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date linkUpdatedAt; public Boolean getStartDateIsFixed() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java index fa340a307..46bab9aea 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -26,10 +27,12 @@ public class RelatedEpicLink implements Serializable { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("updated_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Release.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Release.java index 2f5335258..c9740cd00 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Release.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Release.java @@ -8,6 +8,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -29,10 +30,12 @@ public class Release implements Serializable { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("released_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date releasedAt; @JsonProperty("author") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ReleaseParams.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ReleaseParams.java index 776057aa0..418dd7b8b 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ReleaseParams.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ReleaseParams.java @@ -7,6 +7,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -33,6 +34,7 @@ public class ReleaseParams implements Serializable { @JsonProperty("released_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date releasedAt; public String getName() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RemoteMirror.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RemoteMirror.java index 8d12202d9..fff3fc418 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RemoteMirror.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RemoteMirror.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -23,14 +24,17 @@ public class RemoteMirror implements Serializable { @JsonProperty("last_successful_update_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date lastSuccessfulUpdateAt; @JsonProperty("last_update_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date lastUpdateAt; @JsonProperty("last_update_started_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date lastUpdateStartedAt; @JsonProperty("only_protected_branches") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RunnerDetail.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RunnerDetail.java index 0a2e133d7..3442f2804 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RunnerDetail.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RunnerDetail.java @@ -8,6 +8,7 @@ import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -23,6 +24,7 @@ public class RunnerDetail extends Runner { @JsonProperty("contacted_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date contactedAt; @JsonProperty("projects") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Snippet.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Snippet.java index 62e675ca1..9f92609a3 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Snippet.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Snippet.java @@ -29,6 +29,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -40,10 +41,12 @@ public class Snippet implements Serializable { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("expires_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date expiresAt; @JsonProperty("file_name") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SshKey.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SshKey.java index a10d74ed5..fa4e0fa1d 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SshKey.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SshKey.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -24,10 +25,12 @@ public class SshKey implements Serializable { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("expires_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date expiresAt; @JsonProperty("user_id") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SystemHook.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SystemHook.java index a52448258..612812baa 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SystemHook.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/SystemHook.java @@ -7,6 +7,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -27,6 +28,7 @@ public class SystemHook implements Serializable { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("push_events") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Tag.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Tag.java index 6374e1592..61486528a 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Tag.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Tag.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -26,6 +27,7 @@ public class Tag implements Serializable { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; public Commit getCommit() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Todo.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Todo.java index 0416719cc..f945c06ea 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Todo.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Todo.java @@ -10,6 +10,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonParser; @@ -53,6 +54,7 @@ public class Todo implements Serializable { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Trigger.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Trigger.java index 5376e5700..b4443324b 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Trigger.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Trigger.java @@ -5,6 +5,7 @@ import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -19,10 +20,12 @@ public class Trigger implements Serializable { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("last_used") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date lastUsed; @JsonProperty("token") @@ -30,6 +33,7 @@ public class Trigger implements Serializable { @JsonProperty("updated_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("owner") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/UploadedFile.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/UploadedFile.java index 0a048d4fe..b627e54fe 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/UploadedFile.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/UploadedFile.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -23,6 +24,7 @@ public class UploadedFile implements Serializable { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("uploaded_by") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/User.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/User.java index 4197c2cad..e43cbd86d 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/User.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/User.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -30,10 +31,12 @@ public class User extends AbstractUser { @JsonProperty("confirmed_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date confirmedAt; @JsonProperty("current_sign_in_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date currentSignInAt; @JsonProperty("custom_attributes") @@ -60,6 +63,7 @@ public class User extends AbstractUser { @JsonProperty("last_sign_in_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date lastSignInAt; @JsonProperty("linkedin") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupMemberSystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupMemberSystemHookEvent.java index 852bcfacf..61a739ce0 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupMemberSystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupMemberSystemHookEvent.java @@ -5,6 +5,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -16,10 +17,12 @@ public class GroupMemberSystemHookEvent extends AbstractSystemHookEvent { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("updated_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("event_name") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupSystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupSystemHookEvent.java index 37087cedf..d756e1828 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupSystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupSystemHookEvent.java @@ -5,6 +5,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -16,10 +17,12 @@ public class GroupSystemHookEvent extends AbstractSystemHookEvent { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("updated_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("event_name") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/KeySystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/KeySystemHookEvent.java index e1404b140..ca19a1747 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/KeySystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/KeySystemHookEvent.java @@ -5,6 +5,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -15,10 +16,12 @@ public class KeySystemHookEvent extends AbstractSystemHookEvent { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("updated_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("event_name") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/ProjectSystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/ProjectSystemHookEvent.java index e7c076b48..c31915cde 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/ProjectSystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/ProjectSystemHookEvent.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -19,10 +20,12 @@ public class ProjectSystemHookEvent extends AbstractSystemHookEvent { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("updated_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("event_name") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java index 84abe9df7..2c05a03d2 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -16,10 +17,12 @@ public class TeamMemberSystemHookEvent extends AbstractSystemHookEvent { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("updated_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("event_name") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/UserSystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/UserSystemHookEvent.java index 02fdc2b06..299389384 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/UserSystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/UserSystemHookEvent.java @@ -5,6 +5,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -21,10 +22,12 @@ public class UserSystemHookEvent extends AbstractSystemHookEvent { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("updated_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("email") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/BuildCommit.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/BuildCommit.java index 90d3bfa37..60739a3d9 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/BuildCommit.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/BuildCommit.java @@ -3,9 +3,11 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class BuildCommit { @@ -37,11 +39,13 @@ public class BuildCommit { private Float duration; @JsonProperty("started_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date startedAt; @JsonProperty("finished_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date finishedAt; public Long getId() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/BuildEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/BuildEvent.java index 56d0f33c1..e979aa7e2 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/BuildEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/BuildEvent.java @@ -4,9 +4,11 @@ import org.gitlab4j.api.models.Runner; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; /** * The documentation at: @@ -46,15 +48,18 @@ public class BuildEvent extends AbstractEvent { private String buildStatus; @JsonProperty("build_created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date buildCreatedAt; @JsonProperty("build_started_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date buildStartedAt; @JsonProperty("build_finished_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date buildFinishedAt; @JsonProperty("build_duration") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/DeploymentEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/DeploymentEvent.java index 78ef2b2bf..3f8c63c55 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/DeploymentEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/DeploymentEvent.java @@ -2,7 +2,6 @@ import org.gitlab4j.models.utils.JacksonJson; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; public class DeploymentEvent extends AbstractEvent { @@ -15,7 +14,6 @@ public class DeploymentEvent extends AbstractEvent { private String status; @JsonProperty("status_changed_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss Z") private String statusChangedAt; @JsonProperty("deployable_id") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventChanges.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventChanges.java index 1cbcd46c7..48dc89cf6 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventChanges.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventChanges.java @@ -6,13 +6,16 @@ import java.util.Map; import org.gitlab4j.api.models.Assignee; +import org.gitlab4j.models.utils.DateChangeContainerDeserializer; +import org.gitlab4j.models.utils.DateWithTimeChangeContainerSerializer; import org.gitlab4j.models.utils.JacksonJson; -import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; public abstract class EventChanges { @@ -20,11 +23,15 @@ public abstract class EventChanges { private ChangeContainer authorId; @JsonProperty("created_at") - @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonDeserialize(using = DateChangeContainerDeserializer.class) + @JsonSerialize(using = DateWithTimeChangeContainerSerializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private ChangeContainer createdAt; @JsonProperty("updated_at") - @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonDeserialize(using = DateChangeContainerDeserializer.class) + @JsonSerialize(using = DateWithTimeChangeContainerSerializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private ChangeContainer updatedAt; @JsonProperty("updated_by_id") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventCommit.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventCommit.java index 2a6509f94..b54314f2e 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventCommit.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventCommit.java @@ -7,6 +7,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -23,6 +24,7 @@ public class EventCommit { @JsonProperty("timestamp") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date timestamp; @JsonProperty("url") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventIssue.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventIssue.java index ef8ae0c23..d24922d1c 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventIssue.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventIssue.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -23,6 +24,7 @@ public class EventIssue { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("description") @@ -51,6 +53,7 @@ public class EventIssue { @JsonProperty("updated_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("url") @@ -67,6 +70,7 @@ public class EventIssue { @JsonProperty("last_edited_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date lastEditedAt; @JsonProperty("last_edited_by_id") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventLabel.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventLabel.java index ed0a28d95..3485647a2 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventLabel.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventLabel.java @@ -8,6 +8,7 @@ import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -29,10 +30,12 @@ public class EventLabel implements Serializable { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("updated_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("template") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java index 7eff4ed62..5872ddc7a 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java @@ -7,9 +7,11 @@ import org.gitlab4j.api.models.Assignee; import org.gitlab4j.api.models.Duration; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class EventMergeRequest { @@ -23,7 +25,8 @@ public class EventMergeRequest { private String branchName; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("description") @@ -51,7 +54,8 @@ public class EventMergeRequest { private Integer position; @JsonProperty("locked_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date lockedAt; @JsonProperty("project_id") @@ -85,7 +89,8 @@ public class EventMergeRequest { private String title; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("source") @@ -134,7 +139,8 @@ public class EventMergeRequest { private Long mergeUserId; @JsonProperty("deleted_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date deletedAt; @JsonProperty("in_progress_merge_commit_sha") @@ -144,7 +150,8 @@ public class EventMergeRequest { private Integer lockVersion; @JsonProperty("last_edited_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date lastEditedAt; @JsonProperty("last_edited_by_id") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventSnippet.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventSnippet.java index 97d4d0910..ceb7b55c3 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventSnippet.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventSnippet.java @@ -6,6 +6,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -28,10 +29,12 @@ public class EventSnippet { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("updated_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("file_name") @@ -39,6 +42,7 @@ public class EventSnippet { @JsonProperty("expires_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date expiresAt; @JsonProperty("type") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventWorkItem.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventWorkItem.java index eb79eeb89..16f3d2186 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventWorkItem.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventWorkItem.java @@ -4,9 +4,12 @@ import java.util.List; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; public class EventWorkItem { @@ -14,21 +17,23 @@ public class EventWorkItem { private Long authorId; @JsonProperty("closed_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date closedAt; @JsonProperty("confidential") private Boolean confidential; @JsonProperty("created_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("description") private String description; @JsonProperty("due_date") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") + @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date dueDate; @JsonProperty("id") @@ -38,7 +43,8 @@ public class EventWorkItem { private Long iid; @JsonProperty("last_edited_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date lastEditedAt; @JsonProperty("last_edited_by_id") @@ -63,7 +69,8 @@ public class EventWorkItem { private String title; @JsonProperty("updated_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("updated_by_id") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/IssueChanges.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/IssueChanges.java index c1bae9a81..92b8516bd 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/IssueChanges.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/IssueChanges.java @@ -2,15 +2,18 @@ import java.util.Date; -import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.DateChangeContainerDeserializer; +import org.gitlab4j.models.utils.OnlyDateChangeContainerSerializer; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; public class IssueChanges extends EventChanges { @JsonProperty("due_date") - @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) + @JsonDeserialize(using = DateChangeContainerDeserializer.class) + @JsonSerialize(using = OnlyDateChangeContainerSerializer.class) private ChangeContainer dueDate; @JsonProperty("confidential") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/JobEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/JobEvent.java index 26af98e71..400882245 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/JobEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/JobEvent.java @@ -3,9 +3,11 @@ import java.util.Date; import org.gitlab4j.models.utils.JacksonJson; +import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class JobEvent extends AbstractEvent { private static final long serialVersionUID = 1L; @@ -38,11 +40,13 @@ public class JobEvent extends AbstractEvent { private String jobStatus; @JsonProperty("job_started_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date jobStartedAt; @JsonProperty("job_finished_at") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date jobFinishedAt; @JsonProperty("job_duration") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/NoteEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/NoteEvent.java index b3254fbb3..a2b8ad494 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/NoteEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/NoteEvent.java @@ -8,6 +8,7 @@ import org.gitlab4j.models.utils.MultiDateFormatDeserializer; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -173,10 +174,12 @@ public static class ObjectAttributes { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("updated_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date updatedAt; @JsonProperty("project_id") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/PipelineEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/PipelineEvent.java index 8736677f2..9fc434c61 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/PipelineEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/PipelineEvent.java @@ -9,6 +9,7 @@ import org.gitlab4j.models.utils.JacksonJson; import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -145,10 +146,12 @@ public static class ObjectAttributes { @JsonProperty("created_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date createdAt; @JsonProperty("finished_at") @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private Date finishedAt; @JsonProperty("duration") diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/WorkItemChanges.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/WorkItemChanges.java index 8cde4c287..b1b2a0b79 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/WorkItemChanges.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/WorkItemChanges.java @@ -2,17 +2,20 @@ import java.util.Date; -import org.gitlab4j.models.utils.MultiDateFormatDeserializer; +import org.gitlab4j.models.utils.DateChangeContainerDeserializer; +import org.gitlab4j.models.utils.DateWithTimeChangeContainerSerializer; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; public class WorkItemChanges extends EventChanges { @JsonProperty("health_status") private ChangeContainer healthStatus; @JsonProperty("last_edited_at") - @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonDeserialize(using = DateChangeContainerDeserializer.class) + @JsonSerialize(using = DateWithTimeChangeContainerSerializer.class) private ChangeContainer lastEditedAt; public ChangeContainer getHealthStatus() { diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/models/utils/DateChangeContainerDeserializer.java b/gitlab4j-models/src/main/java/org/gitlab4j/models/utils/DateChangeContainerDeserializer.java new file mode 100644 index 000000000..864ef741e --- /dev/null +++ b/gitlab4j-models/src/main/java/org/gitlab4j/models/utils/DateChangeContainerDeserializer.java @@ -0,0 +1,69 @@ +package org.gitlab4j.models.utils; + +import java.io.IOException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.Date; +import java.util.Locale; + +import org.gitlab4j.api.webhook.ChangeContainer; + +import com.fasterxml.jackson.core.JsonParseException; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.deser.std.StdDeserializer; + +public class DateChangeContainerDeserializer extends StdDeserializer> { + + private static final long serialVersionUID = 1L; + + public static final String[] DATE_FORMATS = new String[] { + "yyyy-MM-dd HH:mm:ss Z", "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", "yyyy-MM-dd'T'HH:mm:ssXXX", "yyyy-MM-dd" + }; + + public DateChangeContainerDeserializer() { + super((Class) null); + } + + @Override + public ChangeContainer deserialize(JsonParser jp, DeserializationContext ctxt) + throws IOException, JsonProcessingException { + JsonNode node = jp.getCodec().readTree(jp); + + Date previous = parseDate(node.get("previous")); + Date current = parseDate(node.get("current")); + + ChangeContainer container = new ChangeContainer<>(); + container.setPrevious(previous); + container.setCurrent(current); + + return container; + } + + private Date parseDate(JsonNode dateNode) throws JsonParseException { + if (dateNode == null || dateNode.isNull()) { + return null; + } + + String dateStr = dateNode.asText(); + if (dateStr.isEmpty()) { + return null; + } + + for (String format : DATE_FORMATS) { + try { + SimpleDateFormat sdf = new SimpleDateFormat(format, Locale.ENGLISH); + sdf.setLenient(false); + return sdf.parse(dateStr); + } catch (ParseException e) { + // optional: Logging + } + } + + throw new JsonParseException( + null, "Unparseable date: \"" + dateStr + "\". Supported formats: " + Arrays.toString(DATE_FORMATS)); + } +} diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/models/utils/DateWithTimeChangeContainerSerializer.java b/gitlab4j-models/src/main/java/org/gitlab4j/models/utils/DateWithTimeChangeContainerSerializer.java new file mode 100644 index 000000000..602915f94 --- /dev/null +++ b/gitlab4j-models/src/main/java/org/gitlab4j/models/utils/DateWithTimeChangeContainerSerializer.java @@ -0,0 +1,36 @@ +package org.gitlab4j.models.utils; + +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Locale; +import java.util.TimeZone; + +import org.gitlab4j.api.webhook.ChangeContainer; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.ser.std.StdSerializer; + +public class DateWithTimeChangeContainerSerializer extends StdSerializer> { + + public DateWithTimeChangeContainerSerializer() { + super((Class>) null); + } + + @Override + public void serialize(ChangeContainer value, JsonGenerator gen, SerializerProvider provider) + throws IOException { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.ENGLISH); + sdf.setTimeZone(TimeZone.getTimeZone("UTC")); + + gen.writeStartObject(); + if (value.getPrevious() != null) { + gen.writeStringField("previous", sdf.format(value.getPrevious())); + } + if (value.getCurrent() != null) { + gen.writeStringField("current", sdf.format(value.getCurrent())); + } + gen.writeEndObject(); + } +} diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/models/utils/MultiDateFormatDeserializer.java b/gitlab4j-models/src/main/java/org/gitlab4j/models/utils/MultiDateFormatDeserializer.java index 2e2728e4c..13e70761b 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/models/utils/MultiDateFormatDeserializer.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/models/utils/MultiDateFormatDeserializer.java @@ -26,9 +26,6 @@ public MultiDateFormatDeserializer(Class vc) { } @Override - /** - * Deserializes a custom date in several international date formats - */ public Date deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException { final String date = ((JsonNode) jp.getCodec().readTree(jp)).textValue(); if (date == null || date.isEmpty()) { @@ -37,7 +34,8 @@ public Date deserialize(JsonParser jp, DeserializationContext ctxt) throws IOExc for (String dateFormat : DATE_FORMATS) { try { SimpleDateFormat formatter = new SimpleDateFormat(dateFormat); - return formatter.parse(date); + Date parsedDate = formatter.parse(date); + return parsedDate; } catch (ParseException e) { } } diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/models/utils/OnlyDateChangeContainerSerializer.java b/gitlab4j-models/src/main/java/org/gitlab4j/models/utils/OnlyDateChangeContainerSerializer.java new file mode 100644 index 000000000..9903567de --- /dev/null +++ b/gitlab4j-models/src/main/java/org/gitlab4j/models/utils/OnlyDateChangeContainerSerializer.java @@ -0,0 +1,36 @@ +package org.gitlab4j.models.utils; + +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Locale; + +import org.gitlab4j.api.webhook.ChangeContainer; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.ser.std.StdSerializer; + +public class OnlyDateChangeContainerSerializer extends StdSerializer> { + + private static final String DATE_FORMAT = "yyyy-MM-dd"; + + public OnlyDateChangeContainerSerializer() { + super((Class>) null); + } + + @Override + public void serialize(ChangeContainer value, JsonGenerator gen, SerializerProvider provider) + throws IOException { + SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT, Locale.ENGLISH); + + gen.writeStartObject(); + if (value.getPrevious() != null) { + gen.writeStringField("previous", sdf.format(value.getPrevious())); + } + if (value.getCurrent() != null) { + gen.writeStringField("current", sdf.format(value.getCurrent())); + } + gen.writeEndObject(); + } +} diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/issue-event.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/issue-event.json index 5f9e8957e..4b2777a5d 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/issue-event.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/issue-event.json @@ -90,8 +90,8 @@ "labels":[], "changes": { "due_date":{ - "previous": "2020-06-01T08:00:00.248Z", - "current": "2020-02-04T08:00:00.248Z" + "previous": "2020-06-01", + "current": "2020-02-04" }, "confidential": { "previous": false, diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/user-list.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/user-list.json index 44dc1272d..8ade98aac 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/user-list.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/user-list.json @@ -16,7 +16,7 @@ "organization": "", "last_sign_in_at": "2012-06-01T11:41:01.248Z", "confirmed_at": "2012-05-23T09:05:22.248Z", - "last_activity_on": "2012-05-23T07:00:00.248Z", + "last_activity_on": "2012-05-23", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, @@ -49,7 +49,7 @@ "organization": "", "last_sign_in_at": "2012-06-01T11:41:01.248Z", "confirmed_at": "2012-05-23T09:05:22.248Z", - "last_activity_on": "2012-05-23T07:00:00.248Z", + "last_activity_on": "2012-05-23", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, @@ -82,7 +82,7 @@ "organization": "", "last_sign_in_at": "2012-06-01T11:41:01.248Z", "confirmed_at": "2012-05-23T09:05:22.248Z", - "last_activity_on": "2012-05-23T07:00:00.248Z", + "last_activity_on": "2012-05-23", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, @@ -115,7 +115,7 @@ "organization": "", "last_sign_in_at": "2012-06-01T11:41:01.248Z", "confirmed_at": "2012-05-23T09:05:22.248Z", - "last_activity_on": "2012-05-23T07:00:00.248Z", + "last_activity_on": "2012-05-23", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, @@ -148,7 +148,7 @@ "organization": "", "last_sign_in_at": "2012-06-01T11:41:01.248Z", "confirmed_at": "2012-05-23T09:05:22.248Z", - "last_activity_on": "2012-05-23T07:00:00.248Z", + "last_activity_on": "2012-05-23", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, @@ -181,7 +181,7 @@ "organization": "", "last_sign_in_at": "2012-06-01T11:41:01.248Z", "confirmed_at": "2012-05-23T09:05:22.248Z", - "last_activity_on": "2012-05-23T07:00:00.248Z", + "last_activity_on": "2012-05-23", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, @@ -214,7 +214,7 @@ "organization": "", "last_sign_in_at": "2012-06-01T11:41:01.248Z", "confirmed_at": "2012-05-23T09:05:22.248Z", - "last_activity_on": "2012-05-23T07:00:00.248Z", + "last_activity_on": "2012-05-23", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, @@ -247,7 +247,7 @@ "organization": "", "last_sign_in_at": "2012-06-01T11:41:01.248Z", "confirmed_at": "2012-05-23T09:05:22.248Z", - "last_activity_on": "2012-05-23T07:00:00.248Z", + "last_activity_on": "2012-05-23", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, @@ -280,7 +280,7 @@ "organization": "", "last_sign_in_at": "2012-06-01T11:41:01.248Z", "confirmed_at": "2012-05-23T09:05:22.248Z", - "last_activity_on": "2012-05-23T07:00:00.248Z", + "last_activity_on": "2012-05-23", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, @@ -313,7 +313,7 @@ "organization": "", "last_sign_in_at": "2012-06-01T11:41:01.248Z", "confirmed_at": "2012-05-23T09:05:22.248Z", - "last_activity_on": "2012-05-23T07:00:00.248Z", + "last_activity_on": "2012-05-23", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, @@ -346,7 +346,7 @@ "organization": "", "last_sign_in_at": "2012-06-01T11:41:01.248Z", "confirmed_at": "2012-05-23T09:05:22.248Z", - "last_activity_on": "2012-05-23T07:00:00.248Z", + "last_activity_on": "2012-05-23", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, @@ -379,7 +379,7 @@ "organization": "", "last_sign_in_at": "2012-06-01T11:41:01.248Z", "confirmed_at": "2012-05-23T09:05:22.248Z", - "last_activity_on": "2012-05-23T07:00:00.248Z", + "last_activity_on": "2012-05-23", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, @@ -412,7 +412,7 @@ "organization": "", "last_sign_in_at": "2012-06-01T11:41:01.248Z", "confirmed_at": "2012-05-23T09:05:22.248Z", - "last_activity_on": "2012-05-23T07:00:00.248Z", + "last_activity_on": "2012-05-23", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, @@ -445,7 +445,7 @@ "organization": "", "last_sign_in_at": "2012-06-01T11:41:01.248Z", "confirmed_at": "2012-05-23T09:05:22.248Z", - "last_activity_on": "2012-05-23T07:00:00.248Z", + "last_activity_on": "2012-05-23", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, @@ -478,7 +478,7 @@ "organization": "", "last_sign_in_at": "2012-06-01T11:41:01.248Z", "confirmed_at": "2012-05-23T09:05:22.248Z", - "last_activity_on": "2012-05-23T07:00:00.248Z", + "last_activity_on": "2012-05-23", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, @@ -511,7 +511,7 @@ "organization": "", "last_sign_in_at": "2012-06-01T11:41:01.248Z", "confirmed_at": "2012-05-23T09:05:22.248Z", - "last_activity_on": "2012-05-23T07:00:00.248Z", + "last_activity_on": "2012-05-23", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, @@ -544,7 +544,7 @@ "organization": "", "last_sign_in_at": "2012-06-01T11:41:01.248Z", "confirmed_at": "2012-05-23T09:05:22.248Z", - "last_activity_on": "2012-05-23T07:00:00.248Z", + "last_activity_on": "2012-05-23", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, @@ -577,7 +577,7 @@ "organization": "", "last_sign_in_at": "2012-06-01T11:41:01.248Z", "confirmed_at": "2012-05-23T09:05:22.248Z", - "last_activity_on": "2012-05-23T07:00:00.248Z", + "last_activity_on": "2012-05-23", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, @@ -610,7 +610,7 @@ "organization": "", "last_sign_in_at": "2012-06-01T11:41:01.248Z", "confirmed_at": "2012-05-23T09:05:22.248Z", - "last_activity_on": "2012-05-23T07:00:00.248Z", + "last_activity_on": "2012-05-23", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, @@ -643,7 +643,7 @@ "organization": "", "last_sign_in_at": "2012-06-01T11:41:01.248Z", "confirmed_at": "2012-05-23T09:05:22.248Z", - "last_activity_on": "2012-05-23T07:00:00.248Z", + "last_activity_on": "2012-05-23", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100, diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/user.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/user.json index b841afe40..138d13c15 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/user.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/user.json @@ -18,7 +18,7 @@ "organization": "", "last_sign_in_at": "2012-06-01T11:41:01.248Z", "confirmed_at": "2012-05-23T09:05:22.248Z", - "last_activity_on": "2012-05-23T07:00:00.248Z", + "last_activity_on": "2012-05-23", "theme_id": 1, "color_scheme_id": 2, "projects_limit": 100,