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/main/java/org/gitlab4j/api/models/AbstractEpic.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java index 9ec5c7854..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 @@ -7,11 +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.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; public class AbstractEpic> extends AbstractMinimalEpic implements Serializable { @@ -40,30 +39,114 @@ 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. + */ + @JsonProperty("start_date") @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date startDate; + /** + * The due date of the epic. + */ + @JsonProperty("due_date") @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date dueDate; + /** + * The end date of the epic. + */ + @JsonProperty("end_date") @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) private Date endDate; + /** + * The date when the epic was created. + */ + @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 date when the epic was last updated. + */ + @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 date when the epic was closed. + */ + @JsonProperty("closed_at") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") 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 9337dbc4b..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 @@ -5,16 +5,46 @@ 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; + /** + * 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; 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..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 @@ -6,9 +6,13 @@ 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; import com.fasterxml.jackson.databind.node.TextNode; @@ -45,51 +49,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. + */ + @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 date when the issue was last updated. + */ + @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 date when the issue was closed. + */ + @JsonProperty("closed_at") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") 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. + */ + @JsonProperty("due_date") + @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) 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; 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 ae3c61155..9540cb347 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,51 @@ import org.gitlab4j.models.utils.JacksonJson; +import com.fasterxml.jackson.annotation.JsonProperty; + 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; 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 dadc9b741..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 @@ -4,21 +4,68 @@ 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 { 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. + */ + @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 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; + + @JsonProperty("locked") private Boolean locked; + + /** + * 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; 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..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 @@ -4,14 +4,45 @@ import org.gitlab4j.models.GitLabForm; +import com.fasterxml.jackson.annotation.JsonProperty; + 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..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 @@ -2,10 +2,27 @@ import java.util.Date; +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 AccessRequest extends AbstractUser { private static final long serialVersionUID = 1L; + /** + * The date when the access request was made. + */ + @JsonProperty("requested_at") + @JsonDeserialize(using = MultiDateFormatDeserializer.class) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") 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 580710add..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 @@ -4,14 +4,44 @@ import org.gitlab4j.models.utils.JacksonJson; +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; + + /** + * The application is used where the client secret can be kept confidential. + * Native mobile apps and Single Page Apps are considered non-confidential. + * Defaults to true if not supplied. + */ + @JsonProperty("confidential") private Boolean confidential; + + @JsonProperty("secret") private String secret; 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..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 @@ -2,32 +2,48 @@ 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; + /** + * The unique identifier of the application settings. + */ + @JsonProperty("id") private Long id; + + /** + * The date when the application settings were created. + */ + @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 date when the application settings were last updated. + */ + @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 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 33549dc79..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 @@ -5,22 +5,88 @@ 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; + + @JsonProperty("report_type") private String reportType; + + /** + * 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; + + /** + * If true, applies the rule to all protected branches + * and ignores the protected_branch_ids attribute. + */ + @JsonProperty("applies_to_all_protected_branches") private Boolean appliesToAllProtectedBranches; + + @JsonProperty("protected_branches") private List protectedBranches; 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/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/AuditEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AuditEvent.java index 001b19bd4..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 @@ -4,15 +4,51 @@ 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; + /** + * 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. + */ + @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/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..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 @@ -5,9 +5,13 @@ 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; @@ -37,12 +41,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. + */ + @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 date when the award emoji was last updated. + */ + @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 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 5e5b2b355..e299dbfa0 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,19 +5,75 @@ 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; + + /** + * Hide the Open list. + */ + @JsonProperty("hide_backlog_list") private Boolean hideBacklogList; + + /** + * Hide the Closed list. + */ + @JsonProperty("hide_closed_list") private Boolean hideClosedList; + + /** + * 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; + + /** + * The group associated with the board. + */ + @JsonProperty("group") private Group group; - private Milestone milestone; + + /** + * The assignee associated with the board. + */ + @JsonProperty("assignee") private Assignee assignee; + + /** + * The labels associated with the board. + */ + @JsonProperty("labels") private List