Skip to content

Bugfix/merge request event object attributes #1277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 25 commits into
base: main
Choose a base branch
from
Open

Bugfix/merge request event object attributes #1277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
956f988
use @JsonProperty annotation to specify actual key the GitLab API is …
bdgould Nov 24, 2024
79e90ba
other object_attribute fields
bdgould Nov 24, 2024
610650c
also noticed this file had a similar issue for mergeRequest -> merge_…
bdgould Nov 25, 2024
0ee8032
webhooks using @JsonProperty and Format annotations
bdgould Dec 7, 2024
d92a24e
merge in and resolve one conflict
bdgould Dec 7, 2024
2f9098b
system hooks using @JsonProperty and @JsonFormat
bdgould Dec 7, 2024
90a8a90
cleanup
bdgould Dec 7, 2024
72e86a6
enriching model annotation metadata with @JsonProperty and @JsonForma…
bdgould Dec 8, 2024
caa9359
updated to reflect testing date time stamps
bdgould Dec 11, 2024
8ffd614
Merge remote-tracking branch 'origin/main' into bugfix/MergeRequestEv…
katrinSaleschus Aug 28, 2025
3f704cf
fix merge
katrinSaleschus Aug 28, 2025
1281363
add JsonAnnotations to new Classes
katrinSaleschus Aug 28, 2025
8267a27
Merge branch 'gitlab4j:main' into bugfix/MergeRequestEvent_object_att…
katrinSaleschus Aug 28, 2025
c4839f1
add JsonAnnotations to missed attributes
katrinSaleschus Aug 28, 2025
7dc5cf5
add milliseconds to date format
katrinSaleschus Sep 1, 2025
58032e3
update test data date format
katrinSaleschus Sep 1, 2025
25b715a
Merge branch 'gitlab4j:main' into bugfix/MergeRequestEvent_object_att…
katrinSaleschus Sep 1, 2025
2fa7d69
add annotations to new attributes
katrinSaleschus Sep 1, 2025
78e3387
fixup! add annotations to new attributes
katrinSaleschus Sep 2, 2025
84eaf1a
remove dateformat information
katrinSaleschus Sep 3, 2025
c0a485d
handle different Date formats
katrinSaleschus Sep 3, 2025
fa99228
fixup! handle different Date formats
katrinSaleschus Sep 3, 2025
4f7408b
add missing date annotations
katrinSaleschus Sep 3, 2025
dfc01ca
add correct deserializers
katrinSaleschus Sep 3, 2025
be2e1b6
reapply format and add ChangeContainerSerialization
katrinSaleschus Sep 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions gitlab4j-api/src/test/resources/org/gitlab4j/api/commit.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
"author_email": "[email protected]",
"committer_name": "Dmitriy",
"committer_email": "[email protected]",
"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"
],
Expand Down
2 changes: 1 addition & 1 deletion gitlab4j-api/src/test/resources/org/gitlab4j/api/merge-request-system-hook-event.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions gitlab4j-api/src/test/resources/org/gitlab4j/api/merge-request.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -36,15 +36,15 @@
"email":"[email protected]",
"name":"Administrator",
"state":"active",
"created_at":"2012-04-29T08:46:00Z"
"created_at":"2012-04-29T08:46:00.248Z"
},
"assignee":{
"id":1,
"username": "admin",
"email":"[email protected]",
"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,
Expand Down
Loading
Loading