diff --git a/.mock/definition/ATS/accountDetails.yml b/.mock/definition/ATS/accountDetails.yml index 812b16432..ceedb3735 100644 --- a/.mock/definition/ATS/accountDetails.yml +++ b/.mock/definition/ATS/accountDetails.yml @@ -16,7 +16,8 @@ service: type: atsRoot.AccountDetails status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: id: 0496d4c2-42e6-4072-80b3-7b69bfdc76fd diff --git a/.mock/definition/ATS/accountToken.yml b/.mock/definition/ATS/accountToken.yml index 5155cd0e2..f173e1e9c 100644 --- a/.mock/definition/ATS/accountToken.yml +++ b/.mock/definition/ATS/accountToken.yml @@ -22,6 +22,8 @@ service: examples: - path-parameters: public_token: public_token + headers: + X-Account-Token: '[object Object]' response: body: account_token: T9klMDQrcHdm9jrtHuOS2Nf06BIHwMNjpPXPMB diff --git a/.mock/definition/ATS/activities.yml b/.mock/definition/ATS/activities.yml index 69030cc81..82396961c 100644 --- a/.mock/definition/ATS/activities.yml +++ b/.mock/definition/ATS/activities.yml @@ -120,7 +120,10 @@ service: type: atsRoot.PaginatedActivityList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -175,7 +178,8 @@ service: type: atsRoot.ActivityResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} remote_user_id: remote_user_id @@ -268,7 +272,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: ecbe05ac-62a3-46c5-ab31-4b478b37d1b4 @@ -304,7 +309,8 @@ service: type: atsRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: diff --git a/.mock/definition/ATS/applications.yml b/.mock/definition/ATS/applications.yml index 9e9930a13..9ebfaa389 100644 --- a/.mock/definition/ATS/applications.yml +++ b/.mock/definition/ATS/applications.yml @@ -123,7 +123,10 @@ service: type: atsRoot.PaginatedApplicationList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -195,7 +198,8 @@ service: type: atsRoot.ApplicationResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} remote_user_id: remote_user_id @@ -284,7 +288,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 92e8a369-fffe-430d-b93a-f7e8a16563f1 @@ -353,7 +358,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token request: {} response: body: @@ -425,7 +431,8 @@ service: type: atsRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: diff --git a/.mock/definition/ATS/asyncPassthrough.yml b/.mock/definition/ATS/asyncPassthrough.yml index 26c270543..223951204 100644 --- a/.mock/definition/ATS/asyncPassthrough.yml +++ b/.mock/definition/ATS/asyncPassthrough.yml @@ -21,7 +21,8 @@ service: type: atsRoot.AsyncPassthroughReciept status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: method: GET path: /scooters @@ -44,7 +45,8 @@ service: examples: - path-parameters: async_passthrough_receipt_id: async_passthrough_receipt_id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: method: GET diff --git a/.mock/definition/ATS/attachments.yml b/.mock/definition/ATS/attachments.yml index 20de5912b..7e31b4e2f 100644 --- a/.mock/definition/ATS/attachments.yml +++ b/.mock/definition/ATS/attachments.yml @@ -87,7 +87,10 @@ service: type: atsRoot.PaginatedAttachmentList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -139,7 +142,8 @@ service: type: atsRoot.AttachmentResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} remote_user_id: remote_user_id @@ -229,7 +233,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: c640b80b-fac9-409f-aa19-1f9221aec445 @@ -262,7 +267,8 @@ service: type: atsRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: diff --git a/.mock/definition/ATS/auditTrail.yml b/.mock/definition/ATS/auditTrail.yml index f63c23ff9..ee24dbe0e 100644 --- a/.mock/definition/ATS/auditTrail.yml +++ b/.mock/definition/ATS/auditTrail.yml @@ -79,7 +79,11 @@ service: type: atsRoot.PaginatedAuditLogEventList status-code: 200 examples: - - response: + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: '[object Object]' + response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw previous: cj1sZXdwd2VycWVtY29zZnNkc2NzUWxNMEUxTXk0ME16UXpNallsTWtJ diff --git a/.mock/definition/ATS/availableActions.yml b/.mock/definition/ATS/availableActions.yml index 11d2ac1c8..52b67a04c 100644 --- a/.mock/definition/ATS/availableActions.yml +++ b/.mock/definition/ATS/availableActions.yml @@ -16,7 +16,8 @@ service: type: atsRoot.AvailableActions status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: integration: diff --git a/.mock/definition/ATS/candidates.yml b/.mock/definition/ATS/candidates.yml index 504a363e1..bfdff22c3 100644 --- a/.mock/definition/ATS/candidates.yml +++ b/.mock/definition/ATS/candidates.yml @@ -103,7 +103,10 @@ service: type: atsRoot.PaginatedCandidateList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -187,7 +190,8 @@ service: type: atsRoot.CandidateResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} remote_user_id: remote_user_id @@ -299,7 +303,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 521b18c2-4d01-4297-b451-19858d07c133 @@ -387,7 +392,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token request: model: {} remote_user_id: remote_user_id @@ -483,7 +489,8 @@ service: examples: - path-parameters: model_id: model_id - headers: {} + headers: + X-Account-Token: X-Account-Token request: reason: GENERAL_CUSTOMER_REQUEST metaPatchRetrieve: @@ -502,7 +509,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: request_schema: @@ -686,7 +694,8 @@ service: type: atsRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: diff --git a/.mock/definition/ATS/deleteAccount.yml b/.mock/definition/ATS/deleteAccount.yml index 02ae3ce75..57554adc1 100644 --- a/.mock/definition/ATS/deleteAccount.yml +++ b/.mock/definition/ATS/deleteAccount.yml @@ -10,6 +10,7 @@ service: source: openapi: ats_v3.yml examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token source: openapi: ats_v3.yml diff --git a/.mock/definition/ATS/departments.yml b/.mock/definition/ATS/departments.yml index 41672b303..d93c61334 100644 --- a/.mock/definition/ATS/departments.yml +++ b/.mock/definition/ATS/departments.yml @@ -68,7 +68,10 @@ service: type: atsRoot.PaginatedDepartmentList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -118,7 +121,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 5b3c1341-a20f-4e51-b72c-f3830a16c97b diff --git a/.mock/definition/ATS/eeocs.yml b/.mock/definition/ATS/eeocs.yml index 2492ffbd5..0db75d4d3 100644 --- a/.mock/definition/ATS/eeocs.yml +++ b/.mock/definition/ATS/eeocs.yml @@ -208,7 +208,10 @@ service: type: atsRoot.PaginatedEeocList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -279,7 +282,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: f7dd7b4f-237e-4772-8bd4-3246384c6c58 diff --git a/.mock/definition/ATS/fieldMapping.yml b/.mock/definition/ATS/fieldMapping.yml index 6f8cf0a70..4a80e0158 100644 --- a/.mock/definition/ATS/fieldMapping.yml +++ b/.mock/definition/ATS/fieldMapping.yml @@ -30,7 +30,8 @@ service: type: atsRoot.FieldMappingApiInstanceResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: Activity: @@ -357,7 +358,8 @@ service: type: atsRoot.FieldMappingInstanceResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: target_field_name: example_target_field_name target_field_description: this is a example description of the target field @@ -424,7 +426,8 @@ service: examples: - path-parameters: field_mapping_id: field_mapping_id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: model: @@ -506,7 +509,8 @@ service: examples: - path-parameters: field_mapping_id: field_mapping_id - headers: {} + headers: + X-Account-Token: X-Account-Token request: {} response: body: @@ -577,7 +581,8 @@ service: type: atsRoot.RemoteFieldApiResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: Activity: @@ -821,7 +826,8 @@ service: type: atsRoot.ExternalTargetFieldApiResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: Activity: diff --git a/.mock/definition/ATS/forceResync.yml b/.mock/definition/ATS/forceResync.yml index be7ea616b..83e61cfe7 100644 --- a/.mock/definition/ATS/forceResync.yml +++ b/.mock/definition/ATS/forceResync.yml @@ -21,7 +21,8 @@ service: type: list status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: - model_name: Candidate diff --git a/.mock/definition/ATS/generateKey.yml b/.mock/definition/ATS/generateKey.yml index 6f190298c..81499ceaa 100644 --- a/.mock/definition/ATS/generateKey.yml +++ b/.mock/definition/ATS/generateKey.yml @@ -26,7 +26,9 @@ service: type: atsRoot.RemoteKey status-code: 200 examples: - - request: + - headers: + X-Account-Token: '[object Object]' + request: name: Remote Deployment Key 1 response: body: diff --git a/.mock/definition/ATS/interviews.yml b/.mock/definition/ATS/interviews.yml index 05bfb0d37..ebd796d68 100644 --- a/.mock/definition/ATS/interviews.yml +++ b/.mock/definition/ATS/interviews.yml @@ -113,7 +113,10 @@ service: type: atsRoot.PaginatedScheduledInterviewList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -173,7 +176,8 @@ service: type: atsRoot.ScheduledInterviewResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} remote_user_id: remote_user_id @@ -271,7 +275,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: b8faf072-98b9-4445-8a9a-6b4950efca19 @@ -312,7 +317,8 @@ service: type: atsRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: diff --git a/.mock/definition/ATS/issues.yml b/.mock/definition/ATS/issues.yml index 188bd7792..143fae061 100644 --- a/.mock/definition/ATS/issues.yml +++ b/.mock/definition/ATS/issues.yml @@ -84,7 +84,11 @@ service: type: atsRoot.PaginatedIssueList status-code: 200 examples: - - response: + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: '[object Object]' + response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw previous: cj1sZXdwd2VycWVtY29zZnNkc2NzUWxNMEUxTXk0ME16UXpNallsTWtJ @@ -116,6 +120,8 @@ service: examples: - path-parameters: id: id + headers: + X-Account-Token: '[object Object]' response: body: id: 3fa85f64-5717-4562-b3fc-2c963f66afa6 diff --git a/.mock/definition/ATS/jobInterviewStages.yml b/.mock/definition/ATS/jobInterviewStages.yml index 83acd43b3..121dd26da 100644 --- a/.mock/definition/ATS/jobInterviewStages.yml +++ b/.mock/definition/ATS/jobInterviewStages.yml @@ -77,7 +77,10 @@ service: type: atsRoot.PaginatedJobInterviewStageList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -135,7 +138,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: f9813dd5-e70b-484c-91d8-00acd6065b07 diff --git a/.mock/definition/ATS/jobPostings.yml b/.mock/definition/ATS/jobPostings.yml index 92bc20988..5dfc648cd 100644 --- a/.mock/definition/ATS/jobPostings.yml +++ b/.mock/definition/ATS/jobPostings.yml @@ -100,7 +100,10 @@ service: type: atsRoot.PaginatedJobPostingList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -167,7 +170,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 156a2bef-57e5-4def-8ed2-7c41bd9a554t diff --git a/.mock/definition/ATS/jobs.yml b/.mock/definition/ATS/jobs.yml index 6f370d80f..503b1d472 100644 --- a/.mock/definition/ATS/jobs.yml +++ b/.mock/definition/ATS/jobs.yml @@ -142,7 +142,10 @@ service: type: atsRoot.PaginatedJobList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -234,7 +237,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 022a2bef-57e5-4def-8ed2-7c41bd9a5ed8 @@ -332,7 +336,10 @@ service: examples: - path-parameters: job_id: job_id - headers: {} + query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw diff --git a/.mock/definition/ATS/linkToken.yml b/.mock/definition/ATS/linkToken.yml index 6fc93968a..12e0eb21d 100644 --- a/.mock/definition/ATS/linkToken.yml +++ b/.mock/definition/ATS/linkToken.yml @@ -136,7 +136,9 @@ service: type: atsRoot.LinkToken status-code: 200 examples: - - request: + - headers: + X-Account-Token: '[object Object]' + request: end_user_email_address: example@gmail.com end_user_organization_name: Test Organization end_user_origin_id: '12345' diff --git a/.mock/definition/ATS/linkedAccounts.yml b/.mock/definition/ATS/linkedAccounts.yml index 03a9bd074..1b0bc5b3b 100644 --- a/.mock/definition/ATS/linkedAccounts.yml +++ b/.mock/definition/ATS/linkedAccounts.yml @@ -111,7 +111,11 @@ service: type: atsRoot.PaginatedAccountDetailsAndActionsList status-code: 200 examples: - - response: + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: '[object Object]' + response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw previous: cj1sZXdwd2VycWVtY29zZnNkc2NzUWxNMEUxTXk0ME16UXpNallsTWtJ diff --git a/.mock/definition/ATS/offers.yml b/.mock/definition/ATS/offers.yml index 2fc1f67e4..5e12683c1 100644 --- a/.mock/definition/ATS/offers.yml +++ b/.mock/definition/ATS/offers.yml @@ -103,7 +103,10 @@ service: type: atsRoot.PaginatedOfferList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -175,7 +178,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: dd85625c-6a59-446f-a317-6de64d83bae7 diff --git a/.mock/definition/ATS/offices.yml b/.mock/definition/ATS/offices.yml index 2ed7047f7..b38aec464 100644 --- a/.mock/definition/ATS/offices.yml +++ b/.mock/definition/ATS/offices.yml @@ -68,7 +68,10 @@ service: type: atsRoot.PaginatedOfficeList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -119,7 +122,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 9871b4a9-f5d2-4f3b-a66b-dfedbed42c46 diff --git a/.mock/definition/ATS/passthrough.yml b/.mock/definition/ATS/passthrough.yml index 4388a16ff..d66e65d8e 100644 --- a/.mock/definition/ATS/passthrough.yml +++ b/.mock/definition/ATS/passthrough.yml @@ -19,7 +19,8 @@ service: type: atsRoot.RemoteResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: method: GET path: /scooters diff --git a/.mock/definition/ATS/regenerateKey.yml b/.mock/definition/ATS/regenerateKey.yml index 03679991e..0ba6ec09b 100644 --- a/.mock/definition/ATS/regenerateKey.yml +++ b/.mock/definition/ATS/regenerateKey.yml @@ -26,7 +26,9 @@ service: type: atsRoot.RemoteKey status-code: 200 examples: - - request: + - headers: + X-Account-Token: '[object Object]' + request: name: Remote Deployment Key 1 response: body: diff --git a/.mock/definition/ATS/rejectReasons.yml b/.mock/definition/ATS/rejectReasons.yml index 446984f75..630b175ef 100644 --- a/.mock/definition/ATS/rejectReasons.yml +++ b/.mock/definition/ATS/rejectReasons.yml @@ -68,7 +68,10 @@ service: type: atsRoot.PaginatedRejectReasonList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -118,7 +121,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 8be99a4a-f8d4-4339-bf1e-30eac970e217 diff --git a/.mock/definition/ATS/scopes.yml b/.mock/definition/ATS/scopes.yml index 20262a71f..82ca890c9 100644 --- a/.mock/definition/ATS/scopes.yml +++ b/.mock/definition/ATS/scopes.yml @@ -19,7 +19,9 @@ service: type: atsRoot.CommonModelScopeApi status-code: 200 examples: - - response: + - headers: + X-Account-Token: '[object Object]' + response: body: common_models: - model_name: Employee @@ -60,7 +62,8 @@ service: type: atsRoot.CommonModelScopeApi status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: common_models: @@ -111,7 +114,8 @@ service: type: atsRoot.CommonModelScopeApi status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: common_models: - model_name: Employee diff --git a/.mock/definition/ATS/scorecards.yml b/.mock/definition/ATS/scorecards.yml index c984b9738..aee7af170 100644 --- a/.mock/definition/ATS/scorecards.yml +++ b/.mock/definition/ATS/scorecards.yml @@ -108,7 +108,10 @@ service: type: atsRoot.PaginatedScorecardList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -179,7 +182,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 3eab2f17-eeb1-450d-97f0-029d8be1e06f diff --git a/.mock/definition/ATS/syncStatus.yml b/.mock/definition/ATS/syncStatus.yml index 345d698c5..456784e72 100644 --- a/.mock/definition/ATS/syncStatus.yml +++ b/.mock/definition/ATS/syncStatus.yml @@ -40,7 +40,10 @@ service: type: atsRoot.PaginatedSyncStatusList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw diff --git a/.mock/definition/ATS/tags.yml b/.mock/definition/ATS/tags.yml index 0b5ff362d..f04050e5b 100644 --- a/.mock/definition/ATS/tags.yml +++ b/.mock/definition/ATS/tags.yml @@ -68,7 +68,10 @@ service: type: atsRoot.PaginatedTagList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw diff --git a/.mock/definition/ATS/users.yml b/.mock/definition/ATS/users.yml index a76e47630..72f9d923d 100644 --- a/.mock/definition/ATS/users.yml +++ b/.mock/definition/ATS/users.yml @@ -85,7 +85,10 @@ service: type: atsRoot.PaginatedRemoteUserList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -150,7 +153,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: b82302de-852e-4e60-b050-edf9da3b7c02 diff --git a/.mock/definition/ATS/webhookReceivers.yml b/.mock/definition/ATS/webhookReceivers.yml index c79220f86..79f6c401a 100644 --- a/.mock/definition/ATS/webhookReceivers.yml +++ b/.mock/definition/ATS/webhookReceivers.yml @@ -16,7 +16,8 @@ service: type: list status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: - event: event @@ -48,7 +49,8 @@ service: type: atsRoot.WebhookReceiver status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: event: event is_active: true diff --git a/.mock/definition/Accounting/accountDetails.yml b/.mock/definition/Accounting/accountDetails.yml index 2ed0ac3ab..5bdbb0610 100644 --- a/.mock/definition/Accounting/accountDetails.yml +++ b/.mock/definition/Accounting/accountDetails.yml @@ -16,7 +16,8 @@ service: type: accountingRoot.AccountDetails status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: id: 0496d4c2-42e6-4072-80b3-7b69bfdc76fd diff --git a/.mock/definition/Accounting/accountToken.yml b/.mock/definition/Accounting/accountToken.yml index 3e8083ad8..61cb17d8e 100644 --- a/.mock/definition/Accounting/accountToken.yml +++ b/.mock/definition/Accounting/accountToken.yml @@ -22,6 +22,8 @@ service: examples: - path-parameters: public_token: public_token + headers: + X-Account-Token: '[object Object]' response: body: account_token: T9klMDQrcHdm9jrtHuOS2Nf06BIHwMNjpPXPMB diff --git a/.mock/definition/Accounting/accountingPeriods.yml b/.mock/definition/Accounting/accountingPeriods.yml index 95e74f284..d06c13190 100644 --- a/.mock/definition/Accounting/accountingPeriods.yml +++ b/.mock/definition/Accounting/accountingPeriods.yml @@ -47,7 +47,10 @@ service: type: accountingRoot.PaginatedAccountingPeriodList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -99,7 +102,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 3015f7b1-4d01-460d-bfab-02a52d16cbd0 diff --git a/.mock/definition/Accounting/accounts.yml b/.mock/definition/Accounting/accounts.yml index b08c143dd..83dd930e6 100644 --- a/.mock/definition/Accounting/accounts.yml +++ b/.mock/definition/Accounting/accounts.yml @@ -132,7 +132,10 @@ service: type: accountingRoot.PaginatedAccountList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -190,7 +193,8 @@ service: type: accountingRoot.AccountResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -286,7 +290,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: ecbe05ac-62a3-46c5-ab31-4b478b37d1b4 @@ -326,7 +331,8 @@ service: type: accountingRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: diff --git a/.mock/definition/Accounting/addresses.yml b/.mock/definition/Accounting/addresses.yml index 8841ef7fb..e8d9f6661 100644 --- a/.mock/definition/Accounting/addresses.yml +++ b/.mock/definition/Accounting/addresses.yml @@ -43,7 +43,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: created_at: '2021-09-15T00:00:00Z' diff --git a/.mock/definition/Accounting/asyncPassthrough.yml b/.mock/definition/Accounting/asyncPassthrough.yml index e1fd037b5..8265047e6 100644 --- a/.mock/definition/Accounting/asyncPassthrough.yml +++ b/.mock/definition/Accounting/asyncPassthrough.yml @@ -21,7 +21,8 @@ service: type: accountingRoot.AsyncPassthroughReciept status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: method: GET path: /scooters @@ -44,7 +45,8 @@ service: examples: - path-parameters: async_passthrough_receipt_id: async_passthrough_receipt_id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: method: GET diff --git a/.mock/definition/Accounting/asyncTasks.yml b/.mock/definition/Accounting/asyncTasks.yml index c9126d810..603a4e6b8 100644 --- a/.mock/definition/Accounting/asyncTasks.yml +++ b/.mock/definition/Accounting/asyncTasks.yml @@ -20,7 +20,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: status: QUEUED diff --git a/.mock/definition/Accounting/attachments.yml b/.mock/definition/Accounting/attachments.yml index 5db063ede..a1b2e6c21 100644 --- a/.mock/definition/Accounting/attachments.yml +++ b/.mock/definition/Accounting/attachments.yml @@ -73,7 +73,10 @@ service: type: accountingRoot.PaginatedAccountingAttachmentList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -124,7 +127,8 @@ service: type: accountingRoot.AccountingAttachmentResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -197,7 +201,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: ecbe05ac-62a3-46c5-ab31-4b478b37d1b4 @@ -230,7 +235,8 @@ service: type: accountingRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: diff --git a/.mock/definition/Accounting/auditTrail.yml b/.mock/definition/Accounting/auditTrail.yml index 906d228f1..39627b8ae 100644 --- a/.mock/definition/Accounting/auditTrail.yml +++ b/.mock/definition/Accounting/auditTrail.yml @@ -79,7 +79,11 @@ service: type: accountingRoot.PaginatedAuditLogEventList status-code: 200 examples: - - response: + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: '[object Object]' + response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw previous: cj1sZXdwd2VycWVtY29zZnNkc2NzUWxNMEUxTXk0ME16UXpNallsTWtJ diff --git a/.mock/definition/Accounting/availableActions.yml b/.mock/definition/Accounting/availableActions.yml index 0d5918894..bb66c38c2 100644 --- a/.mock/definition/Accounting/availableActions.yml +++ b/.mock/definition/Accounting/availableActions.yml @@ -16,7 +16,8 @@ service: type: accountingRoot.AvailableActions status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: integration: diff --git a/.mock/definition/Accounting/balanceSheets.yml b/.mock/definition/Accounting/balanceSheets.yml index fd97b5a2a..0cb28db95 100644 --- a/.mock/definition/Accounting/balanceSheets.yml +++ b/.mock/definition/Accounting/balanceSheets.yml @@ -77,7 +77,10 @@ service: type: accountingRoot.PaginatedBalanceSheetList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -175,7 +178,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 9871b4a9-f5d2-4f3b-a66b-dfedbed42c46 diff --git a/.mock/definition/Accounting/bankFeedAccounts.yml b/.mock/definition/Accounting/bankFeedAccounts.yml index 7cb1c3bbd..f930bdc5f 100644 --- a/.mock/definition/Accounting/bankFeedAccounts.yml +++ b/.mock/definition/Accounting/bankFeedAccounts.yml @@ -47,7 +47,10 @@ service: type: accountingRoot.PaginatedBankFeedAccountList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -100,7 +103,8 @@ service: type: accountingRoot.BankFeedAccountResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -177,7 +181,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: b26fd49a-cbae-470a-a8f8-bcbc119e0390 @@ -214,7 +219,8 @@ service: type: accountingRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: diff --git a/.mock/definition/Accounting/bankFeedTransactions.yml b/.mock/definition/Accounting/bankFeedTransactions.yml index 3411602c1..9454bcf21 100644 --- a/.mock/definition/Accounting/bankFeedTransactions.yml +++ b/.mock/definition/Accounting/bankFeedTransactions.yml @@ -79,7 +79,10 @@ service: type: accountingRoot.PaginatedBankFeedTransactionList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -127,7 +130,8 @@ service: type: accountingRoot.BankFeedTransactionResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -203,7 +207,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: b26fd49a-cbae-470a-a8f8-bcbc119e0390 @@ -233,7 +238,8 @@ service: type: accountingRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: diff --git a/.mock/definition/Accounting/cashFlowStatements.yml b/.mock/definition/Accounting/cashFlowStatements.yml index a5f0900d2..78e66c7b0 100644 --- a/.mock/definition/Accounting/cashFlowStatements.yml +++ b/.mock/definition/Accounting/cashFlowStatements.yml @@ -79,7 +79,10 @@ service: type: accountingRoot.PaginatedCashFlowStatementList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -176,7 +179,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 5b3c1341-a20f-4e51-b72c-f3830a16c97b diff --git a/.mock/definition/Accounting/companyInfo.yml b/.mock/definition/Accounting/companyInfo.yml index 7add92f28..dccfc4379 100644 --- a/.mock/definition/Accounting/companyInfo.yml +++ b/.mock/definition/Accounting/companyInfo.yml @@ -87,7 +87,10 @@ service: type: accountingRoot.PaginatedCompanyInfoList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -162,7 +165,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 65d8ffd0-211b-4ba4-b85a-fbe2ce220982 diff --git a/.mock/definition/Accounting/contacts.yml b/.mock/definition/Accounting/contacts.yml index fe7919956..8e4df145a 100644 --- a/.mock/definition/Accounting/contacts.yml +++ b/.mock/definition/Accounting/contacts.yml @@ -126,7 +126,10 @@ service: type: accountingRoot.PaginatedContactList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -192,7 +195,8 @@ service: type: accountingRoot.ContactResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -301,7 +305,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: c640b80b-fac9-409f-aa19-1f9221aec445 @@ -351,7 +356,8 @@ service: type: accountingRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: @@ -576,7 +582,10 @@ service: type: accountingRoot.PaginatedRemoteFieldClassList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw diff --git a/.mock/definition/Accounting/creditNotes.yml b/.mock/definition/Accounting/creditNotes.yml index 2fd4e08e0..e8c400eae 100644 --- a/.mock/definition/Accounting/creditNotes.yml +++ b/.mock/definition/Accounting/creditNotes.yml @@ -150,7 +150,10 @@ service: type: accountingRoot.PaginatedCreditNoteList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -246,7 +249,8 @@ service: type: accountingRoot.CreditNoteResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -380,7 +384,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 8d9fd929-436c-4fd4-a48b-0c61f68d6178 @@ -409,7 +414,6 @@ service: unit_price: '5.0' tax_rate: 8d9fd929-436c-4fd4-a48b-0c61f68d6178 total_line_amount: '5.0' - tracking_category: tracking_category tracking_categories: - 8d9fd929-436c-4fd4-a48b-0c61f68d6178 - 9b840d2-686a-465a-8a8e-7b028498f8e4 @@ -461,7 +465,8 @@ service: type: accountingRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: diff --git a/.mock/definition/Accounting/deleteAccount.yml b/.mock/definition/Accounting/deleteAccount.yml index 2706d9b8d..b24eb1c18 100644 --- a/.mock/definition/Accounting/deleteAccount.yml +++ b/.mock/definition/Accounting/deleteAccount.yml @@ -10,6 +10,7 @@ service: source: openapi: accounting_v3.yml examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token source: openapi: accounting_v3.yml diff --git a/.mock/definition/Accounting/employees.yml b/.mock/definition/Accounting/employees.yml index 7ada0e1e0..dd9d14284 100644 --- a/.mock/definition/Accounting/employees.yml +++ b/.mock/definition/Accounting/employees.yml @@ -53,7 +53,10 @@ service: type: accountingRoot.PaginatedEmployeeList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -115,7 +118,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: c640b80b-fac9-409f-aa19-1f9221aec445 diff --git a/.mock/definition/Accounting/expenses.yml b/.mock/definition/Accounting/expenses.yml index 212585dcf..340dcba16 100644 --- a/.mock/definition/Accounting/expenses.yml +++ b/.mock/definition/Accounting/expenses.yml @@ -111,7 +111,10 @@ service: type: accountingRoot.PaginatedExpenseList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -210,7 +213,8 @@ service: type: accountingRoot.ExpenseResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -342,7 +346,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: ecbe05ac-62a3-46c5-ab31-4b478b37d1b4 @@ -369,7 +374,6 @@ service: modified_at: '2021-10-16T00:00:00Z' item: b38c59b0-a9d7-4740-b1ee-5436c6751e3d net_amount: 25.54 - tracking_category: tracking_category tracking_categories: - b38c59b0-a9d7-4740-b1ee-5436c6751e3d - 9b840d2-686a-465a-8a8e-7b028498f8e4 @@ -390,7 +394,6 @@ service: modified_at: '2021-10-16T00:00:00Z' item: b38c59b0-a9d7-4740-b1ee-5436c6751e3d net_amount: 10 - tracking_category: tracking_category tracking_categories: - b38c59b0-a9d7-4740-b1ee-5436c6751e3d - 9b840d2-686a-465a-8a8e-7b028498f8e4 @@ -477,7 +480,10 @@ service: type: accountingRoot.PaginatedRemoteFieldClassList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -505,7 +511,8 @@ service: type: accountingRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: @@ -730,7 +737,10 @@ service: type: accountingRoot.PaginatedRemoteFieldClassList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw diff --git a/.mock/definition/Accounting/fieldMapping.yml b/.mock/definition/Accounting/fieldMapping.yml index fbdcd0e06..6a1dc9c09 100644 --- a/.mock/definition/Accounting/fieldMapping.yml +++ b/.mock/definition/Accounting/fieldMapping.yml @@ -30,7 +30,8 @@ service: type: accountingRoot.FieldMappingApiInstanceResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: Account: @@ -501,7 +502,8 @@ service: type: accountingRoot.FieldMappingInstanceResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: target_field_name: example_target_field_name target_field_description: this is a example description of the target field @@ -568,7 +570,8 @@ service: examples: - path-parameters: field_mapping_id: field_mapping_id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: model: @@ -650,7 +653,8 @@ service: examples: - path-parameters: field_mapping_id: field_mapping_id - headers: {} + headers: + X-Account-Token: X-Account-Token request: {} response: body: @@ -721,7 +725,8 @@ service: type: accountingRoot.RemoteFieldApiResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: Account: @@ -1091,7 +1096,8 @@ service: type: accountingRoot.ExternalTargetFieldApiResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: Account: diff --git a/.mock/definition/Accounting/forceResync.yml b/.mock/definition/Accounting/forceResync.yml index 519177e12..273b8d71e 100644 --- a/.mock/definition/Accounting/forceResync.yml +++ b/.mock/definition/Accounting/forceResync.yml @@ -21,7 +21,8 @@ service: type: list status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: - model_name: Invoice diff --git a/.mock/definition/Accounting/generalLedgerTransactions.yml b/.mock/definition/Accounting/generalLedgerTransactions.yml index 837920e6e..8bdc16a93 100644 --- a/.mock/definition/Accounting/generalLedgerTransactions.yml +++ b/.mock/definition/Accounting/generalLedgerTransactions.yml @@ -102,7 +102,10 @@ service: type: accountingRoot.PaginatedGeneralLedgerTransactionList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -188,7 +191,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: b26fd49a-cbae-470a-a8f8-bcbc119e0390 diff --git a/.mock/definition/Accounting/generateKey.yml b/.mock/definition/Accounting/generateKey.yml index 53f0f60d8..783b8fbae 100644 --- a/.mock/definition/Accounting/generateKey.yml +++ b/.mock/definition/Accounting/generateKey.yml @@ -26,7 +26,9 @@ service: type: accountingRoot.RemoteKey status-code: 200 examples: - - request: + - headers: + X-Account-Token: '[object Object]' + request: name: Remote Deployment Key 1 response: body: diff --git a/.mock/definition/Accounting/incomeStatements.yml b/.mock/definition/Accounting/incomeStatements.yml index 1b452c9ad..75278d467 100644 --- a/.mock/definition/Accounting/incomeStatements.yml +++ b/.mock/definition/Accounting/incomeStatements.yml @@ -77,7 +77,10 @@ service: type: accountingRoot.PaginatedIncomeStatementList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -189,7 +192,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 0958cbc6-6040-430a-848e-aafacbadf4ae diff --git a/.mock/definition/Accounting/invoices.yml b/.mock/definition/Accounting/invoices.yml index 7af527999..9cc0026ba 100644 --- a/.mock/definition/Accounting/invoices.yml +++ b/.mock/definition/Accounting/invoices.yml @@ -173,7 +173,10 @@ service: type: accountingRoot.PaginatedInvoiceList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -292,7 +295,8 @@ service: type: accountingRoot.InvoiceResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -451,7 +455,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 9871b4a9-f5d2-4f3b-a66b-dfedbed42c46 @@ -507,7 +512,6 @@ service: item: 5b3c1341-a20f-4e51-b72c-f3830a16c97b account: cd0f32d4-a493-11ec-b909-0242ac120002 tax_rate: a12e7c20-1922-9df7-s75n-edfeewnn7384 - tracking_category: tracking_category tracking_categories: - b38c59b0-a9d7-4740-b1ee-5436c6751e3d - 9b840d2-686a-465a-8a8e-7b028498f8e4 @@ -583,7 +587,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -745,7 +750,10 @@ service: type: accountingRoot.PaginatedRemoteFieldClassList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -777,7 +785,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: request_schema: @@ -961,7 +970,8 @@ service: type: accountingRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: @@ -1186,7 +1196,10 @@ service: type: accountingRoot.PaginatedRemoteFieldClassList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw diff --git a/.mock/definition/Accounting/issues.yml b/.mock/definition/Accounting/issues.yml index aaef5a354..d5e7e7935 100644 --- a/.mock/definition/Accounting/issues.yml +++ b/.mock/definition/Accounting/issues.yml @@ -84,7 +84,11 @@ service: type: accountingRoot.PaginatedIssueList status-code: 200 examples: - - response: + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: '[object Object]' + response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw previous: cj1sZXdwd2VycWVtY29zZnNkc2NzUWxNMEUxTXk0ME16UXpNallsTWtJ @@ -116,6 +120,8 @@ service: examples: - path-parameters: id: id + headers: + X-Account-Token: '[object Object]' response: body: id: 3fa85f64-5717-4562-b3fc-2c963f66afa6 diff --git a/.mock/definition/Accounting/items.yml b/.mock/definition/Accounting/items.yml index 276001a86..cf491b7ea 100644 --- a/.mock/definition/Accounting/items.yml +++ b/.mock/definition/Accounting/items.yml @@ -106,7 +106,10 @@ service: type: accountingRoot.PaginatedItemList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -164,7 +167,8 @@ service: type: accountingRoot.ItemResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -260,7 +264,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: d2f972d0-2526-434b-9409-4c3b468e08f0 @@ -319,7 +324,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -386,7 +392,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: request_schema: @@ -570,7 +577,8 @@ service: type: accountingRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: diff --git a/.mock/definition/Accounting/journalEntries.yml b/.mock/definition/Accounting/journalEntries.yml index e9c87803f..58a562f73 100644 --- a/.mock/definition/Accounting/journalEntries.yml +++ b/.mock/definition/Accounting/journalEntries.yml @@ -111,7 +111,10 @@ service: type: accountingRoot.PaginatedJournalEntryList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -204,7 +207,8 @@ service: type: accountingRoot.JournalEntryResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -330,7 +334,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: ecbe05ac-62a3-46c5-ab31-4b478b37d1b4 @@ -354,7 +359,6 @@ service: modified_at: '2021-10-16T00:00:00Z' account: 9d892439-5fab-4dbb-8bd8-34f7f96c7912 net_amount: 25.54 - tracking_category: tracking_category tracking_categories: - d25d609b-945f-4762-b55a-1c8fb220c43c - 9b840d2-686a-465a-8a8e-7b028498f8e4 @@ -376,7 +380,6 @@ service: modified_at: '2021-10-16T00:00:00Z' account: f963f34d-3d2f-4f77-b557-cf36bc7e6498 net_amount: 10 - tracking_category: tracking_category tracking_categories: - d25d609b-945f-4762-b55a-1c8fb220c43c - 9b840d2-686a-465a-8a8e-7b028498f8e4 @@ -468,7 +471,10 @@ service: type: accountingRoot.PaginatedRemoteFieldClassList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -496,7 +502,8 @@ service: type: accountingRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: @@ -721,7 +728,10 @@ service: type: accountingRoot.PaginatedRemoteFieldClassList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw diff --git a/.mock/definition/Accounting/linkToken.yml b/.mock/definition/Accounting/linkToken.yml index acdb8bb46..a0e48ebe5 100644 --- a/.mock/definition/Accounting/linkToken.yml +++ b/.mock/definition/Accounting/linkToken.yml @@ -136,7 +136,9 @@ service: type: accountingRoot.LinkToken status-code: 200 examples: - - request: + - headers: + X-Account-Token: '[object Object]' + request: end_user_email_address: example@gmail.com end_user_organization_name: Test Organization end_user_origin_id: '12345' diff --git a/.mock/definition/Accounting/linkedAccounts.yml b/.mock/definition/Accounting/linkedAccounts.yml index 228511b13..ec15b619d 100644 --- a/.mock/definition/Accounting/linkedAccounts.yml +++ b/.mock/definition/Accounting/linkedAccounts.yml @@ -111,7 +111,11 @@ service: type: accountingRoot.PaginatedAccountDetailsAndActionsList status-code: 200 examples: - - response: + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: '[object Object]' + response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw previous: cj1sZXdwd2VycWVtY29zZnNkc2NzUWxNMEUxTXk0ME16UXpNallsTWtJ diff --git a/.mock/definition/Accounting/passthrough.yml b/.mock/definition/Accounting/passthrough.yml index 04acc055f..06fefb4b8 100644 --- a/.mock/definition/Accounting/passthrough.yml +++ b/.mock/definition/Accounting/passthrough.yml @@ -19,7 +19,8 @@ service: type: accountingRoot.RemoteResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: method: GET path: /scooters diff --git a/.mock/definition/Accounting/paymentMethods.yml b/.mock/definition/Accounting/paymentMethods.yml index 9e3b60b84..18fc7f5c5 100644 --- a/.mock/definition/Accounting/paymentMethods.yml +++ b/.mock/definition/Accounting/paymentMethods.yml @@ -47,7 +47,10 @@ service: type: accountingRoot.PaginatedPaymentMethodList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -99,7 +102,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: ecbe05ac-62a3-46c5-ab31-4b478b37d1b4 diff --git a/.mock/definition/Accounting/paymentTerms.yml b/.mock/definition/Accounting/paymentTerms.yml index ea5a10547..af1d567d3 100644 --- a/.mock/definition/Accounting/paymentTerms.yml +++ b/.mock/definition/Accounting/paymentTerms.yml @@ -53,7 +53,10 @@ service: type: accountingRoot.PaginatedPaymentTermList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -113,7 +116,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: ecbe05ac-62a3-46c5-ab31-4b478b37d1b4 diff --git a/.mock/definition/Accounting/payments.yml b/.mock/definition/Accounting/payments.yml index c91a3e650..58b58f70e 100644 --- a/.mock/definition/Accounting/payments.yml +++ b/.mock/definition/Accounting/payments.yml @@ -119,7 +119,10 @@ service: type: accountingRoot.PaginatedPaymentList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -200,7 +203,8 @@ service: type: accountingRoot.PaymentResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -314,7 +318,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: b26fd49a-cbae-470a-a8f8-bcbc119e0390 @@ -398,7 +403,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -525,7 +531,10 @@ service: type: accountingRoot.PaginatedRemoteFieldClassList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -557,7 +566,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: request_schema: @@ -741,7 +751,8 @@ service: type: accountingRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: @@ -966,7 +977,10 @@ service: type: accountingRoot.PaginatedRemoteFieldClassList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw diff --git a/.mock/definition/Accounting/phoneNumbers.yml b/.mock/definition/Accounting/phoneNumbers.yml index 293ef8aec..25e95a031 100644 --- a/.mock/definition/Accounting/phoneNumbers.yml +++ b/.mock/definition/Accounting/phoneNumbers.yml @@ -33,7 +33,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: created_at: '2021-09-15T00:00:00Z' diff --git a/.mock/definition/Accounting/projects.yml b/.mock/definition/Accounting/projects.yml index 0aa5d634b..b000193c4 100644 --- a/.mock/definition/Accounting/projects.yml +++ b/.mock/definition/Accounting/projects.yml @@ -62,7 +62,10 @@ service: type: accountingRoot.PaginatedProjectList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -120,7 +123,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: ecbe05ac-62a3-46c5-ab31-4b478b37d1b4 diff --git a/.mock/definition/Accounting/purchaseOrders.yml b/.mock/definition/Accounting/purchaseOrders.yml index f85a771d1..dcd7fe340 100644 --- a/.mock/definition/Accounting/purchaseOrders.yml +++ b/.mock/definition/Accounting/purchaseOrders.yml @@ -123,7 +123,10 @@ service: type: accountingRoot.PaginatedPurchaseOrderList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -226,7 +229,8 @@ service: type: accountingRoot.PurchaseOrderResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -372,7 +376,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 0048ea5b-911e-4dff-9364-92070dea62ff @@ -402,7 +407,6 @@ service: quantity: 10 item: 0958cbc6-6040-430a-848e-aafacbadf4ae account: account - tracking_category: tracking_category tracking_categories: - f1214c24-2702-4617-b74b-3ddecfc0d384 - 9b840d2-686a-465a-8a8e-7b028498f8e4 @@ -425,7 +429,6 @@ service: quantity: 10 item: 249c9faa-3045-4a31-953b-8f22d3613301 account: account - tracking_category: tracking_category tracking_categories: - f1214c24-2702-4617-b74b-3ddecfc0d384 - 9b840d2-686a-465a-8a8e-7b028498f8e4 @@ -514,7 +517,10 @@ service: type: accountingRoot.PaginatedRemoteFieldClassList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -542,7 +548,8 @@ service: type: accountingRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: @@ -767,7 +774,10 @@ service: type: accountingRoot.PaginatedRemoteFieldClassList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw diff --git a/.mock/definition/Accounting/regenerateKey.yml b/.mock/definition/Accounting/regenerateKey.yml index 578850324..3f735c164 100644 --- a/.mock/definition/Accounting/regenerateKey.yml +++ b/.mock/definition/Accounting/regenerateKey.yml @@ -26,7 +26,9 @@ service: type: accountingRoot.RemoteKey status-code: 200 examples: - - request: + - headers: + X-Account-Token: '[object Object]' + request: name: Remote Deployment Key 1 response: body: diff --git a/.mock/definition/Accounting/scopes.yml b/.mock/definition/Accounting/scopes.yml index 5bed6a262..329794ec3 100644 --- a/.mock/definition/Accounting/scopes.yml +++ b/.mock/definition/Accounting/scopes.yml @@ -19,7 +19,9 @@ service: type: accountingRoot.CommonModelScopeApi status-code: 200 examples: - - response: + - headers: + X-Account-Token: '[object Object]' + response: body: common_models: - model_name: Employee @@ -60,7 +62,8 @@ service: type: accountingRoot.CommonModelScopeApi status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: common_models: @@ -112,7 +115,8 @@ service: type: accountingRoot.CommonModelScopeApi status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: common_models: - model_name: Employee diff --git a/.mock/definition/Accounting/syncStatus.yml b/.mock/definition/Accounting/syncStatus.yml index 2872af19f..c8fa8fa5f 100644 --- a/.mock/definition/Accounting/syncStatus.yml +++ b/.mock/definition/Accounting/syncStatus.yml @@ -40,7 +40,10 @@ service: type: accountingRoot.PaginatedSyncStatusList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw diff --git a/.mock/definition/Accounting/taxRates.yml b/.mock/definition/Accounting/taxRates.yml index 8f3ccfb34..7bfa93f15 100644 --- a/.mock/definition/Accounting/taxRates.yml +++ b/.mock/definition/Accounting/taxRates.yml @@ -80,7 +80,10 @@ service: type: accountingRoot.PaginatedTaxRateList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -152,7 +155,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: b82302de-852e-4e60-b050-edf9da3b7c02 diff --git a/.mock/definition/Accounting/trackingCategories.yml b/.mock/definition/Accounting/trackingCategories.yml index 50c47e8e1..b2323394f 100644 --- a/.mock/definition/Accounting/trackingCategories.yml +++ b/.mock/definition/Accounting/trackingCategories.yml @@ -100,7 +100,10 @@ service: type: accountingRoot.PaginatedTrackingCategoryList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -166,7 +169,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: ecbe05ac-62a3-46c5-ab31-4b478b37d1b4 diff --git a/.mock/definition/Accounting/transactions.yml b/.mock/definition/Accounting/transactions.yml index de2a13f6f..8b0578081 100644 --- a/.mock/definition/Accounting/transactions.yml +++ b/.mock/definition/Accounting/transactions.yml @@ -106,7 +106,10 @@ service: type: accountingRoot.PaginatedTransactionList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -210,7 +213,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 0048ea5b-911e-4dff-9364-92070dea62ff @@ -241,7 +245,6 @@ service: quantity: '10.0' item: 0958cbc6-6040-430a-848e-aafacbadf4ae account: 2b38c085-2620-4269-b5ec-75dd9095ed2c - tracking_category: tracking_category tracking_categories: - f1214c24-2702-4617-b74b-3ddecfc0d384 - 9b840d2-686a-465a-8a8e-7b028498f8e4 @@ -261,7 +264,6 @@ service: quantity: '10.0' item: 249c9faa-3045-4a31-953b-8f22d3613301 account: 3e442c5d-8f51-4103-b5c9-dcee39c30a08 - tracking_category: tracking_category tracking_categories: - f1214c24-2702-4617-b74b-3ddecfc0d384 - 9b840d2-686a-465a-8a8e-7b028498f8e4 diff --git a/.mock/definition/Accounting/vendorCredits.yml b/.mock/definition/Accounting/vendorCredits.yml index 6c91ef165..a33583cdf 100644 --- a/.mock/definition/Accounting/vendorCredits.yml +++ b/.mock/definition/Accounting/vendorCredits.yml @@ -104,7 +104,10 @@ service: type: accountingRoot.PaginatedVendorCreditList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -199,7 +202,8 @@ service: type: accountingRoot.VendorCreditResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -322,7 +326,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: ecbe05ac-62a3-46c5-ab31-4b478b37d1b4 @@ -343,7 +348,6 @@ service: created_at: '2021-09-15T00:00:00Z' modified_at: '2021-10-16T00:00:00Z' net_amount: 25.54 - tracking_category: tracking_category tracking_categories: - b38c59b0-a9d7-4740-b1ee-5436c6751e3d - 9b840d2-686a-465a-8a8e-7b028498f8e4 @@ -361,7 +365,6 @@ service: created_at: '2021-09-15T00:00:00Z' modified_at: '2021-10-16T00:00:00Z' net_amount: 10 - tracking_category: tracking_category tracking_categories: - b38c59b0-a9d7-4740-b1ee-5436c6751e3d - 9b840d2-686a-465a-8a8e-7b028498f8e4 @@ -409,7 +412,8 @@ service: type: accountingRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: diff --git a/.mock/definition/Accounting/webhookReceivers.yml b/.mock/definition/Accounting/webhookReceivers.yml index bb5e70aa8..e1a4b30ae 100644 --- a/.mock/definition/Accounting/webhookReceivers.yml +++ b/.mock/definition/Accounting/webhookReceivers.yml @@ -16,7 +16,8 @@ service: type: list status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: - event: event @@ -48,7 +49,8 @@ service: type: accountingRoot.WebhookReceiver status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: event: event is_active: true diff --git a/.mock/definition/CRM/accountDetails.yml b/.mock/definition/CRM/accountDetails.yml index 99cf4cd2f..42bd1c692 100644 --- a/.mock/definition/CRM/accountDetails.yml +++ b/.mock/definition/CRM/accountDetails.yml @@ -16,7 +16,8 @@ service: type: crmRoot.AccountDetails status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: id: 0496d4c2-42e6-4072-80b3-7b69bfdc76fd diff --git a/.mock/definition/CRM/accountToken.yml b/.mock/definition/CRM/accountToken.yml index 814d7a3cb..b9ac409e6 100644 --- a/.mock/definition/CRM/accountToken.yml +++ b/.mock/definition/CRM/accountToken.yml @@ -22,6 +22,8 @@ service: examples: - path-parameters: public_token: public_token + headers: + X-Account-Token: '[object Object]' response: body: account_token: T9klMDQrcHdm9jrtHuOS2Nf06BIHwMNjpPXPMB diff --git a/.mock/definition/CRM/accounts.yml b/.mock/definition/CRM/accounts.yml index a304597f0..a64da124c 100644 --- a/.mock/definition/CRM/accounts.yml +++ b/.mock/definition/CRM/accounts.yml @@ -85,7 +85,10 @@ service: type: crmRoot.PaginatedAccountList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -158,7 +161,8 @@ service: type: crmRoot.CrmAccountResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -264,7 +268,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 0958cbc6-6040-430a-848e-aafacbadf4ae @@ -340,7 +345,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -422,7 +428,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: request_schema: @@ -606,7 +613,8 @@ service: type: crmRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: @@ -836,7 +844,10 @@ service: type: crmRoot.PaginatedRemoteFieldClassList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw diff --git a/.mock/definition/CRM/associationTypes.yml b/.mock/definition/CRM/associationTypes.yml index a0560561e..860050e4d 100644 --- a/.mock/definition/CRM/associationTypes.yml +++ b/.mock/definition/CRM/associationTypes.yml @@ -78,7 +78,10 @@ service: examples: - path-parameters: custom_object_class_id: custom_object_class_id - headers: {} + query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -129,7 +132,8 @@ service: examples: - path-parameters: custom_object_class_id: custom_object_class_id - headers: {} + headers: + X-Account-Token: X-Account-Token request: model: source_object_class: @@ -214,7 +218,8 @@ service: - path-parameters: custom_object_class_id: custom_object_class_id id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 5bb73c32-3c6c-4757-ab7d-7d3540a1be31 @@ -250,7 +255,8 @@ service: examples: - path-parameters: custom_object_class_id: custom_object_class_id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: request_schema: diff --git a/.mock/definition/CRM/associations.yml b/.mock/definition/CRM/associations.yml index f4e420a9b..478198489 100644 --- a/.mock/definition/CRM/associations.yml +++ b/.mock/definition/CRM/associations.yml @@ -86,7 +86,10 @@ service: - path-parameters: custom_object_class_id: custom_object_class_id object_id: object_id - headers: {} + query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -135,7 +138,8 @@ service: source_object_id: source_object_id target_class_id: target_class_id target_object_id: target_object_id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: created_at: '2021-09-15T00:00:00Z' diff --git a/.mock/definition/CRM/asyncPassthrough.yml b/.mock/definition/CRM/asyncPassthrough.yml index 8010d2c58..2185ef19b 100644 --- a/.mock/definition/CRM/asyncPassthrough.yml +++ b/.mock/definition/CRM/asyncPassthrough.yml @@ -21,7 +21,8 @@ service: type: crmRoot.AsyncPassthroughReciept status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: method: GET path: /scooters @@ -44,7 +45,8 @@ service: examples: - path-parameters: async_passthrough_receipt_id: async_passthrough_receipt_id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: method: GET diff --git a/.mock/definition/CRM/auditTrail.yml b/.mock/definition/CRM/auditTrail.yml index 5ee5ca9cf..2e98a5a88 100644 --- a/.mock/definition/CRM/auditTrail.yml +++ b/.mock/definition/CRM/auditTrail.yml @@ -79,7 +79,11 @@ service: type: crmRoot.PaginatedAuditLogEventList status-code: 200 examples: - - response: + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: '[object Object]' + response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw previous: cj1sZXdwd2VycWVtY29zZnNkc2NzUWxNMEUxTXk0ME16UXpNallsTWtJ diff --git a/.mock/definition/CRM/availableActions.yml b/.mock/definition/CRM/availableActions.yml index 59a189498..cc72be6b4 100644 --- a/.mock/definition/CRM/availableActions.yml +++ b/.mock/definition/CRM/availableActions.yml @@ -16,7 +16,8 @@ service: type: crmRoot.AvailableActions status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: integration: diff --git a/.mock/definition/CRM/contacts.yml b/.mock/definition/CRM/contacts.yml index f6363295c..75622c011 100644 --- a/.mock/definition/CRM/contacts.yml +++ b/.mock/definition/CRM/contacts.yml @@ -105,7 +105,10 @@ service: type: crmRoot.PaginatedContactList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -180,7 +183,8 @@ service: type: crmRoot.CrmContactResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -288,7 +292,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 550e8400-e29b-41d4-a716-446655440000 @@ -366,7 +371,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -453,7 +459,8 @@ service: examples: - path-parameters: model_id: model_id - headers: {} + headers: + X-Account-Token: X-Account-Token request: reason: GENERAL_CUSTOMER_REQUEST metaPatchRetrieve: @@ -472,7 +479,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: request_schema: @@ -656,7 +664,8 @@ service: type: crmRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: @@ -886,7 +895,10 @@ service: type: crmRoot.PaginatedRemoteFieldClassList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw diff --git a/.mock/definition/CRM/customObjectClasses.yml b/.mock/definition/CRM/customObjectClasses.yml index 77c19f6c6..0347a1d28 100644 --- a/.mock/definition/CRM/customObjectClasses.yml +++ b/.mock/definition/CRM/customObjectClasses.yml @@ -74,7 +74,10 @@ service: type: crmRoot.PaginatedCustomObjectClassList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -152,7 +155,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: ff1ff4cb-a66b-47dc-8e2a-50388049e602 diff --git a/.mock/definition/CRM/customObjects.yml b/.mock/definition/CRM/customObjects.yml index 3c0b6e2c2..e55db8a3c 100644 --- a/.mock/definition/CRM/customObjects.yml +++ b/.mock/definition/CRM/customObjects.yml @@ -77,7 +77,10 @@ service: examples: - path-parameters: custom_object_class_id: custom_object_class_id - headers: {} + query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -125,7 +128,8 @@ service: examples: - path-parameters: custom_object_class_id: custom_object_class_id - headers: {} + headers: + X-Account-Token: X-Account-Token request: model: fields: @@ -201,7 +205,8 @@ service: - path-parameters: custom_object_class_id: custom_object_class_id id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: da0b1963-be70-469c-9f8c-06a81d0fe759 @@ -234,7 +239,8 @@ service: examples: - path-parameters: custom_object_class_id: custom_object_class_id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: request_schema: @@ -464,7 +470,10 @@ service: type: crmRoot.PaginatedRemoteFieldClassList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw diff --git a/.mock/definition/CRM/deleteAccount.yml b/.mock/definition/CRM/deleteAccount.yml index 5379d1558..07f83ee89 100644 --- a/.mock/definition/CRM/deleteAccount.yml +++ b/.mock/definition/CRM/deleteAccount.yml @@ -10,6 +10,7 @@ service: source: openapi: crm_v3.yml examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token source: openapi: crm_v3.yml diff --git a/.mock/definition/CRM/engagementTypes.yml b/.mock/definition/CRM/engagementTypes.yml index 99d1d5bb0..b5567928d 100644 --- a/.mock/definition/CRM/engagementTypes.yml +++ b/.mock/definition/CRM/engagementTypes.yml @@ -73,7 +73,10 @@ service: type: crmRoot.PaginatedEngagementTypeList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -121,7 +124,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 550e8400-e29b-41d4-a716-446655440000 @@ -192,7 +196,10 @@ service: type: crmRoot.PaginatedRemoteFieldClassList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw diff --git a/.mock/definition/CRM/engagements.yml b/.mock/definition/CRM/engagements.yml index 89883db04..19f77c10c 100644 --- a/.mock/definition/CRM/engagements.yml +++ b/.mock/definition/CRM/engagements.yml @@ -106,7 +106,10 @@ service: type: crmRoot.PaginatedEngagementList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -165,7 +168,8 @@ service: type: crmRoot.EngagementResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -257,7 +261,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 550e8400-e29b-41d4-a716-446655440000 @@ -319,7 +324,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -387,7 +393,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: request_schema: @@ -571,7 +578,8 @@ service: type: crmRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: @@ -801,7 +809,10 @@ service: type: crmRoot.PaginatedRemoteFieldClassList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw diff --git a/.mock/definition/CRM/fieldMapping.yml b/.mock/definition/CRM/fieldMapping.yml index 421def33f..a31caaf36 100644 --- a/.mock/definition/CRM/fieldMapping.yml +++ b/.mock/definition/CRM/fieldMapping.yml @@ -30,7 +30,8 @@ service: type: crmRoot.FieldMappingApiInstanceResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: Account: @@ -245,7 +246,8 @@ service: type: crmRoot.FieldMappingInstanceResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: target_field_name: example_target_field_name target_field_description: this is a example description of the target field @@ -312,7 +314,8 @@ service: examples: - path-parameters: field_mapping_id: field_mapping_id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: model: @@ -394,7 +397,8 @@ service: examples: - path-parameters: field_mapping_id: field_mapping_id - headers: {} + headers: + X-Account-Token: X-Account-Token request: {} response: body: @@ -465,7 +469,8 @@ service: type: crmRoot.RemoteFieldApiResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: Account: @@ -611,7 +616,8 @@ service: type: crmRoot.ExternalTargetFieldApiResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: Account: diff --git a/.mock/definition/CRM/forceResync.yml b/.mock/definition/CRM/forceResync.yml index 94fc4a6d1..f05a91fd9 100644 --- a/.mock/definition/CRM/forceResync.yml +++ b/.mock/definition/CRM/forceResync.yml @@ -21,7 +21,8 @@ service: type: list status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: - model_name: Account diff --git a/.mock/definition/CRM/generateKey.yml b/.mock/definition/CRM/generateKey.yml index 823c5e736..e91da902a 100644 --- a/.mock/definition/CRM/generateKey.yml +++ b/.mock/definition/CRM/generateKey.yml @@ -26,7 +26,9 @@ service: type: crmRoot.RemoteKey status-code: 200 examples: - - request: + - headers: + X-Account-Token: '[object Object]' + request: name: Remote Deployment Key 1 response: body: diff --git a/.mock/definition/CRM/issues.yml b/.mock/definition/CRM/issues.yml index 1fb03f475..302a87a1d 100644 --- a/.mock/definition/CRM/issues.yml +++ b/.mock/definition/CRM/issues.yml @@ -84,7 +84,11 @@ service: type: crmRoot.PaginatedIssueList status-code: 200 examples: - - response: + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: '[object Object]' + response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw previous: cj1sZXdwd2VycWVtY29zZnNkc2NzUWxNMEUxTXk0ME16UXpNallsTWtJ @@ -116,6 +120,8 @@ service: examples: - path-parameters: id: id + headers: + X-Account-Token: '[object Object]' response: body: id: 3fa85f64-5717-4562-b3fc-2c963f66afa6 diff --git a/.mock/definition/CRM/leads.yml b/.mock/definition/CRM/leads.yml index 24d2df661..affed658f 100644 --- a/.mock/definition/CRM/leads.yml +++ b/.mock/definition/CRM/leads.yml @@ -113,7 +113,10 @@ service: type: crmRoot.PaginatedLeadList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -193,7 +196,8 @@ service: type: crmRoot.LeadResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -306,7 +310,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 550e8400-e29b-41d4-a716-446655440000 @@ -370,7 +375,8 @@ service: type: crmRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: @@ -600,7 +606,10 @@ service: type: crmRoot.PaginatedRemoteFieldClassList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw diff --git a/.mock/definition/CRM/linkToken.yml b/.mock/definition/CRM/linkToken.yml index 7e4b0bdb4..3c88a7e1b 100644 --- a/.mock/definition/CRM/linkToken.yml +++ b/.mock/definition/CRM/linkToken.yml @@ -136,7 +136,9 @@ service: type: crmRoot.LinkToken status-code: 200 examples: - - request: + - headers: + X-Account-Token: '[object Object]' + request: end_user_email_address: example@gmail.com end_user_organization_name: Test Organization end_user_origin_id: '12345' diff --git a/.mock/definition/CRM/linkedAccounts.yml b/.mock/definition/CRM/linkedAccounts.yml index 420c18d6e..28486065c 100644 --- a/.mock/definition/CRM/linkedAccounts.yml +++ b/.mock/definition/CRM/linkedAccounts.yml @@ -111,7 +111,11 @@ service: type: crmRoot.PaginatedAccountDetailsAndActionsList status-code: 200 examples: - - response: + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: '[object Object]' + response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw previous: cj1sZXdwd2VycWVtY29zZnNkc2NzUWxNMEUxTXk0ME16UXpNallsTWtJ diff --git a/.mock/definition/CRM/notes.yml b/.mock/definition/CRM/notes.yml index 67805b2d8..f03aad2b0 100644 --- a/.mock/definition/CRM/notes.yml +++ b/.mock/definition/CRM/notes.yml @@ -108,7 +108,10 @@ service: type: crmRoot.PaginatedNoteList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -164,7 +167,8 @@ service: type: crmRoot.NoteResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -253,7 +257,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 550e8400-e29b-41d4-a716-446655440000 @@ -293,7 +298,8 @@ service: type: crmRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: @@ -523,7 +529,10 @@ service: type: crmRoot.PaginatedRemoteFieldClassList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw diff --git a/.mock/definition/CRM/opportunities.yml b/.mock/definition/CRM/opportunities.yml index f4816c11f..4f33dae8d 100644 --- a/.mock/definition/CRM/opportunities.yml +++ b/.mock/definition/CRM/opportunities.yml @@ -137,7 +137,10 @@ service: type: crmRoot.PaginatedOpportunityList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -196,7 +199,8 @@ service: type: crmRoot.OpportunityResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -298,7 +302,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 550e8400-e29b-41d4-a716-446655440000 @@ -360,7 +365,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -428,7 +434,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: request_schema: @@ -612,7 +619,8 @@ service: type: crmRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: @@ -842,7 +850,10 @@ service: type: crmRoot.PaginatedRemoteFieldClassList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw diff --git a/.mock/definition/CRM/passthrough.yml b/.mock/definition/CRM/passthrough.yml index 074a43b16..d31ce9ca9 100644 --- a/.mock/definition/CRM/passthrough.yml +++ b/.mock/definition/CRM/passthrough.yml @@ -19,7 +19,8 @@ service: type: crmRoot.RemoteResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: method: GET path: /scooters diff --git a/.mock/definition/CRM/regenerateKey.yml b/.mock/definition/CRM/regenerateKey.yml index 2515182ce..864b9e4bb 100644 --- a/.mock/definition/CRM/regenerateKey.yml +++ b/.mock/definition/CRM/regenerateKey.yml @@ -26,7 +26,9 @@ service: type: crmRoot.RemoteKey status-code: 200 examples: - - request: + - headers: + X-Account-Token: '[object Object]' + request: name: Remote Deployment Key 1 response: body: diff --git a/.mock/definition/CRM/scopes.yml b/.mock/definition/CRM/scopes.yml index 7091eeaf1..3262c1b69 100644 --- a/.mock/definition/CRM/scopes.yml +++ b/.mock/definition/CRM/scopes.yml @@ -19,7 +19,9 @@ service: type: crmRoot.CommonModelScopeApi status-code: 200 examples: - - response: + - headers: + X-Account-Token: '[object Object]' + response: body: common_models: - model_name: Employee @@ -60,7 +62,8 @@ service: type: crmRoot.CommonModelScopeApi status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: common_models: @@ -111,7 +114,8 @@ service: type: crmRoot.CommonModelScopeApi status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: common_models: - model_name: Employee diff --git a/.mock/definition/CRM/stages.yml b/.mock/definition/CRM/stages.yml index 0c2e8eb6c..a11e5413e 100644 --- a/.mock/definition/CRM/stages.yml +++ b/.mock/definition/CRM/stages.yml @@ -73,7 +73,10 @@ service: type: crmRoot.PaginatedStageList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -130,7 +133,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 0358cbc6-2040-430a-848e-aafacbadf3aa @@ -210,7 +214,10 @@ service: type: crmRoot.PaginatedRemoteFieldClassList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw diff --git a/.mock/definition/CRM/syncStatus.yml b/.mock/definition/CRM/syncStatus.yml index 7a57c6fd5..00c570dab 100644 --- a/.mock/definition/CRM/syncStatus.yml +++ b/.mock/definition/CRM/syncStatus.yml @@ -36,7 +36,10 @@ service: type: crmRoot.PaginatedSyncStatusList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw diff --git a/.mock/definition/CRM/tasks.yml b/.mock/definition/CRM/tasks.yml index 01a7f1b4d..2528cbce1 100644 --- a/.mock/definition/CRM/tasks.yml +++ b/.mock/definition/CRM/tasks.yml @@ -94,7 +94,10 @@ service: type: crmRoot.PaginatedTaskList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -151,7 +154,8 @@ service: type: crmRoot.TaskResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -241,7 +245,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 550e8400-e29b-41d4-a716-446655440000 @@ -301,7 +306,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -367,7 +373,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: request_schema: @@ -551,7 +558,8 @@ service: type: crmRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: @@ -781,7 +789,10 @@ service: type: crmRoot.PaginatedRemoteFieldClassList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw diff --git a/.mock/definition/CRM/users.yml b/.mock/definition/CRM/users.yml index 90719a44f..a97711f64 100644 --- a/.mock/definition/CRM/users.yml +++ b/.mock/definition/CRM/users.yml @@ -76,7 +76,10 @@ service: type: crmRoot.PaginatedUserList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -135,7 +138,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 0358cbc6-2040-430a-848e-aafacbadf3aa @@ -178,7 +182,8 @@ service: examples: - path-parameters: model_id: model_id - headers: {} + headers: + X-Account-Token: X-Account-Token request: reason: GENERAL_CUSTOMER_REQUEST remoteFieldClassesList: @@ -239,7 +244,10 @@ service: type: crmRoot.PaginatedRemoteFieldClassList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw diff --git a/.mock/definition/CRM/webhookReceivers.yml b/.mock/definition/CRM/webhookReceivers.yml index 64b2593e9..2f5f9a1ce 100644 --- a/.mock/definition/CRM/webhookReceivers.yml +++ b/.mock/definition/CRM/webhookReceivers.yml @@ -16,7 +16,8 @@ service: type: list status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: - event: event @@ -48,7 +49,8 @@ service: type: crmRoot.WebhookReceiver status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: event: event is_active: true diff --git a/.mock/definition/FileStorage/accountDetails.yml b/.mock/definition/FileStorage/accountDetails.yml index 10e44e403..3bde3779f 100644 --- a/.mock/definition/FileStorage/accountDetails.yml +++ b/.mock/definition/FileStorage/accountDetails.yml @@ -16,7 +16,8 @@ service: type: fileStorageRoot.AccountDetails status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: id: 0496d4c2-42e6-4072-80b3-7b69bfdc76fd diff --git a/.mock/definition/FileStorage/accountToken.yml b/.mock/definition/FileStorage/accountToken.yml index 46dc75e8d..929023ba8 100644 --- a/.mock/definition/FileStorage/accountToken.yml +++ b/.mock/definition/FileStorage/accountToken.yml @@ -22,6 +22,8 @@ service: examples: - path-parameters: public_token: public_token + headers: + X-Account-Token: '[object Object]' response: body: account_token: T9klMDQrcHdm9jrtHuOS2Nf06BIHwMNjpPXPMB diff --git a/.mock/definition/FileStorage/asyncPassthrough.yml b/.mock/definition/FileStorage/asyncPassthrough.yml index f05f2a0fa..bd9089e14 100644 --- a/.mock/definition/FileStorage/asyncPassthrough.yml +++ b/.mock/definition/FileStorage/asyncPassthrough.yml @@ -21,7 +21,8 @@ service: type: fileStorageRoot.AsyncPassthroughReciept status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: method: GET path: /scooters @@ -44,7 +45,8 @@ service: examples: - path-parameters: async_passthrough_receipt_id: async_passthrough_receipt_id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: method: GET diff --git a/.mock/definition/FileStorage/auditTrail.yml b/.mock/definition/FileStorage/auditTrail.yml index 68b1f4197..2c75a2e18 100644 --- a/.mock/definition/FileStorage/auditTrail.yml +++ b/.mock/definition/FileStorage/auditTrail.yml @@ -79,7 +79,11 @@ service: type: fileStorageRoot.PaginatedAuditLogEventList status-code: 200 examples: - - response: + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: '[object Object]' + response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw previous: cj1sZXdwd2VycWVtY29zZnNkc2NzUWxNMEUxTXk0ME16UXpNallsTWtJ diff --git a/.mock/definition/FileStorage/availableActions.yml b/.mock/definition/FileStorage/availableActions.yml index 9bfd87466..b64491846 100644 --- a/.mock/definition/FileStorage/availableActions.yml +++ b/.mock/definition/FileStorage/availableActions.yml @@ -16,7 +16,8 @@ service: type: fileStorageRoot.AvailableActions status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: integration: diff --git a/.mock/definition/FileStorage/deleteAccount.yml b/.mock/definition/FileStorage/deleteAccount.yml index 5ebc5c5c7..f9c48216f 100644 --- a/.mock/definition/FileStorage/deleteAccount.yml +++ b/.mock/definition/FileStorage/deleteAccount.yml @@ -10,6 +10,7 @@ service: source: openapi: filestorage_v3.yml examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token source: openapi: filestorage_v3.yml diff --git a/.mock/definition/FileStorage/drives.yml b/.mock/definition/FileStorage/drives.yml index 848f87736..b8649b4c8 100644 --- a/.mock/definition/FileStorage/drives.yml +++ b/.mock/definition/FileStorage/drives.yml @@ -73,7 +73,10 @@ service: type: fileStorageRoot.PaginatedDriveList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -125,7 +128,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: f9e3d315-d6c2-458e-85c4-fa773d6ff4a6 diff --git a/.mock/definition/FileStorage/fieldMapping.yml b/.mock/definition/FileStorage/fieldMapping.yml index 86edc0b68..3875d4b78 100644 --- a/.mock/definition/FileStorage/fieldMapping.yml +++ b/.mock/definition/FileStorage/fieldMapping.yml @@ -30,7 +30,8 @@ service: type: fileStorageRoot.FieldMappingApiInstanceResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: File: @@ -181,7 +182,8 @@ service: type: fileStorageRoot.FieldMappingInstanceResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: target_field_name: example_target_field_name target_field_description: this is a example description of the target field @@ -248,7 +250,8 @@ service: examples: - path-parameters: field_mapping_id: field_mapping_id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: model: @@ -330,7 +333,8 @@ service: examples: - path-parameters: field_mapping_id: field_mapping_id - headers: {} + headers: + X-Account-Token: X-Account-Token request: {} response: body: @@ -401,7 +405,8 @@ service: type: fileStorageRoot.RemoteFieldApiResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: File: @@ -491,7 +496,8 @@ service: type: fileStorageRoot.ExternalTargetFieldApiResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: File: diff --git a/.mock/definition/FileStorage/files.yml b/.mock/definition/FileStorage/files.yml index 442ca43fc..14a435fa0 100644 --- a/.mock/definition/FileStorage/files.yml +++ b/.mock/definition/FileStorage/files.yml @@ -139,7 +139,10 @@ service: type: fileStorageRoot.PaginatedFileList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -204,7 +207,8 @@ service: type: fileStorageRoot.FileStorageFileResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -297,7 +301,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 45ce474c-dhcj-43a6-754r-629f799f7d68 @@ -391,7 +396,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 3fa85f64-5717-4562-b3fc-2c963f66afa6 @@ -467,7 +473,10 @@ service: type: fileStorageRoot.PaginatedDownloadRequestMetaList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -490,7 +499,8 @@ service: type: fileStorageRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: diff --git a/.mock/definition/FileStorage/folders.yml b/.mock/definition/FileStorage/folders.yml index c115e0664..6faa2a609 100644 --- a/.mock/definition/FileStorage/folders.yml +++ b/.mock/definition/FileStorage/folders.yml @@ -102,7 +102,10 @@ service: type: fileStorageRoot.PaginatedFolderList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -158,7 +161,8 @@ service: type: fileStorageRoot.FileStorageFolderResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -242,7 +246,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: e021f7a7-74fc-4487-8e12-14180c92d3b7 @@ -280,7 +285,8 @@ service: type: fileStorageRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: diff --git a/.mock/definition/FileStorage/forceResync.yml b/.mock/definition/FileStorage/forceResync.yml index 5a4ee92f5..c19d7e52a 100644 --- a/.mock/definition/FileStorage/forceResync.yml +++ b/.mock/definition/FileStorage/forceResync.yml @@ -21,7 +21,8 @@ service: type: list status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: - model_name: File diff --git a/.mock/definition/FileStorage/generateKey.yml b/.mock/definition/FileStorage/generateKey.yml index 947aa9307..c7b20512e 100644 --- a/.mock/definition/FileStorage/generateKey.yml +++ b/.mock/definition/FileStorage/generateKey.yml @@ -26,7 +26,9 @@ service: type: fileStorageRoot.RemoteKey status-code: 200 examples: - - request: + - headers: + X-Account-Token: '[object Object]' + request: name: Remote Deployment Key 1 response: body: diff --git a/.mock/definition/FileStorage/groups.yml b/.mock/definition/FileStorage/groups.yml index 721be36b7..e640c5bac 100644 --- a/.mock/definition/FileStorage/groups.yml +++ b/.mock/definition/FileStorage/groups.yml @@ -87,7 +87,10 @@ service: type: fileStorageRoot.PaginatedGroupList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -147,7 +150,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 5624aceb-0ea2-4864-ba08-354ac56b9884 diff --git a/.mock/definition/FileStorage/issues.yml b/.mock/definition/FileStorage/issues.yml index 4e54131b8..782e99a1f 100644 --- a/.mock/definition/FileStorage/issues.yml +++ b/.mock/definition/FileStorage/issues.yml @@ -84,7 +84,11 @@ service: type: fileStorageRoot.PaginatedIssueList status-code: 200 examples: - - response: + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: '[object Object]' + response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw previous: cj1sZXdwd2VycWVtY29zZnNkc2NzUWxNMEUxTXk0ME16UXpNallsTWtJ @@ -116,6 +120,8 @@ service: examples: - path-parameters: id: id + headers: + X-Account-Token: '[object Object]' response: body: id: 3fa85f64-5717-4562-b3fc-2c963f66afa6 diff --git a/.mock/definition/FileStorage/linkToken.yml b/.mock/definition/FileStorage/linkToken.yml index a0124a270..44bec5baf 100644 --- a/.mock/definition/FileStorage/linkToken.yml +++ b/.mock/definition/FileStorage/linkToken.yml @@ -136,7 +136,9 @@ service: type: fileStorageRoot.LinkToken status-code: 200 examples: - - request: + - headers: + X-Account-Token: '[object Object]' + request: end_user_email_address: example@gmail.com end_user_organization_name: Test Organization end_user_origin_id: '12345' diff --git a/.mock/definition/FileStorage/linkedAccounts.yml b/.mock/definition/FileStorage/linkedAccounts.yml index 253d028ca..0cb268610 100644 --- a/.mock/definition/FileStorage/linkedAccounts.yml +++ b/.mock/definition/FileStorage/linkedAccounts.yml @@ -111,7 +111,11 @@ service: type: fileStorageRoot.PaginatedAccountDetailsAndActionsList status-code: 200 examples: - - response: + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: '[object Object]' + response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw previous: cj1sZXdwd2VycWVtY29zZnNkc2NzUWxNMEUxTXk0ME16UXpNallsTWtJ diff --git a/.mock/definition/FileStorage/passthrough.yml b/.mock/definition/FileStorage/passthrough.yml index f1f302631..6fe2b5d9f 100644 --- a/.mock/definition/FileStorage/passthrough.yml +++ b/.mock/definition/FileStorage/passthrough.yml @@ -19,7 +19,8 @@ service: type: fileStorageRoot.RemoteResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: method: GET path: /scooters diff --git a/.mock/definition/FileStorage/regenerateKey.yml b/.mock/definition/FileStorage/regenerateKey.yml index 6e7dbfa6e..fcdee8c11 100644 --- a/.mock/definition/FileStorage/regenerateKey.yml +++ b/.mock/definition/FileStorage/regenerateKey.yml @@ -26,7 +26,9 @@ service: type: fileStorageRoot.RemoteKey status-code: 200 examples: - - request: + - headers: + X-Account-Token: '[object Object]' + request: name: Remote Deployment Key 1 response: body: diff --git a/.mock/definition/FileStorage/scopes.yml b/.mock/definition/FileStorage/scopes.yml index fd141a57b..b0148655a 100644 --- a/.mock/definition/FileStorage/scopes.yml +++ b/.mock/definition/FileStorage/scopes.yml @@ -19,7 +19,9 @@ service: type: fileStorageRoot.CommonModelScopeApi status-code: 200 examples: - - response: + - headers: + X-Account-Token: '[object Object]' + response: body: common_models: - model_name: Employee @@ -60,7 +62,8 @@ service: type: fileStorageRoot.CommonModelScopeApi status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: common_models: @@ -112,7 +115,8 @@ service: type: fileStorageRoot.CommonModelScopeApi status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: common_models: - model_name: Employee diff --git a/.mock/definition/FileStorage/syncStatus.yml b/.mock/definition/FileStorage/syncStatus.yml index dd0ca6da0..291662d18 100644 --- a/.mock/definition/FileStorage/syncStatus.yml +++ b/.mock/definition/FileStorage/syncStatus.yml @@ -40,7 +40,10 @@ service: type: fileStorageRoot.PaginatedSyncStatusList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw diff --git a/.mock/definition/FileStorage/users.yml b/.mock/definition/FileStorage/users.yml index ee742af64..b7f6aefe4 100644 --- a/.mock/definition/FileStorage/users.yml +++ b/.mock/definition/FileStorage/users.yml @@ -71,7 +71,10 @@ service: type: fileStorageRoot.PaginatedUserList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -123,7 +126,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 83902e75-4362-4803-b76c-a7d6be292cbd diff --git a/.mock/definition/FileStorage/webhookReceivers.yml b/.mock/definition/FileStorage/webhookReceivers.yml index 098fa4f19..d6d949440 100644 --- a/.mock/definition/FileStorage/webhookReceivers.yml +++ b/.mock/definition/FileStorage/webhookReceivers.yml @@ -16,7 +16,8 @@ service: type: list status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: - event: event @@ -48,7 +49,8 @@ service: type: fileStorageRoot.WebhookReceiver status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: event: event is_active: true diff --git a/.mock/definition/HRIS/accountDetails.yml b/.mock/definition/HRIS/accountDetails.yml index 2a54beef7..eb6c801f4 100644 --- a/.mock/definition/HRIS/accountDetails.yml +++ b/.mock/definition/HRIS/accountDetails.yml @@ -16,7 +16,8 @@ service: type: hrisRoot.AccountDetails status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: id: 0496d4c2-42e6-4072-80b3-7b69bfdc76fd diff --git a/.mock/definition/HRIS/accountToken.yml b/.mock/definition/HRIS/accountToken.yml index c36b7d207..823556e7f 100644 --- a/.mock/definition/HRIS/accountToken.yml +++ b/.mock/definition/HRIS/accountToken.yml @@ -22,6 +22,8 @@ service: examples: - path-parameters: public_token: public_token + headers: + X-Account-Token: '[object Object]' response: body: account_token: T9klMDQrcHdm9jrtHuOS2Nf06BIHwMNjpPXPMB diff --git a/.mock/definition/HRIS/asyncPassthrough.yml b/.mock/definition/HRIS/asyncPassthrough.yml index 76795e183..2f745e1df 100644 --- a/.mock/definition/HRIS/asyncPassthrough.yml +++ b/.mock/definition/HRIS/asyncPassthrough.yml @@ -21,7 +21,8 @@ service: type: hrisRoot.AsyncPassthroughReciept status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: method: GET path: /scooters @@ -44,7 +45,8 @@ service: examples: - path-parameters: async_passthrough_receipt_id: async_passthrough_receipt_id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: method: GET diff --git a/.mock/definition/HRIS/auditTrail.yml b/.mock/definition/HRIS/auditTrail.yml index cd6b98fec..f5d491d3e 100644 --- a/.mock/definition/HRIS/auditTrail.yml +++ b/.mock/definition/HRIS/auditTrail.yml @@ -78,7 +78,11 @@ service: type: hrisRoot.PaginatedAuditLogEventList status-code: 200 examples: - - response: + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: '[object Object]' + response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw previous: cj1sZXdwd2VycWVtY29zZnNkc2NzUWxNMEUxTXk0ME16UXpNallsTWtJ diff --git a/.mock/definition/HRIS/availableActions.yml b/.mock/definition/HRIS/availableActions.yml index 8d00ce784..2bcd4ddb9 100644 --- a/.mock/definition/HRIS/availableActions.yml +++ b/.mock/definition/HRIS/availableActions.yml @@ -16,7 +16,8 @@ service: type: hrisRoot.AvailableActions status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: integration: diff --git a/.mock/definition/HRIS/bankInfo.yml b/.mock/definition/HRIS/bankInfo.yml index f1e2b2f0c..d2fb4c10f 100644 --- a/.mock/definition/HRIS/bankInfo.yml +++ b/.mock/definition/HRIS/bankInfo.yml @@ -120,7 +120,10 @@ service: type: hrisRoot.PaginatedBankInfoList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -191,7 +194,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: fd1e0fb5-8f92-4ec9-9f32-179cf732867d diff --git a/.mock/definition/HRIS/benefits.yml b/.mock/definition/HRIS/benefits.yml index 0fe212494..8400306fc 100644 --- a/.mock/definition/HRIS/benefits.yml +++ b/.mock/definition/HRIS/benefits.yml @@ -79,7 +79,10 @@ service: type: hrisRoot.PaginatedBenefitList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -91,7 +94,6 @@ service: modified_at: '2021-10-16T00:00:00Z' employee: employee provider_name: Blue Shield of California - benefit_plan_type: benefit_plan_type employee_contribution: 23.65 company_contribution: 150 start_date: '2020-11-15T00:59:25Z' @@ -142,7 +144,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 3fe5ae7a-f1ba-4529-b7af-84e86dc6d232 @@ -151,7 +154,6 @@ service: modified_at: '2021-10-16T00:00:00Z' employee: employee provider_name: Blue Shield of California - benefit_plan_type: benefit_plan_type employee_contribution: 23.65 company_contribution: 150 start_date: '2020-11-15T00:59:25Z' diff --git a/.mock/definition/HRIS/companies.yml b/.mock/definition/HRIS/companies.yml index d9f940a62..8e55842b2 100644 --- a/.mock/definition/HRIS/companies.yml +++ b/.mock/definition/HRIS/companies.yml @@ -68,7 +68,10 @@ service: type: hrisRoot.PaginatedCompanyList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -123,7 +126,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 1b998423-db0a-4037-a4cf-f79c60cb67b3 diff --git a/.mock/definition/HRIS/deleteAccount.yml b/.mock/definition/HRIS/deleteAccount.yml index 054b170e4..a209a04ca 100644 --- a/.mock/definition/HRIS/deleteAccount.yml +++ b/.mock/definition/HRIS/deleteAccount.yml @@ -10,6 +10,7 @@ service: source: openapi: hris_v3.yml examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token source: openapi: hris_v3.yml diff --git a/.mock/definition/HRIS/dependents.yml b/.mock/definition/HRIS/dependents.yml index 673189f32..d3fab2e50 100644 --- a/.mock/definition/HRIS/dependents.yml +++ b/.mock/definition/HRIS/dependents.yml @@ -73,7 +73,10 @@ service: type: hrisRoot.PaginatedDependentList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -138,7 +141,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 025fjlc6-6000-430a-848e-aafacbadf4fe diff --git a/.mock/definition/HRIS/employeePayrollRuns.yml b/.mock/definition/HRIS/employeePayrollRuns.yml index 3a13002ec..f31b20cc1 100644 --- a/.mock/definition/HRIS/employeePayrollRuns.yml +++ b/.mock/definition/HRIS/employeePayrollRuns.yml @@ -117,7 +117,10 @@ service: type: hrisRoot.PaginatedEmployeePayrollRunList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -208,7 +211,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: fb8c55b6-1cb8-4b4c-9fb6-17924231619d diff --git a/.mock/definition/HRIS/employees.yml b/.mock/definition/HRIS/employees.yml index 7c4da12db..d8a7ab047 100644 --- a/.mock/definition/HRIS/employees.yml +++ b/.mock/definition/HRIS/employees.yml @@ -325,7 +325,10 @@ service: type: hrisRoot.PaginatedEmployeeList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -352,14 +355,12 @@ service: home_location: home_location work_location: work_location manager: manager - team: team pay_group: pay_group ssn: '1234567890' gender: MALE ethnicity: AMERICAN_INDIAN_OR_ALASKA_NATIVE marital_status: SINGLE date_of_birth: '1990-11-10T00:00:00Z' - hire_date: '2020-10-10T00:00:00Z' start_date: '2020-10-11T00:00:00Z' remote_created_at: '2020-10-11T00:00:00Z' employment_status: ACTIVE @@ -404,7 +405,8 @@ service: type: hrisRoot.EmployeeResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -431,14 +433,12 @@ service: home_location: home_location work_location: work_location manager: manager - team: team pay_group: pay_group ssn: '1234567890' gender: MALE ethnicity: AMERICAN_INDIAN_OR_ALASKA_NATIVE marital_status: SINGLE date_of_birth: '1990-11-10T00:00:00Z' - hire_date: '2020-10-10T00:00:00Z' start_date: '2020-10-11T00:00:00Z' remote_created_at: '2020-10-11T00:00:00Z' employment_status: ACTIVE @@ -526,7 +526,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 0958cbc6-6040-430a-848e-aafacbadf4ae @@ -550,14 +551,12 @@ service: home_location: home_location work_location: work_location manager: manager - team: team pay_group: pay_group ssn: '1234567890' gender: MALE ethnicity: AMERICAN_INDIAN_OR_ALASKA_NATIVE marital_status: SINGLE date_of_birth: '1990-11-10T00:00:00Z' - hire_date: '2020-10-10T00:00:00Z' start_date: '2020-10-11T00:00:00Z' remote_created_at: '2020-10-11T00:00:00Z' employment_status: ACTIVE @@ -594,7 +593,8 @@ service: examples: - path-parameters: model_id: model_id - headers: {} + headers: + X-Account-Token: X-Account-Token request: reason: GENERAL_CUSTOMER_REQUEST metaPostRetrieve: @@ -609,7 +609,8 @@ service: type: hrisRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: diff --git a/.mock/definition/HRIS/employerBenefits.yml b/.mock/definition/HRIS/employerBenefits.yml index 5eea679b2..8cc6c72eb 100644 --- a/.mock/definition/HRIS/employerBenefits.yml +++ b/.mock/definition/HRIS/employerBenefits.yml @@ -68,7 +68,10 @@ service: type: hrisRoot.PaginatedEmployerBenefitList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -119,7 +122,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 025fjlc6-6000-430a-848e-aafacbadf4fele diff --git a/.mock/definition/HRIS/employments.yml b/.mock/definition/HRIS/employments.yml index f474c6902..92b9a333e 100644 --- a/.mock/definition/HRIS/employments.yml +++ b/.mock/definition/HRIS/employments.yml @@ -233,7 +233,10 @@ service: type: hrisRoot.PaginatedEmploymentList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -308,7 +311,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 65d8ffd0-211b-4ba4-b85a-fbe2ce220982 diff --git a/.mock/definition/HRIS/fieldMapping.yml b/.mock/definition/HRIS/fieldMapping.yml index 6e110a162..e6a7333d8 100644 --- a/.mock/definition/HRIS/fieldMapping.yml +++ b/.mock/definition/HRIS/fieldMapping.yml @@ -30,7 +30,8 @@ service: type: hrisRoot.FieldMappingApiInstanceResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: Benefit: @@ -357,7 +358,8 @@ service: type: hrisRoot.FieldMappingInstanceResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: target_field_name: example_target_field_name target_field_description: this is a example description of the target field @@ -424,7 +426,8 @@ service: examples: - path-parameters: field_mapping_id: field_mapping_id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: model: @@ -506,7 +509,8 @@ service: examples: - path-parameters: field_mapping_id: field_mapping_id - headers: {} + headers: + X-Account-Token: X-Account-Token request: {} response: body: @@ -577,7 +581,8 @@ service: type: hrisRoot.RemoteFieldApiResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: Benefit: @@ -821,7 +826,8 @@ service: type: hrisRoot.ExternalTargetFieldApiResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: Benefit: diff --git a/.mock/definition/HRIS/forceResync.yml b/.mock/definition/HRIS/forceResync.yml index a423b5b75..d4918920a 100644 --- a/.mock/definition/HRIS/forceResync.yml +++ b/.mock/definition/HRIS/forceResync.yml @@ -21,7 +21,8 @@ service: type: list status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: - model_name: Employee diff --git a/.mock/definition/HRIS/generateKey.yml b/.mock/definition/HRIS/generateKey.yml index 6fd6d39bc..f22844cea 100644 --- a/.mock/definition/HRIS/generateKey.yml +++ b/.mock/definition/HRIS/generateKey.yml @@ -26,7 +26,9 @@ service: type: hrisRoot.RemoteKey status-code: 200 examples: - - request: + - headers: + X-Account-Token: '[object Object]' + request: name: Remote Deployment Key 1 response: body: diff --git a/.mock/definition/HRIS/groups.yml b/.mock/definition/HRIS/groups.yml index f7012824f..1f67b8cd3 100644 --- a/.mock/definition/HRIS/groups.yml +++ b/.mock/definition/HRIS/groups.yml @@ -95,7 +95,10 @@ service: type: hrisRoot.PaginatedGroupList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -158,7 +161,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 134e0111-0f67-44f6-98f0-597000290bb3 diff --git a/.mock/definition/HRIS/issues.yml b/.mock/definition/HRIS/issues.yml index aec1474d0..1ecee14ab 100644 --- a/.mock/definition/HRIS/issues.yml +++ b/.mock/definition/HRIS/issues.yml @@ -84,7 +84,11 @@ service: type: hrisRoot.PaginatedIssueList status-code: 200 examples: - - response: + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: '[object Object]' + response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw previous: cj1sZXdwd2VycWVtY29zZnNkc2NzUWxNMEUxTXk0ME16UXpNallsTWtJ @@ -116,6 +120,8 @@ service: examples: - path-parameters: id: id + headers: + X-Account-Token: '[object Object]' response: body: id: 3fa85f64-5717-4562-b3fc-2c963f66afa6 diff --git a/.mock/definition/HRIS/linkToken.yml b/.mock/definition/HRIS/linkToken.yml index 48c7cf145..a8b52f548 100644 --- a/.mock/definition/HRIS/linkToken.yml +++ b/.mock/definition/HRIS/linkToken.yml @@ -136,7 +136,9 @@ service: type: hrisRoot.LinkToken status-code: 200 examples: - - request: + - headers: + X-Account-Token: '[object Object]' + request: end_user_email_address: example@gmail.com end_user_organization_name: Test Organization end_user_origin_id: '12345' diff --git a/.mock/definition/HRIS/linkedAccounts.yml b/.mock/definition/HRIS/linkedAccounts.yml index ee1648c7e..a74312d19 100644 --- a/.mock/definition/HRIS/linkedAccounts.yml +++ b/.mock/definition/HRIS/linkedAccounts.yml @@ -111,7 +111,11 @@ service: type: hrisRoot.PaginatedAccountDetailsAndActionsList status-code: 200 examples: - - response: + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: '[object Object]' + response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw previous: cj1sZXdwd2VycWVtY29zZnNkc2NzUWxNMEUxTXk0ME16UXpNallsTWtJ diff --git a/.mock/definition/HRIS/locations.yml b/.mock/definition/HRIS/locations.yml index e758c05cc..4c5da26e9 100644 --- a/.mock/definition/HRIS/locations.yml +++ b/.mock/definition/HRIS/locations.yml @@ -124,7 +124,10 @@ service: type: hrisRoot.PaginatedLocationList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -192,7 +195,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: f5e6a151-f44e-449a-afb1-8fd781905958 diff --git a/.mock/definition/HRIS/passthrough.yml b/.mock/definition/HRIS/passthrough.yml index 7ab71e68f..5b1cabb97 100644 --- a/.mock/definition/HRIS/passthrough.yml +++ b/.mock/definition/HRIS/passthrough.yml @@ -19,7 +19,8 @@ service: type: hrisRoot.RemoteResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: method: GET path: /scooters diff --git a/.mock/definition/HRIS/payGroups.yml b/.mock/definition/HRIS/payGroups.yml index 5c0d321bf..5cb7746df 100644 --- a/.mock/definition/HRIS/payGroups.yml +++ b/.mock/definition/HRIS/payGroups.yml @@ -68,7 +68,10 @@ service: type: hrisRoot.PaginatedPayGroupList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -118,7 +121,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: fd1e0fb5-8f92-4ec9-9f32-179cf732867d diff --git a/.mock/definition/HRIS/payrollRuns.yml b/.mock/definition/HRIS/payrollRuns.yml index e21ebb971..a79bc9e33 100644 --- a/.mock/definition/HRIS/payrollRuns.yml +++ b/.mock/definition/HRIS/payrollRuns.yml @@ -157,7 +157,10 @@ service: type: hrisRoot.PaginatedPayrollRunList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -221,7 +224,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 37336947-b3d4-4a4c-a310-ab6ab510e079 diff --git a/.mock/definition/HRIS/regenerateKey.yml b/.mock/definition/HRIS/regenerateKey.yml index 77a18e6f3..a6f3ceac4 100644 --- a/.mock/definition/HRIS/regenerateKey.yml +++ b/.mock/definition/HRIS/regenerateKey.yml @@ -26,7 +26,9 @@ service: type: hrisRoot.RemoteKey status-code: 200 examples: - - request: + - headers: + X-Account-Token: '[object Object]' + request: name: Remote Deployment Key 1 response: body: diff --git a/.mock/definition/HRIS/scopes.yml b/.mock/definition/HRIS/scopes.yml index 221a73240..c7b39fa72 100644 --- a/.mock/definition/HRIS/scopes.yml +++ b/.mock/definition/HRIS/scopes.yml @@ -19,7 +19,9 @@ service: type: hrisRoot.CommonModelScopeApi status-code: 200 examples: - - response: + - headers: + X-Account-Token: '[object Object]' + response: body: common_models: - model_name: Employee @@ -60,7 +62,8 @@ service: type: hrisRoot.CommonModelScopeApi status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: common_models: @@ -111,7 +114,8 @@ service: type: hrisRoot.CommonModelScopeApi status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: common_models: - model_name: Employee diff --git a/.mock/definition/HRIS/syncStatus.yml b/.mock/definition/HRIS/syncStatus.yml index f31c29075..90db422cb 100644 --- a/.mock/definition/HRIS/syncStatus.yml +++ b/.mock/definition/HRIS/syncStatus.yml @@ -40,7 +40,10 @@ service: type: hrisRoot.PaginatedSyncStatusList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw diff --git a/.mock/definition/HRIS/teams.yml b/.mock/definition/HRIS/teams.yml index 87d7ed508..29ed6fe72 100644 --- a/.mock/definition/HRIS/teams.yml +++ b/.mock/definition/HRIS/teams.yml @@ -77,7 +77,10 @@ service: type: hrisRoot.PaginatedTeamList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -134,7 +137,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 13a72919-9fae-4f54-81ca-ddfd8712a1ba diff --git a/.mock/definition/HRIS/timeOff.yml b/.mock/definition/HRIS/timeOff.yml index e15ac99e8..40bc6b1ea 100644 --- a/.mock/definition/HRIS/timeOff.yml +++ b/.mock/definition/HRIS/timeOff.yml @@ -237,7 +237,10 @@ service: type: hrisRoot.PaginatedTimeOffList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -293,7 +296,8 @@ service: type: hrisRoot.TimeOffResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -387,7 +391,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 91b2b905-e866-40c8-8be2-efe53827a0aa @@ -425,7 +430,8 @@ service: type: hrisRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: diff --git a/.mock/definition/HRIS/timeOffBalances.yml b/.mock/definition/HRIS/timeOffBalances.yml index 7df0df8bc..e9e5650c7 100644 --- a/.mock/definition/HRIS/timeOffBalances.yml +++ b/.mock/definition/HRIS/timeOffBalances.yml @@ -117,7 +117,10 @@ service: type: hrisRoot.PaginatedTimeOffBalanceList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -186,7 +189,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 91b2b905-e866-40c8-8be2-efe53827a0aa diff --git a/.mock/definition/HRIS/timesheetEntries.yml b/.mock/definition/HRIS/timesheetEntries.yml index 1fd61a786..100580994 100644 --- a/.mock/definition/HRIS/timesheetEntries.yml +++ b/.mock/definition/HRIS/timesheetEntries.yml @@ -111,7 +111,10 @@ service: type: hrisRoot.PaginatedTimesheetEntryList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -162,7 +165,8 @@ service: type: hrisRoot.TimesheetEntryResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -241,7 +245,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 91b2b905-e866-40c8-8be2-efe53827a0aa @@ -274,7 +279,8 @@ service: type: hrisRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: diff --git a/.mock/definition/HRIS/webhookReceivers.yml b/.mock/definition/HRIS/webhookReceivers.yml index e0b952631..11e213981 100644 --- a/.mock/definition/HRIS/webhookReceivers.yml +++ b/.mock/definition/HRIS/webhookReceivers.yml @@ -16,7 +16,8 @@ service: type: list status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: - event: event @@ -48,7 +49,8 @@ service: type: hrisRoot.WebhookReceiver status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: event: event is_active: true diff --git a/.mock/definition/Ticketing/accountDetails.yml b/.mock/definition/Ticketing/accountDetails.yml index 48a7a292e..cbd87fb9a 100644 --- a/.mock/definition/Ticketing/accountDetails.yml +++ b/.mock/definition/Ticketing/accountDetails.yml @@ -16,7 +16,8 @@ service: type: ticketingRoot.AccountDetails status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: id: 0496d4c2-42e6-4072-80b3-7b69bfdc76fd diff --git a/.mock/definition/Ticketing/accountToken.yml b/.mock/definition/Ticketing/accountToken.yml index 8bf457237..bc7ab15fb 100644 --- a/.mock/definition/Ticketing/accountToken.yml +++ b/.mock/definition/Ticketing/accountToken.yml @@ -22,6 +22,8 @@ service: examples: - path-parameters: public_token: public_token + headers: + X-Account-Token: '[object Object]' response: body: account_token: T9klMDQrcHdm9jrtHuOS2Nf06BIHwMNjpPXPMB diff --git a/.mock/definition/Ticketing/accounts.yml b/.mock/definition/Ticketing/accounts.yml index cfcde4a43..1d93c29ee 100644 --- a/.mock/definition/Ticketing/accounts.yml +++ b/.mock/definition/Ticketing/accounts.yml @@ -68,7 +68,10 @@ service: type: ticketingRoot.PaginatedAccountList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -121,7 +124,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 17a54124-287f-494d-965e-3c5b330c9a68 diff --git a/.mock/definition/Ticketing/asyncPassthrough.yml b/.mock/definition/Ticketing/asyncPassthrough.yml index bf2a6d707..9a26bc2db 100644 --- a/.mock/definition/Ticketing/asyncPassthrough.yml +++ b/.mock/definition/Ticketing/asyncPassthrough.yml @@ -21,7 +21,8 @@ service: type: ticketingRoot.AsyncPassthroughReciept status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: method: GET path: /scooters @@ -44,7 +45,8 @@ service: examples: - path-parameters: async_passthrough_receipt_id: async_passthrough_receipt_id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: method: GET diff --git a/.mock/definition/Ticketing/attachments.yml b/.mock/definition/Ticketing/attachments.yml index dff8552a1..776fcb117 100644 --- a/.mock/definition/Ticketing/attachments.yml +++ b/.mock/definition/Ticketing/attachments.yml @@ -82,7 +82,10 @@ service: type: ticketingRoot.PaginatedAttachmentList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -133,7 +136,8 @@ service: type: ticketingRoot.TicketingAttachmentResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -212,7 +216,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 17a54124-287f-494d-965e-3c5b330c9a68 @@ -276,7 +281,8 @@ service: type: ticketingRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: diff --git a/.mock/definition/Ticketing/auditTrail.yml b/.mock/definition/Ticketing/auditTrail.yml index 0c68bdad0..1ac61ff27 100644 --- a/.mock/definition/Ticketing/auditTrail.yml +++ b/.mock/definition/Ticketing/auditTrail.yml @@ -79,7 +79,11 @@ service: type: ticketingRoot.PaginatedAuditLogEventList status-code: 200 examples: - - response: + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: '[object Object]' + response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw previous: cj1sZXdwd2VycWVtY29zZnNkc2NzUWxNMEUxTXk0ME16UXpNallsTWtJ diff --git a/.mock/definition/Ticketing/availableActions.yml b/.mock/definition/Ticketing/availableActions.yml index bfca9de50..1133adafc 100644 --- a/.mock/definition/Ticketing/availableActions.yml +++ b/.mock/definition/Ticketing/availableActions.yml @@ -16,7 +16,8 @@ service: type: ticketingRoot.AvailableActions status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: integration: diff --git a/.mock/definition/Ticketing/collections.yml b/.mock/definition/Ticketing/collections.yml index 8e47ee014..3d47804c5 100644 --- a/.mock/definition/Ticketing/collections.yml +++ b/.mock/definition/Ticketing/collections.yml @@ -92,7 +92,10 @@ service: type: ticketingRoot.PaginatedCollectionList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -172,7 +175,10 @@ service: examples: - path-parameters: collection_id: collection_id - headers: {} + query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -229,7 +235,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: fb8c55b6-1cb8-4b4c-9fb6-17924231619d diff --git a/.mock/definition/Ticketing/comments.yml b/.mock/definition/Ticketing/comments.yml index cecddc38a..a252d5dd9 100644 --- a/.mock/definition/Ticketing/comments.yml +++ b/.mock/definition/Ticketing/comments.yml @@ -97,7 +97,10 @@ service: type: ticketingRoot.PaginatedCommentList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -153,7 +156,8 @@ service: type: ticketingRoot.CommentResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -237,7 +241,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 0958cbc6-6040-430a-848e-aafacbadf4ae @@ -275,7 +280,8 @@ service: type: ticketingRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: diff --git a/.mock/definition/Ticketing/contacts.yml b/.mock/definition/Ticketing/contacts.yml index e0fd3ff7e..56fd54e5d 100644 --- a/.mock/definition/Ticketing/contacts.yml +++ b/.mock/definition/Ticketing/contacts.yml @@ -74,7 +74,10 @@ service: type: ticketingRoot.PaginatedContactList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -124,7 +127,8 @@ service: type: ticketingRoot.TicketingContactResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -202,7 +206,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 17a54124-287f-494d-965e-3c5b330c9a68 @@ -236,7 +241,8 @@ service: type: ticketingRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: diff --git a/.mock/definition/Ticketing/deleteAccount.yml b/.mock/definition/Ticketing/deleteAccount.yml index 42a1724a9..e166b7194 100644 --- a/.mock/definition/Ticketing/deleteAccount.yml +++ b/.mock/definition/Ticketing/deleteAccount.yml @@ -10,6 +10,7 @@ service: source: openapi: ticketing_v3.yml examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token source: openapi: ticketing_v3.yml diff --git a/.mock/definition/Ticketing/fieldMapping.yml b/.mock/definition/Ticketing/fieldMapping.yml index f62911c5e..1f26ea6df 100644 --- a/.mock/definition/Ticketing/fieldMapping.yml +++ b/.mock/definition/Ticketing/fieldMapping.yml @@ -30,7 +30,8 @@ service: type: ticketingRoot.FieldMappingApiInstanceResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: Ticket: @@ -277,7 +278,8 @@ service: type: ticketingRoot.FieldMappingInstanceResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: target_field_name: example_target_field_name target_field_description: this is a example description of the target field @@ -344,7 +346,8 @@ service: examples: - path-parameters: field_mapping_id: field_mapping_id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: model: @@ -426,7 +429,8 @@ service: examples: - path-parameters: field_mapping_id: field_mapping_id - headers: {} + headers: + X-Account-Token: X-Account-Token request: {} response: body: @@ -497,7 +501,8 @@ service: type: ticketingRoot.RemoteFieldApiResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: Ticket: @@ -671,7 +676,8 @@ service: type: ticketingRoot.ExternalTargetFieldApiResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: Ticket: diff --git a/.mock/definition/Ticketing/forceResync.yml b/.mock/definition/Ticketing/forceResync.yml index cd2b747a2..96c6e0f5e 100644 --- a/.mock/definition/Ticketing/forceResync.yml +++ b/.mock/definition/Ticketing/forceResync.yml @@ -21,7 +21,8 @@ service: type: list status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: - model_name: Ticket diff --git a/.mock/definition/Ticketing/generateKey.yml b/.mock/definition/Ticketing/generateKey.yml index 713f090d0..4869e4ff4 100644 --- a/.mock/definition/Ticketing/generateKey.yml +++ b/.mock/definition/Ticketing/generateKey.yml @@ -26,7 +26,9 @@ service: type: ticketingRoot.RemoteKey status-code: 200 examples: - - request: + - headers: + X-Account-Token: '[object Object]' + request: name: Remote Deployment Key 1 response: body: diff --git a/.mock/definition/Ticketing/issues.yml b/.mock/definition/Ticketing/issues.yml index f96e91009..b096c2eb1 100644 --- a/.mock/definition/Ticketing/issues.yml +++ b/.mock/definition/Ticketing/issues.yml @@ -84,7 +84,11 @@ service: type: ticketingRoot.PaginatedIssueList status-code: 200 examples: - - response: + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: '[object Object]' + response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw previous: cj1sZXdwd2VycWVtY29zZnNkc2NzUWxNMEUxTXk0ME16UXpNallsTWtJ @@ -116,6 +120,8 @@ service: examples: - path-parameters: id: id + headers: + X-Account-Token: '[object Object]' response: body: id: 3fa85f64-5717-4562-b3fc-2c963f66afa6 diff --git a/.mock/definition/Ticketing/linkToken.yml b/.mock/definition/Ticketing/linkToken.yml index 121fae941..8fdf47bd9 100644 --- a/.mock/definition/Ticketing/linkToken.yml +++ b/.mock/definition/Ticketing/linkToken.yml @@ -136,7 +136,9 @@ service: type: ticketingRoot.LinkToken status-code: 200 examples: - - request: + - headers: + X-Account-Token: '[object Object]' + request: end_user_email_address: example@gmail.com end_user_organization_name: Test Organization end_user_origin_id: '12345' diff --git a/.mock/definition/Ticketing/linkedAccounts.yml b/.mock/definition/Ticketing/linkedAccounts.yml index cde7bb73b..d426f3ffc 100644 --- a/.mock/definition/Ticketing/linkedAccounts.yml +++ b/.mock/definition/Ticketing/linkedAccounts.yml @@ -111,7 +111,11 @@ service: type: ticketingRoot.PaginatedAccountDetailsAndActionsList status-code: 200 examples: - - response: + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: '[object Object]' + response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw previous: cj1sZXdwd2VycWVtY29zZnNkc2NzUWxNMEUxTXk0ME16UXpNallsTWtJ diff --git a/.mock/definition/Ticketing/passthrough.yml b/.mock/definition/Ticketing/passthrough.yml index f8de1a3c4..47622b6d6 100644 --- a/.mock/definition/Ticketing/passthrough.yml +++ b/.mock/definition/Ticketing/passthrough.yml @@ -19,7 +19,8 @@ service: type: ticketingRoot.RemoteResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: method: GET path: /scooters diff --git a/.mock/definition/Ticketing/projects.yml b/.mock/definition/Ticketing/projects.yml index 531e496fa..e1560c7f8 100644 --- a/.mock/definition/Ticketing/projects.yml +++ b/.mock/definition/Ticketing/projects.yml @@ -68,7 +68,10 @@ service: type: ticketingRoot.PaginatedProjectList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -117,7 +120,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: fb8c55b6-1cb8-4b4c-9fb6-17924231619d @@ -189,7 +193,10 @@ service: examples: - path-parameters: parent_id: parent_id - headers: {} + query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw diff --git a/.mock/definition/Ticketing/regenerateKey.yml b/.mock/definition/Ticketing/regenerateKey.yml index eafa7c63f..d7973bbf0 100644 --- a/.mock/definition/Ticketing/regenerateKey.yml +++ b/.mock/definition/Ticketing/regenerateKey.yml @@ -26,7 +26,9 @@ service: type: ticketingRoot.RemoteKey status-code: 200 examples: - - request: + - headers: + X-Account-Token: '[object Object]' + request: name: Remote Deployment Key 1 response: body: diff --git a/.mock/definition/Ticketing/roles.yml b/.mock/definition/Ticketing/roles.yml index 396ae69f4..e541cfc88 100644 --- a/.mock/definition/Ticketing/roles.yml +++ b/.mock/definition/Ticketing/roles.yml @@ -68,7 +68,10 @@ service: type: ticketingRoot.PaginatedRoleList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -121,7 +124,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 23454124-387f-494d-265e-345b330c9123 diff --git a/.mock/definition/Ticketing/scopes.yml b/.mock/definition/Ticketing/scopes.yml index e0fe30d63..573d010e1 100644 --- a/.mock/definition/Ticketing/scopes.yml +++ b/.mock/definition/Ticketing/scopes.yml @@ -19,7 +19,9 @@ service: type: ticketingRoot.CommonModelScopeApi status-code: 200 examples: - - response: + - headers: + X-Account-Token: '[object Object]' + response: body: common_models: - model_name: Employee @@ -60,7 +62,8 @@ service: type: ticketingRoot.CommonModelScopeApi status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: common_models: @@ -112,7 +115,8 @@ service: type: ticketingRoot.CommonModelScopeApi status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: common_models: - model_name: Employee diff --git a/.mock/definition/Ticketing/syncStatus.yml b/.mock/definition/Ticketing/syncStatus.yml index 527759501..069c60cf0 100644 --- a/.mock/definition/Ticketing/syncStatus.yml +++ b/.mock/definition/Ticketing/syncStatus.yml @@ -40,7 +40,10 @@ service: type: ticketingRoot.PaginatedSyncStatusList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw diff --git a/.mock/definition/Ticketing/tags.yml b/.mock/definition/Ticketing/tags.yml index ada3d4201..b8f113868 100644 --- a/.mock/definition/Ticketing/tags.yml +++ b/.mock/definition/Ticketing/tags.yml @@ -68,7 +68,10 @@ service: type: ticketingRoot.PaginatedTagList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -116,7 +119,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: remote_id: '19202938' diff --git a/.mock/definition/Ticketing/teams.yml b/.mock/definition/Ticketing/teams.yml index 9b9cf315f..ecba7d291 100644 --- a/.mock/definition/Ticketing/teams.yml +++ b/.mock/definition/Ticketing/teams.yml @@ -68,7 +68,10 @@ service: type: ticketingRoot.PaginatedTeamList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -117,7 +120,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 17a54124-287f-494d-965e-3c5b330c9a68 diff --git a/.mock/definition/Ticketing/tickets.yml b/.mock/definition/Ticketing/tickets.yml index f6b39b81c..3ae1d3605 100644 --- a/.mock/definition/Ticketing/tickets.yml +++ b/.mock/definition/Ticketing/tickets.yml @@ -274,7 +274,10 @@ service: type: ticketingRoot.PaginatedTicketList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -353,7 +356,8 @@ service: type: ticketingRoot.TicketResponse status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -475,7 +479,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 0958cbc6-6040-430a-848e-aafacbadf4ae @@ -559,7 +564,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token request: model: {} response: @@ -688,7 +694,10 @@ service: examples: - path-parameters: ticket_id: ticket_id - headers: {} + query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -716,7 +725,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: request_schema: @@ -909,7 +919,8 @@ service: type: ticketingRoot.MetaResponse status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: request_schema: @@ -1139,7 +1150,10 @@ service: type: ticketingRoot.PaginatedRemoteFieldClassList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw diff --git a/.mock/definition/Ticketing/users.yml b/.mock/definition/Ticketing/users.yml index d48816068..bff6a9375 100644 --- a/.mock/definition/Ticketing/users.yml +++ b/.mock/definition/Ticketing/users.yml @@ -95,7 +95,10 @@ service: type: ticketingRoot.PaginatedUserList status-code: 200 examples: - - headers: {} + - query-parameters: + cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw + headers: + X-Account-Token: X-Account-Token response: body: next: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw @@ -157,7 +160,8 @@ service: examples: - path-parameters: id: id - headers: {} + headers: + X-Account-Token: X-Account-Token response: body: id: 17a54124-287f-494d-965e-3c5b330c9a68 diff --git a/.mock/definition/Ticketing/webhookReceivers.yml b/.mock/definition/Ticketing/webhookReceivers.yml index 38154a43c..68c2307b8 100644 --- a/.mock/definition/Ticketing/webhookReceivers.yml +++ b/.mock/definition/Ticketing/webhookReceivers.yml @@ -16,7 +16,8 @@ service: type: list status-code: 200 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token response: body: - event: event @@ -48,7 +49,8 @@ service: type: ticketingRoot.WebhookReceiver status-code: 201 examples: - - headers: {} + - headers: + X-Account-Token: X-Account-Token request: event: event is_active: true diff --git a/.mock/fern.config.json b/.mock/fern.config.json index c4faf103e..43adf15e6 100644 --- a/.mock/fern.config.json +++ b/.mock/fern.config.json @@ -1,4 +1,4 @@ { "organization" : "merge", - "version" : "0.63.28" + "version" : "0.66.29" } \ No newline at end of file diff --git a/README.md b/README.md index cc2144127..23742ae47 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,9 @@ # Merge Java Library [![fern shield](https://img.shields.io/badge/%F0%9F%8C%BF-Built%20with%20Fern-brightgreen)](https://buildwithfern.com?utm_source=github&utm_medium=github&utm_campaign=readme&utm_source=https%3A%2F%2Fgithub.com%2Fmerge-api%2Fmerge-java-client) +[![Maven Central](https://img.shields.io/maven-central/v/dev.merge/merge-java-client)](https://central.sonatype.com/artifact/dev.merge/merge-java-client) -The Merge Java library provides convenient access to the Merge API from Java. +The Merge Java library provides convenient access to the Merge APIs from Java. ## Documentation @@ -12,23 +13,23 @@ API documentation is available at [here](https://docs.merge.dev/basics/authentic ### Gradle -Add the dependency in your `build.gradle`: +Add the dependency in your `build.gradle` file: ```groovy dependencies { - implementation 'dev.merge:merge-java-client:0.x.x' + implementation 'dev.merge:merge-java-client' } ``` ### Maven -Add the dependency in your `pom.xml`: +Add the dependency in your `pom.xml` file: ```xml - dev.merge - merge-java-client - 0.x.x + dev.merge + merge-java-client + 4.0.0 ``` @@ -74,29 +75,12 @@ Instantiate and use the client with the following: package com.example.usage; import com.merge.api.MergeApiClient; -import com.merge.api.ats.types.ActivityEndpointRequest; -import com.merge.api.ats.types.ActivityRequest; - -public class Example { - public static void main(String[] args) { - MergeApiClient client = MergeApiClient - .builder() - .apiKey("") - .build(); - - client.ats().activities().create( - ActivityEndpointRequest - .builder() - .model( - ActivityRequest - .builder() - .build() - ) - .remoteUserId("remote_user_id") - .build() - ); - } -} + +MergeApiClient client = MergeApiClient + .builder() + .build(); + +client.ats().accountDetails().retrieve(...); ``` ## Environments @@ -134,7 +118,7 @@ When the API returns a non-success status code (4xx or 5xx response), an API exc import com.merge.api.core.ApiError; try { - client.ats().activities().create(...); + client.ats().accountDetails().retrieve(...); } catch (ApiError e) { // Do something with the API exception... } @@ -197,7 +181,7 @@ MergeApiClient client = MergeApiClient .build(); // Request level -client.ats().activities().create( +client.ats().accountDetails().retrieve( ..., RequestOptions .builder() @@ -206,6 +190,32 @@ client.ats().activities().create( ); ``` +### Custom Headers + +The SDK allows you to add custom headers to requests. You can configure headers at the client level or at the request level. + +```java +import com.merge.api.MergeApiClient; +import com.merge.api.core.RequestOptions; + +// Client level +MergeApiClient client = MergeApiClient + .builder() + .addHeader("X-Custom-Header", "custom-value") + .addHeader("X-Request-Id", "abc-123") + .build(); +; + +// Request level +client.ats().accountDetails().retrieve( + ..., + RequestOptions + .builder() + .addHeader("X-Request-Header", "request-value") + .build() +); +``` + ## Contributing While we value open-source contributions to this SDK, this library is generated programmatically. @@ -214,4 +224,7 @@ otherwise they would be overwritten upon the next generated release. Feel free t a proof of concept, but know that we will not be able to merge it as-is. We suggest opening an issue first to discuss with us! -On the other hand, contributions to the README are always very welcome! \ No newline at end of file +On the other hand, contributions to the README are always very welcome! +## Reference + +A full reference for this library is available [here](https://github.com/merge-api/merge-java-client/blob/HEAD/./reference.md). diff --git a/build.gradle b/build.gradle index 8c653b0ac..be423164d 100644 --- a/build.gradle +++ b/build.gradle @@ -20,6 +20,7 @@ dependencies { api 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2' testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.8.2' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.2' } @@ -85,7 +86,7 @@ publishing { url = 'https://buildwithfern.com' licenses { license { - name = 'CustomLicense{filename: LICENSE}' + name = 'Custom License (LICENSE)' } } developers { @@ -120,9 +121,10 @@ sonatypeCentralUpload { } signing { - def signingKeyId = "$System.env.MAVEN_SIGNATURE_SECRET_KEY" + def signingKeyId = "$System.env.MAVEN_SIGNATURE_KID" + def signingKey = "$System.env.MAVEN_SIGNATURE_SECRET_KEY" def signingPassword = "$System.env.MAVEN_SIGNATURE_PASSWORD" - useInMemoryPgpKeys(signingKeyId, signingPassword) + useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword) sign publishing.publications.maven } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ca025c83a..d4081da47 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/com/merge/api/AsyncMergeApiClientBuilder.java b/src/main/java/com/merge/api/AsyncMergeApiClientBuilder.java index 5d100f9a5..16f41b57c 100644 --- a/src/main/java/com/merge/api/AsyncMergeApiClientBuilder.java +++ b/src/main/java/com/merge/api/AsyncMergeApiClientBuilder.java @@ -5,10 +5,17 @@ import com.merge.api.core.ClientOptions; import com.merge.api.core.Environment; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; import okhttp3.OkHttpClient; -public final class AsyncMergeApiClientBuilder { - private ClientOptions.Builder clientOptionsBuilder = ClientOptions.builder(); +public class AsyncMergeApiClientBuilder { + private Optional timeout = Optional.empty(); + + private Optional maxRetries = Optional.empty(); + + private final Map customHeaders = new HashMap<>(); private String apiKey = null; @@ -16,6 +23,8 @@ public final class AsyncMergeApiClientBuilder { private Environment environment = Environment.PRODUCTION; + private OkHttpClient httpClient; + /** * Sets apiKey */ @@ -46,7 +55,7 @@ public AsyncMergeApiClientBuilder url(String url) { * Sets the timeout (in seconds) for the client. Defaults to 60 seconds. */ public AsyncMergeApiClientBuilder timeout(int timeout) { - this.clientOptionsBuilder.timeout(timeout); + this.timeout = Optional.of(timeout); return this; } @@ -54,7 +63,7 @@ public AsyncMergeApiClientBuilder timeout(int timeout) { * Sets the maximum number of retries for the client. Defaults to 2 retries. */ public AsyncMergeApiClientBuilder maxRetries(int maxRetries) { - this.clientOptionsBuilder.maxRetries(maxRetries); + this.maxRetries = Optional.of(maxRetries); return this; } @@ -62,19 +71,167 @@ public AsyncMergeApiClientBuilder maxRetries(int maxRetries) { * Sets the underlying OkHttp client */ public AsyncMergeApiClientBuilder httpClient(OkHttpClient httpClient) { - this.clientOptionsBuilder.httpClient(httpClient); + this.httpClient = httpClient; + return this; + } + + /** + * Add a custom header to be sent with all requests. + * For headers that need to be computed dynamically or conditionally, use the setAdditional() method override instead. + * + * @param name The header name + * @param value The header value + * @return This builder for method chaining + */ + public AsyncMergeApiClientBuilder addHeader(String name, String value) { + this.customHeaders.put(name, value); return this; } + protected ClientOptions buildClientOptions() { + ClientOptions.Builder builder = ClientOptions.builder(); + setEnvironment(builder); + setAuthentication(builder); + setCustomHeaders(builder); + setHttpClient(builder); + setTimeouts(builder); + setRetries(builder); + for (Map.Entry header : this.customHeaders.entrySet()) { + builder.addHeader(header.getKey(), header.getValue()); + } + setAdditional(builder); + return builder.build(); + } + + /** + * Sets the environment configuration for the client. + * Override this method to modify URLs or add environment-specific logic. + * + * @param builder The ClientOptions.Builder to configure + */ + protected void setEnvironment(ClientOptions.Builder builder) { + builder.environment(this.environment); + } + + /** + * Override this method to customize authentication. + * This method is called during client options construction to set up authentication headers. + * + * @param builder The ClientOptions.Builder to configure + * + * Example: + * 
{@code
+     * @Override
+     * protected void setAuthentication(ClientOptions.Builder builder) {
+     *     super.setAuthentication(builder); // Keep existing auth
+     *     builder.addHeader("X-API-Key", this.apiKey);
+     * }
+     * }
+ */ + protected void setAuthentication(ClientOptions.Builder builder) { + if (this.apiKey != null) { + builder.addHeader("Authorization", "Bearer " + this.apiKey); + } + } + + /** + * Override this method to add or modify custom headers. + * This method is called during client options construction to set up custom headers defined in the API. + * + * @param builder The ClientOptions.Builder to configure + * + * Example: + * 
{@code
+     * @Override
+     * protected void setCustomHeaders(ClientOptions.Builder builder) {
+     *     super.setCustomHeaders(builder); // Keep existing headers
+     *     builder.addHeader("X-Trace-ID", generateTraceId());
+     * }
+     * }
+ */ + protected void setCustomHeaders(ClientOptions.Builder builder) { + if (this.accountToken != null) { + builder.addHeader("X-Account-Token", this.accountToken); + } + } + + /** + * Sets the request timeout configuration. + * Override this method to customize timeout behavior. + * + * @param builder The ClientOptions.Builder to configure + */ + protected void setTimeouts(ClientOptions.Builder builder) { + if (this.timeout.isPresent()) { + builder.timeout(this.timeout.get()); + } + } + + /** + * Sets the retry configuration for failed requests. + * Override this method to implement custom retry strategies. + * + * @param builder The ClientOptions.Builder to configure + */ + protected void setRetries(ClientOptions.Builder builder) { + if (this.maxRetries.isPresent()) { + builder.maxRetries(this.maxRetries.get()); + } + } + + /** + * Sets the OkHttp client configuration. + * Override this method to customize HTTP client behavior (interceptors, connection pools, etc). + * + * @param builder The ClientOptions.Builder to configure + */ + protected void setHttpClient(ClientOptions.Builder builder) { + if (this.httpClient != null) { + builder.httpClient(this.httpClient); + } + } + + /** + * Override this method to add any additional configuration to the client. + * This method is called at the end of the configuration chain, allowing you to add + * custom headers, modify settings, or perform any other client customization. + * + * @param builder The ClientOptions.Builder to configure + * + * Example: + * 
{@code
+     * @Override
+     * protected void setAdditional(ClientOptions.Builder builder) {
+     *     builder.addHeader("X-Request-ID", () -> UUID.randomUUID().toString());
+     *     builder.addHeader("X-Client-Version", "1.0.0");
+     * }
+     * }
+ */ + protected void setAdditional(ClientOptions.Builder builder) {} + + /** + * Override this method to add custom validation logic before the client is built. + * This method is called at the beginning of the build() method to ensure the configuration is valid. + * Throw an exception to prevent client creation if validation fails. + * + * Example: + * 
{@code
+     * @Override
+     * protected void validateConfiguration() {
+     *     super.validateConfiguration(); // Run parent validations
+     *     if (tenantId == null || tenantId.isEmpty()) {
+     *         throw new IllegalStateException("tenantId is required");
+     *     }
+     * }
+     * }
+ */ + protected void validateConfiguration() {} + public AsyncMergeApiClient build() { if (apiKey == null) { throw new RuntimeException("Please provide apiKey"); } - this.clientOptionsBuilder.addHeader("Authorization", "Bearer " + this.apiKey); - if (accountToken != null) { - this.clientOptionsBuilder.addHeader("X-Account-Token", this.accountToken); - } - clientOptionsBuilder.environment(this.environment); - return new AsyncMergeApiClient(clientOptionsBuilder.build()); + validateConfiguration(); + return new AsyncMergeApiClient(buildClientOptions()); } } diff --git a/src/main/java/com/merge/api/MergeApiClientBuilder.java b/src/main/java/com/merge/api/MergeApiClientBuilder.java index 9e66bbfe6..b6101beb4 100644 --- a/src/main/java/com/merge/api/MergeApiClientBuilder.java +++ b/src/main/java/com/merge/api/MergeApiClientBuilder.java @@ -5,10 +5,17 @@ import com.merge.api.core.ClientOptions; import com.merge.api.core.Environment; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; import okhttp3.OkHttpClient; -public final class MergeApiClientBuilder { - private ClientOptions.Builder clientOptionsBuilder = ClientOptions.builder(); +public class MergeApiClientBuilder { + private Optional timeout = Optional.empty(); + + private Optional maxRetries = Optional.empty(); + + private final Map customHeaders = new HashMap<>(); private String apiKey = null; @@ -16,6 +23,8 @@ public final class MergeApiClientBuilder { private Environment environment = Environment.PRODUCTION; + private OkHttpClient httpClient; + /** * Sets apiKey */ @@ -46,7 +55,7 @@ public MergeApiClientBuilder url(String url) { * Sets the timeout (in seconds) for the client. Defaults to 60 seconds. */ public MergeApiClientBuilder timeout(int timeout) { - this.clientOptionsBuilder.timeout(timeout); + this.timeout = Optional.of(timeout); return this; } @@ -54,7 +63,7 @@ public MergeApiClientBuilder timeout(int timeout) { * Sets the maximum number of retries for the client. Defaults to 2 retries. */ public MergeApiClientBuilder maxRetries(int maxRetries) { - this.clientOptionsBuilder.maxRetries(maxRetries); + this.maxRetries = Optional.of(maxRetries); return this; } @@ -62,19 +71,167 @@ public MergeApiClientBuilder maxRetries(int maxRetries) { * Sets the underlying OkHttp client */ public MergeApiClientBuilder httpClient(OkHttpClient httpClient) { - this.clientOptionsBuilder.httpClient(httpClient); + this.httpClient = httpClient; + return this; + } + + /** + * Add a custom header to be sent with all requests. + * For headers that need to be computed dynamically or conditionally, use the setAdditional() method override instead. + * + * @param name The header name + * @param value The header value + * @return This builder for method chaining + */ + public MergeApiClientBuilder addHeader(String name, String value) { + this.customHeaders.put(name, value); return this; } + protected ClientOptions buildClientOptions() { + ClientOptions.Builder builder = ClientOptions.builder(); + setEnvironment(builder); + setAuthentication(builder); + setCustomHeaders(builder); + setHttpClient(builder); + setTimeouts(builder); + setRetries(builder); + for (Map.Entry header : this.customHeaders.entrySet()) { + builder.addHeader(header.getKey(), header.getValue()); + } + setAdditional(builder); + return builder.build(); + } + + /** + * Sets the environment configuration for the client. + * Override this method to modify URLs or add environment-specific logic. + * + * @param builder The ClientOptions.Builder to configure + */ + protected void setEnvironment(ClientOptions.Builder builder) { + builder.environment(this.environment); + } + + /** + * Override this method to customize authentication. + * This method is called during client options construction to set up authentication headers. + * + * @param builder The ClientOptions.Builder to configure + * + * Example: + * 
{@code
+     * @Override
+     * protected void setAuthentication(ClientOptions.Builder builder) {
+     *     super.setAuthentication(builder); // Keep existing auth
+     *     builder.addHeader("X-API-Key", this.apiKey);
+     * }
+     * }
+ */ + protected void setAuthentication(ClientOptions.Builder builder) { + if (this.apiKey != null) { + builder.addHeader("Authorization", "Bearer " + this.apiKey); + } + } + + /** + * Override this method to add or modify custom headers. + * This method is called during client options construction to set up custom headers defined in the API. + * + * @param builder The ClientOptions.Builder to configure + * + * Example: + * 
{@code
+     * @Override
+     * protected void setCustomHeaders(ClientOptions.Builder builder) {
+     *     super.setCustomHeaders(builder); // Keep existing headers
+     *     builder.addHeader("X-Trace-ID", generateTraceId());
+     * }
+     * }
+ */ + protected void setCustomHeaders(ClientOptions.Builder builder) { + if (this.accountToken != null) { + builder.addHeader("X-Account-Token", this.accountToken); + } + } + + /** + * Sets the request timeout configuration. + * Override this method to customize timeout behavior. + * + * @param builder The ClientOptions.Builder to configure + */ + protected void setTimeouts(ClientOptions.Builder builder) { + if (this.timeout.isPresent()) { + builder.timeout(this.timeout.get()); + } + } + + /** + * Sets the retry configuration for failed requests. + * Override this method to implement custom retry strategies. + * + * @param builder The ClientOptions.Builder to configure + */ + protected void setRetries(ClientOptions.Builder builder) { + if (this.maxRetries.isPresent()) { + builder.maxRetries(this.maxRetries.get()); + } + } + + /** + * Sets the OkHttp client configuration. + * Override this method to customize HTTP client behavior (interceptors, connection pools, etc). + * + * @param builder The ClientOptions.Builder to configure + */ + protected void setHttpClient(ClientOptions.Builder builder) { + if (this.httpClient != null) { + builder.httpClient(this.httpClient); + } + } + + /** + * Override this method to add any additional configuration to the client. + * This method is called at the end of the configuration chain, allowing you to add + * custom headers, modify settings, or perform any other client customization. + * + * @param builder The ClientOptions.Builder to configure + * + * Example: + * 
{@code
+     * @Override
+     * protected void setAdditional(ClientOptions.Builder builder) {
+     *     builder.addHeader("X-Request-ID", () -> UUID.randomUUID().toString());
+     *     builder.addHeader("X-Client-Version", "1.0.0");
+     * }
+     * }
+ */ + protected void setAdditional(ClientOptions.Builder builder) {} + + /** + * Override this method to add custom validation logic before the client is built. + * This method is called at the beginning of the build() method to ensure the configuration is valid. + * Throw an exception to prevent client creation if validation fails. + * + * Example: + * 
{@code
+     * @Override
+     * protected void validateConfiguration() {
+     *     super.validateConfiguration(); // Run parent validations
+     *     if (tenantId == null || tenantId.isEmpty()) {
+     *         throw new IllegalStateException("tenantId is required");
+     *     }
+     * }
+     * }
+ */ + protected void validateConfiguration() {} + public MergeApiClient build() { if (apiKey == null) { throw new RuntimeException("Please provide apiKey"); } - this.clientOptionsBuilder.addHeader("Authorization", "Bearer " + this.apiKey); - if (accountToken != null) { - this.clientOptionsBuilder.addHeader("X-Account-Token", this.accountToken); - } - clientOptionsBuilder.environment(this.environment); - return new MergeApiClient(clientOptionsBuilder.build()); + validateConfiguration(); + return new MergeApiClient(buildClientOptions()); } } diff --git a/src/main/java/com/merge/api/accounting/AsyncRawAccountDetailsClient.java b/src/main/java/com/merge/api/accounting/AsyncRawAccountDetailsClient.java index 367f56694..6c2bc2036 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawAccountDetailsClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawAccountDetailsClient.java @@ -48,7 +48,6 @@ public CompletableFuture> retrieve(RequestO .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawAccountTokenClient.java b/src/main/java/com/merge/api/accounting/AsyncRawAccountTokenClient.java index 2ad6c4d8e..b5f2c7d7b 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawAccountTokenClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawAccountTokenClient.java @@ -50,7 +50,6 @@ public CompletableFuture> retrieve( .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawAccountingPeriodsClient.java b/src/main/java/com/merge/api/accounting/AsyncRawAccountingPeriodsClient.java index aa8b39f81..8e96030b6 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawAccountingPeriodsClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawAccountingPeriodsClient.java @@ -69,32 +69,28 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawAccountsClient.java b/src/main/java/com/merge/api/accounting/AsyncRawAccountsClient.java index f5eb4fd55..e83deb213 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawAccountsClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawAccountsClient.java @@ -81,11 +81,11 @@ public CompletableFuture>> list } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -95,33 +95,27 @@ public CompletableFuture>> list QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getName().isPresent()) { QueryStringMapper.addQueryParameter( @@ -129,11 +123,11 @@ public CompletableFuture>> list } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -141,10 +135,7 @@ public CompletableFuture>> list } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( @@ -152,13 +143,12 @@ public CompletableFuture>> list } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -229,11 +219,11 @@ public CompletableFuture> create( .addPathSegments("accounting/v1/accounts"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -313,36 +303,29 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -398,7 +381,6 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawAddressesClient.java b/src/main/java/com/merge/api/accounting/AsyncRawAddressesClient.java index fa1eb1309..5e0580b26 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawAddressesClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawAddressesClient.java @@ -58,15 +58,12 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -80,7 +77,6 @@ public CompletableFuture> retrieve( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawAsyncPassthroughClient.java b/src/main/java/com/merge/api/accounting/AsyncRawAsyncPassthroughClient.java index c39e2af54..98ecea4f7 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawAsyncPassthroughClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawAsyncPassthroughClient.java @@ -122,7 +122,6 @@ public CompletableFuture> .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawAsyncTasksClient.java b/src/main/java/com/merge/api/accounting/AsyncRawAsyncTasksClient.java index 121673ecf..e5ff7bb9a 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawAsyncTasksClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawAsyncTasksClient.java @@ -49,7 +49,6 @@ public CompletableFuture> retrieve(String id .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawAttachmentsClient.java b/src/main/java/com/merge/api/accounting/AsyncRawAttachmentsClient.java index 9e1efeaa8..f7768372d 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawAttachmentsClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawAttachmentsClient.java @@ -74,11 +74,11 @@ public CompletableFuture> cre .addPathSegments("accounting/v1/attachments"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -288,21 +281,17 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -359,7 +348,6 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawAuditTrailClient.java b/src/main/java/com/merge/api/accounting/AsyncRawAuditTrailClient.java index f3d5bac30..3929d7565 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawAuditTrailClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawAuditTrailClient.java @@ -74,7 +74,7 @@ public CompletableFuture> } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getStartDate().isPresent()) { QueryStringMapper.addQueryParameter( @@ -88,7 +88,6 @@ public CompletableFuture> .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawAvailableActionsClient.java b/src/main/java/com/merge/api/accounting/AsyncRawAvailableActionsClient.java index 5366de445..066431754 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawAvailableActionsClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawAvailableActionsClient.java @@ -48,7 +48,6 @@ public CompletableFuture> retrieve(Reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawBalanceSheetsClient.java b/src/main/java/com/merge/api/accounting/AsyncRawBalanceSheetsClient.java index 7ac03d1b0..7d2972f84 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawBalanceSheetsClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawBalanceSheetsClient.java @@ -67,11 +67,11 @@ public CompletableFuture>> } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -81,37 +81,31 @@ public CompletableFuture>> QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -119,13 +113,12 @@ public CompletableFuture>> } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -207,25 +200,21 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawBankFeedAccountsClient.java b/src/main/java/com/merge/api/accounting/AsyncRawBankFeedAccountsClient.java index 3f88e9bfc..fa7018bb8 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawBankFeedAccountsClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawBankFeedAccountsClient.java @@ -76,32 +76,28 @@ public CompletableFuture> create( .addPathSegments("accounting/v1/bank-feed-accounts"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -260,21 +256,17 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -331,7 +323,6 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawBankFeedTransactionsClient.java b/src/main/java/com/merge/api/accounting/AsyncRawBankFeedTransactionsClient.java index 6a62c8c5a..2f709c204 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawBankFeedTransactionsClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawBankFeedTransactionsClient.java @@ -70,11 +70,11 @@ public CompletableFuture> crea .addPathSegments("accounting/v1/bank-feed-transactions"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -292,25 +285,21 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -367,7 +356,6 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawCashFlowStatementsClient.java b/src/main/java/com/merge/api/accounting/AsyncRawCashFlowStatementsClient.java index 1be29e934..a9746c958 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawCashFlowStatementsClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawCashFlowStatementsClient.java @@ -67,11 +67,11 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawCompanyInfoClient.java b/src/main/java/com/merge/api/accounting/AsyncRawCompanyInfoClient.java index c0a7b5f36..25c4f6d8f 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawCompanyInfoClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawCompanyInfoClient.java @@ -63,11 +63,11 @@ public CompletableFuture>> .addPathSegments("accounting/v1/company-info"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -77,37 +77,31 @@ public CompletableFuture>> QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -115,13 +109,12 @@ public CompletableFuture>> } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -203,25 +196,21 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawContactsClient.java b/src/main/java/com/merge/api/accounting/AsyncRawContactsClient.java index eaecbe0ec..e4892a40b 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawContactsClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawContactsClient.java @@ -76,11 +76,11 @@ public CompletableFuture>> list } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -94,29 +94,26 @@ public CompletableFuture>> list QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsCustomer().isPresent()) { QueryStringMapper.addQueryParameter( @@ -128,14 +125,11 @@ public CompletableFuture>> list } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getName().isPresent()) { QueryStringMapper.addQueryParameter( @@ -143,7 +137,7 @@ public CompletableFuture>> list } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -163,13 +157,12 @@ public CompletableFuture>> list } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -240,11 +233,11 @@ public CompletableFuture> create( .addPathSegments("accounting/v1/contacts"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -324,22 +317,19 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -351,13 +341,12 @@ public CompletableFuture> retrieve( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -413,7 +402,6 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -483,43 +471,39 @@ public CompletableFuture>> l } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -88,41 +88,35 @@ public CompletableFuture>> l QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -130,34 +124,30 @@ public CompletableFuture>> l } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getTransactionDateAfter().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "transaction_date_after", - request.getTransactionDateAfter().get().toString(), + request.getTransactionDateAfter().get(), false); } if (request.getTransactionDateBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "transaction_date_before", - request.getTransactionDateBefore().get().toString(), + request.getTransactionDateBefore().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -228,11 +218,11 @@ public CompletableFuture> create( .addPathSegments("accounting/v1/credit-notes"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -312,36 +302,29 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -398,7 +381,6 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawEmployeesClient.java b/src/main/java/com/merge/api/accounting/AsyncRawEmployeesClient.java index ef5e9ad53..b6c96552a 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawEmployeesClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawEmployeesClient.java @@ -68,36 +68,32 @@ public CompletableFuture>> lis QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -178,25 +174,21 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawExpensesClient.java b/src/main/java/com/merge/api/accounting/AsyncRawExpensesClient.java index b59bbdb93..2ab542f01 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawExpensesClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawExpensesClient.java @@ -77,11 +77,11 @@ public CompletableFuture>> list } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -91,44 +91,38 @@ public CompletableFuture>> list QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -138,25 +132,24 @@ public CompletableFuture>> list QueryStringMapper.addQueryParameter( httpUrl, "transaction_date_after", - request.getTransactionDateAfter().get().toString(), + request.getTransactionDateAfter().get(), false); } if (request.getTransactionDateBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "transaction_date_before", - request.getTransactionDateBefore().get().toString(), + request.getTransactionDateBefore().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -227,11 +220,11 @@ public CompletableFuture> create( .addPathSegments("accounting/v1/expenses"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -311,32 +304,28 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -405,43 +394,39 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -587,43 +571,39 @@ public CompletableFuture> QueryStringMapper.addQueryParameter( httpUrl, "exclude_remote_field_metadata", - request.getExcludeRemoteFieldMetadata().get().toString(), + request.getExcludeRemoteFieldMetadata().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -135,7 +134,7 @@ public CompletableFuture> fie QueryStringMapper.addQueryParameter( httpUrl, "exclude_remote_field_metadata", - request.getExcludeRemoteFieldMetadata().get().toString(), + request.getExcludeRemoteFieldMetadata().get(), false); } Map properties = new HashMap<>(); @@ -217,7 +216,6 @@ public CompletableFuture> fie .url(httpUrl) .method("DELETE", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -371,7 +369,6 @@ public CompletableFuture> remoteFie .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -430,7 +427,6 @@ public CompletableFuture> t .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawForceResyncClient.java b/src/main/java/com/merge/api/accounting/AsyncRawForceResyncClient.java index c8833b9ed..e2576117c 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawForceResyncClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawForceResyncClient.java @@ -52,7 +52,6 @@ public CompletableFuture>> syncStatusResyn .url(httpUrl) .method("POST", RequestBody.create("", null)) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawGeneralLedgerTransactionsClient.java b/src/main/java/com/merge/api/accounting/AsyncRawGeneralLedgerTransactionsClient.java index 3d7ade364..b5001983b 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawGeneralLedgerTransactionsClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawGeneralLedgerTransactionsClient.java @@ -67,11 +67,11 @@ public CompletableFuture> retriev QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawIncomeStatementsClient.java b/src/main/java/com/merge/api/accounting/AsyncRawIncomeStatementsClient.java index 1e58c6c93..19706e6b4 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawIncomeStatementsClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawIncomeStatementsClient.java @@ -67,11 +67,11 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawInvoicesClient.java b/src/main/java/com/merge/api/accounting/AsyncRawInvoicesClient.java index 5991053ed..8de6021f0 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawInvoicesClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawInvoicesClient.java @@ -82,11 +82,11 @@ public CompletableFuture>> list } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -96,54 +96,42 @@ public CompletableFuture>> list QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIssueDateAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "issue_date_after", - request.getIssueDateAfter().get().toString(), - false); + httpUrl, "issue_date_after", request.getIssueDateAfter().get(), false); } if (request.getIssueDateBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "issue_date_before", - request.getIssueDateBefore().get().toString(), - false); + httpUrl, "issue_date_before", request.getIssueDateBefore().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getNumber().isPresent()) { QueryStringMapper.addQueryParameter( @@ -151,7 +139,7 @@ public CompletableFuture>> list } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -167,21 +155,20 @@ public CompletableFuture>> list } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "status", request.getStatus().get().toString(), false); + httpUrl, "status", request.getStatus().get(), false); } if (request.getType().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "type", request.getType().get().toString(), false); + httpUrl, "type", request.getType().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -254,11 +241,11 @@ public CompletableFuture> create( .addPathSegments("accounting/v1/invoices"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -338,22 +325,19 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -365,13 +349,12 @@ public CompletableFuture> retrieve( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -427,11 +410,11 @@ public CompletableFuture> partialUpdate( .addPathSegment(id); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -518,43 +501,39 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) { QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsCommonModelField().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "is_common_model_field", - request.getIsCommonModelField().get().toString(), + request.getIsCommonModelField().get(), false); } if (request.getIsCustom().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_custom", request.getIsCustom().get().toString(), false); + httpUrl, "is_custom", request.getIsCustom().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -632,7 +611,6 @@ public CompletableFuture> metaPatchRetrieve( .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -689,7 +667,6 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -759,43 +736,39 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "first_incident_time_after", - request.getFirstIncidentTimeAfter().get().toString(), + request.getFirstIncidentTimeAfter().get(), false); } if (request.getFirstIncidentTimeBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "first_incident_time_before", - request.getFirstIncidentTimeBefore().get().toString(), + request.getFirstIncidentTimeBefore().get(), false); } if (request.getIncludeMuted().isPresent()) { @@ -104,14 +104,14 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "last_incident_time_after", - request.getLastIncidentTimeAfter().get().toString(), + request.getLastIncidentTimeAfter().get(), false); } if (request.getLastIncidentTimeBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "last_incident_time_before", - request.getLastIncidentTimeBefore().get().toString(), + request.getLastIncidentTimeBefore().get(), false); } if (request.getLinkedAccountId().isPresent()) { @@ -120,7 +120,7 @@ public CompletableFuture>> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getStartDate().isPresent()) { QueryStringMapper.addQueryParameter( @@ -128,13 +128,12 @@ public CompletableFuture>> list( } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "status", request.getStatus().get().toString(), false); + httpUrl, "status", request.getStatus().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -208,7 +207,6 @@ public CompletableFuture> retrieve(String id, Reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawItemsClient.java b/src/main/java/com/merge/api/accounting/AsyncRawItemsClient.java index 9cac8db4c..81f6e9671 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawItemsClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawItemsClient.java @@ -74,11 +74,11 @@ public CompletableFuture>> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -88,37 +88,31 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -134,13 +128,12 @@ public CompletableFuture>> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -211,11 +204,11 @@ public CompletableFuture> create( .addPathSegments("accounting/v1/items"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -295,15 +288,12 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -315,13 +305,12 @@ public CompletableFuture> retrieve( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -377,11 +366,11 @@ public CompletableFuture> partialUpdate( .addPathSegment(id); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -455,7 +444,6 @@ public CompletableFuture> metaPatchRetrieve( .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -512,7 +500,6 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawJournalEntriesClient.java b/src/main/java/com/merge/api/accounting/AsyncRawJournalEntriesClient.java index c88f88326..fa141fa8a 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawJournalEntriesClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawJournalEntriesClient.java @@ -78,11 +78,11 @@ public CompletableFuture>> } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -92,44 +92,38 @@ public CompletableFuture>> QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -139,25 +133,24 @@ public CompletableFuture>> QueryStringMapper.addQueryParameter( httpUrl, "transaction_date_after", - request.getTransactionDateAfter().get().toString(), + request.getTransactionDateAfter().get(), false); } if (request.getTransactionDateBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "transaction_date_before", - request.getTransactionDateBefore().get().toString(), + request.getTransactionDateBefore().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -228,11 +221,11 @@ public CompletableFuture> create( .addPathSegments("accounting/v1/journal-entries"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -313,32 +306,28 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -408,43 +397,39 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -590,43 +574,39 @@ public CompletableFuture> QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -176,21 +172,17 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawPaymentTermsClient.java b/src/main/java/com/merge/api/accounting/AsyncRawPaymentTermsClient.java index a51053c54..cda3215ba 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawPaymentTermsClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawPaymentTermsClient.java @@ -69,36 +69,32 @@ public CompletableFuture>> QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -180,25 +176,21 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawPaymentsClient.java b/src/main/java/com/merge/api/accounting/AsyncRawPaymentsClient.java index c9975d594..d1e3d2aaf 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawPaymentsClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawPaymentsClient.java @@ -86,11 +86,11 @@ public CompletableFuture>> list } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -100,44 +100,38 @@ public CompletableFuture>> list QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -147,25 +141,24 @@ public CompletableFuture>> list QueryStringMapper.addQueryParameter( httpUrl, "transaction_date_after", - request.getTransactionDateAfter().get().toString(), + request.getTransactionDateAfter().get(), false); } if (request.getTransactionDateBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "transaction_date_before", - request.getTransactionDateBefore().get().toString(), + request.getTransactionDateBefore().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -236,11 +229,11 @@ public CompletableFuture> create( .addPathSegments("accounting/v1/payments"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -320,32 +313,28 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -401,11 +390,11 @@ public CompletableFuture> partialUpdate( .addPathSegment(id); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -492,43 +481,39 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) { QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsCommonModelField().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "is_common_model_field", - request.getIsCommonModelField().get().toString(), + request.getIsCommonModelField().get(), false); } if (request.getIsCustom().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_custom", request.getIsCustom().get().toString(), false); + httpUrl, "is_custom", request.getIsCustom().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -606,7 +591,6 @@ public CompletableFuture> metaPatchRetrieve( .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -663,7 +647,6 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -733,43 +716,39 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawProjectsClient.java b/src/main/java/com/merge/api/accounting/AsyncRawProjectsClient.java index 34c9d5d21..9d5514d9b 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawProjectsClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawProjectsClient.java @@ -63,36 +63,32 @@ public CompletableFuture> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -157,25 +153,21 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawPurchaseOrdersClient.java b/src/main/java/com/merge/api/accounting/AsyncRawPurchaseOrdersClient.java index e71878aa6..e20b90526 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawPurchaseOrdersClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawPurchaseOrdersClient.java @@ -78,11 +78,11 @@ public CompletableFuture> } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -92,58 +92,46 @@ public CompletableFuture> QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIssueDateAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "issue_date_after", - request.getIssueDateAfter().get().toString(), - false); + httpUrl, "issue_date_after", request.getIssueDateAfter().get(), false); } if (request.getIssueDateBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "issue_date_before", - request.getIssueDateBefore().get().toString(), - false); + httpUrl, "issue_date_before", request.getIssueDateBefore().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -159,13 +147,12 @@ public CompletableFuture> } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -236,11 +223,11 @@ public CompletableFuture> create( .addPathSegments("accounting/v1/purchase-orders"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -321,22 +308,19 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -348,13 +332,12 @@ public CompletableFuture> retrieve( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -426,43 +409,39 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) { QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsCommonModelField().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "is_common_model_field", - request.getIsCommonModelField().get().toString(), + request.getIsCommonModelField().get(), false); } if (request.getIsCustom().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_custom", request.getIsCustom().get().toString(), false); + httpUrl, "is_custom", request.getIsCustom().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -538,7 +517,6 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -608,43 +586,39 @@ public CompletableFuture> defaultScope .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -111,7 +110,6 @@ public CompletableFuture> linkedAccoun .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawSyncStatusClient.java b/src/main/java/com/merge/api/accounting/AsyncRawSyncStatusClient.java index 34a5aad56..268d466b4 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawSyncStatusClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawSyncStatusClient.java @@ -65,13 +65,12 @@ public CompletableFuture>> l } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawTaxRatesClient.java b/src/main/java/com/merge/api/accounting/AsyncRawTaxRatesClient.java index 8b7d1139f..388848d9e 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawTaxRatesClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawTaxRatesClient.java @@ -66,11 +66,11 @@ public CompletableFuture>> list } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -80,33 +80,27 @@ public CompletableFuture>> list QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getName().isPresent()) { QueryStringMapper.addQueryParameter( @@ -114,7 +108,7 @@ public CompletableFuture>> list } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -122,13 +116,12 @@ public CompletableFuture>> list } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -209,25 +202,21 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawTrackingCategoriesClient.java b/src/main/java/com/merge/api/accounting/AsyncRawTrackingCategoriesClient.java index 1d375f71b..2beba2676 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawTrackingCategoriesClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawTrackingCategoriesClient.java @@ -71,11 +71,11 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -249,13 +239,12 @@ public CompletableFuture> retrieve( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawTransactionsClient.java b/src/main/java/com/merge/api/accounting/AsyncRawTransactionsClient.java index dd14efe02..9ecda18db 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawTransactionsClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawTransactionsClient.java @@ -67,11 +67,11 @@ public CompletableFuture>> } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -81,37 +81,31 @@ public CompletableFuture>> QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -121,25 +115,24 @@ public CompletableFuture>> QueryStringMapper.addQueryParameter( httpUrl, "transaction_date_after", - request.getTransactionDateAfter().get().toString(), + request.getTransactionDateAfter().get(), false); } if (request.getTransactionDateBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "transaction_date_before", - request.getTransactionDateBefore().get().toString(), + request.getTransactionDateBefore().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -221,25 +214,21 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawVendorCreditsClient.java b/src/main/java/com/merge/api/accounting/AsyncRawVendorCreditsClient.java index 02ad8c3c8..a369596db 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawVendorCreditsClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawVendorCreditsClient.java @@ -74,11 +74,11 @@ public CompletableFuture>> } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -88,37 +88,31 @@ public CompletableFuture>> QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -128,25 +122,24 @@ public CompletableFuture>> QueryStringMapper.addQueryParameter( httpUrl, "transaction_date_after", - request.getTransactionDateAfter().get().toString(), + request.getTransactionDateAfter().get(), false); } if (request.getTransactionDateBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "transaction_date_before", - request.getTransactionDateBefore().get().toString(), + request.getTransactionDateBefore().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -217,11 +210,11 @@ public CompletableFuture> create( .addPathSegments("accounting/v1/vendor-credits"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -302,25 +295,21 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -377,7 +366,6 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/AsyncRawWebhookReceiversClient.java b/src/main/java/com/merge/api/accounting/AsyncRawWebhookReceiversClient.java index ef00e4e6c..587d0de91 100644 --- a/src/main/java/com/merge/api/accounting/AsyncRawWebhookReceiversClient.java +++ b/src/main/java/com/merge/api/accounting/AsyncRawWebhookReceiversClient.java @@ -54,7 +54,6 @@ public CompletableFuture>> list(Reque .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawAccountDetailsClient.java b/src/main/java/com/merge/api/accounting/RawAccountDetailsClient.java index 992300359..5ad592d7a 100644 --- a/src/main/java/com/merge/api/accounting/RawAccountDetailsClient.java +++ b/src/main/java/com/merge/api/accounting/RawAccountDetailsClient.java @@ -44,7 +44,6 @@ public MergeApiHttpResponse retrieve(RequestOptions requestOptio .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawAccountTokenClient.java b/src/main/java/com/merge/api/accounting/RawAccountTokenClient.java index c2d70efe9..7dded342b 100644 --- a/src/main/java/com/merge/api/accounting/RawAccountTokenClient.java +++ b/src/main/java/com/merge/api/accounting/RawAccountTokenClient.java @@ -45,7 +45,6 @@ public MergeApiHttpResponse retrieve(String publicToken, RequestOp .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawAccountingPeriodsClient.java b/src/main/java/com/merge/api/accounting/RawAccountingPeriodsClient.java index cb595b761..817971513 100644 --- a/src/main/java/com/merge/api/accounting/RawAccountingPeriodsClient.java +++ b/src/main/java/com/merge/api/accounting/RawAccountingPeriodsClient.java @@ -63,32 +63,28 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -150,21 +146,17 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawAccountsClient.java b/src/main/java/com/merge/api/accounting/RawAccountsClient.java index 00f7847ba..744f64a6d 100644 --- a/src/main/java/com/merge/api/accounting/RawAccountsClient.java +++ b/src/main/java/com/merge/api/accounting/RawAccountsClient.java @@ -76,11 +76,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -90,33 +90,27 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getName().isPresent()) { QueryStringMapper.addQueryParameter( @@ -124,11 +118,11 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -136,10 +130,7 @@ public MergeApiHttpResponse> list( } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( @@ -147,13 +138,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -204,11 +194,11 @@ public MergeApiHttpResponse create(AccountEndpointRequest reque .addPathSegments("accounting/v1/accounts"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -274,36 +264,29 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -346,7 +329,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawAddressesClient.java b/src/main/java/com/merge/api/accounting/RawAddressesClient.java index d65ef05f5..429833e3c 100644 --- a/src/main/java/com/merge/api/accounting/RawAddressesClient.java +++ b/src/main/java/com/merge/api/accounting/RawAddressesClient.java @@ -54,15 +54,12 @@ public MergeApiHttpResponse
retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -76,7 +73,6 @@ public MergeApiHttpResponse
retrieve( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawAsyncPassthroughClient.java b/src/main/java/com/merge/api/accounting/RawAsyncPassthroughClient.java index 7dfc4ead2..1ffe54009 100644 --- a/src/main/java/com/merge/api/accounting/RawAsyncPassthroughClient.java +++ b/src/main/java/com/merge/api/accounting/RawAsyncPassthroughClient.java @@ -103,7 +103,6 @@ public MergeApiHttpResponse retrieve( .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawAsyncTasksClient.java b/src/main/java/com/merge/api/accounting/RawAsyncTasksClient.java index d52f67845..9ce1438cb 100644 --- a/src/main/java/com/merge/api/accounting/RawAsyncTasksClient.java +++ b/src/main/java/com/merge/api/accounting/RawAsyncTasksClient.java @@ -45,7 +45,6 @@ public MergeApiHttpResponse retrieve(String id, RequestOptions re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawAttachmentsClient.java b/src/main/java/com/merge/api/accounting/RawAttachmentsClient.java index f926f46e9..fc0f9b75d 100644 --- a/src/main/java/com/merge/api/accounting/RawAttachmentsClient.java +++ b/src/main/java/com/merge/api/accounting/RawAttachmentsClient.java @@ -68,11 +68,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -82,37 +82,31 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -122,7 +116,6 @@ public MergeApiHttpResponse> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -174,11 +167,11 @@ public MergeApiHttpResponse create( .addPathSegments("accounting/v1/attachments"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -245,21 +238,17 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -303,7 +292,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawAuditTrailClient.java b/src/main/java/com/merge/api/accounting/RawAuditTrailClient.java index e1034ebca..696f50eda 100644 --- a/src/main/java/com/merge/api/accounting/RawAuditTrailClient.java +++ b/src/main/java/com/merge/api/accounting/RawAuditTrailClient.java @@ -68,7 +68,7 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getStartDate().isPresent()) { QueryStringMapper.addQueryParameter( @@ -82,7 +82,6 @@ public MergeApiHttpResponse> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawAvailableActionsClient.java b/src/main/java/com/merge/api/accounting/RawAvailableActionsClient.java index 2133efac4..d8274f2bf 100644 --- a/src/main/java/com/merge/api/accounting/RawAvailableActionsClient.java +++ b/src/main/java/com/merge/api/accounting/RawAvailableActionsClient.java @@ -44,7 +44,6 @@ public MergeApiHttpResponse retrieve(RequestOptions requestOpt .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawBalanceSheetsClient.java b/src/main/java/com/merge/api/accounting/RawBalanceSheetsClient.java index a9ba86bd7..c639460fa 100644 --- a/src/main/java/com/merge/api/accounting/RawBalanceSheetsClient.java +++ b/src/main/java/com/merge/api/accounting/RawBalanceSheetsClient.java @@ -61,11 +61,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -75,37 +75,31 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -113,13 +107,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -181,25 +174,21 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawBankFeedAccountsClient.java b/src/main/java/com/merge/api/accounting/RawBankFeedAccountsClient.java index 7de54ea9d..e5b373b80 100644 --- a/src/main/java/com/merge/api/accounting/RawBankFeedAccountsClient.java +++ b/src/main/java/com/merge/api/accounting/RawBankFeedAccountsClient.java @@ -70,32 +70,28 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -147,11 +143,11 @@ public MergeApiHttpResponse create( .addPathSegments("accounting/v1/bank-feed-accounts"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -218,21 +214,17 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -275,7 +267,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawBankFeedTransactionsClient.java b/src/main/java/com/merge/api/accounting/RawBankFeedTransactionsClient.java index af00b845e..10644246b 100644 --- a/src/main/java/com/merge/api/accounting/RawBankFeedTransactionsClient.java +++ b/src/main/java/com/merge/api/accounting/RawBankFeedTransactionsClient.java @@ -64,11 +64,11 @@ public MergeApiHttpResponse> list( .addPathSegments("accounting/v1/bank-feed-transactions"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -78,41 +78,35 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsProcessed().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_processed", request.getIsProcessed().get().toString(), false); + httpUrl, "is_processed", request.getIsProcessed().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -120,13 +114,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -178,11 +171,11 @@ public MergeApiHttpResponse create( .addPathSegments("accounting/v1/bank-feed-transactions"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -249,25 +242,21 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -311,7 +300,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawCashFlowStatementsClient.java b/src/main/java/com/merge/api/accounting/RawCashFlowStatementsClient.java index 4fb519187..886a5ba7c 100644 --- a/src/main/java/com/merge/api/accounting/RawCashFlowStatementsClient.java +++ b/src/main/java/com/merge/api/accounting/RawCashFlowStatementsClient.java @@ -61,11 +61,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -75,37 +75,31 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -113,13 +107,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -181,25 +174,21 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawCompanyInfoClient.java b/src/main/java/com/merge/api/accounting/RawCompanyInfoClient.java index 9d4deb0c9..7b0c754f0 100644 --- a/src/main/java/com/merge/api/accounting/RawCompanyInfoClient.java +++ b/src/main/java/com/merge/api/accounting/RawCompanyInfoClient.java @@ -57,11 +57,11 @@ public MergeApiHttpResponse> list( .addPathSegments("accounting/v1/company-info"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -71,37 +71,31 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -109,13 +103,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -177,25 +170,21 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawContactsClient.java b/src/main/java/com/merge/api/accounting/RawContactsClient.java index 7a83810e8..c70e200b6 100644 --- a/src/main/java/com/merge/api/accounting/RawContactsClient.java +++ b/src/main/java/com/merge/api/accounting/RawContactsClient.java @@ -71,11 +71,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -89,29 +89,26 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsCustomer().isPresent()) { QueryStringMapper.addQueryParameter( @@ -123,14 +120,11 @@ public MergeApiHttpResponse> list( } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getName().isPresent()) { QueryStringMapper.addQueryParameter( @@ -138,7 +132,7 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -158,13 +152,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -215,11 +208,11 @@ public MergeApiHttpResponse create(ContactEndpointRequest reque .addPathSegments("accounting/v1/contacts"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -285,22 +278,19 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -312,13 +302,12 @@ public MergeApiHttpResponse retrieve( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -361,7 +350,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -417,43 +405,39 @@ public MergeApiHttpResponse> remoteFieldCla QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsCommonModelField().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "is_common_model_field", - request.getIsCommonModelField().get().toString(), + request.getIsCommonModelField().get(), false); } if (request.getIsCustom().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_custom", request.getIsCustom().get().toString(), false); + httpUrl, "is_custom", request.getIsCustom().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawCreditNotesClient.java b/src/main/java/com/merge/api/accounting/RawCreditNotesClient.java index c70e8bc6e..b987060fc 100644 --- a/src/main/java/com/merge/api/accounting/RawCreditNotesClient.java +++ b/src/main/java/com/merge/api/accounting/RawCreditNotesClient.java @@ -68,11 +68,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -82,41 +82,35 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -124,34 +118,30 @@ public MergeApiHttpResponse> list( } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getTransactionDateAfter().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "transaction_date_after", - request.getTransactionDateAfter().get().toString(), + request.getTransactionDateAfter().get(), false); } if (request.getTransactionDateBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "transaction_date_before", - request.getTransactionDateBefore().get().toString(), + request.getTransactionDateBefore().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -203,11 +193,11 @@ public MergeApiHttpResponse create( .addPathSegments("accounting/v1/credit-notes"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -273,36 +263,29 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -345,7 +328,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawEmployeesClient.java b/src/main/java/com/merge/api/accounting/RawEmployeesClient.java index 43b908cea..0044c053f 100644 --- a/src/main/java/com/merge/api/accounting/RawEmployeesClient.java +++ b/src/main/java/com/merge/api/accounting/RawEmployeesClient.java @@ -63,36 +63,32 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -154,25 +150,21 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawExpensesClient.java b/src/main/java/com/merge/api/accounting/RawExpensesClient.java index 596a9ae6f..622ce7c79 100644 --- a/src/main/java/com/merge/api/accounting/RawExpensesClient.java +++ b/src/main/java/com/merge/api/accounting/RawExpensesClient.java @@ -72,11 +72,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -86,44 +86,38 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -133,25 +127,24 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "transaction_date_after", - request.getTransactionDateAfter().get().toString(), + request.getTransactionDateAfter().get(), false); } if (request.getTransactionDateBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "transaction_date_before", - request.getTransactionDateBefore().get().toString(), + request.getTransactionDateBefore().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -202,11 +195,11 @@ public MergeApiHttpResponse create(ExpenseEndpointRequest reque .addPathSegments("accounting/v1/expenses"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -272,32 +265,28 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -353,43 +342,39 @@ public MergeApiHttpResponse> linesRemoteFie QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsCommonModelField().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "is_common_model_field", - request.getIsCommonModelField().get().toString(), + request.getIsCommonModelField().get(), false); } if (request.getIsCustom().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_custom", request.getIsCustom().get().toString(), false); + httpUrl, "is_custom", request.getIsCustom().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -445,7 +430,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -501,43 +485,39 @@ public MergeApiHttpResponse> remoteFieldCla QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsCommonModelField().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "is_common_model_field", - request.getIsCommonModelField().get().toString(), + request.getIsCommonModelField().get(), false); } if (request.getIsCustom().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_custom", request.getIsCustom().get().toString(), false); + httpUrl, "is_custom", request.getIsCustom().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawFieldMappingClient.java b/src/main/java/com/merge/api/accounting/RawFieldMappingClient.java index a609c41fb..008716ff4 100644 --- a/src/main/java/com/merge/api/accounting/RawFieldMappingClient.java +++ b/src/main/java/com/merge/api/accounting/RawFieldMappingClient.java @@ -65,14 +65,13 @@ public MergeApiHttpResponse fieldMappingsRetrie QueryStringMapper.addQueryParameter( httpUrl, "exclude_remote_field_metadata", - request.getExcludeRemoteFieldMetadata().get().toString(), + request.getExcludeRemoteFieldMetadata().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -117,7 +116,7 @@ public MergeApiHttpResponse fieldMappingsCreate( QueryStringMapper.addQueryParameter( httpUrl, "exclude_remote_field_metadata", - request.getExcludeRemoteFieldMetadata().get().toString(), + request.getExcludeRemoteFieldMetadata().get(), false); } Map properties = new HashMap<>(); @@ -184,7 +183,6 @@ public MergeApiHttpResponse fieldMappingsDestroy( .url(httpUrl) .method("DELETE", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -308,7 +306,6 @@ public MergeApiHttpResponse remoteFieldsRetrieve( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -352,7 +349,6 @@ public MergeApiHttpResponse targetFieldsRetrieve .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawForceResyncClient.java b/src/main/java/com/merge/api/accounting/RawForceResyncClient.java index ed6f32f0d..fca1bd5ad 100644 --- a/src/main/java/com/merge/api/accounting/RawForceResyncClient.java +++ b/src/main/java/com/merge/api/accounting/RawForceResyncClient.java @@ -47,7 +47,6 @@ public MergeApiHttpResponse> syncStatusResyncCreate(RequestOpti .url(httpUrl) .method("POST", RequestBody.create("", null)) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawGeneralLedgerTransactionsClient.java b/src/main/java/com/merge/api/accounting/RawGeneralLedgerTransactionsClient.java index bfcc2c965..9e68c2cdb 100644 --- a/src/main/java/com/merge/api/accounting/RawGeneralLedgerTransactionsClient.java +++ b/src/main/java/com/merge/api/accounting/RawGeneralLedgerTransactionsClient.java @@ -62,11 +62,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -76,51 +76,39 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getPostedDateAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "posted_date_after", - request.getPostedDateAfter().get().toString(), - false); + httpUrl, "posted_date_after", request.getPostedDateAfter().get(), false); } if (request.getPostedDateBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "posted_date_before", - request.getPostedDateBefore().get().toString(), - false); + httpUrl, "posted_date_before", request.getPostedDateBefore().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -128,13 +116,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -198,25 +185,21 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawIncomeStatementsClient.java b/src/main/java/com/merge/api/accounting/RawIncomeStatementsClient.java index 1eecf9006..a5302f1c2 100644 --- a/src/main/java/com/merge/api/accounting/RawIncomeStatementsClient.java +++ b/src/main/java/com/merge/api/accounting/RawIncomeStatementsClient.java @@ -61,11 +61,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -75,37 +75,31 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -113,13 +107,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -181,25 +174,21 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawInvoicesClient.java b/src/main/java/com/merge/api/accounting/RawInvoicesClient.java index fb94301cf..0c95e705b 100644 --- a/src/main/java/com/merge/api/accounting/RawInvoicesClient.java +++ b/src/main/java/com/merge/api/accounting/RawInvoicesClient.java @@ -77,11 +77,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -91,54 +91,42 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIssueDateAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "issue_date_after", - request.getIssueDateAfter().get().toString(), - false); + httpUrl, "issue_date_after", request.getIssueDateAfter().get(), false); } if (request.getIssueDateBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "issue_date_before", - request.getIssueDateBefore().get().toString(), - false); + httpUrl, "issue_date_before", request.getIssueDateBefore().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getNumber().isPresent()) { QueryStringMapper.addQueryParameter( @@ -146,7 +134,7 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -162,21 +150,20 @@ public MergeApiHttpResponse> list( } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "status", request.getStatus().get().toString(), false); + httpUrl, "status", request.getStatus().get(), false); } if (request.getType().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "type", request.getType().get().toString(), false); + httpUrl, "type", request.getType().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -229,11 +216,11 @@ public MergeApiHttpResponse create(InvoiceEndpointRequest reque .addPathSegments("accounting/v1/invoices"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -299,22 +286,19 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -326,13 +310,12 @@ public MergeApiHttpResponse retrieve( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -374,11 +357,11 @@ public MergeApiHttpResponse partialUpdate( .addPathSegment(id); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -449,43 +432,39 @@ public MergeApiHttpResponse> lineItemsRemot QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsCommonModelField().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "is_common_model_field", - request.getIsCommonModelField().get().toString(), + request.getIsCommonModelField().get(), false); } if (request.getIsCustom().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_custom", request.getIsCustom().get().toString(), false); + httpUrl, "is_custom", request.getIsCustom().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -542,7 +521,6 @@ public MergeApiHttpResponse metaPatchRetrieve(String id, RequestOp .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -585,7 +563,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -641,43 +618,39 @@ public MergeApiHttpResponse> remoteFieldCla QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsCommonModelField().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "is_common_model_field", - request.getIsCommonModelField().get().toString(), + request.getIsCommonModelField().get(), false); } if (request.getIsCustom().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_custom", request.getIsCustom().get().toString(), false); + httpUrl, "is_custom", request.getIsCustom().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawIssuesClient.java b/src/main/java/com/merge/api/accounting/RawIssuesClient.java index beaaa3b5a..87c8f5cce 100644 --- a/src/main/java/com/merge/api/accounting/RawIssuesClient.java +++ b/src/main/java/com/merge/api/accounting/RawIssuesClient.java @@ -77,14 +77,14 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "first_incident_time_after", - request.getFirstIncidentTimeAfter().get().toString(), + request.getFirstIncidentTimeAfter().get(), false); } if (request.getFirstIncidentTimeBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "first_incident_time_before", - request.getFirstIncidentTimeBefore().get().toString(), + request.getFirstIncidentTimeBefore().get(), false); } if (request.getIncludeMuted().isPresent()) { @@ -99,14 +99,14 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "last_incident_time_after", - request.getLastIncidentTimeAfter().get().toString(), + request.getLastIncidentTimeAfter().get(), false); } if (request.getLastIncidentTimeBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "last_incident_time_before", - request.getLastIncidentTimeBefore().get().toString(), + request.getLastIncidentTimeBefore().get(), false); } if (request.getLinkedAccountId().isPresent()) { @@ -115,7 +115,7 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getStartDate().isPresent()) { QueryStringMapper.addQueryParameter( @@ -123,13 +123,12 @@ public MergeApiHttpResponse> list( } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "status", request.getStatus().get().toString(), false); + httpUrl, "status", request.getStatus().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -184,7 +183,6 @@ public MergeApiHttpResponse retrieve(String id, RequestOptions requestOpt .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawItemsClient.java b/src/main/java/com/merge/api/accounting/RawItemsClient.java index fcf5059b3..92ffaa1a1 100644 --- a/src/main/java/com/merge/api/accounting/RawItemsClient.java +++ b/src/main/java/com/merge/api/accounting/RawItemsClient.java @@ -69,11 +69,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -83,37 +83,31 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -129,13 +123,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -186,11 +179,11 @@ public MergeApiHttpResponse create(ItemEndpointRequest request, Re .addPathSegments("accounting/v1/items"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -255,15 +248,12 @@ public MergeApiHttpResponse retrieve(String id, ItemsRetrieveRequest reque QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -275,13 +265,12 @@ public MergeApiHttpResponse retrieve(String id, ItemsRetrieveRequest reque } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -323,11 +312,11 @@ public MergeApiHttpResponse partialUpdate( .addPathSegment(id); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -386,7 +375,6 @@ public MergeApiHttpResponse metaPatchRetrieve(String id, RequestOp .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -429,7 +417,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawJournalEntriesClient.java b/src/main/java/com/merge/api/accounting/RawJournalEntriesClient.java index b33f99b3e..e6f5d8bf0 100644 --- a/src/main/java/com/merge/api/accounting/RawJournalEntriesClient.java +++ b/src/main/java/com/merge/api/accounting/RawJournalEntriesClient.java @@ -72,11 +72,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -86,44 +86,38 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -133,25 +127,24 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "transaction_date_after", - request.getTransactionDateAfter().get().toString(), + request.getTransactionDateAfter().get(), false); } if (request.getTransactionDateBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "transaction_date_before", - request.getTransactionDateBefore().get().toString(), + request.getTransactionDateBefore().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -203,11 +196,11 @@ public MergeApiHttpResponse create( .addPathSegments("accounting/v1/journal-entries"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -274,32 +267,28 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -355,43 +344,39 @@ public MergeApiHttpResponse> linesRemoteFie QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsCommonModelField().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "is_common_model_field", - request.getIsCommonModelField().get().toString(), + request.getIsCommonModelField().get(), false); } if (request.getIsCustom().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_custom", request.getIsCustom().get().toString(), false); + httpUrl, "is_custom", request.getIsCustom().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -447,7 +432,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -503,43 +487,39 @@ public MergeApiHttpResponse> remoteFieldCla QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsCommonModelField().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "is_common_model_field", - request.getIsCommonModelField().get().toString(), + request.getIsCommonModelField().get(), false); } if (request.getIsCustom().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_custom", request.getIsCustom().get().toString(), false); + httpUrl, "is_custom", request.getIsCustom().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawLinkedAccountsClient.java b/src/main/java/com/merge/api/accounting/RawLinkedAccountsClient.java index 68416ddab..54fec84c9 100644 --- a/src/main/java/com/merge/api/accounting/RawLinkedAccountsClient.java +++ b/src/main/java/com/merge/api/accounting/RawLinkedAccountsClient.java @@ -56,7 +56,7 @@ public MergeApiHttpResponse> list( .addPathSegments("accounting/v1/linked-accounts"); if (request.getCategory().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "category", request.getCategory().get().toString(), false); + httpUrl, "category", request.getCategory().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -97,7 +97,7 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_duplicates", - request.getIncludeDuplicates().get().toString(), + request.getIncludeDuplicates().get(), false); } if (request.getIntegrationName().isPresent()) { @@ -110,7 +110,7 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( @@ -120,7 +120,6 @@ public MergeApiHttpResponse> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawPaymentMethodsClient.java b/src/main/java/com/merge/api/accounting/RawPaymentMethodsClient.java index afc508b36..7d2736a88 100644 --- a/src/main/java/com/merge/api/accounting/RawPaymentMethodsClient.java +++ b/src/main/java/com/merge/api/accounting/RawPaymentMethodsClient.java @@ -63,32 +63,28 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -150,21 +146,17 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawPaymentTermsClient.java b/src/main/java/com/merge/api/accounting/RawPaymentTermsClient.java index 42b474359..f68e4b2cb 100644 --- a/src/main/java/com/merge/api/accounting/RawPaymentTermsClient.java +++ b/src/main/java/com/merge/api/accounting/RawPaymentTermsClient.java @@ -63,36 +63,32 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -154,25 +150,21 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawPaymentsClient.java b/src/main/java/com/merge/api/accounting/RawPaymentsClient.java index e74160af6..355648629 100644 --- a/src/main/java/com/merge/api/accounting/RawPaymentsClient.java +++ b/src/main/java/com/merge/api/accounting/RawPaymentsClient.java @@ -81,11 +81,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -95,44 +95,38 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -142,25 +136,24 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "transaction_date_after", - request.getTransactionDateAfter().get().toString(), + request.getTransactionDateAfter().get(), false); } if (request.getTransactionDateBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "transaction_date_before", - request.getTransactionDateBefore().get().toString(), + request.getTransactionDateBefore().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -211,11 +204,11 @@ public MergeApiHttpResponse create(PaymentEndpointRequest reque .addPathSegments("accounting/v1/payments"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -281,32 +274,28 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -348,11 +337,11 @@ public MergeApiHttpResponse partialUpdate( .addPathSegment(id); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -423,43 +412,39 @@ public MergeApiHttpResponse> lineItemsRemot QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsCommonModelField().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "is_common_model_field", - request.getIsCommonModelField().get().toString(), + request.getIsCommonModelField().get(), false); } if (request.getIsCustom().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_custom", request.getIsCustom().get().toString(), false); + httpUrl, "is_custom", request.getIsCustom().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -516,7 +501,6 @@ public MergeApiHttpResponse metaPatchRetrieve(String id, RequestOp .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -559,7 +543,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -615,43 +598,39 @@ public MergeApiHttpResponse> remoteFieldCla QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsCommonModelField().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "is_common_model_field", - request.getIsCommonModelField().get().toString(), + request.getIsCommonModelField().get(), false); } if (request.getIsCustom().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_custom", request.getIsCustom().get().toString(), false); + httpUrl, "is_custom", request.getIsCustom().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawPhoneNumbersClient.java b/src/main/java/com/merge/api/accounting/RawPhoneNumbersClient.java index f33e03bad..1514811c1 100644 --- a/src/main/java/com/merge/api/accounting/RawPhoneNumbersClient.java +++ b/src/main/java/com/merge/api/accounting/RawPhoneNumbersClient.java @@ -54,21 +54,17 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawProjectsClient.java b/src/main/java/com/merge/api/accounting/RawProjectsClient.java index f89c53473..296efdadf 100644 --- a/src/main/java/com/merge/api/accounting/RawProjectsClient.java +++ b/src/main/java/com/merge/api/accounting/RawProjectsClient.java @@ -58,36 +58,32 @@ public MergeApiHttpResponse list(ProjectsListRequest reque QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -139,25 +135,21 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawPurchaseOrdersClient.java b/src/main/java/com/merge/api/accounting/RawPurchaseOrdersClient.java index d8a35be4b..ac411ab2e 100644 --- a/src/main/java/com/merge/api/accounting/RawPurchaseOrdersClient.java +++ b/src/main/java/com/merge/api/accounting/RawPurchaseOrdersClient.java @@ -72,11 +72,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -86,58 +86,46 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIssueDateAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "issue_date_after", - request.getIssueDateAfter().get().toString(), - false); + httpUrl, "issue_date_after", request.getIssueDateAfter().get(), false); } if (request.getIssueDateBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "issue_date_before", - request.getIssueDateBefore().get().toString(), - false); + httpUrl, "issue_date_before", request.getIssueDateBefore().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -153,13 +141,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -211,11 +198,11 @@ public MergeApiHttpResponse create( .addPathSegments("accounting/v1/purchase-orders"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -282,22 +269,19 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -309,13 +293,12 @@ public MergeApiHttpResponse retrieve( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -371,43 +354,39 @@ public MergeApiHttpResponse> lineItemsRemot QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsCommonModelField().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "is_common_model_field", - request.getIsCommonModelField().get().toString(), + request.getIsCommonModelField().get(), false); } if (request.getIsCustom().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_custom", request.getIsCustom().get().toString(), false); + httpUrl, "is_custom", request.getIsCustom().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -463,7 +442,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -519,43 +497,39 @@ public MergeApiHttpResponse> remoteFieldCla QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsCommonModelField().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "is_common_model_field", - request.getIsCommonModelField().get().toString(), + request.getIsCommonModelField().get(), false); } if (request.getIsCustom().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_custom", request.getIsCustom().get().toString(), false); + httpUrl, "is_custom", request.getIsCustom().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawScopesClient.java b/src/main/java/com/merge/api/accounting/RawScopesClient.java index a5dc30547..22e347d6d 100644 --- a/src/main/java/com/merge/api/accounting/RawScopesClient.java +++ b/src/main/java/com/merge/api/accounting/RawScopesClient.java @@ -48,7 +48,6 @@ public MergeApiHttpResponse defaultScopesRetrieve(RequestOp .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -92,7 +91,6 @@ public MergeApiHttpResponse linkedAccountScopesRetrieve(Req .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawSyncStatusClient.java b/src/main/java/com/merge/api/accounting/RawSyncStatusClient.java index e9703bd1c..f21052dc8 100644 --- a/src/main/java/com/merge/api/accounting/RawSyncStatusClient.java +++ b/src/main/java/com/merge/api/accounting/RawSyncStatusClient.java @@ -60,13 +60,12 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawTaxRatesClient.java b/src/main/java/com/merge/api/accounting/RawTaxRatesClient.java index e375e6c52..fee288aa6 100644 --- a/src/main/java/com/merge/api/accounting/RawTaxRatesClient.java +++ b/src/main/java/com/merge/api/accounting/RawTaxRatesClient.java @@ -61,11 +61,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -75,33 +75,27 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getName().isPresent()) { QueryStringMapper.addQueryParameter( @@ -109,7 +103,7 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -117,13 +111,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -185,25 +178,21 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawTrackingCategoriesClient.java b/src/main/java/com/merge/api/accounting/RawTrackingCategoriesClient.java index 207829361..17ce6b0e6 100644 --- a/src/main/java/com/merge/api/accounting/RawTrackingCategoriesClient.java +++ b/src/main/java/com/merge/api/accounting/RawTrackingCategoriesClient.java @@ -65,11 +65,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -79,33 +79,27 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getName().isPresent()) { QueryStringMapper.addQueryParameter( @@ -113,7 +107,7 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -133,13 +127,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -201,15 +194,12 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -221,13 +211,12 @@ public MergeApiHttpResponse retrieve( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawTransactionsClient.java b/src/main/java/com/merge/api/accounting/RawTransactionsClient.java index c55187186..d2ae4b429 100644 --- a/src/main/java/com/merge/api/accounting/RawTransactionsClient.java +++ b/src/main/java/com/merge/api/accounting/RawTransactionsClient.java @@ -61,11 +61,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -75,37 +75,31 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -115,25 +109,24 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "transaction_date_after", - request.getTransactionDateAfter().get().toString(), + request.getTransactionDateAfter().get(), false); } if (request.getTransactionDateBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "transaction_date_before", - request.getTransactionDateBefore().get().toString(), + request.getTransactionDateBefore().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -195,25 +188,21 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawVendorCreditsClient.java b/src/main/java/com/merge/api/accounting/RawVendorCreditsClient.java index a2dc6563f..004c2e816 100644 --- a/src/main/java/com/merge/api/accounting/RawVendorCreditsClient.java +++ b/src/main/java/com/merge/api/accounting/RawVendorCreditsClient.java @@ -68,11 +68,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -82,37 +82,31 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -122,25 +116,24 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "transaction_date_after", - request.getTransactionDateAfter().get().toString(), + request.getTransactionDateAfter().get(), false); } if (request.getTransactionDateBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "transaction_date_before", - request.getTransactionDateBefore().get().toString(), + request.getTransactionDateBefore().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -192,11 +185,11 @@ public MergeApiHttpResponse create( .addPathSegments("accounting/v1/vendor-credits"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -263,25 +256,21 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -324,7 +313,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/RawWebhookReceiversClient.java b/src/main/java/com/merge/api/accounting/RawWebhookReceiversClient.java index 65ab9b857..9dd2a8114 100644 --- a/src/main/java/com/merge/api/accounting/RawWebhookReceiversClient.java +++ b/src/main/java/com/merge/api/accounting/RawWebhookReceiversClient.java @@ -50,7 +50,6 @@ public MergeApiHttpResponse> list(RequestOptions requestOp .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/accounting/types/AccountAccountType.java b/src/main/java/com/merge/api/accounting/types/AccountAccountType.java index 2e2bed065..cc08d55d8 100644 --- a/src/main/java/com/merge/api/accounting/types/AccountAccountType.java +++ b/src/main/java/com/merge/api/accounting/types/AccountAccountType.java @@ -83,11 +83,11 @@ public AccountAccountType deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AccountAccountTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/AccountClassification.java b/src/main/java/com/merge/api/accounting/types/AccountClassification.java index f226138e8..f9c09a996 100644 --- a/src/main/java/com/merge/api/accounting/types/AccountClassification.java +++ b/src/main/java/com/merge/api/accounting/types/AccountClassification.java @@ -83,11 +83,11 @@ public AccountClassification deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, ClassificationEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/AccountCurrency.java b/src/main/java/com/merge/api/accounting/types/AccountCurrency.java index adb57e7ce..048f6b5d3 100644 --- a/src/main/java/com/merge/api/accounting/types/AccountCurrency.java +++ b/src/main/java/com/merge/api/accounting/types/AccountCurrency.java @@ -83,11 +83,11 @@ public AccountCurrency deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TransactionCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/AccountDetailsAndActionsCategory.java b/src/main/java/com/merge/api/accounting/types/AccountDetailsAndActionsCategory.java index f6d3c5baa..2396f1cd7 100644 --- a/src/main/java/com/merge/api/accounting/types/AccountDetailsAndActionsCategory.java +++ b/src/main/java/com/merge/api/accounting/types/AccountDetailsAndActionsCategory.java @@ -84,11 +84,11 @@ public AccountDetailsAndActionsCategory deserialize(JsonParser p, Deserializatio Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CategoryEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/AccountDetailsAndActionsIntegration.java b/src/main/java/com/merge/api/accounting/types/AccountDetailsAndActionsIntegration.java index 85ed8a1aa..4da9a5381 100644 --- a/src/main/java/com/merge/api/accounting/types/AccountDetailsAndActionsIntegration.java +++ b/src/main/java/com/merge/api/accounting/types/AccountDetailsAndActionsIntegration.java @@ -293,7 +293,9 @@ public _FinalStage image(Optional image) { @java.lang.Override public _FinalStage addAllCategories(List categories) { - this.categories.addAll(categories); + if (categories != null) { + this.categories.addAll(categories); + } return this; } diff --git a/src/main/java/com/merge/api/accounting/types/AccountDetailsAndActionsStatus.java b/src/main/java/com/merge/api/accounting/types/AccountDetailsAndActionsStatus.java index 0a2ecef48..bcbfd4fd0 100644 --- a/src/main/java/com/merge/api/accounting/types/AccountDetailsAndActionsStatus.java +++ b/src/main/java/com/merge/api/accounting/types/AccountDetailsAndActionsStatus.java @@ -84,11 +84,11 @@ public AccountDetailsAndActionsStatus deserialize(JsonParser p, DeserializationC Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AccountDetailsAndActionsStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/AccountIntegration.java b/src/main/java/com/merge/api/accounting/types/AccountIntegration.java index 39ca34c2f..5fc5630ad 100644 --- a/src/main/java/com/merge/api/accounting/types/AccountIntegration.java +++ b/src/main/java/com/merge/api/accounting/types/AccountIntegration.java @@ -197,7 +197,7 @@ public static NameStage builder() { public interface NameStage { /** - * Company name. + *

Company name.

*/ _FinalStage name(@NotNull String name); @@ -311,7 +311,8 @@ public Builder from(AccountIntegration other) { } /** - * Company name.

Company name.

+ *

Company name.

+ *

Company name.

* @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/accounting/types/AccountRequestAccountType.java b/src/main/java/com/merge/api/accounting/types/AccountRequestAccountType.java index 2bc3757bd..06ea02aa4 100644 --- a/src/main/java/com/merge/api/accounting/types/AccountRequestAccountType.java +++ b/src/main/java/com/merge/api/accounting/types/AccountRequestAccountType.java @@ -83,11 +83,11 @@ public AccountRequestAccountType deserialize(JsonParser p, DeserializationContex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AccountAccountTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/AccountRequestClassification.java b/src/main/java/com/merge/api/accounting/types/AccountRequestClassification.java index 6c1b1add9..033024de3 100644 --- a/src/main/java/com/merge/api/accounting/types/AccountRequestClassification.java +++ b/src/main/java/com/merge/api/accounting/types/AccountRequestClassification.java @@ -84,11 +84,11 @@ public AccountRequestClassification deserialize(JsonParser p, DeserializationCon Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, ClassificationEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/AccountRequestCurrency.java b/src/main/java/com/merge/api/accounting/types/AccountRequestCurrency.java index d72843bd4..36ef4ed96 100644 --- a/src/main/java/com/merge/api/accounting/types/AccountRequestCurrency.java +++ b/src/main/java/com/merge/api/accounting/types/AccountRequestCurrency.java @@ -83,11 +83,11 @@ public AccountRequestCurrency deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TransactionCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/AccountRequestStatus.java b/src/main/java/com/merge/api/accounting/types/AccountRequestStatus.java index 2aedbbf80..e5459f960 100644 --- a/src/main/java/com/merge/api/accounting/types/AccountRequestStatus.java +++ b/src/main/java/com/merge/api/accounting/types/AccountRequestStatus.java @@ -83,11 +83,11 @@ public AccountRequestStatus deserialize(JsonParser p, DeserializationContext con Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AccountStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/AccountResponse.java b/src/main/java/com/merge/api/accounting/types/AccountResponse.java index 57df45366..1c253c58a 100644 --- a/src/main/java/com/merge/api/accounting/types/AccountResponse.java +++ b/src/main/java/com/merge/api/accounting/types/AccountResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/accounting/types/AccountStatus.java b/src/main/java/com/merge/api/accounting/types/AccountStatus.java index c779e73d1..8e8badf82 100644 --- a/src/main/java/com/merge/api/accounting/types/AccountStatus.java +++ b/src/main/java/com/merge/api/accounting/types/AccountStatus.java @@ -83,11 +83,11 @@ public AccountStatus deserialize(JsonParser p, DeserializationContext context) t Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AccountStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/AccountingAttachmentResponse.java b/src/main/java/com/merge/api/accounting/types/AccountingAttachmentResponse.java index da46e3e96..bde8db4ff 100644 --- a/src/main/java/com/merge/api/accounting/types/AccountingAttachmentResponse.java +++ b/src/main/java/com/merge/api/accounting/types/AccountingAttachmentResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/accounting/types/AccountingPeriodStatus.java b/src/main/java/com/merge/api/accounting/types/AccountingPeriodStatus.java index b3c5e49a1..fd998783b 100644 --- a/src/main/java/com/merge/api/accounting/types/AccountingPeriodStatus.java +++ b/src/main/java/com/merge/api/accounting/types/AccountingPeriodStatus.java @@ -83,11 +83,11 @@ public AccountingPeriodStatus deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Status895Enum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/AddressCountry.java b/src/main/java/com/merge/api/accounting/types/AddressCountry.java index 31a1151fb..a6941cc2e 100644 --- a/src/main/java/com/merge/api/accounting/types/AddressCountry.java +++ b/src/main/java/com/merge/api/accounting/types/AddressCountry.java @@ -83,11 +83,11 @@ public AddressCountry deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CountryEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/AddressRequestCountry.java b/src/main/java/com/merge/api/accounting/types/AddressRequestCountry.java index a5bf742c7..4858d4375 100644 --- a/src/main/java/com/merge/api/accounting/types/AddressRequestCountry.java +++ b/src/main/java/com/merge/api/accounting/types/AddressRequestCountry.java @@ -83,11 +83,11 @@ public AddressRequestCountry deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CountryEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/AddressRequestType.java b/src/main/java/com/merge/api/accounting/types/AddressRequestType.java index 0664e9446..112f88ede 100644 --- a/src/main/java/com/merge/api/accounting/types/AddressRequestType.java +++ b/src/main/java/com/merge/api/accounting/types/AddressRequestType.java @@ -83,11 +83,11 @@ public AddressRequestType deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AddressTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/AddressType.java b/src/main/java/com/merge/api/accounting/types/AddressType.java index e7beccff5..86b0bf51e 100644 --- a/src/main/java/com/merge/api/accounting/types/AddressType.java +++ b/src/main/java/com/merge/api/accounting/types/AddressType.java @@ -83,11 +83,11 @@ public AddressType deserialize(JsonParser p, DeserializationContext context) thr Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AddressTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/AsyncPassthroughRetrieveResponse.java b/src/main/java/com/merge/api/accounting/types/AsyncPassthroughRetrieveResponse.java index 957daa930..db9098274 100644 --- a/src/main/java/com/merge/api/accounting/types/AsyncPassthroughRetrieveResponse.java +++ b/src/main/java/com/merge/api/accounting/types/AsyncPassthroughRetrieveResponse.java @@ -84,11 +84,11 @@ public AsyncPassthroughRetrieveResponse deserialize(JsonParser p, Deserializatio Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RemoteResponse.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/AsyncPostTaskStatus.java b/src/main/java/com/merge/api/accounting/types/AsyncPostTaskStatus.java index f108ff2aa..448277537 100644 --- a/src/main/java/com/merge/api/accounting/types/AsyncPostTaskStatus.java +++ b/src/main/java/com/merge/api/accounting/types/AsyncPostTaskStatus.java @@ -83,11 +83,11 @@ public AsyncPostTaskStatus deserialize(JsonParser p, DeserializationContext cont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AsyncPostTaskStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/AuditLogEvent.java b/src/main/java/com/merge/api/accounting/types/AuditLogEvent.java index 935c2b311..2f8f209b1 100644 --- a/src/main/java/com/merge/api/accounting/types/AuditLogEvent.java +++ b/src/main/java/com/merge/api/accounting/types/AuditLogEvent.java @@ -212,14 +212,15 @@ public static RoleStage builder() { public interface RoleStage { /** - * Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring. - * - * * `ADMIN` - ADMIN - * * `DEVELOPER` - DEVELOPER - * * `MEMBER` - MEMBER - * * `API` - API - * * `SYSTEM` - SYSTEM - * * `MERGE_TEAM` - MERGE_TEAM + *

Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring.

+ *
    + *
  • ADMIN - ADMIN
    • + *
  • DEVELOPER - DEVELOPER
    • + *
  • MEMBER - MEMBER
    • + *
  • API - API
    • + *
  • SYSTEM - SYSTEM
    • + *
  • MERGE_TEAM - MERGE_TEAM
    • + *
*/ IpAddressStage role(@NotNull AuditLogEventRole role); @@ -232,51 +233,52 @@ public interface IpAddressStage { public interface EventTypeStage { /** - * Designates the type of event that occurred. - * - * * `CREATED_REMOTE_PRODUCTION_API_KEY` - CREATED_REMOTE_PRODUCTION_API_KEY - * * `DELETED_REMOTE_PRODUCTION_API_KEY` - DELETED_REMOTE_PRODUCTION_API_KEY - * * `CREATED_TEST_API_KEY` - CREATED_TEST_API_KEY - * * `DELETED_TEST_API_KEY` - DELETED_TEST_API_KEY - * * `REGENERATED_PRODUCTION_API_KEY` - REGENERATED_PRODUCTION_API_KEY - * * `REGENERATED_WEBHOOK_SIGNATURE` - REGENERATED_WEBHOOK_SIGNATURE - * * `INVITED_USER` - INVITED_USER - * * `TWO_FACTOR_AUTH_ENABLED` - TWO_FACTOR_AUTH_ENABLED - * * `TWO_FACTOR_AUTH_DISABLED` - TWO_FACTOR_AUTH_DISABLED - * * `DELETED_LINKED_ACCOUNT` - DELETED_LINKED_ACCOUNT - * * `DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT` - DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT - * * `CREATED_DESTINATION` - CREATED_DESTINATION - * * `DELETED_DESTINATION` - DELETED_DESTINATION - * * `CHANGED_DESTINATION` - CHANGED_DESTINATION - * * `CHANGED_SCOPES` - CHANGED_SCOPES - * * `CHANGED_PERSONAL_INFORMATION` - CHANGED_PERSONAL_INFORMATION - * * `CHANGED_ORGANIZATION_SETTINGS` - CHANGED_ORGANIZATION_SETTINGS - * * `ENABLED_INTEGRATION` - ENABLED_INTEGRATION - * * `DISABLED_INTEGRATION` - DISABLED_INTEGRATION - * * `ENABLED_CATEGORY` - ENABLED_CATEGORY - * * `DISABLED_CATEGORY` - DISABLED_CATEGORY - * * `CHANGED_PASSWORD` - CHANGED_PASSWORD - * * `RESET_PASSWORD` - RESET_PASSWORD - * * `ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION` - ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - * * `ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT` - ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - * * `DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION` - DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - * * `DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT` - DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - * * `CREATED_INTEGRATION_WIDE_FIELD_MAPPING` - CREATED_INTEGRATION_WIDE_FIELD_MAPPING - * * `CREATED_LINKED_ACCOUNT_FIELD_MAPPING` - CREATED_LINKED_ACCOUNT_FIELD_MAPPING - * * `CHANGED_INTEGRATION_WIDE_FIELD_MAPPING` - CHANGED_INTEGRATION_WIDE_FIELD_MAPPING - * * `CHANGED_LINKED_ACCOUNT_FIELD_MAPPING` - CHANGED_LINKED_ACCOUNT_FIELD_MAPPING - * * `DELETED_INTEGRATION_WIDE_FIELD_MAPPING` - DELETED_INTEGRATION_WIDE_FIELD_MAPPING - * * `DELETED_LINKED_ACCOUNT_FIELD_MAPPING` - DELETED_LINKED_ACCOUNT_FIELD_MAPPING - * * `CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `FORCED_LINKED_ACCOUNT_RESYNC` - FORCED_LINKED_ACCOUNT_RESYNC - * * `MUTED_ISSUE` - MUTED_ISSUE - * * `GENERATED_MAGIC_LINK` - GENERATED_MAGIC_LINK - * * `ENABLED_MERGE_WEBHOOK` - ENABLED_MERGE_WEBHOOK - * * `DISABLED_MERGE_WEBHOOK` - DISABLED_MERGE_WEBHOOK - * * `MERGE_WEBHOOK_TARGET_CHANGED` - MERGE_WEBHOOK_TARGET_CHANGED - * * `END_USER_CREDENTIALS_ACCESSED` - END_USER_CREDENTIALS_ACCESSED + *

Designates the type of event that occurred.

+ *
    + *
  • CREATED_REMOTE_PRODUCTION_API_KEY - CREATED_REMOTE_PRODUCTION_API_KEY
    • + *
  • DELETED_REMOTE_PRODUCTION_API_KEY - DELETED_REMOTE_PRODUCTION_API_KEY
    • + *
  • CREATED_TEST_API_KEY - CREATED_TEST_API_KEY
    • + *
  • DELETED_TEST_API_KEY - DELETED_TEST_API_KEY
    • + *
  • REGENERATED_PRODUCTION_API_KEY - REGENERATED_PRODUCTION_API_KEY
    • + *
  • REGENERATED_WEBHOOK_SIGNATURE - REGENERATED_WEBHOOK_SIGNATURE
    • + *
  • INVITED_USER - INVITED_USER
    • + *
  • TWO_FACTOR_AUTH_ENABLED - TWO_FACTOR_AUTH_ENABLED
    • + *
  • TWO_FACTOR_AUTH_DISABLED - TWO_FACTOR_AUTH_DISABLED
    • + *
  • DELETED_LINKED_ACCOUNT - DELETED_LINKED_ACCOUNT
    • + *
  • DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT - DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT
    • + *
  • CREATED_DESTINATION - CREATED_DESTINATION
    • + *
  • DELETED_DESTINATION - DELETED_DESTINATION
    • + *
  • CHANGED_DESTINATION - CHANGED_DESTINATION
    • + *
  • CHANGED_SCOPES - CHANGED_SCOPES
    • + *
  • CHANGED_PERSONAL_INFORMATION - CHANGED_PERSONAL_INFORMATION
    • + *
  • CHANGED_ORGANIZATION_SETTINGS - CHANGED_ORGANIZATION_SETTINGS
    • + *
  • ENABLED_INTEGRATION - ENABLED_INTEGRATION
    • + *
  • DISABLED_INTEGRATION - DISABLED_INTEGRATION
    • + *
  • ENABLED_CATEGORY - ENABLED_CATEGORY
    • + *
  • DISABLED_CATEGORY - DISABLED_CATEGORY
    • + *
  • CHANGED_PASSWORD - CHANGED_PASSWORD
    • + *
  • RESET_PASSWORD - RESET_PASSWORD
    • + *
  • ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION
    • + *
  • ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT
    • + *
  • DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION
    • + *
  • DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT
    • + *
  • CREATED_INTEGRATION_WIDE_FIELD_MAPPING - CREATED_INTEGRATION_WIDE_FIELD_MAPPING
    • + *
  • CREATED_LINKED_ACCOUNT_FIELD_MAPPING - CREATED_LINKED_ACCOUNT_FIELD_MAPPING
    • + *
  • CHANGED_INTEGRATION_WIDE_FIELD_MAPPING - CHANGED_INTEGRATION_WIDE_FIELD_MAPPING
    • + *
  • CHANGED_LINKED_ACCOUNT_FIELD_MAPPING - CHANGED_LINKED_ACCOUNT_FIELD_MAPPING
    • + *
  • DELETED_INTEGRATION_WIDE_FIELD_MAPPING - DELETED_INTEGRATION_WIDE_FIELD_MAPPING
    • + *
  • DELETED_LINKED_ACCOUNT_FIELD_MAPPING - DELETED_LINKED_ACCOUNT_FIELD_MAPPING
    • + *
  • CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
    • + *
  • CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
    • + *
  • DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
    • + *
  • FORCED_LINKED_ACCOUNT_RESYNC - FORCED_LINKED_ACCOUNT_RESYNC
    • + *
  • MUTED_ISSUE - MUTED_ISSUE
    • + *
  • GENERATED_MAGIC_LINK - GENERATED_MAGIC_LINK
    • + *
  • ENABLED_MERGE_WEBHOOK - ENABLED_MERGE_WEBHOOK
    • + *
  • DISABLED_MERGE_WEBHOOK - DISABLED_MERGE_WEBHOOK
    • + *
  • MERGE_WEBHOOK_TARGET_CHANGED - MERGE_WEBHOOK_TARGET_CHANGED
    • + *
  • END_USER_CREDENTIALS_ACCESSED - END_USER_CREDENTIALS_ACCESSED
    • + *
*/ EventDescriptionStage eventType(@NotNull AuditLogEventEventType eventType); } @@ -349,14 +351,16 @@ public Builder from(AuditLogEvent other) { } /** - * Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring. - * - * * `ADMIN` - ADMIN - * * `DEVELOPER` - DEVELOPER - * * `MEMBER` - MEMBER - * * `API` - API - * * `SYSTEM` - SYSTEM - * * `MERGE_TEAM` - MERGE_TEAM

Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring.

+ *

Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring.

+ *
    + *
  • ADMIN - ADMIN
    • + *
  • DEVELOPER - DEVELOPER
    • + *
  • MEMBER - MEMBER
    • + *
  • API - API
    • + *
  • SYSTEM - SYSTEM
    • + *
  • MERGE_TEAM - MERGE_TEAM
    • + *
+ *

Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring.

*
    *
  • ADMIN - ADMIN
    • *
  • DEVELOPER - DEVELOPER
    • @@ -382,51 +386,53 @@ public EventTypeStage ipAddress(@NotNull String ipAddress) { } /** - * Designates the type of event that occurred. - * - * * `CREATED_REMOTE_PRODUCTION_API_KEY` - CREATED_REMOTE_PRODUCTION_API_KEY - * * `DELETED_REMOTE_PRODUCTION_API_KEY` - DELETED_REMOTE_PRODUCTION_API_KEY - * * `CREATED_TEST_API_KEY` - CREATED_TEST_API_KEY - * * `DELETED_TEST_API_KEY` - DELETED_TEST_API_KEY - * * `REGENERATED_PRODUCTION_API_KEY` - REGENERATED_PRODUCTION_API_KEY - * * `REGENERATED_WEBHOOK_SIGNATURE` - REGENERATED_WEBHOOK_SIGNATURE - * * `INVITED_USER` - INVITED_USER - * * `TWO_FACTOR_AUTH_ENABLED` - TWO_FACTOR_AUTH_ENABLED - * * `TWO_FACTOR_AUTH_DISABLED` - TWO_FACTOR_AUTH_DISABLED - * * `DELETED_LINKED_ACCOUNT` - DELETED_LINKED_ACCOUNT - * * `DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT` - DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT - * * `CREATED_DESTINATION` - CREATED_DESTINATION - * * `DELETED_DESTINATION` - DELETED_DESTINATION - * * `CHANGED_DESTINATION` - CHANGED_DESTINATION - * * `CHANGED_SCOPES` - CHANGED_SCOPES - * * `CHANGED_PERSONAL_INFORMATION` - CHANGED_PERSONAL_INFORMATION - * * `CHANGED_ORGANIZATION_SETTINGS` - CHANGED_ORGANIZATION_SETTINGS - * * `ENABLED_INTEGRATION` - ENABLED_INTEGRATION - * * `DISABLED_INTEGRATION` - DISABLED_INTEGRATION - * * `ENABLED_CATEGORY` - ENABLED_CATEGORY - * * `DISABLED_CATEGORY` - DISABLED_CATEGORY - * * `CHANGED_PASSWORD` - CHANGED_PASSWORD - * * `RESET_PASSWORD` - RESET_PASSWORD - * * `ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION` - ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - * * `ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT` - ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - * * `DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION` - DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - * * `DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT` - DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - * * `CREATED_INTEGRATION_WIDE_FIELD_MAPPING` - CREATED_INTEGRATION_WIDE_FIELD_MAPPING - * * `CREATED_LINKED_ACCOUNT_FIELD_MAPPING` - CREATED_LINKED_ACCOUNT_FIELD_MAPPING - * * `CHANGED_INTEGRATION_WIDE_FIELD_MAPPING` - CHANGED_INTEGRATION_WIDE_FIELD_MAPPING - * * `CHANGED_LINKED_ACCOUNT_FIELD_MAPPING` - CHANGED_LINKED_ACCOUNT_FIELD_MAPPING - * * `DELETED_INTEGRATION_WIDE_FIELD_MAPPING` - DELETED_INTEGRATION_WIDE_FIELD_MAPPING - * * `DELETED_LINKED_ACCOUNT_FIELD_MAPPING` - DELETED_LINKED_ACCOUNT_FIELD_MAPPING - * * `CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `FORCED_LINKED_ACCOUNT_RESYNC` - FORCED_LINKED_ACCOUNT_RESYNC - * * `MUTED_ISSUE` - MUTED_ISSUE - * * `GENERATED_MAGIC_LINK` - GENERATED_MAGIC_LINK - * * `ENABLED_MERGE_WEBHOOK` - ENABLED_MERGE_WEBHOOK - * * `DISABLED_MERGE_WEBHOOK` - DISABLED_MERGE_WEBHOOK - * * `MERGE_WEBHOOK_TARGET_CHANGED` - MERGE_WEBHOOK_TARGET_CHANGED - * * `END_USER_CREDENTIALS_ACCESSED` - END_USER_CREDENTIALS_ACCESSED

    Designates the type of event that occurred.

    + *

    Designates the type of event that occurred.

    + *
      + *
    • CREATED_REMOTE_PRODUCTION_API_KEY - CREATED_REMOTE_PRODUCTION_API_KEY
      • + *
    • DELETED_REMOTE_PRODUCTION_API_KEY - DELETED_REMOTE_PRODUCTION_API_KEY
      • + *
    • CREATED_TEST_API_KEY - CREATED_TEST_API_KEY
      • + *
    • DELETED_TEST_API_KEY - DELETED_TEST_API_KEY
      • + *
    • REGENERATED_PRODUCTION_API_KEY - REGENERATED_PRODUCTION_API_KEY
      • + *
    • REGENERATED_WEBHOOK_SIGNATURE - REGENERATED_WEBHOOK_SIGNATURE
      • + *
    • INVITED_USER - INVITED_USER
      • + *
    • TWO_FACTOR_AUTH_ENABLED - TWO_FACTOR_AUTH_ENABLED
      • + *
    • TWO_FACTOR_AUTH_DISABLED - TWO_FACTOR_AUTH_DISABLED
      • + *
    • DELETED_LINKED_ACCOUNT - DELETED_LINKED_ACCOUNT
      • + *
    • DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT - DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT
      • + *
    • CREATED_DESTINATION - CREATED_DESTINATION
      • + *
    • DELETED_DESTINATION - DELETED_DESTINATION
      • + *
    • CHANGED_DESTINATION - CHANGED_DESTINATION
      • + *
    • CHANGED_SCOPES - CHANGED_SCOPES
      • + *
    • CHANGED_PERSONAL_INFORMATION - CHANGED_PERSONAL_INFORMATION
      • + *
    • CHANGED_ORGANIZATION_SETTINGS - CHANGED_ORGANIZATION_SETTINGS
      • + *
    • ENABLED_INTEGRATION - ENABLED_INTEGRATION
      • + *
    • DISABLED_INTEGRATION - DISABLED_INTEGRATION
      • + *
    • ENABLED_CATEGORY - ENABLED_CATEGORY
      • + *
    • DISABLED_CATEGORY - DISABLED_CATEGORY
      • + *
    • CHANGED_PASSWORD - CHANGED_PASSWORD
      • + *
    • RESET_PASSWORD - RESET_PASSWORD
      • + *
    • ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION
      • + *
    • ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT
      • + *
    • DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION
      • + *
    • DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT
      • + *
    • CREATED_INTEGRATION_WIDE_FIELD_MAPPING - CREATED_INTEGRATION_WIDE_FIELD_MAPPING
      • + *
    • CREATED_LINKED_ACCOUNT_FIELD_MAPPING - CREATED_LINKED_ACCOUNT_FIELD_MAPPING
      • + *
    • CHANGED_INTEGRATION_WIDE_FIELD_MAPPING - CHANGED_INTEGRATION_WIDE_FIELD_MAPPING
      • + *
    • CHANGED_LINKED_ACCOUNT_FIELD_MAPPING - CHANGED_LINKED_ACCOUNT_FIELD_MAPPING
      • + *
    • DELETED_INTEGRATION_WIDE_FIELD_MAPPING - DELETED_INTEGRATION_WIDE_FIELD_MAPPING
      • + *
    • DELETED_LINKED_ACCOUNT_FIELD_MAPPING - DELETED_LINKED_ACCOUNT_FIELD_MAPPING
      • + *
    • CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
      • + *
    • CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
      • + *
    • DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
      • + *
    • FORCED_LINKED_ACCOUNT_RESYNC - FORCED_LINKED_ACCOUNT_RESYNC
      • + *
    • MUTED_ISSUE - MUTED_ISSUE
      • + *
    • GENERATED_MAGIC_LINK - GENERATED_MAGIC_LINK
      • + *
    • ENABLED_MERGE_WEBHOOK - ENABLED_MERGE_WEBHOOK
      • + *
    • DISABLED_MERGE_WEBHOOK - DISABLED_MERGE_WEBHOOK
      • + *
    • MERGE_WEBHOOK_TARGET_CHANGED - MERGE_WEBHOOK_TARGET_CHANGED
      • + *
    • END_USER_CREDENTIALS_ACCESSED - END_USER_CREDENTIALS_ACCESSED
      • + *
    + *

    Designates the type of event that occurred.

    *
      *
    • CREATED_REMOTE_PRODUCTION_API_KEY - CREATED_REMOTE_PRODUCTION_API_KEY
      • *
    • DELETED_REMOTE_PRODUCTION_API_KEY - DELETED_REMOTE_PRODUCTION_API_KEY
      • diff --git a/src/main/java/com/merge/api/accounting/types/AuditLogEventEventType.java b/src/main/java/com/merge/api/accounting/types/AuditLogEventEventType.java index ed6a68248..1d9e119ca 100644 --- a/src/main/java/com/merge/api/accounting/types/AuditLogEventEventType.java +++ b/src/main/java/com/merge/api/accounting/types/AuditLogEventEventType.java @@ -83,11 +83,11 @@ public AuditLogEventEventType deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, EventTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/AuditLogEventRole.java b/src/main/java/com/merge/api/accounting/types/AuditLogEventRole.java index 4add81b3b..d8c3db1e5 100644 --- a/src/main/java/com/merge/api/accounting/types/AuditLogEventRole.java +++ b/src/main/java/com/merge/api/accounting/types/AuditLogEventRole.java @@ -83,11 +83,11 @@ public AuditLogEventRole deserialize(JsonParser p, DeserializationContext contex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RoleEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/BalanceSheetCompany.java b/src/main/java/com/merge/api/accounting/types/BalanceSheetCompany.java index 348cfec5b..6d61db45e 100644 --- a/src/main/java/com/merge/api/accounting/types/BalanceSheetCompany.java +++ b/src/main/java/com/merge/api/accounting/types/BalanceSheetCompany.java @@ -83,11 +83,11 @@ public BalanceSheetCompany deserialize(JsonParser p, DeserializationContext cont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CompanyInfo.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/BalanceSheetCurrency.java b/src/main/java/com/merge/api/accounting/types/BalanceSheetCurrency.java index 727c4e2b8..b0787aa06 100644 --- a/src/main/java/com/merge/api/accounting/types/BalanceSheetCurrency.java +++ b/src/main/java/com/merge/api/accounting/types/BalanceSheetCurrency.java @@ -83,11 +83,11 @@ public BalanceSheetCurrency deserialize(JsonParser p, DeserializationContext con Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TransactionCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/BankFeedAccountAccountType.java b/src/main/java/com/merge/api/accounting/types/BankFeedAccountAccountType.java index 13c9c824b..57c0414b3 100644 --- a/src/main/java/com/merge/api/accounting/types/BankFeedAccountAccountType.java +++ b/src/main/java/com/merge/api/accounting/types/BankFeedAccountAccountType.java @@ -83,11 +83,11 @@ public BankFeedAccountAccountType deserialize(JsonParser p, DeserializationConte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, BankFeedAccountAccountTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/BankFeedAccountCurrency.java b/src/main/java/com/merge/api/accounting/types/BankFeedAccountCurrency.java index 06eccc94a..45e754c33 100644 --- a/src/main/java/com/merge/api/accounting/types/BankFeedAccountCurrency.java +++ b/src/main/java/com/merge/api/accounting/types/BankFeedAccountCurrency.java @@ -83,11 +83,11 @@ public BankFeedAccountCurrency deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TransactionCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/BankFeedAccountFeedStatus.java b/src/main/java/com/merge/api/accounting/types/BankFeedAccountFeedStatus.java index 4a129e41e..5103bd172 100644 --- a/src/main/java/com/merge/api/accounting/types/BankFeedAccountFeedStatus.java +++ b/src/main/java/com/merge/api/accounting/types/BankFeedAccountFeedStatus.java @@ -83,11 +83,11 @@ public BankFeedAccountFeedStatus deserialize(JsonParser p, DeserializationContex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, FeedStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/BankFeedAccountRequestAccountType.java b/src/main/java/com/merge/api/accounting/types/BankFeedAccountRequestAccountType.java index d3d731e83..34763f5d6 100644 --- a/src/main/java/com/merge/api/accounting/types/BankFeedAccountRequestAccountType.java +++ b/src/main/java/com/merge/api/accounting/types/BankFeedAccountRequestAccountType.java @@ -84,11 +84,11 @@ public BankFeedAccountRequestAccountType deserialize(JsonParser p, Deserializati Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, BankFeedAccountAccountTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/BankFeedAccountRequestCurrency.java b/src/main/java/com/merge/api/accounting/types/BankFeedAccountRequestCurrency.java index 10e350bb1..1dadfd734 100644 --- a/src/main/java/com/merge/api/accounting/types/BankFeedAccountRequestCurrency.java +++ b/src/main/java/com/merge/api/accounting/types/BankFeedAccountRequestCurrency.java @@ -84,11 +84,11 @@ public BankFeedAccountRequestCurrency deserialize(JsonParser p, DeserializationC Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TransactionCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/BankFeedAccountRequestFeedStatus.java b/src/main/java/com/merge/api/accounting/types/BankFeedAccountRequestFeedStatus.java index 16fa95c8c..8a82cf935 100644 --- a/src/main/java/com/merge/api/accounting/types/BankFeedAccountRequestFeedStatus.java +++ b/src/main/java/com/merge/api/accounting/types/BankFeedAccountRequestFeedStatus.java @@ -84,11 +84,11 @@ public BankFeedAccountRequestFeedStatus deserialize(JsonParser p, Deserializatio Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, FeedStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/BankFeedAccountResponse.java b/src/main/java/com/merge/api/accounting/types/BankFeedAccountResponse.java index 82fb8ad13..691415831 100644 --- a/src/main/java/com/merge/api/accounting/types/BankFeedAccountResponse.java +++ b/src/main/java/com/merge/api/accounting/types/BankFeedAccountResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/accounting/types/BankFeedTransactionBankFeedAccount.java b/src/main/java/com/merge/api/accounting/types/BankFeedTransactionBankFeedAccount.java index 6183f3354..b8640d3d0 100644 --- a/src/main/java/com/merge/api/accounting/types/BankFeedTransactionBankFeedAccount.java +++ b/src/main/java/com/merge/api/accounting/types/BankFeedTransactionBankFeedAccount.java @@ -85,11 +85,11 @@ public BankFeedTransactionBankFeedAccount deserialize(JsonParser p, Deserializat Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, BankFeedAccount.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/BankFeedTransactionCreditOrDebit.java b/src/main/java/com/merge/api/accounting/types/BankFeedTransactionCreditOrDebit.java index bc644dfd7..f87b992b3 100644 --- a/src/main/java/com/merge/api/accounting/types/BankFeedTransactionCreditOrDebit.java +++ b/src/main/java/com/merge/api/accounting/types/BankFeedTransactionCreditOrDebit.java @@ -84,11 +84,11 @@ public BankFeedTransactionCreditOrDebit deserialize(JsonParser p, Deserializatio Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CreditOrDebitEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/BankFeedTransactionRequestRequestBankFeedAccount.java b/src/main/java/com/merge/api/accounting/types/BankFeedTransactionRequestRequestBankFeedAccount.java index 0f18ad810..6a00b0ebf 100644 --- a/src/main/java/com/merge/api/accounting/types/BankFeedTransactionRequestRequestBankFeedAccount.java +++ b/src/main/java/com/merge/api/accounting/types/BankFeedTransactionRequestRequestBankFeedAccount.java @@ -85,11 +85,11 @@ public BankFeedTransactionRequestRequestBankFeedAccount deserialize( Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, BankFeedAccount.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/BankFeedTransactionRequestRequestCreditOrDebit.java b/src/main/java/com/merge/api/accounting/types/BankFeedTransactionRequestRequestCreditOrDebit.java index 5754b5530..c2ead3835 100644 --- a/src/main/java/com/merge/api/accounting/types/BankFeedTransactionRequestRequestCreditOrDebit.java +++ b/src/main/java/com/merge/api/accounting/types/BankFeedTransactionRequestRequestCreditOrDebit.java @@ -85,11 +85,11 @@ public BankFeedTransactionRequestRequestCreditOrDebit deserialize(JsonParser p, Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CreditOrDebitEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/BankFeedTransactionResponse.java b/src/main/java/com/merge/api/accounting/types/BankFeedTransactionResponse.java index 32ad25cab..4a95cb193 100644 --- a/src/main/java/com/merge/api/accounting/types/BankFeedTransactionResponse.java +++ b/src/main/java/com/merge/api/accounting/types/BankFeedTransactionResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/accounting/types/CashFlowStatementCompany.java b/src/main/java/com/merge/api/accounting/types/CashFlowStatementCompany.java index 2fd3fc061..1134eb2eb 100644 --- a/src/main/java/com/merge/api/accounting/types/CashFlowStatementCompany.java +++ b/src/main/java/com/merge/api/accounting/types/CashFlowStatementCompany.java @@ -83,11 +83,11 @@ public CashFlowStatementCompany deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CompanyInfo.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/CashFlowStatementCurrency.java b/src/main/java/com/merge/api/accounting/types/CashFlowStatementCurrency.java index 579a6fd8b..48caa9477 100644 --- a/src/main/java/com/merge/api/accounting/types/CashFlowStatementCurrency.java +++ b/src/main/java/com/merge/api/accounting/types/CashFlowStatementCurrency.java @@ -83,11 +83,11 @@ public CashFlowStatementCurrency deserialize(JsonParser p, DeserializationContex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TransactionCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/CommonModelScopeApi.java b/src/main/java/com/merge/api/accounting/types/CommonModelScopeApi.java index b4fbbc954..41637940b 100644 --- a/src/main/java/com/merge/api/accounting/types/CommonModelScopeApi.java +++ b/src/main/java/com/merge/api/accounting/types/CommonModelScopeApi.java @@ -98,7 +98,9 @@ public Builder addCommonModels(IndividualCommonModelScopeDeserializer commonMode } public Builder addAllCommonModels(List commonModels) { - this.commonModels.addAll(commonModels); + if (commonModels != null) { + this.commonModels.addAll(commonModels); + } return this; } diff --git a/src/main/java/com/merge/api/accounting/types/CommonModelScopesBodyRequest.java b/src/main/java/com/merge/api/accounting/types/CommonModelScopesBodyRequest.java index deace2ea7..372d68e78 100644 --- a/src/main/java/com/merge/api/accounting/types/CommonModelScopesBodyRequest.java +++ b/src/main/java/com/merge/api/accounting/types/CommonModelScopesBodyRequest.java @@ -139,7 +139,9 @@ public _FinalStage modelId(@NotNull String modelId) { @java.lang.Override public _FinalStage addAllDisabledFields(List disabledFields) { - this.disabledFields.addAll(disabledFields); + if (disabledFields != null) { + this.disabledFields.addAll(disabledFields); + } return this; } @@ -159,7 +161,9 @@ public _FinalStage disabledFields(List disabledFields) { @java.lang.Override public _FinalStage addAllEnabledActions(List enabledActions) { - this.enabledActions.addAll(enabledActions); + if (enabledActions != null) { + this.enabledActions.addAll(enabledActions); + } return this; } diff --git a/src/main/java/com/merge/api/accounting/types/ContactAddressesItem.java b/src/main/java/com/merge/api/accounting/types/ContactAddressesItem.java index e3caa27ed..090381ad3 100644 --- a/src/main/java/com/merge/api/accounting/types/ContactAddressesItem.java +++ b/src/main/java/com/merge/api/accounting/types/ContactAddressesItem.java @@ -83,11 +83,11 @@ public ContactAddressesItem deserialize(JsonParser p, DeserializationContext con Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Address.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ContactRequestAddressesItem.java b/src/main/java/com/merge/api/accounting/types/ContactRequestAddressesItem.java index 0e600d44d..b3a19ed8a 100644 --- a/src/main/java/com/merge/api/accounting/types/ContactRequestAddressesItem.java +++ b/src/main/java/com/merge/api/accounting/types/ContactRequestAddressesItem.java @@ -84,11 +84,11 @@ public ContactRequestAddressesItem deserialize(JsonParser p, DeserializationCont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Address.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ContactRequestStatus.java b/src/main/java/com/merge/api/accounting/types/ContactRequestStatus.java index 09b599023..c923a86d6 100644 --- a/src/main/java/com/merge/api/accounting/types/ContactRequestStatus.java +++ b/src/main/java/com/merge/api/accounting/types/ContactRequestStatus.java @@ -83,11 +83,11 @@ public ContactRequestStatus deserialize(JsonParser p, DeserializationContext con Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Status7D1Enum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ContactResponse.java b/src/main/java/com/merge/api/accounting/types/ContactResponse.java index afddf2028..5510958f4 100644 --- a/src/main/java/com/merge/api/accounting/types/ContactResponse.java +++ b/src/main/java/com/merge/api/accounting/types/ContactResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/accounting/types/ContactStatus.java b/src/main/java/com/merge/api/accounting/types/ContactStatus.java index 86ac199eb..ae527e5c9 100644 --- a/src/main/java/com/merge/api/accounting/types/ContactStatus.java +++ b/src/main/java/com/merge/api/accounting/types/ContactStatus.java @@ -83,11 +83,11 @@ public ContactStatus deserialize(JsonParser p, DeserializationContext context) t Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Status7D1Enum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/CreateFieldMappingRequest.java b/src/main/java/com/merge/api/accounting/types/CreateFieldMappingRequest.java index 9d2fe8d59..6be7c0c55 100644 --- a/src/main/java/com/merge/api/accounting/types/CreateFieldMappingRequest.java +++ b/src/main/java/com/merge/api/accounting/types/CreateFieldMappingRequest.java @@ -159,7 +159,7 @@ public static TargetFieldNameStage builder() { public interface TargetFieldNameStage { /** - * The name of the target field you want this remote field to map to. + *

      The name of the target field you want this remote field to map to.

      */ TargetFieldDescriptionStage targetFieldName(@NotNull String targetFieldName); @@ -168,28 +168,28 @@ public interface TargetFieldNameStage { public interface TargetFieldDescriptionStage { /** - * The description of the target field you want this remote field to map to. + *

      The description of the target field you want this remote field to map to.

      */ RemoteMethodStage targetFieldDescription(@NotNull String targetFieldDescription); } public interface RemoteMethodStage { /** - * The method of the remote endpoint where the remote field is coming from. + *

      The method of the remote endpoint where the remote field is coming from.

      */ RemoteUrlPathStage remoteMethod(@NotNull String remoteMethod); } public interface RemoteUrlPathStage { /** - * The path of the remote endpoint where the remote field is coming from. + *

      The path of the remote endpoint where the remote field is coming from.

      */ CommonModelNameStage remoteUrlPath(@NotNull String remoteUrlPath); } public interface CommonModelNameStage { /** - * The name of the Common Model that the remote field corresponds to in a given category. + *

      The name of the Common Model that the remote field corresponds to in a given category.

      */ _FinalStage commonModelName(@NotNull String commonModelName); } @@ -254,7 +254,8 @@ public Builder from(CreateFieldMappingRequest other) { } /** - * The name of the target field you want this remote field to map to.

      The name of the target field you want this remote field to map to.

      + *

      The name of the target field you want this remote field to map to.

      + *

      The name of the target field you want this remote field to map to.

      * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -265,7 +266,8 @@ public TargetFieldDescriptionStage targetFieldName(@NotNull String targetFieldNa } /** - * The description of the target field you want this remote field to map to.

      The description of the target field you want this remote field to map to.

      + *

      The description of the target field you want this remote field to map to.

      + *

      The description of the target field you want this remote field to map to.

      * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -276,7 +278,8 @@ public RemoteMethodStage targetFieldDescription(@NotNull String targetFieldDescr } /** - * The method of the remote endpoint where the remote field is coming from.

      The method of the remote endpoint where the remote field is coming from.

      + *

      The method of the remote endpoint where the remote field is coming from.

      + *

      The method of the remote endpoint where the remote field is coming from.

      * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -287,7 +290,8 @@ public RemoteUrlPathStage remoteMethod(@NotNull String remoteMethod) { } /** - * The path of the remote endpoint where the remote field is coming from.

      The path of the remote endpoint where the remote field is coming from.

      + *

      The path of the remote endpoint where the remote field is coming from.

      + *

      The path of the remote endpoint where the remote field is coming from.

      * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -298,7 +302,8 @@ public CommonModelNameStage remoteUrlPath(@NotNull String remoteUrlPath) { } /** - * The name of the Common Model that the remote field corresponds to in a given category.

      The name of the Common Model that the remote field corresponds to in a given category.

      + *

      The name of the Common Model that the remote field corresponds to in a given category.

      + *

      The name of the Common Model that the remote field corresponds to in a given category.

      * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -314,7 +319,9 @@ public _FinalStage commonModelName(@NotNull String commonModelName) { */ @java.lang.Override public _FinalStage addAllRemoteFieldTraversalPath(List remoteFieldTraversalPath) { - this.remoteFieldTraversalPath.addAll(remoteFieldTraversalPath); + if (remoteFieldTraversalPath != null) { + this.remoteFieldTraversalPath.addAll(remoteFieldTraversalPath); + } return this; } diff --git a/src/main/java/com/merge/api/accounting/types/CreditNoteAccountingPeriod.java b/src/main/java/com/merge/api/accounting/types/CreditNoteAccountingPeriod.java index 9513abe54..2fdb397a4 100644 --- a/src/main/java/com/merge/api/accounting/types/CreditNoteAccountingPeriod.java +++ b/src/main/java/com/merge/api/accounting/types/CreditNoteAccountingPeriod.java @@ -83,11 +83,11 @@ public CreditNoteAccountingPeriod deserialize(JsonParser p, DeserializationConte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AccountingPeriod.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/CreditNoteAppliedPaymentsItem.java b/src/main/java/com/merge/api/accounting/types/CreditNoteAppliedPaymentsItem.java index ccd37821f..0b0a59fdd 100644 --- a/src/main/java/com/merge/api/accounting/types/CreditNoteAppliedPaymentsItem.java +++ b/src/main/java/com/merge/api/accounting/types/CreditNoteAppliedPaymentsItem.java @@ -84,11 +84,11 @@ public CreditNoteAppliedPaymentsItem deserialize(JsonParser p, DeserializationCo Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PaymentLineItem.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/CreditNoteApplyLineForCreditNoteInvoice.java b/src/main/java/com/merge/api/accounting/types/CreditNoteApplyLineForCreditNoteInvoice.java index 0d90feb4d..092c59dcf 100644 --- a/src/main/java/com/merge/api/accounting/types/CreditNoteApplyLineForCreditNoteInvoice.java +++ b/src/main/java/com/merge/api/accounting/types/CreditNoteApplyLineForCreditNoteInvoice.java @@ -85,11 +85,11 @@ public CreditNoteApplyLineForCreditNoteInvoice deserialize(JsonParser p, Deseria Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Invoice.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/CreditNoteApplyLineForCreditNoteRequestInvoice.java b/src/main/java/com/merge/api/accounting/types/CreditNoteApplyLineForCreditNoteRequestInvoice.java index 795fd151b..6bcb9b521 100644 --- a/src/main/java/com/merge/api/accounting/types/CreditNoteApplyLineForCreditNoteRequestInvoice.java +++ b/src/main/java/com/merge/api/accounting/types/CreditNoteApplyLineForCreditNoteRequestInvoice.java @@ -85,11 +85,11 @@ public CreditNoteApplyLineForCreditNoteRequestInvoice deserialize(JsonParser p, Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Invoice.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/CreditNoteApplyLineForInvoiceCreditNote.java b/src/main/java/com/merge/api/accounting/types/CreditNoteApplyLineForInvoiceCreditNote.java index 6c02312b9..aedb7beb9 100644 --- a/src/main/java/com/merge/api/accounting/types/CreditNoteApplyLineForInvoiceCreditNote.java +++ b/src/main/java/com/merge/api/accounting/types/CreditNoteApplyLineForInvoiceCreditNote.java @@ -85,11 +85,11 @@ public CreditNoteApplyLineForInvoiceCreditNote deserialize(JsonParser p, Deseria Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CreditNote.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/CreditNoteCompany.java b/src/main/java/com/merge/api/accounting/types/CreditNoteCompany.java index eed7047a2..c5d1fa650 100644 --- a/src/main/java/com/merge/api/accounting/types/CreditNoteCompany.java +++ b/src/main/java/com/merge/api/accounting/types/CreditNoteCompany.java @@ -83,11 +83,11 @@ public CreditNoteCompany deserialize(JsonParser p, DeserializationContext contex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CompanyInfo.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/CreditNoteContact.java b/src/main/java/com/merge/api/accounting/types/CreditNoteContact.java index 0f278d5d0..a0663acdb 100644 --- a/src/main/java/com/merge/api/accounting/types/CreditNoteContact.java +++ b/src/main/java/com/merge/api/accounting/types/CreditNoteContact.java @@ -83,11 +83,11 @@ public CreditNoteContact deserialize(JsonParser p, DeserializationContext contex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/CreditNoteCurrency.java b/src/main/java/com/merge/api/accounting/types/CreditNoteCurrency.java index 11ad73567..eda2f989c 100644 --- a/src/main/java/com/merge/api/accounting/types/CreditNoteCurrency.java +++ b/src/main/java/com/merge/api/accounting/types/CreditNoteCurrency.java @@ -83,11 +83,11 @@ public CreditNoteCurrency deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TransactionCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemCompany.java b/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemCompany.java index 9a9945efe..fc90caffa 100644 --- a/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemCompany.java +++ b/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemCompany.java @@ -83,11 +83,11 @@ public CreditNoteLineItemCompany deserialize(JsonParser p, DeserializationContex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CompanyInfo.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemContact.java b/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemContact.java index c844a4745..f5eb36908 100644 --- a/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemContact.java +++ b/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemContact.java @@ -83,11 +83,11 @@ public CreditNoteLineItemContact deserialize(JsonParser p, DeserializationContex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemItem.java b/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemItem.java index 8d69c6872..e2b952094 100644 --- a/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemItem.java +++ b/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemItem.java @@ -83,11 +83,11 @@ public CreditNoteLineItemItem deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Item.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemProject.java b/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemProject.java index fe0ddeb6b..0b0a4ceb5 100644 --- a/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemProject.java +++ b/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemProject.java @@ -83,11 +83,11 @@ public CreditNoteLineItemProject deserialize(JsonParser p, DeserializationContex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Project.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemRequestCompany.java b/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemRequestCompany.java index 1ef25e3e7..0d13e2d7c 100644 --- a/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemRequestCompany.java +++ b/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemRequestCompany.java @@ -84,11 +84,11 @@ public CreditNoteLineItemRequestCompany deserialize(JsonParser p, Deserializatio Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CompanyInfo.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemRequestContact.java b/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemRequestContact.java index a7b5f9a97..7c803db8e 100644 --- a/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemRequestContact.java +++ b/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemRequestContact.java @@ -84,11 +84,11 @@ public CreditNoteLineItemRequestContact deserialize(JsonParser p, Deserializatio Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemRequestItem.java b/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemRequestItem.java index c274b5e9a..03b9b8e1a 100644 --- a/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemRequestItem.java +++ b/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemRequestItem.java @@ -84,11 +84,11 @@ public CreditNoteLineItemRequestItem deserialize(JsonParser p, DeserializationCo Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Item.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemRequestProject.java b/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemRequestProject.java index ff50af455..0bc89d586 100644 --- a/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemRequestProject.java +++ b/src/main/java/com/merge/api/accounting/types/CreditNoteLineItemRequestProject.java @@ -84,11 +84,11 @@ public CreditNoteLineItemRequestProject deserialize(JsonParser p, Deserializatio Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Project.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/CreditNotePaymentsItem.java b/src/main/java/com/merge/api/accounting/types/CreditNotePaymentsItem.java index fe03de3b5..46db95fed 100644 --- a/src/main/java/com/merge/api/accounting/types/CreditNotePaymentsItem.java +++ b/src/main/java/com/merge/api/accounting/types/CreditNotePaymentsItem.java @@ -83,11 +83,11 @@ public CreditNotePaymentsItem deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Payment.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/CreditNoteRequestAccountingPeriod.java b/src/main/java/com/merge/api/accounting/types/CreditNoteRequestAccountingPeriod.java index b1ab71bd2..f34c76b08 100644 --- a/src/main/java/com/merge/api/accounting/types/CreditNoteRequestAccountingPeriod.java +++ b/src/main/java/com/merge/api/accounting/types/CreditNoteRequestAccountingPeriod.java @@ -84,11 +84,11 @@ public CreditNoteRequestAccountingPeriod deserialize(JsonParser p, Deserializati Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AccountingPeriod.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/CreditNoteRequestAppliedPaymentsItem.java b/src/main/java/com/merge/api/accounting/types/CreditNoteRequestAppliedPaymentsItem.java index 04aecc876..6686a70d5 100644 --- a/src/main/java/com/merge/api/accounting/types/CreditNoteRequestAppliedPaymentsItem.java +++ b/src/main/java/com/merge/api/accounting/types/CreditNoteRequestAppliedPaymentsItem.java @@ -85,11 +85,11 @@ public CreditNoteRequestAppliedPaymentsItem deserialize(JsonParser p, Deserializ Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PaymentLineItem.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/CreditNoteRequestCompany.java b/src/main/java/com/merge/api/accounting/types/CreditNoteRequestCompany.java index decc04e52..7956ee4c2 100644 --- a/src/main/java/com/merge/api/accounting/types/CreditNoteRequestCompany.java +++ b/src/main/java/com/merge/api/accounting/types/CreditNoteRequestCompany.java @@ -83,11 +83,11 @@ public CreditNoteRequestCompany deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CompanyInfo.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/CreditNoteRequestContact.java b/src/main/java/com/merge/api/accounting/types/CreditNoteRequestContact.java index 5e00cd8a7..35549e5cc 100644 --- a/src/main/java/com/merge/api/accounting/types/CreditNoteRequestContact.java +++ b/src/main/java/com/merge/api/accounting/types/CreditNoteRequestContact.java @@ -83,11 +83,11 @@ public CreditNoteRequestContact deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/CreditNoteRequestCurrency.java b/src/main/java/com/merge/api/accounting/types/CreditNoteRequestCurrency.java index 742cdb9e0..697891f5a 100644 --- a/src/main/java/com/merge/api/accounting/types/CreditNoteRequestCurrency.java +++ b/src/main/java/com/merge/api/accounting/types/CreditNoteRequestCurrency.java @@ -83,11 +83,11 @@ public CreditNoteRequestCurrency deserialize(JsonParser p, DeserializationContex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TransactionCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/CreditNoteRequestLineItemsItem.java b/src/main/java/com/merge/api/accounting/types/CreditNoteRequestLineItemsItem.java index 8fc78aab0..3da640257 100644 --- a/src/main/java/com/merge/api/accounting/types/CreditNoteRequestLineItemsItem.java +++ b/src/main/java/com/merge/api/accounting/types/CreditNoteRequestLineItemsItem.java @@ -84,11 +84,11 @@ public CreditNoteRequestLineItemsItem deserialize(JsonParser p, DeserializationC Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CreditNoteLineItemRequest.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/CreditNoteRequestPaymentsItem.java b/src/main/java/com/merge/api/accounting/types/CreditNoteRequestPaymentsItem.java index 51a5162e8..0b545fe8f 100644 --- a/src/main/java/com/merge/api/accounting/types/CreditNoteRequestPaymentsItem.java +++ b/src/main/java/com/merge/api/accounting/types/CreditNoteRequestPaymentsItem.java @@ -84,11 +84,11 @@ public CreditNoteRequestPaymentsItem deserialize(JsonParser p, DeserializationCo Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Payment.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/CreditNoteRequestStatus.java b/src/main/java/com/merge/api/accounting/types/CreditNoteRequestStatus.java index 66b7063ef..55bbec023 100644 --- a/src/main/java/com/merge/api/accounting/types/CreditNoteRequestStatus.java +++ b/src/main/java/com/merge/api/accounting/types/CreditNoteRequestStatus.java @@ -83,11 +83,11 @@ public CreditNoteRequestStatus deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CreditNoteStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/CreditNoteRequestTrackingCategoriesItem.java b/src/main/java/com/merge/api/accounting/types/CreditNoteRequestTrackingCategoriesItem.java index 636932054..a52d6945e 100644 --- a/src/main/java/com/merge/api/accounting/types/CreditNoteRequestTrackingCategoriesItem.java +++ b/src/main/java/com/merge/api/accounting/types/CreditNoteRequestTrackingCategoriesItem.java @@ -85,11 +85,11 @@ public CreditNoteRequestTrackingCategoriesItem deserialize(JsonParser p, Deseria Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TrackingCategory.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/CreditNoteResponse.java b/src/main/java/com/merge/api/accounting/types/CreditNoteResponse.java index f4e569805..1cce465db 100644 --- a/src/main/java/com/merge/api/accounting/types/CreditNoteResponse.java +++ b/src/main/java/com/merge/api/accounting/types/CreditNoteResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/accounting/types/CreditNoteStatus.java b/src/main/java/com/merge/api/accounting/types/CreditNoteStatus.java index 3eabf72f7..5639094e0 100644 --- a/src/main/java/com/merge/api/accounting/types/CreditNoteStatus.java +++ b/src/main/java/com/merge/api/accounting/types/CreditNoteStatus.java @@ -83,11 +83,11 @@ public CreditNoteStatus deserialize(JsonParser p, DeserializationContext context Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CreditNoteStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/CreditNoteTrackingCategoriesItem.java b/src/main/java/com/merge/api/accounting/types/CreditNoteTrackingCategoriesItem.java index 6a80deb32..6107b2eb2 100644 --- a/src/main/java/com/merge/api/accounting/types/CreditNoteTrackingCategoriesItem.java +++ b/src/main/java/com/merge/api/accounting/types/CreditNoteTrackingCategoriesItem.java @@ -84,11 +84,11 @@ public CreditNoteTrackingCategoriesItem deserialize(JsonParser p, Deserializatio Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TrackingCategory.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/DataPassthroughRequest.java b/src/main/java/com/merge/api/accounting/types/DataPassthroughRequest.java index 29af16a0e..4f79e923c 100644 --- a/src/main/java/com/merge/api/accounting/types/DataPassthroughRequest.java +++ b/src/main/java/com/merge/api/accounting/types/DataPassthroughRequest.java @@ -172,7 +172,7 @@ public interface MethodStage { public interface PathStage { /** - * The path of the request in the third party's platform. + *

      The path of the request in the third party's platform.

      */ _FinalStage path(@NotNull String path); } @@ -264,7 +264,8 @@ public PathStage method(@NotNull MethodEnum method) { } /** - * The path of the request in the third party's platform.

      The path of the request in the third party's platform.

      + *

      The path of the request in the third party's platform.

      + *

      The path of the request in the third party's platform.

      * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/accounting/types/Employee.java b/src/main/java/com/merge/api/accounting/types/Employee.java index 2580563fa..f656241dd 100644 --- a/src/main/java/com/merge/api/accounting/types/Employee.java +++ b/src/main/java/com/merge/api/accounting/types/Employee.java @@ -252,10 +252,11 @@ public static StatusStage builder() { public interface StatusStage { /** - * The employee's status in the accounting system. - * - * * `ACTIVE` - ACTIVE - * * `INACTIVE` - INACTIVE + *

      The employee's status in the accounting system.

      + *
        + *
      • ACTIVE - ACTIVE
        • + *
      • INACTIVE - INACTIVE
        • + *
      */ _FinalStage status(@NotNull EmployeeStatus status); @@ -403,10 +404,12 @@ public Builder from(Employee other) { } /** - * The employee's status in the accounting system. - * - * * `ACTIVE` - ACTIVE - * * `INACTIVE` - INACTIVE

      The employee's status in the accounting system.

      + *

      The employee's status in the accounting system.

      + *
        + *
      • ACTIVE - ACTIVE
        • + *
      • INACTIVE - INACTIVE
        • + *
      + *

      The employee's status in the accounting system.

      *
        *
      • ACTIVE - ACTIVE
        • *
      • INACTIVE - INACTIVE
        • diff --git a/src/main/java/com/merge/api/accounting/types/EmployeeCompany.java b/src/main/java/com/merge/api/accounting/types/EmployeeCompany.java index ecff2db05..4b623050c 100644 --- a/src/main/java/com/merge/api/accounting/types/EmployeeCompany.java +++ b/src/main/java/com/merge/api/accounting/types/EmployeeCompany.java @@ -83,11 +83,11 @@ public EmployeeCompany deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CompanyInfo.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/EmployeeStatus.java b/src/main/java/com/merge/api/accounting/types/EmployeeStatus.java index f8f5101a3..32efcab98 100644 --- a/src/main/java/com/merge/api/accounting/types/EmployeeStatus.java +++ b/src/main/java/com/merge/api/accounting/types/EmployeeStatus.java @@ -83,11 +83,11 @@ public EmployeeStatus deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Status895Enum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/EndUserDetailsRequest.java b/src/main/java/com/merge/api/accounting/types/EndUserDetailsRequest.java index 6a9cce703..4f0d83e13 100644 --- a/src/main/java/com/merge/api/accounting/types/EndUserDetailsRequest.java +++ b/src/main/java/com/merge/api/accounting/types/EndUserDetailsRequest.java @@ -250,7 +250,7 @@ public static EndUserEmailAddressStage builder() { public interface EndUserEmailAddressStage { /** - * Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent. + *

        Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.

        */ EndUserOrganizationNameStage endUserEmailAddress(@NotNull String endUserEmailAddress); @@ -259,14 +259,14 @@ public interface EndUserEmailAddressStage { public interface EndUserOrganizationNameStage { /** - * Your end user's organization. + *

        Your end user's organization.

        */ EndUserOriginIdStage endUserOrganizationName(@NotNull String endUserOrganizationName); } public interface EndUserOriginIdStage { /** - * This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers. + *

        This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.

        */ _FinalStage endUserOriginId(@NotNull String endUserOriginId); } @@ -408,7 +408,8 @@ public Builder from(EndUserDetailsRequest other) { } /** - * Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.

        Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.

        + *

        Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.

        + *

        Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.

        * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -419,7 +420,8 @@ public EndUserOrganizationNameStage endUserEmailAddress(@NotNull String endUserE } /** - * Your end user's organization.

        Your end user's organization.

        + *

        Your end user's organization.

        + *

        Your end user's organization.

        * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -430,7 +432,8 @@ public EndUserOriginIdStage endUserOrganizationName(@NotNull String endUserOrgan } /** - * This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.

        This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.

        + *

        This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.

        + *

        This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.

        * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -637,7 +640,9 @@ public _FinalStage integration(Optional integration) { */ @java.lang.Override public _FinalStage addAllCategories(List categories) { - this.categories.addAll(categories); + if (categories != null) { + this.categories.addAll(categories); + } return this; } diff --git a/src/main/java/com/merge/api/accounting/types/EndUserDetailsRequestLanguage.java b/src/main/java/com/merge/api/accounting/types/EndUserDetailsRequestLanguage.java index 6491d8cc7..7571c382a 100644 --- a/src/main/java/com/merge/api/accounting/types/EndUserDetailsRequestLanguage.java +++ b/src/main/java/com/merge/api/accounting/types/EndUserDetailsRequestLanguage.java @@ -84,11 +84,11 @@ public EndUserDetailsRequestLanguage deserialize(JsonParser p, DeserializationCo Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, LanguageEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ExpenseAccount.java b/src/main/java/com/merge/api/accounting/types/ExpenseAccount.java index d48eedbca..4dcd15c13 100644 --- a/src/main/java/com/merge/api/accounting/types/ExpenseAccount.java +++ b/src/main/java/com/merge/api/accounting/types/ExpenseAccount.java @@ -83,11 +83,11 @@ public ExpenseAccount deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ExpenseAccountingPeriod.java b/src/main/java/com/merge/api/accounting/types/ExpenseAccountingPeriod.java index 6672df199..e0005f8ab 100644 --- a/src/main/java/com/merge/api/accounting/types/ExpenseAccountingPeriod.java +++ b/src/main/java/com/merge/api/accounting/types/ExpenseAccountingPeriod.java @@ -83,11 +83,11 @@ public ExpenseAccountingPeriod deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AccountingPeriod.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ExpenseCompany.java b/src/main/java/com/merge/api/accounting/types/ExpenseCompany.java index d7b8b43c9..265964371 100644 --- a/src/main/java/com/merge/api/accounting/types/ExpenseCompany.java +++ b/src/main/java/com/merge/api/accounting/types/ExpenseCompany.java @@ -83,11 +83,11 @@ public ExpenseCompany deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CompanyInfo.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ExpenseContact.java b/src/main/java/com/merge/api/accounting/types/ExpenseContact.java index e8606f4f8..6d8e3ebcd 100644 --- a/src/main/java/com/merge/api/accounting/types/ExpenseContact.java +++ b/src/main/java/com/merge/api/accounting/types/ExpenseContact.java @@ -83,11 +83,11 @@ public ExpenseContact deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ExpenseCurrency.java b/src/main/java/com/merge/api/accounting/types/ExpenseCurrency.java index 13b6498ee..b54ac3b8d 100644 --- a/src/main/java/com/merge/api/accounting/types/ExpenseCurrency.java +++ b/src/main/java/com/merge/api/accounting/types/ExpenseCurrency.java @@ -83,11 +83,11 @@ public ExpenseCurrency deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TransactionCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ExpenseEmployee.java b/src/main/java/com/merge/api/accounting/types/ExpenseEmployee.java index b551e86d4..9061ef00d 100644 --- a/src/main/java/com/merge/api/accounting/types/ExpenseEmployee.java +++ b/src/main/java/com/merge/api/accounting/types/ExpenseEmployee.java @@ -83,11 +83,11 @@ public ExpenseEmployee deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Employee.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ExpenseLineAccount.java b/src/main/java/com/merge/api/accounting/types/ExpenseLineAccount.java index 2ebf38b75..d4ffe991b 100644 --- a/src/main/java/com/merge/api/accounting/types/ExpenseLineAccount.java +++ b/src/main/java/com/merge/api/accounting/types/ExpenseLineAccount.java @@ -83,11 +83,11 @@ public ExpenseLineAccount deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ExpenseLineContact.java b/src/main/java/com/merge/api/accounting/types/ExpenseLineContact.java index 33c72fb9f..157ebfc68 100644 --- a/src/main/java/com/merge/api/accounting/types/ExpenseLineContact.java +++ b/src/main/java/com/merge/api/accounting/types/ExpenseLineContact.java @@ -83,11 +83,11 @@ public ExpenseLineContact deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ExpenseLineEmployee.java b/src/main/java/com/merge/api/accounting/types/ExpenseLineEmployee.java index 6165ec8c4..98e190393 100644 --- a/src/main/java/com/merge/api/accounting/types/ExpenseLineEmployee.java +++ b/src/main/java/com/merge/api/accounting/types/ExpenseLineEmployee.java @@ -83,11 +83,11 @@ public ExpenseLineEmployee deserialize(JsonParser p, DeserializationContext cont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Employee.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ExpenseLineItem.java b/src/main/java/com/merge/api/accounting/types/ExpenseLineItem.java index 3f8ba65b8..e6bbe0cc1 100644 --- a/src/main/java/com/merge/api/accounting/types/ExpenseLineItem.java +++ b/src/main/java/com/merge/api/accounting/types/ExpenseLineItem.java @@ -83,11 +83,11 @@ public ExpenseLineItem deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Item.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ExpenseLineProject.java b/src/main/java/com/merge/api/accounting/types/ExpenseLineProject.java index 3659a1be8..e4809440d 100644 --- a/src/main/java/com/merge/api/accounting/types/ExpenseLineProject.java +++ b/src/main/java/com/merge/api/accounting/types/ExpenseLineProject.java @@ -83,11 +83,11 @@ public ExpenseLineProject deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Project.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestAccount.java b/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestAccount.java index e7ff6c037..c47e2ef98 100644 --- a/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestAccount.java +++ b/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestAccount.java @@ -83,11 +83,11 @@ public ExpenseLineRequestAccount deserialize(JsonParser p, DeserializationContex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestContact.java b/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestContact.java index 8c2464d9b..7208c7557 100644 --- a/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestContact.java +++ b/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestContact.java @@ -83,11 +83,11 @@ public ExpenseLineRequestContact deserialize(JsonParser p, DeserializationContex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestCurrency.java b/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestCurrency.java index bcded0b69..072a7b896 100644 --- a/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestCurrency.java +++ b/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestCurrency.java @@ -83,11 +83,11 @@ public ExpenseLineRequestCurrency deserialize(JsonParser p, DeserializationConte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TransactionCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestEmployee.java b/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestEmployee.java index e51ecdd37..e1520cecd 100644 --- a/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestEmployee.java +++ b/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestEmployee.java @@ -83,11 +83,11 @@ public ExpenseLineRequestEmployee deserialize(JsonParser p, DeserializationConte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Employee.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestItem.java b/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestItem.java index cde98df6c..199854e4c 100644 --- a/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestItem.java +++ b/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestItem.java @@ -83,11 +83,11 @@ public ExpenseLineRequestItem deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Item.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestProject.java b/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestProject.java index daa284eb8..89d19fb29 100644 --- a/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestProject.java +++ b/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestProject.java @@ -83,11 +83,11 @@ public ExpenseLineRequestProject deserialize(JsonParser p, DeserializationContex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Project.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestTrackingCategoriesItem.java b/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestTrackingCategoriesItem.java index 463df83bf..1738ea730 100644 --- a/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestTrackingCategoriesItem.java +++ b/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestTrackingCategoriesItem.java @@ -85,11 +85,11 @@ public ExpenseLineRequestTrackingCategoriesItem deserialize(JsonParser p, Deseri Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TrackingCategory.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestTrackingCategory.java b/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestTrackingCategory.java index 64c5a9e21..c652afa55 100644 --- a/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestTrackingCategory.java +++ b/src/main/java/com/merge/api/accounting/types/ExpenseLineRequestTrackingCategory.java @@ -85,11 +85,11 @@ public ExpenseLineRequestTrackingCategory deserialize(JsonParser p, Deserializat Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TrackingCategory.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ExpenseLineTrackingCategoriesItem.java b/src/main/java/com/merge/api/accounting/types/ExpenseLineTrackingCategoriesItem.java index 1f80474d5..c704500e1 100644 --- a/src/main/java/com/merge/api/accounting/types/ExpenseLineTrackingCategoriesItem.java +++ b/src/main/java/com/merge/api/accounting/types/ExpenseLineTrackingCategoriesItem.java @@ -84,11 +84,11 @@ public ExpenseLineTrackingCategoriesItem deserialize(JsonParser p, Deserializati Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TrackingCategory.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ExpenseLineTrackingCategory.java b/src/main/java/com/merge/api/accounting/types/ExpenseLineTrackingCategory.java index 724bc9afc..cf8c60b55 100644 --- a/src/main/java/com/merge/api/accounting/types/ExpenseLineTrackingCategory.java +++ b/src/main/java/com/merge/api/accounting/types/ExpenseLineTrackingCategory.java @@ -84,11 +84,11 @@ public ExpenseLineTrackingCategory deserialize(JsonParser p, DeserializationCont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TrackingCategory.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ExpenseRequestAccount.java b/src/main/java/com/merge/api/accounting/types/ExpenseRequestAccount.java index ac597f015..35b5c01a3 100644 --- a/src/main/java/com/merge/api/accounting/types/ExpenseRequestAccount.java +++ b/src/main/java/com/merge/api/accounting/types/ExpenseRequestAccount.java @@ -83,11 +83,11 @@ public ExpenseRequestAccount deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ExpenseRequestAccountingPeriod.java b/src/main/java/com/merge/api/accounting/types/ExpenseRequestAccountingPeriod.java index f168dcdfc..20a974802 100644 --- a/src/main/java/com/merge/api/accounting/types/ExpenseRequestAccountingPeriod.java +++ b/src/main/java/com/merge/api/accounting/types/ExpenseRequestAccountingPeriod.java @@ -84,11 +84,11 @@ public ExpenseRequestAccountingPeriod deserialize(JsonParser p, DeserializationC Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AccountingPeriod.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ExpenseRequestCompany.java b/src/main/java/com/merge/api/accounting/types/ExpenseRequestCompany.java index 24a1c3ada..0db44a153 100644 --- a/src/main/java/com/merge/api/accounting/types/ExpenseRequestCompany.java +++ b/src/main/java/com/merge/api/accounting/types/ExpenseRequestCompany.java @@ -83,11 +83,11 @@ public ExpenseRequestCompany deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CompanyInfo.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ExpenseRequestContact.java b/src/main/java/com/merge/api/accounting/types/ExpenseRequestContact.java index b469f1599..bea6cae50 100644 --- a/src/main/java/com/merge/api/accounting/types/ExpenseRequestContact.java +++ b/src/main/java/com/merge/api/accounting/types/ExpenseRequestContact.java @@ -83,11 +83,11 @@ public ExpenseRequestContact deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ExpenseRequestEmployee.java b/src/main/java/com/merge/api/accounting/types/ExpenseRequestEmployee.java index 37f940643..99ab0b8fc 100644 --- a/src/main/java/com/merge/api/accounting/types/ExpenseRequestEmployee.java +++ b/src/main/java/com/merge/api/accounting/types/ExpenseRequestEmployee.java @@ -83,11 +83,11 @@ public ExpenseRequestEmployee deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Employee.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ExpenseRequestTrackingCategoriesItem.java b/src/main/java/com/merge/api/accounting/types/ExpenseRequestTrackingCategoriesItem.java index b0311b92f..5aee412e4 100644 --- a/src/main/java/com/merge/api/accounting/types/ExpenseRequestTrackingCategoriesItem.java +++ b/src/main/java/com/merge/api/accounting/types/ExpenseRequestTrackingCategoriesItem.java @@ -85,11 +85,11 @@ public ExpenseRequestTrackingCategoriesItem deserialize(JsonParser p, Deserializ Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TrackingCategory.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ExpenseResponse.java b/src/main/java/com/merge/api/accounting/types/ExpenseResponse.java index ca4367f5a..a8ee6833d 100644 --- a/src/main/java/com/merge/api/accounting/types/ExpenseResponse.java +++ b/src/main/java/com/merge/api/accounting/types/ExpenseResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/accounting/types/ExpenseTrackingCategoriesItem.java b/src/main/java/com/merge/api/accounting/types/ExpenseTrackingCategoriesItem.java index e02ee20ab..600b0fe96 100644 --- a/src/main/java/com/merge/api/accounting/types/ExpenseTrackingCategoriesItem.java +++ b/src/main/java/com/merge/api/accounting/types/ExpenseTrackingCategoriesItem.java @@ -84,11 +84,11 @@ public ExpenseTrackingCategoriesItem deserialize(JsonParser p, DeserializationCo Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TrackingCategory.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/FieldMappingInstanceResponse.java b/src/main/java/com/merge/api/accounting/types/FieldMappingInstanceResponse.java index 7b3c460ad..2375e1e03 100644 --- a/src/main/java/com/merge/api/accounting/types/FieldMappingInstanceResponse.java +++ b/src/main/java/com/merge/api/accounting/types/FieldMappingInstanceResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionAccountingPeriod.java b/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionAccountingPeriod.java index 49a64c613..948a44118 100644 --- a/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionAccountingPeriod.java +++ b/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionAccountingPeriod.java @@ -85,11 +85,11 @@ public GeneralLedgerTransactionAccountingPeriod deserialize(JsonParser p, Deseri Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AccountingPeriod.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionCompany.java b/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionCompany.java index c0ac80c92..358478445 100644 --- a/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionCompany.java +++ b/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionCompany.java @@ -84,11 +84,11 @@ public GeneralLedgerTransactionCompany deserialize(JsonParser p, Deserialization Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CompanyInfo.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionGeneralLedgerTransactionLinesItem.java b/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionGeneralLedgerTransactionLinesItem.java index d3e4e7488..ba84da68a 100644 --- a/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionGeneralLedgerTransactionLinesItem.java +++ b/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionGeneralLedgerTransactionLinesItem.java @@ -85,11 +85,11 @@ public GeneralLedgerTransactionGeneralLedgerTransactionLinesItem deserialize( Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, GeneralLedgerTransactionLine.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineAccount.java b/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineAccount.java index d4d6ecace..6bf928949 100644 --- a/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineAccount.java +++ b/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineAccount.java @@ -85,11 +85,11 @@ public GeneralLedgerTransactionLineAccount deserialize(JsonParser p, Deserializa Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineCompany.java b/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineCompany.java index c8e92f9f6..d0559ef0a 100644 --- a/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineCompany.java +++ b/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineCompany.java @@ -85,11 +85,11 @@ public GeneralLedgerTransactionLineCompany deserialize(JsonParser p, Deserializa Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CompanyInfo.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineContact.java b/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineContact.java index 46d1398b3..8b07ef951 100644 --- a/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineContact.java +++ b/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineContact.java @@ -85,11 +85,11 @@ public GeneralLedgerTransactionLineContact deserialize(JsonParser p, Deserializa Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineEmployee.java b/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineEmployee.java index 688dc874d..97a0c1698 100644 --- a/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineEmployee.java +++ b/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineEmployee.java @@ -85,11 +85,11 @@ public GeneralLedgerTransactionLineEmployee deserialize(JsonParser p, Deserializ Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Employee.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineItem.java b/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineItem.java index af5963812..55092756d 100644 --- a/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineItem.java +++ b/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineItem.java @@ -84,11 +84,11 @@ public GeneralLedgerTransactionLineItem deserialize(JsonParser p, Deserializatio Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Item.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineProject.java b/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineProject.java index 691ba1f52..3c5eb81d4 100644 --- a/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineProject.java +++ b/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineProject.java @@ -85,11 +85,11 @@ public GeneralLedgerTransactionLineProject deserialize(JsonParser p, Deserializa Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Project.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineTrackingCategoriesItem.java b/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineTrackingCategoriesItem.java index 4adc2edac..112900440 100644 --- a/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineTrackingCategoriesItem.java +++ b/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineTrackingCategoriesItem.java @@ -85,11 +85,11 @@ public GeneralLedgerTransactionLineTrackingCategoriesItem deserialize( Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TrackingCategory.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineTransactionCurrency.java b/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineTransactionCurrency.java index c64dae487..7f4788a57 100644 --- a/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineTransactionCurrency.java +++ b/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionLineTransactionCurrency.java @@ -85,11 +85,11 @@ public GeneralLedgerTransactionLineTransactionCurrency deserialize(JsonParser p, Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TransactionCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionTrackingCategoriesItem.java b/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionTrackingCategoriesItem.java index c9ec8b74e..986fadd34 100644 --- a/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionTrackingCategoriesItem.java +++ b/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionTrackingCategoriesItem.java @@ -85,11 +85,11 @@ public GeneralLedgerTransactionTrackingCategoriesItem deserialize(JsonParser p, Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TrackingCategory.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionUnderlyingTransactionType.java b/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionUnderlyingTransactionType.java index 676198f4f..debcfbd9b 100644 --- a/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionUnderlyingTransactionType.java +++ b/src/main/java/com/merge/api/accounting/types/GeneralLedgerTransactionUnderlyingTransactionType.java @@ -85,11 +85,11 @@ public GeneralLedgerTransactionUnderlyingTransactionType deserialize( Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, UnderlyingTransactionTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/GenerateRemoteKeyRequest.java b/src/main/java/com/merge/api/accounting/types/GenerateRemoteKeyRequest.java index 5a5cdf96a..f4bfab91a 100644 --- a/src/main/java/com/merge/api/accounting/types/GenerateRemoteKeyRequest.java +++ b/src/main/java/com/merge/api/accounting/types/GenerateRemoteKeyRequest.java @@ -67,7 +67,7 @@ public static NameStage builder() { public interface NameStage { /** - * The name of the remote key + *

        The name of the remote key

        */ _FinalStage name(@NotNull String name); @@ -94,7 +94,8 @@ public Builder from(GenerateRemoteKeyRequest other) { } /** - * The name of the remote key

        The name of the remote key

        + *

        The name of the remote key

        + *

        The name of the remote key

        * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/accounting/types/IncomeStatementCompany.java b/src/main/java/com/merge/api/accounting/types/IncomeStatementCompany.java index b7a76b291..dbb532e9e 100644 --- a/src/main/java/com/merge/api/accounting/types/IncomeStatementCompany.java +++ b/src/main/java/com/merge/api/accounting/types/IncomeStatementCompany.java @@ -83,11 +83,11 @@ public IncomeStatementCompany deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CompanyInfo.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/IncomeStatementCurrency.java b/src/main/java/com/merge/api/accounting/types/IncomeStatementCurrency.java index 8adccea30..97cd78498 100644 --- a/src/main/java/com/merge/api/accounting/types/IncomeStatementCurrency.java +++ b/src/main/java/com/merge/api/accounting/types/IncomeStatementCurrency.java @@ -83,11 +83,11 @@ public IncomeStatementCurrency deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TransactionCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceAccountingPeriod.java b/src/main/java/com/merge/api/accounting/types/InvoiceAccountingPeriod.java index 8da766438..27704d636 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceAccountingPeriod.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceAccountingPeriod.java @@ -83,11 +83,11 @@ public InvoiceAccountingPeriod deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AccountingPeriod.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceAppliedCreditNotesItem.java b/src/main/java/com/merge/api/accounting/types/InvoiceAppliedCreditNotesItem.java index 323a7daec..7eefef3c6 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceAppliedCreditNotesItem.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceAppliedCreditNotesItem.java @@ -84,11 +84,11 @@ public InvoiceAppliedCreditNotesItem deserialize(JsonParser p, DeserializationCo Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CreditNoteApplyLineForInvoice.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceAppliedPaymentsItem.java b/src/main/java/com/merge/api/accounting/types/InvoiceAppliedPaymentsItem.java index 95114a51f..b332a0912 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceAppliedPaymentsItem.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceAppliedPaymentsItem.java @@ -83,11 +83,11 @@ public InvoiceAppliedPaymentsItem deserialize(JsonParser p, DeserializationConte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PaymentLineItem.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceAppliedVendorCreditsItem.java b/src/main/java/com/merge/api/accounting/types/InvoiceAppliedVendorCreditsItem.java index 88f198428..21185088e 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceAppliedVendorCreditsItem.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceAppliedVendorCreditsItem.java @@ -84,11 +84,11 @@ public InvoiceAppliedVendorCreditsItem deserialize(JsonParser p, Deserialization Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, VendorCreditApplyLineForInvoice.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceCompany.java b/src/main/java/com/merge/api/accounting/types/InvoiceCompany.java index 1ac9dd4f1..9ddf0014c 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceCompany.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceCompany.java @@ -83,11 +83,11 @@ public InvoiceCompany deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CompanyInfo.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceContact.java b/src/main/java/com/merge/api/accounting/types/InvoiceContact.java index 646d04a05..bd19e99a1 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceContact.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceContact.java @@ -83,11 +83,11 @@ public InvoiceContact deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceCurrency.java b/src/main/java/com/merge/api/accounting/types/InvoiceCurrency.java index acedaebe7..f96457abc 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceCurrency.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceCurrency.java @@ -83,11 +83,11 @@ public InvoiceCurrency deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TransactionCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceEmployee.java b/src/main/java/com/merge/api/accounting/types/InvoiceEmployee.java index fca7981b3..d34aa2e72 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceEmployee.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceEmployee.java @@ -83,11 +83,11 @@ public InvoiceEmployee deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Employee.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemAccount.java b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemAccount.java index 0185616ca..a0ad13c9a 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemAccount.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemAccount.java @@ -83,11 +83,11 @@ public InvoiceLineItemAccount deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemContact.java b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemContact.java index 173d95935..e3fb2d86b 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemContact.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemContact.java @@ -83,11 +83,11 @@ public InvoiceLineItemContact deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemCurrency.java b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemCurrency.java index 7d10ef117..474b47211 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemCurrency.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemCurrency.java @@ -83,11 +83,11 @@ public InvoiceLineItemCurrency deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TransactionCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemEmployee.java b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemEmployee.java index 371229f2a..2a520b08b 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemEmployee.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemEmployee.java @@ -83,11 +83,11 @@ public InvoiceLineItemEmployee deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Employee.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemItem.java b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemItem.java index 04ed6e079..889d27d4b 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemItem.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemItem.java @@ -83,11 +83,11 @@ public InvoiceLineItemItem deserialize(JsonParser p, DeserializationContext cont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Item.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemProject.java b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemProject.java index ff57e43d4..6c20b84a5 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemProject.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemProject.java @@ -83,11 +83,11 @@ public InvoiceLineItemProject deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Project.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestAccount.java b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestAccount.java index 1b0f95300..f79d4e786 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestAccount.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestAccount.java @@ -84,11 +84,11 @@ public InvoiceLineItemRequestAccount deserialize(JsonParser p, DeserializationCo Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestContact.java b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestContact.java index ef0753db8..c40f558ea 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestContact.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestContact.java @@ -84,11 +84,11 @@ public InvoiceLineItemRequestContact deserialize(JsonParser p, DeserializationCo Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestCurrency.java b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestCurrency.java index f5babd858..4458d5d91 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestCurrency.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestCurrency.java @@ -84,11 +84,11 @@ public InvoiceLineItemRequestCurrency deserialize(JsonParser p, DeserializationC Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TransactionCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestEmployee.java b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestEmployee.java index 92a23823c..c4deb53ff 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestEmployee.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestEmployee.java @@ -84,11 +84,11 @@ public InvoiceLineItemRequestEmployee deserialize(JsonParser p, DeserializationC Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Employee.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestItem.java b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestItem.java index eb9218e89..a97cd4135 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestItem.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestItem.java @@ -83,11 +83,11 @@ public InvoiceLineItemRequestItem deserialize(JsonParser p, DeserializationConte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Item.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestProject.java b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestProject.java index 982469a90..321b4b10e 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestProject.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestProject.java @@ -84,11 +84,11 @@ public InvoiceLineItemRequestProject deserialize(JsonParser p, DeserializationCo Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Project.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestTrackingCategoriesItem.java b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestTrackingCategoriesItem.java index 690608ffe..b6512ca73 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestTrackingCategoriesItem.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestTrackingCategoriesItem.java @@ -85,11 +85,11 @@ public InvoiceLineItemRequestTrackingCategoriesItem deserialize(JsonParser p, De Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TrackingCategory.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestTrackingCategory.java b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestTrackingCategory.java index d8b5d280c..d37c14082 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestTrackingCategory.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemRequestTrackingCategory.java @@ -85,11 +85,11 @@ public InvoiceLineItemRequestTrackingCategory deserialize(JsonParser p, Deserial Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TrackingCategory.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemTrackingCategoriesItem.java b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemTrackingCategoriesItem.java index 45f781456..829e37bda 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemTrackingCategoriesItem.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemTrackingCategoriesItem.java @@ -85,11 +85,11 @@ public InvoiceLineItemTrackingCategoriesItem deserialize(JsonParser p, Deseriali Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TrackingCategory.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemTrackingCategory.java b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemTrackingCategory.java index 0be06a29e..a80bfed19 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceLineItemTrackingCategory.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceLineItemTrackingCategory.java @@ -84,11 +84,11 @@ public InvoiceLineItemTrackingCategory deserialize(JsonParser p, Deserialization Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TrackingCategory.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoicePaymentTerm.java b/src/main/java/com/merge/api/accounting/types/InvoicePaymentTerm.java index af373214e..f4a128675 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoicePaymentTerm.java +++ b/src/main/java/com/merge/api/accounting/types/InvoicePaymentTerm.java @@ -83,11 +83,11 @@ public InvoicePaymentTerm deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PaymentTerm.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoicePaymentsItem.java b/src/main/java/com/merge/api/accounting/types/InvoicePaymentsItem.java index f408141d0..2d45edf4f 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoicePaymentsItem.java +++ b/src/main/java/com/merge/api/accounting/types/InvoicePaymentsItem.java @@ -83,11 +83,11 @@ public InvoicePaymentsItem deserialize(JsonParser p, DeserializationContext cont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Payment.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoicePurchaseOrdersItem.java b/src/main/java/com/merge/api/accounting/types/InvoicePurchaseOrdersItem.java index b209cf6ed..9d4887dd6 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoicePurchaseOrdersItem.java +++ b/src/main/java/com/merge/api/accounting/types/InvoicePurchaseOrdersItem.java @@ -83,11 +83,11 @@ public InvoicePurchaseOrdersItem deserialize(JsonParser p, DeserializationContex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PurchaseOrder.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceRequestCompany.java b/src/main/java/com/merge/api/accounting/types/InvoiceRequestCompany.java index b19ed4d43..94597590c 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceRequestCompany.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceRequestCompany.java @@ -83,11 +83,11 @@ public InvoiceRequestCompany deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CompanyInfo.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceRequestContact.java b/src/main/java/com/merge/api/accounting/types/InvoiceRequestContact.java index 2ddd42f06..61f13220c 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceRequestContact.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceRequestContact.java @@ -83,11 +83,11 @@ public InvoiceRequestContact deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceRequestCurrency.java b/src/main/java/com/merge/api/accounting/types/InvoiceRequestCurrency.java index b683b74d6..6de717559 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceRequestCurrency.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceRequestCurrency.java @@ -83,11 +83,11 @@ public InvoiceRequestCurrency deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TransactionCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceRequestEmployee.java b/src/main/java/com/merge/api/accounting/types/InvoiceRequestEmployee.java index 627dcbe86..7ace6922f 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceRequestEmployee.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceRequestEmployee.java @@ -83,11 +83,11 @@ public InvoiceRequestEmployee deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Employee.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceRequestPaymentTerm.java b/src/main/java/com/merge/api/accounting/types/InvoiceRequestPaymentTerm.java index b4572b5ea..c43eba1a5 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceRequestPaymentTerm.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceRequestPaymentTerm.java @@ -83,11 +83,11 @@ public InvoiceRequestPaymentTerm deserialize(JsonParser p, DeserializationContex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PaymentTerm.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceRequestPaymentsItem.java b/src/main/java/com/merge/api/accounting/types/InvoiceRequestPaymentsItem.java index 92c88b2cd..30408e199 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceRequestPaymentsItem.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceRequestPaymentsItem.java @@ -83,11 +83,11 @@ public InvoiceRequestPaymentsItem deserialize(JsonParser p, DeserializationConte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Payment.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceRequestPurchaseOrdersItem.java b/src/main/java/com/merge/api/accounting/types/InvoiceRequestPurchaseOrdersItem.java index ec5c5aa09..632f2f334 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceRequestPurchaseOrdersItem.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceRequestPurchaseOrdersItem.java @@ -84,11 +84,11 @@ public InvoiceRequestPurchaseOrdersItem deserialize(JsonParser p, Deserializatio Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PurchaseOrder.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceRequestStatus.java b/src/main/java/com/merge/api/accounting/types/InvoiceRequestStatus.java index 4f3be7529..7d874c3b2 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceRequestStatus.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceRequestStatus.java @@ -83,11 +83,11 @@ public InvoiceRequestStatus deserialize(JsonParser p, DeserializationContext con Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, InvoiceStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceRequestTrackingCategoriesItem.java b/src/main/java/com/merge/api/accounting/types/InvoiceRequestTrackingCategoriesItem.java index a919bdab4..ac04491e1 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceRequestTrackingCategoriesItem.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceRequestTrackingCategoriesItem.java @@ -85,11 +85,11 @@ public InvoiceRequestTrackingCategoriesItem deserialize(JsonParser p, Deserializ Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TrackingCategory.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceRequestType.java b/src/main/java/com/merge/api/accounting/types/InvoiceRequestType.java index 4dbf0448c..705abc03e 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceRequestType.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceRequestType.java @@ -83,11 +83,11 @@ public InvoiceRequestType deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, InvoiceTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceResponse.java b/src/main/java/com/merge/api/accounting/types/InvoiceResponse.java index 49ede4a1a..4b50f0a55 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceResponse.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceStatus.java b/src/main/java/com/merge/api/accounting/types/InvoiceStatus.java index 14eed0d1b..9093066c3 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceStatus.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceStatus.java @@ -83,11 +83,11 @@ public InvoiceStatus deserialize(JsonParser p, DeserializationContext context) t Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, InvoiceStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/InvoiceTrackingCategoriesItem.java b/src/main/java/com/merge/api/accounting/types/InvoiceTrackingCategoriesItem.java index 5ab29deb4..32f097cde 100644 --- a/src/main/java/com/merge/api/accounting/types/InvoiceTrackingCategoriesItem.java +++ b/src/main/java/com/merge/api/accounting/types/InvoiceTrackingCategoriesItem.java @@ -84,11 +84,11 @@ public InvoiceTrackingCategoriesItem deserialize(JsonParser p, DeserializationCo Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TrackingCategory.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/IssueStatus.java b/src/main/java/com/merge/api/accounting/types/IssueStatus.java index 3ea0325ba..7e21e30c3 100644 --- a/src/main/java/com/merge/api/accounting/types/IssueStatus.java +++ b/src/main/java/com/merge/api/accounting/types/IssueStatus.java @@ -83,11 +83,11 @@ public IssueStatus deserialize(JsonParser p, DeserializationContext context) thr Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, IssueStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ItemCompany.java b/src/main/java/com/merge/api/accounting/types/ItemCompany.java index 635148952..e9fa3a222 100644 --- a/src/main/java/com/merge/api/accounting/types/ItemCompany.java +++ b/src/main/java/com/merge/api/accounting/types/ItemCompany.java @@ -83,11 +83,11 @@ public ItemCompany deserialize(JsonParser p, DeserializationContext context) thr Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CompanyInfo.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ItemPurchaseAccount.java b/src/main/java/com/merge/api/accounting/types/ItemPurchaseAccount.java index 98964416b..f5e3fa004 100644 --- a/src/main/java/com/merge/api/accounting/types/ItemPurchaseAccount.java +++ b/src/main/java/com/merge/api/accounting/types/ItemPurchaseAccount.java @@ -83,11 +83,11 @@ public ItemPurchaseAccount deserialize(JsonParser p, DeserializationContext cont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ItemPurchaseTaxRate.java b/src/main/java/com/merge/api/accounting/types/ItemPurchaseTaxRate.java index 9033ea93f..9c40bf8b8 100644 --- a/src/main/java/com/merge/api/accounting/types/ItemPurchaseTaxRate.java +++ b/src/main/java/com/merge/api/accounting/types/ItemPurchaseTaxRate.java @@ -83,11 +83,11 @@ public ItemPurchaseTaxRate deserialize(JsonParser p, DeserializationContext cont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TaxRate.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ItemRequestRequestCompany.java b/src/main/java/com/merge/api/accounting/types/ItemRequestRequestCompany.java index 27a97781e..443f1dae3 100644 --- a/src/main/java/com/merge/api/accounting/types/ItemRequestRequestCompany.java +++ b/src/main/java/com/merge/api/accounting/types/ItemRequestRequestCompany.java @@ -83,11 +83,11 @@ public ItemRequestRequestCompany deserialize(JsonParser p, DeserializationContex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CompanyInfo.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ItemRequestRequestPurchaseAccount.java b/src/main/java/com/merge/api/accounting/types/ItemRequestRequestPurchaseAccount.java index 3b6b41bd6..b78681862 100644 --- a/src/main/java/com/merge/api/accounting/types/ItemRequestRequestPurchaseAccount.java +++ b/src/main/java/com/merge/api/accounting/types/ItemRequestRequestPurchaseAccount.java @@ -84,11 +84,11 @@ public ItemRequestRequestPurchaseAccount deserialize(JsonParser p, Deserializati Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ItemRequestRequestPurchaseTaxRate.java b/src/main/java/com/merge/api/accounting/types/ItemRequestRequestPurchaseTaxRate.java index 8c14398a8..08239d4ca 100644 --- a/src/main/java/com/merge/api/accounting/types/ItemRequestRequestPurchaseTaxRate.java +++ b/src/main/java/com/merge/api/accounting/types/ItemRequestRequestPurchaseTaxRate.java @@ -84,11 +84,11 @@ public ItemRequestRequestPurchaseTaxRate deserialize(JsonParser p, Deserializati Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TaxRate.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ItemRequestRequestSalesAccount.java b/src/main/java/com/merge/api/accounting/types/ItemRequestRequestSalesAccount.java index d551c8506..dffc7a895 100644 --- a/src/main/java/com/merge/api/accounting/types/ItemRequestRequestSalesAccount.java +++ b/src/main/java/com/merge/api/accounting/types/ItemRequestRequestSalesAccount.java @@ -84,11 +84,11 @@ public ItemRequestRequestSalesAccount deserialize(JsonParser p, DeserializationC Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ItemRequestRequestSalesTaxRate.java b/src/main/java/com/merge/api/accounting/types/ItemRequestRequestSalesTaxRate.java index 277f999cc..a8580993f 100644 --- a/src/main/java/com/merge/api/accounting/types/ItemRequestRequestSalesTaxRate.java +++ b/src/main/java/com/merge/api/accounting/types/ItemRequestRequestSalesTaxRate.java @@ -84,11 +84,11 @@ public ItemRequestRequestSalesTaxRate deserialize(JsonParser p, DeserializationC Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TaxRate.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ItemRequestRequestStatus.java b/src/main/java/com/merge/api/accounting/types/ItemRequestRequestStatus.java index 575751cd6..aead3ce80 100644 --- a/src/main/java/com/merge/api/accounting/types/ItemRequestRequestStatus.java +++ b/src/main/java/com/merge/api/accounting/types/ItemRequestRequestStatus.java @@ -83,11 +83,11 @@ public ItemRequestRequestStatus deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Status7D1Enum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ItemRequestRequestType.java b/src/main/java/com/merge/api/accounting/types/ItemRequestRequestType.java index c20835b14..22e06136f 100644 --- a/src/main/java/com/merge/api/accounting/types/ItemRequestRequestType.java +++ b/src/main/java/com/merge/api/accounting/types/ItemRequestRequestType.java @@ -83,11 +83,11 @@ public ItemRequestRequestType deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Type2BbEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ItemResponse.java b/src/main/java/com/merge/api/accounting/types/ItemResponse.java index bf228a7ea..f65c5fe13 100644 --- a/src/main/java/com/merge/api/accounting/types/ItemResponse.java +++ b/src/main/java/com/merge/api/accounting/types/ItemResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/accounting/types/ItemSalesAccount.java b/src/main/java/com/merge/api/accounting/types/ItemSalesAccount.java index 0e41fedfe..93d97b5e7 100644 --- a/src/main/java/com/merge/api/accounting/types/ItemSalesAccount.java +++ b/src/main/java/com/merge/api/accounting/types/ItemSalesAccount.java @@ -83,11 +83,11 @@ public ItemSalesAccount deserialize(JsonParser p, DeserializationContext context Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ItemSalesTaxRate.java b/src/main/java/com/merge/api/accounting/types/ItemSalesTaxRate.java index d92235f46..3d712c8f1 100644 --- a/src/main/java/com/merge/api/accounting/types/ItemSalesTaxRate.java +++ b/src/main/java/com/merge/api/accounting/types/ItemSalesTaxRate.java @@ -83,11 +83,11 @@ public ItemSalesTaxRate deserialize(JsonParser p, DeserializationContext context Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TaxRate.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ItemStatus.java b/src/main/java/com/merge/api/accounting/types/ItemStatus.java index f8aedebe0..bc62a74b1 100644 --- a/src/main/java/com/merge/api/accounting/types/ItemStatus.java +++ b/src/main/java/com/merge/api/accounting/types/ItemStatus.java @@ -83,11 +83,11 @@ public ItemStatus deserialize(JsonParser p, DeserializationContext context) thro Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Status7D1Enum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ItemType.java b/src/main/java/com/merge/api/accounting/types/ItemType.java index e86e5bf3e..16ddc8eae 100644 --- a/src/main/java/com/merge/api/accounting/types/ItemType.java +++ b/src/main/java/com/merge/api/accounting/types/ItemType.java @@ -83,11 +83,11 @@ public ItemType deserialize(JsonParser p, DeserializationContext context) throws Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Type2BbEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/JournalEntryAccountingPeriod.java b/src/main/java/com/merge/api/accounting/types/JournalEntryAccountingPeriod.java index 4980067f0..df071b387 100644 --- a/src/main/java/com/merge/api/accounting/types/JournalEntryAccountingPeriod.java +++ b/src/main/java/com/merge/api/accounting/types/JournalEntryAccountingPeriod.java @@ -84,11 +84,11 @@ public JournalEntryAccountingPeriod deserialize(JsonParser p, DeserializationCon Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AccountingPeriod.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/JournalEntryAppliedPaymentsItem.java b/src/main/java/com/merge/api/accounting/types/JournalEntryAppliedPaymentsItem.java index 7a4db3d49..9c753c178 100644 --- a/src/main/java/com/merge/api/accounting/types/JournalEntryAppliedPaymentsItem.java +++ b/src/main/java/com/merge/api/accounting/types/JournalEntryAppliedPaymentsItem.java @@ -84,11 +84,11 @@ public JournalEntryAppliedPaymentsItem deserialize(JsonParser p, Deserialization Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PaymentLineItem.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/JournalEntryCompany.java b/src/main/java/com/merge/api/accounting/types/JournalEntryCompany.java index 95b88f1ef..5560cbb6a 100644 --- a/src/main/java/com/merge/api/accounting/types/JournalEntryCompany.java +++ b/src/main/java/com/merge/api/accounting/types/JournalEntryCompany.java @@ -83,11 +83,11 @@ public JournalEntryCompany deserialize(JsonParser p, DeserializationContext cont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CompanyInfo.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/JournalEntryCurrency.java b/src/main/java/com/merge/api/accounting/types/JournalEntryCurrency.java index a7fd8ded0..9f5982dbe 100644 --- a/src/main/java/com/merge/api/accounting/types/JournalEntryCurrency.java +++ b/src/main/java/com/merge/api/accounting/types/JournalEntryCurrency.java @@ -83,11 +83,11 @@ public JournalEntryCurrency deserialize(JsonParser p, DeserializationContext con Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TransactionCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/JournalEntryPaymentsItem.java b/src/main/java/com/merge/api/accounting/types/JournalEntryPaymentsItem.java index c3eaeb32c..6d5045796 100644 --- a/src/main/java/com/merge/api/accounting/types/JournalEntryPaymentsItem.java +++ b/src/main/java/com/merge/api/accounting/types/JournalEntryPaymentsItem.java @@ -83,11 +83,11 @@ public JournalEntryPaymentsItem deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Payment.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/JournalEntryPostingStatus.java b/src/main/java/com/merge/api/accounting/types/JournalEntryPostingStatus.java index 9e26412f9..cf01b973a 100644 --- a/src/main/java/com/merge/api/accounting/types/JournalEntryPostingStatus.java +++ b/src/main/java/com/merge/api/accounting/types/JournalEntryPostingStatus.java @@ -83,11 +83,11 @@ public JournalEntryPostingStatus deserialize(JsonParser p, DeserializationContex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PostingStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/JournalEntryRequestCompany.java b/src/main/java/com/merge/api/accounting/types/JournalEntryRequestCompany.java index 437b5b45e..8e9942e37 100644 --- a/src/main/java/com/merge/api/accounting/types/JournalEntryRequestCompany.java +++ b/src/main/java/com/merge/api/accounting/types/JournalEntryRequestCompany.java @@ -83,11 +83,11 @@ public JournalEntryRequestCompany deserialize(JsonParser p, DeserializationConte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CompanyInfo.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/JournalEntryRequestCurrency.java b/src/main/java/com/merge/api/accounting/types/JournalEntryRequestCurrency.java index 878444785..40eb52b4a 100644 --- a/src/main/java/com/merge/api/accounting/types/JournalEntryRequestCurrency.java +++ b/src/main/java/com/merge/api/accounting/types/JournalEntryRequestCurrency.java @@ -84,11 +84,11 @@ public JournalEntryRequestCurrency deserialize(JsonParser p, DeserializationCont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TransactionCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/JournalEntryRequestPaymentsItem.java b/src/main/java/com/merge/api/accounting/types/JournalEntryRequestPaymentsItem.java index ea7295e05..8b8a95809 100644 --- a/src/main/java/com/merge/api/accounting/types/JournalEntryRequestPaymentsItem.java +++ b/src/main/java/com/merge/api/accounting/types/JournalEntryRequestPaymentsItem.java @@ -84,11 +84,11 @@ public JournalEntryRequestPaymentsItem deserialize(JsonParser p, Deserialization Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Payment.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/JournalEntryRequestPostingStatus.java b/src/main/java/com/merge/api/accounting/types/JournalEntryRequestPostingStatus.java index 3dc4df3ed..fddf1434f 100644 --- a/src/main/java/com/merge/api/accounting/types/JournalEntryRequestPostingStatus.java +++ b/src/main/java/com/merge/api/accounting/types/JournalEntryRequestPostingStatus.java @@ -84,11 +84,11 @@ public JournalEntryRequestPostingStatus deserialize(JsonParser p, Deserializatio Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PostingStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/JournalEntryRequestTrackingCategoriesItem.java b/src/main/java/com/merge/api/accounting/types/JournalEntryRequestTrackingCategoriesItem.java index 9870c710e..6cf944280 100644 --- a/src/main/java/com/merge/api/accounting/types/JournalEntryRequestTrackingCategoriesItem.java +++ b/src/main/java/com/merge/api/accounting/types/JournalEntryRequestTrackingCategoriesItem.java @@ -85,11 +85,11 @@ public JournalEntryRequestTrackingCategoriesItem deserialize(JsonParser p, Deser Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TrackingCategory.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/JournalEntryResponse.java b/src/main/java/com/merge/api/accounting/types/JournalEntryResponse.java index 450768a78..f33df29eb 100644 --- a/src/main/java/com/merge/api/accounting/types/JournalEntryResponse.java +++ b/src/main/java/com/merge/api/accounting/types/JournalEntryResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/accounting/types/JournalEntryTrackingCategoriesItem.java b/src/main/java/com/merge/api/accounting/types/JournalEntryTrackingCategoriesItem.java index 6fad96761..d92c557bd 100644 --- a/src/main/java/com/merge/api/accounting/types/JournalEntryTrackingCategoriesItem.java +++ b/src/main/java/com/merge/api/accounting/types/JournalEntryTrackingCategoriesItem.java @@ -85,11 +85,11 @@ public JournalEntryTrackingCategoriesItem deserialize(JsonParser p, Deserializat Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TrackingCategory.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/JournalLineAccount.java b/src/main/java/com/merge/api/accounting/types/JournalLineAccount.java index f20640145..f2a578358 100644 --- a/src/main/java/com/merge/api/accounting/types/JournalLineAccount.java +++ b/src/main/java/com/merge/api/accounting/types/JournalLineAccount.java @@ -83,11 +83,11 @@ public JournalLineAccount deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/JournalLineCurrency.java b/src/main/java/com/merge/api/accounting/types/JournalLineCurrency.java index d93554cee..12cfb631a 100644 --- a/src/main/java/com/merge/api/accounting/types/JournalLineCurrency.java +++ b/src/main/java/com/merge/api/accounting/types/JournalLineCurrency.java @@ -83,11 +83,11 @@ public JournalLineCurrency deserialize(JsonParser p, DeserializationContext cont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TransactionCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/JournalLineProject.java b/src/main/java/com/merge/api/accounting/types/JournalLineProject.java index 6ae28ba93..4b493f387 100644 --- a/src/main/java/com/merge/api/accounting/types/JournalLineProject.java +++ b/src/main/java/com/merge/api/accounting/types/JournalLineProject.java @@ -83,11 +83,11 @@ public JournalLineProject deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Project.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/JournalLineRequestAccount.java b/src/main/java/com/merge/api/accounting/types/JournalLineRequestAccount.java index 03df21f55..a07dfc0e3 100644 --- a/src/main/java/com/merge/api/accounting/types/JournalLineRequestAccount.java +++ b/src/main/java/com/merge/api/accounting/types/JournalLineRequestAccount.java @@ -83,11 +83,11 @@ public JournalLineRequestAccount deserialize(JsonParser p, DeserializationContex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/JournalLineRequestCurrency.java b/src/main/java/com/merge/api/accounting/types/JournalLineRequestCurrency.java index 5aecfc65b..7cc571ded 100644 --- a/src/main/java/com/merge/api/accounting/types/JournalLineRequestCurrency.java +++ b/src/main/java/com/merge/api/accounting/types/JournalLineRequestCurrency.java @@ -83,11 +83,11 @@ public JournalLineRequestCurrency deserialize(JsonParser p, DeserializationConte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TransactionCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/JournalLineRequestProject.java b/src/main/java/com/merge/api/accounting/types/JournalLineRequestProject.java index 2849b2e67..17a52da83 100644 --- a/src/main/java/com/merge/api/accounting/types/JournalLineRequestProject.java +++ b/src/main/java/com/merge/api/accounting/types/JournalLineRequestProject.java @@ -83,11 +83,11 @@ public JournalLineRequestProject deserialize(JsonParser p, DeserializationContex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Project.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/JournalLineRequestTrackingCategoriesItem.java b/src/main/java/com/merge/api/accounting/types/JournalLineRequestTrackingCategoriesItem.java index 615297b69..19ddf20ca 100644 --- a/src/main/java/com/merge/api/accounting/types/JournalLineRequestTrackingCategoriesItem.java +++ b/src/main/java/com/merge/api/accounting/types/JournalLineRequestTrackingCategoriesItem.java @@ -85,11 +85,11 @@ public JournalLineRequestTrackingCategoriesItem deserialize(JsonParser p, Deseri Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TrackingCategory.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/JournalLineRequestTrackingCategory.java b/src/main/java/com/merge/api/accounting/types/JournalLineRequestTrackingCategory.java index ebe460e3f..2f18f4ce1 100644 --- a/src/main/java/com/merge/api/accounting/types/JournalLineRequestTrackingCategory.java +++ b/src/main/java/com/merge/api/accounting/types/JournalLineRequestTrackingCategory.java @@ -85,11 +85,11 @@ public JournalLineRequestTrackingCategory deserialize(JsonParser p, Deserializat Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TrackingCategory.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/JournalLineTrackingCategoriesItem.java b/src/main/java/com/merge/api/accounting/types/JournalLineTrackingCategoriesItem.java index 64b5dcf80..80917bb19 100644 --- a/src/main/java/com/merge/api/accounting/types/JournalLineTrackingCategoriesItem.java +++ b/src/main/java/com/merge/api/accounting/types/JournalLineTrackingCategoriesItem.java @@ -84,11 +84,11 @@ public JournalLineTrackingCategoriesItem deserialize(JsonParser p, Deserializati Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TrackingCategory.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/JournalLineTrackingCategory.java b/src/main/java/com/merge/api/accounting/types/JournalLineTrackingCategory.java index 40c14a7aa..76d2d5ce6 100644 --- a/src/main/java/com/merge/api/accounting/types/JournalLineTrackingCategory.java +++ b/src/main/java/com/merge/api/accounting/types/JournalLineTrackingCategory.java @@ -84,11 +84,11 @@ public JournalLineTrackingCategory deserialize(JsonParser p, DeserializationCont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TrackingCategory.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/LinkedAccountCommonModelScopeDeserializerRequest.java b/src/main/java/com/merge/api/accounting/types/LinkedAccountCommonModelScopeDeserializerRequest.java index 47399000e..afcbdd15a 100644 --- a/src/main/java/com/merge/api/accounting/types/LinkedAccountCommonModelScopeDeserializerRequest.java +++ b/src/main/java/com/merge/api/accounting/types/LinkedAccountCommonModelScopeDeserializerRequest.java @@ -100,7 +100,9 @@ public Builder addCommonModels(IndividualCommonModelScopeDeserializerRequest com } public Builder addAllCommonModels(List commonModels) { - this.commonModels.addAll(commonModels); + if (commonModels != null) { + this.commonModels.addAll(commonModels); + } return this; } diff --git a/src/main/java/com/merge/api/accounting/types/MetaResponse.java b/src/main/java/com/merge/api/accounting/types/MetaResponse.java index 4106103d6..6618ed2b4 100644 --- a/src/main/java/com/merge/api/accounting/types/MetaResponse.java +++ b/src/main/java/com/merge/api/accounting/types/MetaResponse.java @@ -216,7 +216,9 @@ public _FinalStage requestSchema(String key, JsonNode value) { @java.lang.Override public _FinalStage putAllRequestSchema(Map requestSchema) { - this.requestSchema.putAll(requestSchema); + if (requestSchema != null) { + this.requestSchema.putAll(requestSchema); + } return this; } diff --git a/src/main/java/com/merge/api/accounting/types/ModelOperation.java b/src/main/java/com/merge/api/accounting/types/ModelOperation.java index 3dfa4606d..5af2e8187 100644 --- a/src/main/java/com/merge/api/accounting/types/ModelOperation.java +++ b/src/main/java/com/merge/api/accounting/types/ModelOperation.java @@ -159,7 +159,9 @@ public _FinalStage modelName(@NotNull String modelName) { @java.lang.Override public _FinalStage addAllSupportedFields(List supportedFields) { - this.supportedFields.addAll(supportedFields); + if (supportedFields != null) { + this.supportedFields.addAll(supportedFields); + } return this; } @@ -179,7 +181,9 @@ public _FinalStage supportedFields(List supportedFields) { @java.lang.Override public _FinalStage addAllRequiredPostParameters(List requiredPostParameters) { - this.requiredPostParameters.addAll(requiredPostParameters); + if (requiredPostParameters != null) { + this.requiredPostParameters.addAll(requiredPostParameters); + } return this; } @@ -199,7 +203,9 @@ public _FinalStage requiredPostParameters(List requiredPostParameters) { @java.lang.Override public _FinalStage addAllAvailableOperations(List availableOperations) { - this.availableOperations.addAll(availableOperations); + if (availableOperations != null) { + this.availableOperations.addAll(availableOperations); + } return this; } diff --git a/src/main/java/com/merge/api/accounting/types/MultipartFormFieldRequest.java b/src/main/java/com/merge/api/accounting/types/MultipartFormFieldRequest.java index baf8e3602..5eaff435e 100644 --- a/src/main/java/com/merge/api/accounting/types/MultipartFormFieldRequest.java +++ b/src/main/java/com/merge/api/accounting/types/MultipartFormFieldRequest.java @@ -128,7 +128,7 @@ public static NameStage builder() { public interface NameStage { /** - * The name of the form field + *

        The name of the form field

        */ DataStage name(@NotNull String name); @@ -137,7 +137,7 @@ public interface NameStage { public interface DataStage { /** - * The data for the form field. + *

        The data for the form field.

        */ _FinalStage data(@NotNull String data); } @@ -200,7 +200,8 @@ public Builder from(MultipartFormFieldRequest other) { } /** - * The name of the form field

        The name of the form field

        + *

        The name of the form field

        + *

        The name of the form field

        * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -211,7 +212,8 @@ public DataStage name(@NotNull String name) { } /** - * The data for the form field.

        The data for the form field.

        + *

        The data for the form field.

        + *

        The data for the form field.

        * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/accounting/types/PatchedItemRequestRequestStatus.java b/src/main/java/com/merge/api/accounting/types/PatchedItemRequestRequestStatus.java index 07537217a..af2ddc21f 100644 --- a/src/main/java/com/merge/api/accounting/types/PatchedItemRequestRequestStatus.java +++ b/src/main/java/com/merge/api/accounting/types/PatchedItemRequestRequestStatus.java @@ -84,11 +84,11 @@ public PatchedItemRequestRequestStatus deserialize(JsonParser p, Deserialization Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Status7D1Enum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PatchedItemRequestRequestType.java b/src/main/java/com/merge/api/accounting/types/PatchedItemRequestRequestType.java index ab0349848..0cf3bf900 100644 --- a/src/main/java/com/merge/api/accounting/types/PatchedItemRequestRequestType.java +++ b/src/main/java/com/merge/api/accounting/types/PatchedItemRequestRequestType.java @@ -84,11 +84,11 @@ public PatchedItemRequestRequestType deserialize(JsonParser p, DeserializationCo Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Type2BbEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestAccount.java b/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestAccount.java index 215fc703f..00a89d5db 100644 --- a/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestAccount.java +++ b/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestAccount.java @@ -84,11 +84,11 @@ public PatchedPaymentRequestAccount deserialize(JsonParser p, DeserializationCon Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestAccountingPeriod.java b/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestAccountingPeriod.java index 0d9944c5a..47d197ad0 100644 --- a/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestAccountingPeriod.java +++ b/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestAccountingPeriod.java @@ -85,11 +85,11 @@ public PatchedPaymentRequestAccountingPeriod deserialize(JsonParser p, Deseriali Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AccountingPeriod.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestAppliedToLinesItem.java b/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestAppliedToLinesItem.java index d9a7b68c8..6c3e48347 100644 --- a/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestAppliedToLinesItem.java +++ b/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestAppliedToLinesItem.java @@ -85,11 +85,11 @@ public PatchedPaymentRequestAppliedToLinesItem deserialize(JsonParser p, Deseria Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PaymentLineItemRequest.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestCompany.java b/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestCompany.java index da4f172d2..2e2b7c020 100644 --- a/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestCompany.java +++ b/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestCompany.java @@ -84,11 +84,11 @@ public PatchedPaymentRequestCompany deserialize(JsonParser p, DeserializationCon Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CompanyInfo.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestContact.java b/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestContact.java index 6440c8c26..ffbd3f4fe 100644 --- a/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestContact.java +++ b/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestContact.java @@ -84,11 +84,11 @@ public PatchedPaymentRequestContact deserialize(JsonParser p, DeserializationCon Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestCurrency.java b/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestCurrency.java index 5f0de1b39..658ed51a1 100644 --- a/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestCurrency.java +++ b/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestCurrency.java @@ -84,11 +84,11 @@ public PatchedPaymentRequestCurrency deserialize(JsonParser p, DeserializationCo Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TransactionCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestPaymentMethod.java b/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestPaymentMethod.java index f63887f40..e81a2d022 100644 --- a/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestPaymentMethod.java +++ b/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestPaymentMethod.java @@ -85,11 +85,11 @@ public PatchedPaymentRequestPaymentMethod deserialize(JsonParser p, Deserializat Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PaymentMethod.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestTrackingCategoriesItem.java b/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestTrackingCategoriesItem.java index db9d163e9..02ca01f6a 100644 --- a/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestTrackingCategoriesItem.java +++ b/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestTrackingCategoriesItem.java @@ -85,11 +85,11 @@ public PatchedPaymentRequestTrackingCategoriesItem deserialize(JsonParser p, Des Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TrackingCategory.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestType.java b/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestType.java index 0751d13ef..fd08fd84e 100644 --- a/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestType.java +++ b/src/main/java/com/merge/api/accounting/types/PatchedPaymentRequestType.java @@ -83,11 +83,11 @@ public PatchedPaymentRequestType deserialize(JsonParser p, DeserializationContex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PaymentTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PaymentAccount.java b/src/main/java/com/merge/api/accounting/types/PaymentAccount.java index 9b06eb01a..d33a06c6e 100644 --- a/src/main/java/com/merge/api/accounting/types/PaymentAccount.java +++ b/src/main/java/com/merge/api/accounting/types/PaymentAccount.java @@ -83,11 +83,11 @@ public PaymentAccount deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PaymentAccountingPeriod.java b/src/main/java/com/merge/api/accounting/types/PaymentAccountingPeriod.java index da11c2ef6..11cde4763 100644 --- a/src/main/java/com/merge/api/accounting/types/PaymentAccountingPeriod.java +++ b/src/main/java/com/merge/api/accounting/types/PaymentAccountingPeriod.java @@ -83,11 +83,11 @@ public PaymentAccountingPeriod deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AccountingPeriod.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PaymentAppliedToLinesItem.java b/src/main/java/com/merge/api/accounting/types/PaymentAppliedToLinesItem.java index 0628582cd..b218b8660 100644 --- a/src/main/java/com/merge/api/accounting/types/PaymentAppliedToLinesItem.java +++ b/src/main/java/com/merge/api/accounting/types/PaymentAppliedToLinesItem.java @@ -83,11 +83,11 @@ public PaymentAppliedToLinesItem deserialize(JsonParser p, DeserializationContex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PaymentLineItem.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PaymentCompany.java b/src/main/java/com/merge/api/accounting/types/PaymentCompany.java index 5ec52ac18..6fdefba0a 100644 --- a/src/main/java/com/merge/api/accounting/types/PaymentCompany.java +++ b/src/main/java/com/merge/api/accounting/types/PaymentCompany.java @@ -83,11 +83,11 @@ public PaymentCompany deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CompanyInfo.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PaymentContact.java b/src/main/java/com/merge/api/accounting/types/PaymentContact.java index eedadc430..f54a68d58 100644 --- a/src/main/java/com/merge/api/accounting/types/PaymentContact.java +++ b/src/main/java/com/merge/api/accounting/types/PaymentContact.java @@ -83,11 +83,11 @@ public PaymentContact deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PaymentCurrency.java b/src/main/java/com/merge/api/accounting/types/PaymentCurrency.java index 6724e3a39..1895bb11b 100644 --- a/src/main/java/com/merge/api/accounting/types/PaymentCurrency.java +++ b/src/main/java/com/merge/api/accounting/types/PaymentCurrency.java @@ -83,11 +83,11 @@ public PaymentCurrency deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TransactionCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PaymentMethod.java b/src/main/java/com/merge/api/accounting/types/PaymentMethod.java index e89a2d55c..33e305ebf 100644 --- a/src/main/java/com/merge/api/accounting/types/PaymentMethod.java +++ b/src/main/java/com/merge/api/accounting/types/PaymentMethod.java @@ -199,13 +199,14 @@ public static MethodTypeStage builder() { public interface MethodTypeStage { /** - * The type of the payment method. - * - * * `CREDIT_CARD` - CREDIT_CARD - * * `DEBIT_CARD` - DEBIT_CARD - * * `ACH` - ACH - * * `CASH` - CASH - * * `CHECK` - CHECK + *

        The type of the payment method.

        + *
          + *
        • CREDIT_CARD - CREDIT_CARD
          • + *
        • DEBIT_CARD - DEBIT_CARD
          • + *
        • ACH - ACH
          • + *
        • CASH - CASH
          • + *
        • CHECK - CHECK
          • + *
        */ NameStage methodType(@NotNull PaymentMethodMethodType methodType); @@ -214,7 +215,7 @@ public interface MethodTypeStage { public interface NameStage { /** - * The payment method’s name + *

        The payment method’s name

        */ _FinalStage name(@NotNull String name); } @@ -313,13 +314,15 @@ public Builder from(PaymentMethod other) { } /** - * The type of the payment method. - * - * * `CREDIT_CARD` - CREDIT_CARD - * * `DEBIT_CARD` - DEBIT_CARD - * * `ACH` - ACH - * * `CASH` - CASH - * * `CHECK` - CHECK

        The type of the payment method.

        + *

        The type of the payment method.

        + *
          + *
        • CREDIT_CARD - CREDIT_CARD
          • + *
        • DEBIT_CARD - DEBIT_CARD
          • + *
        • ACH - ACH
          • + *
        • CASH - CASH
          • + *
        • CHECK - CHECK
          • + *
        + *

        The type of the payment method.

        *
          *
        • CREDIT_CARD - CREDIT_CARD
          • *
        • DEBIT_CARD - DEBIT_CARD
          • @@ -337,7 +340,8 @@ public NameStage methodType(@NotNull PaymentMethodMethodType methodType) { } /** - * The payment method’s name

          The payment method’s name

          + *

          The payment method’s name

          + *

          The payment method’s name

          * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/accounting/types/PaymentMethodMethodType.java b/src/main/java/com/merge/api/accounting/types/PaymentMethodMethodType.java index 4d7b1ffdc..9e88e9e7f 100644 --- a/src/main/java/com/merge/api/accounting/types/PaymentMethodMethodType.java +++ b/src/main/java/com/merge/api/accounting/types/PaymentMethodMethodType.java @@ -83,11 +83,11 @@ public PaymentMethodMethodType deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, MethodTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PaymentPaymentMethod.java b/src/main/java/com/merge/api/accounting/types/PaymentPaymentMethod.java index 268d9275e..f0d400aa5 100644 --- a/src/main/java/com/merge/api/accounting/types/PaymentPaymentMethod.java +++ b/src/main/java/com/merge/api/accounting/types/PaymentPaymentMethod.java @@ -83,11 +83,11 @@ public PaymentPaymentMethod deserialize(JsonParser p, DeserializationContext con Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PaymentMethod.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PaymentRequestAccount.java b/src/main/java/com/merge/api/accounting/types/PaymentRequestAccount.java index 8299cbc9f..e926d8e18 100644 --- a/src/main/java/com/merge/api/accounting/types/PaymentRequestAccount.java +++ b/src/main/java/com/merge/api/accounting/types/PaymentRequestAccount.java @@ -83,11 +83,11 @@ public PaymentRequestAccount deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PaymentRequestAccountingPeriod.java b/src/main/java/com/merge/api/accounting/types/PaymentRequestAccountingPeriod.java index 3ef7823b6..70263d28d 100644 --- a/src/main/java/com/merge/api/accounting/types/PaymentRequestAccountingPeriod.java +++ b/src/main/java/com/merge/api/accounting/types/PaymentRequestAccountingPeriod.java @@ -84,11 +84,11 @@ public PaymentRequestAccountingPeriod deserialize(JsonParser p, DeserializationC Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AccountingPeriod.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PaymentRequestAppliedToLinesItem.java b/src/main/java/com/merge/api/accounting/types/PaymentRequestAppliedToLinesItem.java index 8f0fff4de..a0922fca6 100644 --- a/src/main/java/com/merge/api/accounting/types/PaymentRequestAppliedToLinesItem.java +++ b/src/main/java/com/merge/api/accounting/types/PaymentRequestAppliedToLinesItem.java @@ -84,11 +84,11 @@ public PaymentRequestAppliedToLinesItem deserialize(JsonParser p, Deserializatio Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PaymentLineItemRequest.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PaymentRequestCompany.java b/src/main/java/com/merge/api/accounting/types/PaymentRequestCompany.java index cebd99399..dde9d304a 100644 --- a/src/main/java/com/merge/api/accounting/types/PaymentRequestCompany.java +++ b/src/main/java/com/merge/api/accounting/types/PaymentRequestCompany.java @@ -83,11 +83,11 @@ public PaymentRequestCompany deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CompanyInfo.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PaymentRequestContact.java b/src/main/java/com/merge/api/accounting/types/PaymentRequestContact.java index 231553965..236dd147f 100644 --- a/src/main/java/com/merge/api/accounting/types/PaymentRequestContact.java +++ b/src/main/java/com/merge/api/accounting/types/PaymentRequestContact.java @@ -83,11 +83,11 @@ public PaymentRequestContact deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PaymentRequestCurrency.java b/src/main/java/com/merge/api/accounting/types/PaymentRequestCurrency.java index c1e555978..20b0b7047 100644 --- a/src/main/java/com/merge/api/accounting/types/PaymentRequestCurrency.java +++ b/src/main/java/com/merge/api/accounting/types/PaymentRequestCurrency.java @@ -83,11 +83,11 @@ public PaymentRequestCurrency deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TransactionCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PaymentRequestPaymentMethod.java b/src/main/java/com/merge/api/accounting/types/PaymentRequestPaymentMethod.java index 50a44b742..d87dfb71f 100644 --- a/src/main/java/com/merge/api/accounting/types/PaymentRequestPaymentMethod.java +++ b/src/main/java/com/merge/api/accounting/types/PaymentRequestPaymentMethod.java @@ -84,11 +84,11 @@ public PaymentRequestPaymentMethod deserialize(JsonParser p, DeserializationCont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PaymentMethod.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PaymentRequestTrackingCategoriesItem.java b/src/main/java/com/merge/api/accounting/types/PaymentRequestTrackingCategoriesItem.java index a2b2185ec..bc48cfbdf 100644 --- a/src/main/java/com/merge/api/accounting/types/PaymentRequestTrackingCategoriesItem.java +++ b/src/main/java/com/merge/api/accounting/types/PaymentRequestTrackingCategoriesItem.java @@ -85,11 +85,11 @@ public PaymentRequestTrackingCategoriesItem deserialize(JsonParser p, Deserializ Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TrackingCategory.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PaymentRequestType.java b/src/main/java/com/merge/api/accounting/types/PaymentRequestType.java index e698bae91..cd8d1a7d5 100644 --- a/src/main/java/com/merge/api/accounting/types/PaymentRequestType.java +++ b/src/main/java/com/merge/api/accounting/types/PaymentRequestType.java @@ -83,11 +83,11 @@ public PaymentRequestType deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PaymentTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PaymentResponse.java b/src/main/java/com/merge/api/accounting/types/PaymentResponse.java index 2a3b75006..725071d1f 100644 --- a/src/main/java/com/merge/api/accounting/types/PaymentResponse.java +++ b/src/main/java/com/merge/api/accounting/types/PaymentResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/accounting/types/PaymentTerm.java b/src/main/java/com/merge/api/accounting/types/PaymentTerm.java index 1ec02c9ef..e4abee539 100644 --- a/src/main/java/com/merge/api/accounting/types/PaymentTerm.java +++ b/src/main/java/com/merge/api/accounting/types/PaymentTerm.java @@ -220,7 +220,7 @@ public static NameStage builder() { public interface NameStage { /** - * The name of the payment term. + *

          The name of the payment term.

          */ _FinalStage name(@NotNull String name); @@ -348,7 +348,8 @@ public Builder from(PaymentTerm other) { } /** - * The name of the payment term.

          The name of the payment term.

          + *

          The name of the payment term.

          + *

          The name of the payment term.

          * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/accounting/types/PaymentTermCompany.java b/src/main/java/com/merge/api/accounting/types/PaymentTermCompany.java index a01949625..1b5483efa 100644 --- a/src/main/java/com/merge/api/accounting/types/PaymentTermCompany.java +++ b/src/main/java/com/merge/api/accounting/types/PaymentTermCompany.java @@ -83,11 +83,11 @@ public PaymentTermCompany deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CompanyInfo.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PaymentTrackingCategoriesItem.java b/src/main/java/com/merge/api/accounting/types/PaymentTrackingCategoriesItem.java index 072ae1579..29b3810da 100644 --- a/src/main/java/com/merge/api/accounting/types/PaymentTrackingCategoriesItem.java +++ b/src/main/java/com/merge/api/accounting/types/PaymentTrackingCategoriesItem.java @@ -84,11 +84,11 @@ public PaymentTrackingCategoriesItem deserialize(JsonParser p, DeserializationCo Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TrackingCategory.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PaymentType.java b/src/main/java/com/merge/api/accounting/types/PaymentType.java index f6003b9ef..1f997f20c 100644 --- a/src/main/java/com/merge/api/accounting/types/PaymentType.java +++ b/src/main/java/com/merge/api/accounting/types/PaymentType.java @@ -83,11 +83,11 @@ public PaymentType deserialize(JsonParser p, DeserializationContext context) thr Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PaymentTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/Project.java b/src/main/java/com/merge/api/accounting/types/Project.java index f2ffaa842..2f4410989 100644 --- a/src/main/java/com/merge/api/accounting/types/Project.java +++ b/src/main/java/com/merge/api/accounting/types/Project.java @@ -192,7 +192,7 @@ public static NameStage builder() { public interface NameStage { /** - * The project’s name + *

          The project’s name

          */ _FinalStage name(@NotNull String name); @@ -300,7 +300,8 @@ public Builder from(Project other) { } /** - * The project’s name

          The project’s name

          + *

          The project’s name

          + *

          The project’s name

          * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/accounting/types/ProjectCompany.java b/src/main/java/com/merge/api/accounting/types/ProjectCompany.java index 93e497570..c30891c3e 100644 --- a/src/main/java/com/merge/api/accounting/types/ProjectCompany.java +++ b/src/main/java/com/merge/api/accounting/types/ProjectCompany.java @@ -83,11 +83,11 @@ public ProjectCompany deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CompanyInfo.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/ProjectContact.java b/src/main/java/com/merge/api/accounting/types/ProjectContact.java index 6aa2b62cc..b2c0964d0 100644 --- a/src/main/java/com/merge/api/accounting/types/ProjectContact.java +++ b/src/main/java/com/merge/api/accounting/types/ProjectContact.java @@ -83,11 +83,11 @@ public ProjectContact deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PurchaseOrderAccountingPeriod.java b/src/main/java/com/merge/api/accounting/types/PurchaseOrderAccountingPeriod.java index 90e38b5c2..38d1409fb 100644 --- a/src/main/java/com/merge/api/accounting/types/PurchaseOrderAccountingPeriod.java +++ b/src/main/java/com/merge/api/accounting/types/PurchaseOrderAccountingPeriod.java @@ -84,11 +84,11 @@ public PurchaseOrderAccountingPeriod deserialize(JsonParser p, DeserializationCo Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AccountingPeriod.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PurchaseOrderCompany.java b/src/main/java/com/merge/api/accounting/types/PurchaseOrderCompany.java index fee07d01f..e0d5a0f9c 100644 --- a/src/main/java/com/merge/api/accounting/types/PurchaseOrderCompany.java +++ b/src/main/java/com/merge/api/accounting/types/PurchaseOrderCompany.java @@ -83,11 +83,11 @@ public PurchaseOrderCompany deserialize(JsonParser p, DeserializationContext con Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CompanyInfo.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PurchaseOrderCurrency.java b/src/main/java/com/merge/api/accounting/types/PurchaseOrderCurrency.java index 21914f031..aaa34872e 100644 --- a/src/main/java/com/merge/api/accounting/types/PurchaseOrderCurrency.java +++ b/src/main/java/com/merge/api/accounting/types/PurchaseOrderCurrency.java @@ -83,11 +83,11 @@ public PurchaseOrderCurrency deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TransactionCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PurchaseOrderDeliveryAddress.java b/src/main/java/com/merge/api/accounting/types/PurchaseOrderDeliveryAddress.java index b64e7cae6..0c7e510ed 100644 --- a/src/main/java/com/merge/api/accounting/types/PurchaseOrderDeliveryAddress.java +++ b/src/main/java/com/merge/api/accounting/types/PurchaseOrderDeliveryAddress.java @@ -84,11 +84,11 @@ public PurchaseOrderDeliveryAddress deserialize(JsonParser p, DeserializationCon Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Address.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PurchaseOrderLineItemCurrency.java b/src/main/java/com/merge/api/accounting/types/PurchaseOrderLineItemCurrency.java index 7e8499cd7..83467daa5 100644 --- a/src/main/java/com/merge/api/accounting/types/PurchaseOrderLineItemCurrency.java +++ b/src/main/java/com/merge/api/accounting/types/PurchaseOrderLineItemCurrency.java @@ -84,11 +84,11 @@ public PurchaseOrderLineItemCurrency deserialize(JsonParser p, DeserializationCo Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TransactionCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PurchaseOrderLineItemItem.java b/src/main/java/com/merge/api/accounting/types/PurchaseOrderLineItemItem.java index 9bad56b53..fd2354724 100644 --- a/src/main/java/com/merge/api/accounting/types/PurchaseOrderLineItemItem.java +++ b/src/main/java/com/merge/api/accounting/types/PurchaseOrderLineItemItem.java @@ -83,11 +83,11 @@ public PurchaseOrderLineItemItem deserialize(JsonParser p, DeserializationContex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Item.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PurchaseOrderLineItemRequestCurrency.java b/src/main/java/com/merge/api/accounting/types/PurchaseOrderLineItemRequestCurrency.java index 54d2be282..09e0503a8 100644 --- a/src/main/java/com/merge/api/accounting/types/PurchaseOrderLineItemRequestCurrency.java +++ b/src/main/java/com/merge/api/accounting/types/PurchaseOrderLineItemRequestCurrency.java @@ -85,11 +85,11 @@ public PurchaseOrderLineItemRequestCurrency deserialize(JsonParser p, Deserializ Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TransactionCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PurchaseOrderLineItemRequestItem.java b/src/main/java/com/merge/api/accounting/types/PurchaseOrderLineItemRequestItem.java index d128a0043..6f675b798 100644 --- a/src/main/java/com/merge/api/accounting/types/PurchaseOrderLineItemRequestItem.java +++ b/src/main/java/com/merge/api/accounting/types/PurchaseOrderLineItemRequestItem.java @@ -84,11 +84,11 @@ public PurchaseOrderLineItemRequestItem deserialize(JsonParser p, Deserializatio Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Item.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PurchaseOrderPaymentTerm.java b/src/main/java/com/merge/api/accounting/types/PurchaseOrderPaymentTerm.java index d948b853c..312c0853d 100644 --- a/src/main/java/com/merge/api/accounting/types/PurchaseOrderPaymentTerm.java +++ b/src/main/java/com/merge/api/accounting/types/PurchaseOrderPaymentTerm.java @@ -83,11 +83,11 @@ public PurchaseOrderPaymentTerm deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PaymentTerm.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PurchaseOrderRequestCompany.java b/src/main/java/com/merge/api/accounting/types/PurchaseOrderRequestCompany.java index 287b7e4f5..54706ba4e 100644 --- a/src/main/java/com/merge/api/accounting/types/PurchaseOrderRequestCompany.java +++ b/src/main/java/com/merge/api/accounting/types/PurchaseOrderRequestCompany.java @@ -84,11 +84,11 @@ public PurchaseOrderRequestCompany deserialize(JsonParser p, DeserializationCont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CompanyInfo.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PurchaseOrderRequestCurrency.java b/src/main/java/com/merge/api/accounting/types/PurchaseOrderRequestCurrency.java index eb12088d5..5687ba539 100644 --- a/src/main/java/com/merge/api/accounting/types/PurchaseOrderRequestCurrency.java +++ b/src/main/java/com/merge/api/accounting/types/PurchaseOrderRequestCurrency.java @@ -84,11 +84,11 @@ public PurchaseOrderRequestCurrency deserialize(JsonParser p, DeserializationCon Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TransactionCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PurchaseOrderRequestDeliveryAddress.java b/src/main/java/com/merge/api/accounting/types/PurchaseOrderRequestDeliveryAddress.java index b3010a92e..c939d5a19 100644 --- a/src/main/java/com/merge/api/accounting/types/PurchaseOrderRequestDeliveryAddress.java +++ b/src/main/java/com/merge/api/accounting/types/PurchaseOrderRequestDeliveryAddress.java @@ -85,11 +85,11 @@ public PurchaseOrderRequestDeliveryAddress deserialize(JsonParser p, Deserializa Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Address.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PurchaseOrderRequestPaymentTerm.java b/src/main/java/com/merge/api/accounting/types/PurchaseOrderRequestPaymentTerm.java index 0fa16e7be..0197f0f92 100644 --- a/src/main/java/com/merge/api/accounting/types/PurchaseOrderRequestPaymentTerm.java +++ b/src/main/java/com/merge/api/accounting/types/PurchaseOrderRequestPaymentTerm.java @@ -84,11 +84,11 @@ public PurchaseOrderRequestPaymentTerm deserialize(JsonParser p, Deserialization Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PaymentTerm.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PurchaseOrderRequestStatus.java b/src/main/java/com/merge/api/accounting/types/PurchaseOrderRequestStatus.java index 6dde6699a..0c0110d44 100644 --- a/src/main/java/com/merge/api/accounting/types/PurchaseOrderRequestStatus.java +++ b/src/main/java/com/merge/api/accounting/types/PurchaseOrderRequestStatus.java @@ -83,11 +83,11 @@ public PurchaseOrderRequestStatus deserialize(JsonParser p, DeserializationConte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PurchaseOrderStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PurchaseOrderRequestTrackingCategoriesItem.java b/src/main/java/com/merge/api/accounting/types/PurchaseOrderRequestTrackingCategoriesItem.java index c2fa6e444..a340b28bb 100644 --- a/src/main/java/com/merge/api/accounting/types/PurchaseOrderRequestTrackingCategoriesItem.java +++ b/src/main/java/com/merge/api/accounting/types/PurchaseOrderRequestTrackingCategoriesItem.java @@ -85,11 +85,11 @@ public PurchaseOrderRequestTrackingCategoriesItem deserialize(JsonParser p, Dese Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TrackingCategory.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PurchaseOrderRequestVendor.java b/src/main/java/com/merge/api/accounting/types/PurchaseOrderRequestVendor.java index 22c7f110b..a4cafbbed 100644 --- a/src/main/java/com/merge/api/accounting/types/PurchaseOrderRequestVendor.java +++ b/src/main/java/com/merge/api/accounting/types/PurchaseOrderRequestVendor.java @@ -83,11 +83,11 @@ public PurchaseOrderRequestVendor deserialize(JsonParser p, DeserializationConte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PurchaseOrderResponse.java b/src/main/java/com/merge/api/accounting/types/PurchaseOrderResponse.java index 68520ccd3..dd82011ac 100644 --- a/src/main/java/com/merge/api/accounting/types/PurchaseOrderResponse.java +++ b/src/main/java/com/merge/api/accounting/types/PurchaseOrderResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/accounting/types/PurchaseOrderStatus.java b/src/main/java/com/merge/api/accounting/types/PurchaseOrderStatus.java index b8b529ca0..ab9b8fcbf 100644 --- a/src/main/java/com/merge/api/accounting/types/PurchaseOrderStatus.java +++ b/src/main/java/com/merge/api/accounting/types/PurchaseOrderStatus.java @@ -83,11 +83,11 @@ public PurchaseOrderStatus deserialize(JsonParser p, DeserializationContext cont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PurchaseOrderStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PurchaseOrderTrackingCategoriesItem.java b/src/main/java/com/merge/api/accounting/types/PurchaseOrderTrackingCategoriesItem.java index 83717dfb7..fd73ddbee 100644 --- a/src/main/java/com/merge/api/accounting/types/PurchaseOrderTrackingCategoriesItem.java +++ b/src/main/java/com/merge/api/accounting/types/PurchaseOrderTrackingCategoriesItem.java @@ -85,11 +85,11 @@ public PurchaseOrderTrackingCategoriesItem deserialize(JsonParser p, Deserializa Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TrackingCategory.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/PurchaseOrderVendor.java b/src/main/java/com/merge/api/accounting/types/PurchaseOrderVendor.java index b781dceac..0f73355fc 100644 --- a/src/main/java/com/merge/api/accounting/types/PurchaseOrderVendor.java +++ b/src/main/java/com/merge/api/accounting/types/PurchaseOrderVendor.java @@ -83,11 +83,11 @@ public PurchaseOrderVendor deserialize(JsonParser p, DeserializationContext cont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/RemoteData.java b/src/main/java/com/merge/api/accounting/types/RemoteData.java index 676fcbf50..aae8477b5 100644 --- a/src/main/java/com/merge/api/accounting/types/RemoteData.java +++ b/src/main/java/com/merge/api/accounting/types/RemoteData.java @@ -78,7 +78,7 @@ public static PathStage builder() { public interface PathStage { /** - * The third-party API path that is being called. + *

          The third-party API path that is being called.

          */ _FinalStage path(@NotNull String path); @@ -112,7 +112,8 @@ public Builder from(RemoteData other) { } /** - * The third-party API path that is being called.

          The third-party API path that is being called.

          + *

          The third-party API path that is being called.

          + *

          The third-party API path that is being called.

          * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/accounting/types/RemoteEndpointInfo.java b/src/main/java/com/merge/api/accounting/types/RemoteEndpointInfo.java index f88389823..b91f9917b 100644 --- a/src/main/java/com/merge/api/accounting/types/RemoteEndpointInfo.java +++ b/src/main/java/com/merge/api/accounting/types/RemoteEndpointInfo.java @@ -145,7 +145,9 @@ public _FinalStage urlPath(@NotNull String urlPath) { @java.lang.Override public _FinalStage addAllFieldTraversalPath(List fieldTraversalPath) { - this.fieldTraversalPath.addAll(fieldTraversalPath); + if (fieldTraversalPath != null) { + this.fieldTraversalPath.addAll(fieldTraversalPath); + } return this; } diff --git a/src/main/java/com/merge/api/accounting/types/RemoteFieldApi.java b/src/main/java/com/merge/api/accounting/types/RemoteFieldApi.java index 984beffe6..295f4e39e 100644 --- a/src/main/java/com/merge/api/accounting/types/RemoteFieldApi.java +++ b/src/main/java/com/merge/api/accounting/types/RemoteFieldApi.java @@ -248,7 +248,9 @@ public _FinalStage schema(String key, JsonNode value) { @java.lang.Override public _FinalStage putAllSchema(Map schema) { - this.schema.putAll(schema); + if (schema != null) { + this.schema.putAll(schema); + } return this; } diff --git a/src/main/java/com/merge/api/accounting/types/RemoteFieldRemoteFieldClass.java b/src/main/java/com/merge/api/accounting/types/RemoteFieldRemoteFieldClass.java index 14c4696fa..d9f552b32 100644 --- a/src/main/java/com/merge/api/accounting/types/RemoteFieldRemoteFieldClass.java +++ b/src/main/java/com/merge/api/accounting/types/RemoteFieldRemoteFieldClass.java @@ -84,11 +84,11 @@ public RemoteFieldRemoteFieldClass deserialize(JsonParser p, DeserializationCont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RemoteFieldClass.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/RemoteFieldRequestRemoteFieldClass.java b/src/main/java/com/merge/api/accounting/types/RemoteFieldRequestRemoteFieldClass.java index 7cb799dc0..bc6bb0c33 100644 --- a/src/main/java/com/merge/api/accounting/types/RemoteFieldRequestRemoteFieldClass.java +++ b/src/main/java/com/merge/api/accounting/types/RemoteFieldRequestRemoteFieldClass.java @@ -85,11 +85,11 @@ public RemoteFieldRequestRemoteFieldClass deserialize(JsonParser p, Deserializat Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RemoteFieldClass.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/RemoteKeyForRegenerationRequest.java b/src/main/java/com/merge/api/accounting/types/RemoteKeyForRegenerationRequest.java index ab18303d4..e40b5cbc7 100644 --- a/src/main/java/com/merge/api/accounting/types/RemoteKeyForRegenerationRequest.java +++ b/src/main/java/com/merge/api/accounting/types/RemoteKeyForRegenerationRequest.java @@ -67,7 +67,7 @@ public static NameStage builder() { public interface NameStage { /** - * The name of the remote key + *

          The name of the remote key

          */ _FinalStage name(@NotNull String name); @@ -94,7 +94,8 @@ public Builder from(RemoteKeyForRegenerationRequest other) { } /** - * The name of the remote key

          The name of the remote key

          + *

          The name of the remote key

          + *

          The name of the remote key

          * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/accounting/types/SyncStatusLastSyncResult.java b/src/main/java/com/merge/api/accounting/types/SyncStatusLastSyncResult.java index edef918c0..290f9f3ef 100644 --- a/src/main/java/com/merge/api/accounting/types/SyncStatusLastSyncResult.java +++ b/src/main/java/com/merge/api/accounting/types/SyncStatusLastSyncResult.java @@ -83,11 +83,11 @@ public SyncStatusLastSyncResult deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, LastSyncResultEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/SyncStatusStatus.java b/src/main/java/com/merge/api/accounting/types/SyncStatusStatus.java index ae309161f..c5748e18f 100644 --- a/src/main/java/com/merge/api/accounting/types/SyncStatusStatus.java +++ b/src/main/java/com/merge/api/accounting/types/SyncStatusStatus.java @@ -83,11 +83,11 @@ public SyncStatusStatus deserialize(JsonParser p, DeserializationContext context Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, StatusFd5Enum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/TaxComponentComponentType.java b/src/main/java/com/merge/api/accounting/types/TaxComponentComponentType.java index f5e5859f3..fda6e6d0b 100644 --- a/src/main/java/com/merge/api/accounting/types/TaxComponentComponentType.java +++ b/src/main/java/com/merge/api/accounting/types/TaxComponentComponentType.java @@ -83,11 +83,11 @@ public TaxComponentComponentType deserialize(JsonParser p, DeserializationContex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, ComponentTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/TaxRateCompany.java b/src/main/java/com/merge/api/accounting/types/TaxRateCompany.java index 7ccc15b68..644ea0a16 100644 --- a/src/main/java/com/merge/api/accounting/types/TaxRateCompany.java +++ b/src/main/java/com/merge/api/accounting/types/TaxRateCompany.java @@ -83,11 +83,11 @@ public TaxRateCompany deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CompanyInfo.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/TaxRateStatus.java b/src/main/java/com/merge/api/accounting/types/TaxRateStatus.java index 353bc0869..4fc638fcc 100644 --- a/src/main/java/com/merge/api/accounting/types/TaxRateStatus.java +++ b/src/main/java/com/merge/api/accounting/types/TaxRateStatus.java @@ -83,11 +83,11 @@ public TaxRateStatus deserialize(JsonParser p, DeserializationContext context) t Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Status7D1Enum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/TaxRateTaxComponentsItem.java b/src/main/java/com/merge/api/accounting/types/TaxRateTaxComponentsItem.java index e8542ae0f..adc7cfc09 100644 --- a/src/main/java/com/merge/api/accounting/types/TaxRateTaxComponentsItem.java +++ b/src/main/java/com/merge/api/accounting/types/TaxRateTaxComponentsItem.java @@ -83,11 +83,11 @@ public TaxRateTaxComponentsItem deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TaxComponent.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/TrackingCategoryCategoryType.java b/src/main/java/com/merge/api/accounting/types/TrackingCategoryCategoryType.java index a29eefb32..e04b1437a 100644 --- a/src/main/java/com/merge/api/accounting/types/TrackingCategoryCategoryType.java +++ b/src/main/java/com/merge/api/accounting/types/TrackingCategoryCategoryType.java @@ -84,11 +84,11 @@ public TrackingCategoryCategoryType deserialize(JsonParser p, DeserializationCon Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CategoryTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/TrackingCategoryCompany.java b/src/main/java/com/merge/api/accounting/types/TrackingCategoryCompany.java index 51aa86ea2..08243c938 100644 --- a/src/main/java/com/merge/api/accounting/types/TrackingCategoryCompany.java +++ b/src/main/java/com/merge/api/accounting/types/TrackingCategoryCompany.java @@ -83,11 +83,11 @@ public TrackingCategoryCompany deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CompanyInfo.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/TrackingCategoryStatus.java b/src/main/java/com/merge/api/accounting/types/TrackingCategoryStatus.java index 6943ae5ae..cb88ec839 100644 --- a/src/main/java/com/merge/api/accounting/types/TrackingCategoryStatus.java +++ b/src/main/java/com/merge/api/accounting/types/TrackingCategoryStatus.java @@ -83,11 +83,11 @@ public TrackingCategoryStatus deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Status7D1Enum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/TransactionAccount.java b/src/main/java/com/merge/api/accounting/types/TransactionAccount.java index 391e4dcce..dcebbc96c 100644 --- a/src/main/java/com/merge/api/accounting/types/TransactionAccount.java +++ b/src/main/java/com/merge/api/accounting/types/TransactionAccount.java @@ -83,11 +83,11 @@ public TransactionAccount deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/TransactionAccountingPeriod.java b/src/main/java/com/merge/api/accounting/types/TransactionAccountingPeriod.java index 09f2eaa5c..88a87ac2f 100644 --- a/src/main/java/com/merge/api/accounting/types/TransactionAccountingPeriod.java +++ b/src/main/java/com/merge/api/accounting/types/TransactionAccountingPeriod.java @@ -84,11 +84,11 @@ public TransactionAccountingPeriod deserialize(JsonParser p, DeserializationCont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AccountingPeriod.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/TransactionContact.java b/src/main/java/com/merge/api/accounting/types/TransactionContact.java index 8b9c4b812..e36cb36b0 100644 --- a/src/main/java/com/merge/api/accounting/types/TransactionContact.java +++ b/src/main/java/com/merge/api/accounting/types/TransactionContact.java @@ -83,11 +83,11 @@ public TransactionContact deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/TransactionCurrency.java b/src/main/java/com/merge/api/accounting/types/TransactionCurrency.java index 19e0707ca..6bda4bcc1 100644 --- a/src/main/java/com/merge/api/accounting/types/TransactionCurrency.java +++ b/src/main/java/com/merge/api/accounting/types/TransactionCurrency.java @@ -83,11 +83,11 @@ public TransactionCurrency deserialize(JsonParser p, DeserializationContext cont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TransactionCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/TransactionLineItemCurrency.java b/src/main/java/com/merge/api/accounting/types/TransactionLineItemCurrency.java index 76f252329..6fc7added 100644 --- a/src/main/java/com/merge/api/accounting/types/TransactionLineItemCurrency.java +++ b/src/main/java/com/merge/api/accounting/types/TransactionLineItemCurrency.java @@ -84,11 +84,11 @@ public TransactionLineItemCurrency deserialize(JsonParser p, DeserializationCont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TransactionCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/TransactionLineItemItem.java b/src/main/java/com/merge/api/accounting/types/TransactionLineItemItem.java index f3d69e7a0..4cf16207f 100644 --- a/src/main/java/com/merge/api/accounting/types/TransactionLineItemItem.java +++ b/src/main/java/com/merge/api/accounting/types/TransactionLineItemItem.java @@ -83,11 +83,11 @@ public TransactionLineItemItem deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Item.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/TransactionTrackingCategoriesItem.java b/src/main/java/com/merge/api/accounting/types/TransactionTrackingCategoriesItem.java index d3aabac94..c76345837 100644 --- a/src/main/java/com/merge/api/accounting/types/TransactionTrackingCategoriesItem.java +++ b/src/main/java/com/merge/api/accounting/types/TransactionTrackingCategoriesItem.java @@ -84,11 +84,11 @@ public TransactionTrackingCategoriesItem deserialize(JsonParser p, Deserializati Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TrackingCategory.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/VendorCreditAccountingPeriod.java b/src/main/java/com/merge/api/accounting/types/VendorCreditAccountingPeriod.java index 388715d73..1a1a831b2 100644 --- a/src/main/java/com/merge/api/accounting/types/VendorCreditAccountingPeriod.java +++ b/src/main/java/com/merge/api/accounting/types/VendorCreditAccountingPeriod.java @@ -84,11 +84,11 @@ public VendorCreditAccountingPeriod deserialize(JsonParser p, DeserializationCon Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AccountingPeriod.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/VendorCreditApplyLineForInvoiceVendorCredit.java b/src/main/java/com/merge/api/accounting/types/VendorCreditApplyLineForInvoiceVendorCredit.java index b26a88af2..d3771c0ac 100644 --- a/src/main/java/com/merge/api/accounting/types/VendorCreditApplyLineForInvoiceVendorCredit.java +++ b/src/main/java/com/merge/api/accounting/types/VendorCreditApplyLineForInvoiceVendorCredit.java @@ -85,11 +85,11 @@ public VendorCreditApplyLineForInvoiceVendorCredit deserialize(JsonParser p, Des Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, VendorCredit.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/VendorCreditApplyLineForVendorCreditInvoice.java b/src/main/java/com/merge/api/accounting/types/VendorCreditApplyLineForVendorCreditInvoice.java index 7f3c84043..d53f5300b 100644 --- a/src/main/java/com/merge/api/accounting/types/VendorCreditApplyLineForVendorCreditInvoice.java +++ b/src/main/java/com/merge/api/accounting/types/VendorCreditApplyLineForVendorCreditInvoice.java @@ -85,11 +85,11 @@ public VendorCreditApplyLineForVendorCreditInvoice deserialize(JsonParser p, Des Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Invoice.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/VendorCreditApplyLineForVendorCreditRequestInvoice.java b/src/main/java/com/merge/api/accounting/types/VendorCreditApplyLineForVendorCreditRequestInvoice.java index 66aaca9ad..17edbfa53 100644 --- a/src/main/java/com/merge/api/accounting/types/VendorCreditApplyLineForVendorCreditRequestInvoice.java +++ b/src/main/java/com/merge/api/accounting/types/VendorCreditApplyLineForVendorCreditRequestInvoice.java @@ -85,11 +85,11 @@ public VendorCreditApplyLineForVendorCreditRequestInvoice deserialize( Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Invoice.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/VendorCreditCompany.java b/src/main/java/com/merge/api/accounting/types/VendorCreditCompany.java index a07915abf..ac5072a5e 100644 --- a/src/main/java/com/merge/api/accounting/types/VendorCreditCompany.java +++ b/src/main/java/com/merge/api/accounting/types/VendorCreditCompany.java @@ -83,11 +83,11 @@ public VendorCreditCompany deserialize(JsonParser p, DeserializationContext cont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CompanyInfo.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/VendorCreditCurrency.java b/src/main/java/com/merge/api/accounting/types/VendorCreditCurrency.java index f8b73786b..4563f7815 100644 --- a/src/main/java/com/merge/api/accounting/types/VendorCreditCurrency.java +++ b/src/main/java/com/merge/api/accounting/types/VendorCreditCurrency.java @@ -83,11 +83,11 @@ public VendorCreditCurrency deserialize(JsonParser p, DeserializationContext con Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TransactionCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/VendorCreditLineAccount.java b/src/main/java/com/merge/api/accounting/types/VendorCreditLineAccount.java index 8b2316190..806c3207c 100644 --- a/src/main/java/com/merge/api/accounting/types/VendorCreditLineAccount.java +++ b/src/main/java/com/merge/api/accounting/types/VendorCreditLineAccount.java @@ -83,11 +83,11 @@ public VendorCreditLineAccount deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/VendorCreditLineContact.java b/src/main/java/com/merge/api/accounting/types/VendorCreditLineContact.java index 28b27d5d2..eb26bb0ea 100644 --- a/src/main/java/com/merge/api/accounting/types/VendorCreditLineContact.java +++ b/src/main/java/com/merge/api/accounting/types/VendorCreditLineContact.java @@ -83,11 +83,11 @@ public VendorCreditLineContact deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/VendorCreditLineProject.java b/src/main/java/com/merge/api/accounting/types/VendorCreditLineProject.java index 006a165f7..1fe8c2bcd 100644 --- a/src/main/java/com/merge/api/accounting/types/VendorCreditLineProject.java +++ b/src/main/java/com/merge/api/accounting/types/VendorCreditLineProject.java @@ -83,11 +83,11 @@ public VendorCreditLineProject deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Project.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/VendorCreditLineRequestAccount.java b/src/main/java/com/merge/api/accounting/types/VendorCreditLineRequestAccount.java index 8afa36c0a..929c766cb 100644 --- a/src/main/java/com/merge/api/accounting/types/VendorCreditLineRequestAccount.java +++ b/src/main/java/com/merge/api/accounting/types/VendorCreditLineRequestAccount.java @@ -84,11 +84,11 @@ public VendorCreditLineRequestAccount deserialize(JsonParser p, DeserializationC Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/VendorCreditLineRequestContact.java b/src/main/java/com/merge/api/accounting/types/VendorCreditLineRequestContact.java index 001d73c6e..b309542b2 100644 --- a/src/main/java/com/merge/api/accounting/types/VendorCreditLineRequestContact.java +++ b/src/main/java/com/merge/api/accounting/types/VendorCreditLineRequestContact.java @@ -84,11 +84,11 @@ public VendorCreditLineRequestContact deserialize(JsonParser p, DeserializationC Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/VendorCreditLineRequestProject.java b/src/main/java/com/merge/api/accounting/types/VendorCreditLineRequestProject.java index 2561ab5b1..3fc8c2fbe 100644 --- a/src/main/java/com/merge/api/accounting/types/VendorCreditLineRequestProject.java +++ b/src/main/java/com/merge/api/accounting/types/VendorCreditLineRequestProject.java @@ -84,11 +84,11 @@ public VendorCreditLineRequestProject deserialize(JsonParser p, DeserializationC Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Project.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/VendorCreditRequestAccountingPeriod.java b/src/main/java/com/merge/api/accounting/types/VendorCreditRequestAccountingPeriod.java index a953dbe57..3179cbda2 100644 --- a/src/main/java/com/merge/api/accounting/types/VendorCreditRequestAccountingPeriod.java +++ b/src/main/java/com/merge/api/accounting/types/VendorCreditRequestAccountingPeriod.java @@ -85,11 +85,11 @@ public VendorCreditRequestAccountingPeriod deserialize(JsonParser p, Deserializa Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AccountingPeriod.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/VendorCreditRequestCompany.java b/src/main/java/com/merge/api/accounting/types/VendorCreditRequestCompany.java index e5d982a82..2d5663e92 100644 --- a/src/main/java/com/merge/api/accounting/types/VendorCreditRequestCompany.java +++ b/src/main/java/com/merge/api/accounting/types/VendorCreditRequestCompany.java @@ -83,11 +83,11 @@ public VendorCreditRequestCompany deserialize(JsonParser p, DeserializationConte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CompanyInfo.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/VendorCreditRequestCurrency.java b/src/main/java/com/merge/api/accounting/types/VendorCreditRequestCurrency.java index abd3970e7..d0b5e02c5 100644 --- a/src/main/java/com/merge/api/accounting/types/VendorCreditRequestCurrency.java +++ b/src/main/java/com/merge/api/accounting/types/VendorCreditRequestCurrency.java @@ -84,11 +84,11 @@ public VendorCreditRequestCurrency deserialize(JsonParser p, DeserializationCont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TransactionCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/VendorCreditRequestTrackingCategoriesItem.java b/src/main/java/com/merge/api/accounting/types/VendorCreditRequestTrackingCategoriesItem.java index 582203ab2..b2f49fba5 100644 --- a/src/main/java/com/merge/api/accounting/types/VendorCreditRequestTrackingCategoriesItem.java +++ b/src/main/java/com/merge/api/accounting/types/VendorCreditRequestTrackingCategoriesItem.java @@ -85,11 +85,11 @@ public VendorCreditRequestTrackingCategoriesItem deserialize(JsonParser p, Deser Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TrackingCategory.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/VendorCreditRequestVendor.java b/src/main/java/com/merge/api/accounting/types/VendorCreditRequestVendor.java index e4c0d6049..13695c2e6 100644 --- a/src/main/java/com/merge/api/accounting/types/VendorCreditRequestVendor.java +++ b/src/main/java/com/merge/api/accounting/types/VendorCreditRequestVendor.java @@ -83,11 +83,11 @@ public VendorCreditRequestVendor deserialize(JsonParser p, DeserializationContex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/VendorCreditResponse.java b/src/main/java/com/merge/api/accounting/types/VendorCreditResponse.java index b165808ce..c6096b7bb 100644 --- a/src/main/java/com/merge/api/accounting/types/VendorCreditResponse.java +++ b/src/main/java/com/merge/api/accounting/types/VendorCreditResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/accounting/types/VendorCreditTrackingCategoriesItem.java b/src/main/java/com/merge/api/accounting/types/VendorCreditTrackingCategoriesItem.java index 6eb3978ea..4fae371fe 100644 --- a/src/main/java/com/merge/api/accounting/types/VendorCreditTrackingCategoriesItem.java +++ b/src/main/java/com/merge/api/accounting/types/VendorCreditTrackingCategoriesItem.java @@ -85,11 +85,11 @@ public VendorCreditTrackingCategoriesItem deserialize(JsonParser p, Deserializat Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TrackingCategory.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/accounting/types/VendorCreditVendor.java b/src/main/java/com/merge/api/accounting/types/VendorCreditVendor.java index 9a9c3e9d5..348a64043 100644 --- a/src/main/java/com/merge/api/accounting/types/VendorCreditVendor.java +++ b/src/main/java/com/merge/api/accounting/types/VendorCreditVendor.java @@ -83,11 +83,11 @@ public VendorCreditVendor deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/AsyncRawAccountDetailsClient.java b/src/main/java/com/merge/api/ats/AsyncRawAccountDetailsClient.java index 21a89d458..ec6fa2cc4 100644 --- a/src/main/java/com/merge/api/ats/AsyncRawAccountDetailsClient.java +++ b/src/main/java/com/merge/api/ats/AsyncRawAccountDetailsClient.java @@ -48,7 +48,6 @@ public CompletableFuture> retrieve(RequestO .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/AsyncRawAccountTokenClient.java b/src/main/java/com/merge/api/ats/AsyncRawAccountTokenClient.java index ff1974883..3dd75672f 100644 --- a/src/main/java/com/merge/api/ats/AsyncRawAccountTokenClient.java +++ b/src/main/java/com/merge/api/ats/AsyncRawAccountTokenClient.java @@ -50,7 +50,6 @@ public CompletableFuture> retrieve( .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/AsyncRawActivitiesClient.java b/src/main/java/com/merge/api/ats/AsyncRawActivitiesClient.java index 1bfb32b15..4020ff739 100644 --- a/src/main/java/com/merge/api/ats/AsyncRawActivitiesClient.java +++ b/src/main/java/com/merge/api/ats/AsyncRawActivitiesClient.java @@ -69,11 +69,11 @@ public CompletableFuture>> lis .addPathSegments("ats/v1/activities"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -83,41 +83,35 @@ public CompletableFuture>> lis QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -125,10 +119,7 @@ public CompletableFuture>> lis } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getUserId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -136,13 +127,12 @@ public CompletableFuture>> lis } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -213,11 +203,11 @@ public CompletableFuture> create( .addPathSegments("ats/v1/activities"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -298,36 +288,29 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -383,7 +366,6 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/AsyncRawApplicationsClient.java b/src/main/java/com/merge/api/ats/AsyncRawApplicationsClient.java index 17ae90c37..1e67665eb 100644 --- a/src/main/java/com/merge/api/ats/AsyncRawApplicationsClient.java +++ b/src/main/java/com/merge/api/ats/AsyncRawApplicationsClient.java @@ -76,11 +76,11 @@ public CompletableFuture>> } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCreditedToId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -98,22 +98,19 @@ public CompletableFuture>> QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getJobId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -121,18 +118,15 @@ public CompletableFuture>> } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRejectReasonId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -148,13 +142,12 @@ public CompletableFuture>> } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -229,11 +222,11 @@ public CompletableFuture> create( .addPathSegments("ats/v1/applications"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -315,25 +308,21 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -398,11 +387,11 @@ public CompletableFuture> changeStageC .addPathSegments("change-stage"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); if (request.getJobInterviewStage().isPresent()) { @@ -494,7 +483,6 @@ public CompletableFuture> metaPostRetrieve( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/AsyncRawAsyncPassthroughClient.java b/src/main/java/com/merge/api/ats/AsyncRawAsyncPassthroughClient.java index aa5fed334..61c7ce08a 100644 --- a/src/main/java/com/merge/api/ats/AsyncRawAsyncPassthroughClient.java +++ b/src/main/java/com/merge/api/ats/AsyncRawAsyncPassthroughClient.java @@ -122,7 +122,6 @@ public CompletableFuture> .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/AsyncRawAttachmentsClient.java b/src/main/java/com/merge/api/ats/AsyncRawAttachmentsClient.java index 48f3680cf..194420625 100644 --- a/src/main/java/com/merge/api/ats/AsyncRawAttachmentsClient.java +++ b/src/main/java/com/merge/api/ats/AsyncRawAttachmentsClient.java @@ -74,11 +74,11 @@ public CompletableFuture>> l } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -88,37 +88,31 @@ public CompletableFuture>> l QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -134,13 +128,12 @@ public CompletableFuture>> l } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -211,11 +204,11 @@ public CompletableFuture> create( .addPathSegments("ats/v1/attachments"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -296,15 +289,12 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -316,13 +306,12 @@ public CompletableFuture> retrieve( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -379,7 +368,6 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/AsyncRawAuditTrailClient.java b/src/main/java/com/merge/api/ats/AsyncRawAuditTrailClient.java index 5fa896142..d36eff89b 100644 --- a/src/main/java/com/merge/api/ats/AsyncRawAuditTrailClient.java +++ b/src/main/java/com/merge/api/ats/AsyncRawAuditTrailClient.java @@ -74,7 +74,7 @@ public CompletableFuture> } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getStartDate().isPresent()) { QueryStringMapper.addQueryParameter( @@ -88,7 +88,6 @@ public CompletableFuture> .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/AsyncRawAvailableActionsClient.java b/src/main/java/com/merge/api/ats/AsyncRawAvailableActionsClient.java index 36a251e52..0f8544713 100644 --- a/src/main/java/com/merge/api/ats/AsyncRawAvailableActionsClient.java +++ b/src/main/java/com/merge/api/ats/AsyncRawAvailableActionsClient.java @@ -48,7 +48,6 @@ public CompletableFuture> retrieve(Reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/AsyncRawCandidatesClient.java b/src/main/java/com/merge/api/ats/AsyncRawCandidatesClient.java index b564454ec..64fbb7509 100644 --- a/src/main/java/com/merge/api/ats/AsyncRawCandidatesClient.java +++ b/src/main/java/com/merge/api/ats/AsyncRawCandidatesClient.java @@ -72,11 +72,11 @@ public CompletableFuture>> li .addPathSegments("ats/v1/candidates"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -94,22 +94,19 @@ public CompletableFuture>> li QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getLastName().isPresent()) { QueryStringMapper.addQueryParameter( @@ -117,18 +114,15 @@ public CompletableFuture>> li } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -140,13 +134,12 @@ public CompletableFuture>> li } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -217,11 +210,11 @@ public CompletableFuture> create( .addPathSegments("ats/v1/candidates"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -302,25 +295,21 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -376,11 +365,11 @@ public CompletableFuture> partialUpdate( .addPathSegment(id); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -519,7 +508,6 @@ public CompletableFuture> metaPatchRetrieve( .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -576,7 +564,6 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/AsyncRawDepartmentsClient.java b/src/main/java/com/merge/api/ats/AsyncRawDepartmentsClient.java index 13fa45a13..daa9de755 100644 --- a/src/main/java/com/merge/api/ats/AsyncRawDepartmentsClient.java +++ b/src/main/java/com/merge/api/ats/AsyncRawDepartmentsClient.java @@ -63,11 +63,11 @@ public CompletableFuture>> l .addPathSegments("ats/v1/departments"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -77,37 +77,31 @@ public CompletableFuture>> l QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -117,7 +111,6 @@ public CompletableFuture>> l .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -198,21 +191,17 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/AsyncRawEeocsClient.java b/src/main/java/com/merge/api/ats/AsyncRawEeocsClient.java index bcc7f39dc..45e6109f3 100644 --- a/src/main/java/com/merge/api/ats/AsyncRawEeocsClient.java +++ b/src/main/java/com/merge/api/ats/AsyncRawEeocsClient.java @@ -66,11 +66,11 @@ public CompletableFuture>> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -80,41 +80,35 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -122,20 +116,16 @@ public CompletableFuture>> list( } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -216,36 +206,29 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/AsyncRawFieldMappingClient.java b/src/main/java/com/merge/api/ats/AsyncRawFieldMappingClient.java index b2bb7d6f2..ea2205c76 100644 --- a/src/main/java/com/merge/api/ats/AsyncRawFieldMappingClient.java +++ b/src/main/java/com/merge/api/ats/AsyncRawFieldMappingClient.java @@ -69,14 +69,13 @@ public CompletableFuture> QueryStringMapper.addQueryParameter( httpUrl, "exclude_remote_field_metadata", - request.getExcludeRemoteFieldMetadata().get().toString(), + request.getExcludeRemoteFieldMetadata().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -135,7 +134,7 @@ public CompletableFuture> fie QueryStringMapper.addQueryParameter( httpUrl, "exclude_remote_field_metadata", - request.getExcludeRemoteFieldMetadata().get().toString(), + request.getExcludeRemoteFieldMetadata().get(), false); } Map properties = new HashMap<>(); @@ -217,7 +216,6 @@ public CompletableFuture> fie .url(httpUrl) .method("DELETE", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -371,7 +369,6 @@ public CompletableFuture> remoteFie .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -430,7 +427,6 @@ public CompletableFuture> t .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/AsyncRawForceResyncClient.java b/src/main/java/com/merge/api/ats/AsyncRawForceResyncClient.java index d45966b04..d35a86847 100644 --- a/src/main/java/com/merge/api/ats/AsyncRawForceResyncClient.java +++ b/src/main/java/com/merge/api/ats/AsyncRawForceResyncClient.java @@ -52,7 +52,6 @@ public CompletableFuture>> syncStatusResyn .url(httpUrl) .method("POST", RequestBody.create("", null)) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/AsyncRawInterviewsClient.java b/src/main/java/com/merge/api/ats/AsyncRawInterviewsClient.java index 2712ea00c..ed099a3e2 100644 --- a/src/main/java/com/merge/api/ats/AsyncRawInterviewsClient.java +++ b/src/main/java/com/merge/api/ats/AsyncRawInterviewsClient.java @@ -74,11 +74,11 @@ public CompletableFuture> creat .addPathSegments("ats/v1/interviews"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -316,15 +309,12 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -336,13 +326,12 @@ public CompletableFuture> retrieve( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -399,7 +388,6 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/AsyncRawIssuesClient.java b/src/main/java/com/merge/api/ats/AsyncRawIssuesClient.java index b30514af2..817b28fc5 100644 --- a/src/main/java/com/merge/api/ats/AsyncRawIssuesClient.java +++ b/src/main/java/com/merge/api/ats/AsyncRawIssuesClient.java @@ -82,14 +82,14 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "first_incident_time_after", - request.getFirstIncidentTimeAfter().get().toString(), + request.getFirstIncidentTimeAfter().get(), false); } if (request.getFirstIncidentTimeBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "first_incident_time_before", - request.getFirstIncidentTimeBefore().get().toString(), + request.getFirstIncidentTimeBefore().get(), false); } if (request.getIncludeMuted().isPresent()) { @@ -104,14 +104,14 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "last_incident_time_after", - request.getLastIncidentTimeAfter().get().toString(), + request.getLastIncidentTimeAfter().get(), false); } if (request.getLastIncidentTimeBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "last_incident_time_before", - request.getLastIncidentTimeBefore().get().toString(), + request.getLastIncidentTimeBefore().get(), false); } if (request.getLinkedAccountId().isPresent()) { @@ -120,7 +120,7 @@ public CompletableFuture>> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getStartDate().isPresent()) { QueryStringMapper.addQueryParameter( @@ -128,13 +128,12 @@ public CompletableFuture>> list( } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "status", request.getStatus().get().toString(), false); + httpUrl, "status", request.getStatus().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -208,7 +207,6 @@ public CompletableFuture> retrieve(String id, Reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/AsyncRawJobInterviewStagesClient.java b/src/main/java/com/merge/api/ats/AsyncRawJobInterviewStagesClient.java index 38fae44c8..7203a1c13 100644 --- a/src/main/java/com/merge/api/ats/AsyncRawJobInterviewStagesClient.java +++ b/src/main/java/com/merge/api/ats/AsyncRawJobInterviewStagesClient.java @@ -63,11 +63,11 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/AsyncRawJobPostingsClient.java b/src/main/java/com/merge/api/ats/AsyncRawJobPostingsClient.java index 02c36c21f..8fc0a37c1 100644 --- a/src/main/java/com/merge/api/ats/AsyncRawJobPostingsClient.java +++ b/src/main/java/com/merge/api/ats/AsyncRawJobPostingsClient.java @@ -63,11 +63,11 @@ public CompletableFuture>> l .addPathSegments("ats/v1/job-postings"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -77,37 +77,31 @@ public CompletableFuture>> l QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -115,17 +109,16 @@ public CompletableFuture>> l } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "status", request.getStatus().get().toString(), false); + httpUrl, "status", request.getStatus().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -206,25 +199,21 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/AsyncRawJobsClient.java b/src/main/java/com/merge/api/ats/AsyncRawJobsClient.java index c7b05c84d..6219de166 100644 --- a/src/main/java/com/merge/api/ats/AsyncRawJobsClient.java +++ b/src/main/java/com/merge/api/ats/AsyncRawJobsClient.java @@ -69,11 +69,11 @@ public CompletableFuture>> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -83,33 +83,27 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getOffices().isPresent()) { QueryStringMapper.addQueryParameter( @@ -117,7 +111,7 @@ public CompletableFuture>> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -133,17 +127,16 @@ public CompletableFuture>> list( } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "status", request.getStatus().get().toString(), false); + httpUrl, "status", request.getStatus().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -224,15 +217,12 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -244,13 +234,12 @@ public CompletableFuture> retrieve( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -322,36 +311,32 @@ public CompletableFuture>> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCreatorId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -84,37 +84,31 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -130,13 +124,12 @@ public CompletableFuture>> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -217,15 +210,12 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -237,13 +227,12 @@ public CompletableFuture> retrieve( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/AsyncRawOfficesClient.java b/src/main/java/com/merge/api/ats/AsyncRawOfficesClient.java index d3baef8e8..bc281171a 100644 --- a/src/main/java/com/merge/api/ats/AsyncRawOfficesClient.java +++ b/src/main/java/com/merge/api/ats/AsyncRawOfficesClient.java @@ -62,11 +62,11 @@ public CompletableFuture>> list( .addPathSegments("ats/v1/offices"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -76,37 +76,31 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -116,7 +110,6 @@ public CompletableFuture>> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -197,21 +190,17 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/AsyncRawRejectReasonsClient.java b/src/main/java/com/merge/api/ats/AsyncRawRejectReasonsClient.java index d2aa4a756..5f47a282b 100644 --- a/src/main/java/com/merge/api/ats/AsyncRawRejectReasonsClient.java +++ b/src/main/java/com/merge/api/ats/AsyncRawRejectReasonsClient.java @@ -63,11 +63,11 @@ public CompletableFuture>> .addPathSegments("ats/v1/reject-reasons"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -77,37 +77,31 @@ public CompletableFuture>> QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -117,7 +111,6 @@ public CompletableFuture>> .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -199,21 +192,17 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/AsyncRawScopesClient.java b/src/main/java/com/merge/api/ats/AsyncRawScopesClient.java index fd8680d71..04a038078 100644 --- a/src/main/java/com/merge/api/ats/AsyncRawScopesClient.java +++ b/src/main/java/com/merge/api/ats/AsyncRawScopesClient.java @@ -53,7 +53,6 @@ public CompletableFuture> defaultScope .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -111,7 +110,6 @@ public CompletableFuture> linkedAccoun .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/AsyncRawScorecardsClient.java b/src/main/java/com/merge/api/ats/AsyncRawScorecardsClient.java index baf62dee8..4403e5b6f 100644 --- a/src/main/java/com/merge/api/ats/AsyncRawScorecardsClient.java +++ b/src/main/java/com/merge/api/ats/AsyncRawScorecardsClient.java @@ -66,11 +66,11 @@ public CompletableFuture>> li } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -80,22 +80,19 @@ public CompletableFuture>> li QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getInterviewId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -107,18 +104,15 @@ public CompletableFuture>> li } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -134,13 +128,12 @@ public CompletableFuture>> li } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -221,15 +214,12 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -241,13 +231,12 @@ public CompletableFuture> retrieve( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/AsyncRawSyncStatusClient.java b/src/main/java/com/merge/api/ats/AsyncRawSyncStatusClient.java index 4e18f3a4b..54460d781 100644 --- a/src/main/java/com/merge/api/ats/AsyncRawSyncStatusClient.java +++ b/src/main/java/com/merge/api/ats/AsyncRawSyncStatusClient.java @@ -65,13 +65,12 @@ public CompletableFuture>> l } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/AsyncRawTagsClient.java b/src/main/java/com/merge/api/ats/AsyncRawTagsClient.java index 5eff020bd..2dfd9533d 100644 --- a/src/main/java/com/merge/api/ats/AsyncRawTagsClient.java +++ b/src/main/java/com/merge/api/ats/AsyncRawTagsClient.java @@ -61,11 +61,11 @@ public CompletableFuture>> list( .addPathSegments("ats/v1/tags"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -75,37 +75,31 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -115,7 +109,6 @@ public CompletableFuture>> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/AsyncRawUsersClient.java b/src/main/java/com/merge/api/ats/AsyncRawUsersClient.java index fb358be9e..1f6eff069 100644 --- a/src/main/java/com/merge/api/ats/AsyncRawUsersClient.java +++ b/src/main/java/com/merge/api/ats/AsyncRawUsersClient.java @@ -62,11 +62,11 @@ public CompletableFuture>> l .addPathSegments("ats/v1/users"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -80,37 +80,31 @@ public CompletableFuture>> l QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -128,7 +122,6 @@ public CompletableFuture>> l .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -209,15 +202,12 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -231,7 +221,6 @@ public CompletableFuture> retrieve( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/AsyncRawWebhookReceiversClient.java b/src/main/java/com/merge/api/ats/AsyncRawWebhookReceiversClient.java index 106da8e34..789da2d78 100644 --- a/src/main/java/com/merge/api/ats/AsyncRawWebhookReceiversClient.java +++ b/src/main/java/com/merge/api/ats/AsyncRawWebhookReceiversClient.java @@ -54,7 +54,6 @@ public CompletableFuture>> list(Reque .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/RawAccountDetailsClient.java b/src/main/java/com/merge/api/ats/RawAccountDetailsClient.java index 31be682de..24d5bb03f 100644 --- a/src/main/java/com/merge/api/ats/RawAccountDetailsClient.java +++ b/src/main/java/com/merge/api/ats/RawAccountDetailsClient.java @@ -44,7 +44,6 @@ public MergeApiHttpResponse retrieve(RequestOptions requestOptio .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/RawAccountTokenClient.java b/src/main/java/com/merge/api/ats/RawAccountTokenClient.java index 3a5ddd972..8d1ea04e1 100644 --- a/src/main/java/com/merge/api/ats/RawAccountTokenClient.java +++ b/src/main/java/com/merge/api/ats/RawAccountTokenClient.java @@ -45,7 +45,6 @@ public MergeApiHttpResponse retrieve(String publicToken, RequestOp .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/RawActivitiesClient.java b/src/main/java/com/merge/api/ats/RawActivitiesClient.java index 349f76a5b..7bce6fbef 100644 --- a/src/main/java/com/merge/api/ats/RawActivitiesClient.java +++ b/src/main/java/com/merge/api/ats/RawActivitiesClient.java @@ -64,11 +64,11 @@ public MergeApiHttpResponse> list( .addPathSegments("ats/v1/activities"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -78,41 +78,35 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -120,10 +114,7 @@ public MergeApiHttpResponse> list( } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getUserId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -131,13 +122,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -189,11 +179,11 @@ public MergeApiHttpResponse create( .addPathSegments("ats/v1/activities"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -260,36 +250,29 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -332,7 +315,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/RawApplicationsClient.java b/src/main/java/com/merge/api/ats/RawApplicationsClient.java index 55bb50d0a..e83f44e5e 100644 --- a/src/main/java/com/merge/api/ats/RawApplicationsClient.java +++ b/src/main/java/com/merge/api/ats/RawApplicationsClient.java @@ -70,11 +70,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCreditedToId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -92,22 +92,19 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getJobId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -115,18 +112,15 @@ public MergeApiHttpResponse> list( } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRejectReasonId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -142,13 +136,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -204,11 +197,11 @@ public MergeApiHttpResponse create( .addPathSegments("ats/v1/applications"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -276,25 +269,21 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -345,11 +334,11 @@ public MergeApiHttpResponse changeStageCreate( .addPathSegments("change-stage"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); if (request.getJobInterviewStage().isPresent()) { @@ -427,7 +416,6 @@ public MergeApiHttpResponse metaPostRetrieve( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/RawAsyncPassthroughClient.java b/src/main/java/com/merge/api/ats/RawAsyncPassthroughClient.java index 7dfb427a9..3059d9d63 100644 --- a/src/main/java/com/merge/api/ats/RawAsyncPassthroughClient.java +++ b/src/main/java/com/merge/api/ats/RawAsyncPassthroughClient.java @@ -103,7 +103,6 @@ public MergeApiHttpResponse retrieve( .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/RawAttachmentsClient.java b/src/main/java/com/merge/api/ats/RawAttachmentsClient.java index dbbb5ca06..4c82a4d40 100644 --- a/src/main/java/com/merge/api/ats/RawAttachmentsClient.java +++ b/src/main/java/com/merge/api/ats/RawAttachmentsClient.java @@ -68,11 +68,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -82,37 +82,31 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -128,13 +122,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -186,11 +179,11 @@ public MergeApiHttpResponse create( .addPathSegments("ats/v1/attachments"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -257,15 +250,12 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -277,13 +267,12 @@ public MergeApiHttpResponse retrieve( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -326,7 +315,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/RawAuditTrailClient.java b/src/main/java/com/merge/api/ats/RawAuditTrailClient.java index f2876ef3d..7caa79372 100644 --- a/src/main/java/com/merge/api/ats/RawAuditTrailClient.java +++ b/src/main/java/com/merge/api/ats/RawAuditTrailClient.java @@ -68,7 +68,7 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getStartDate().isPresent()) { QueryStringMapper.addQueryParameter( @@ -82,7 +82,6 @@ public MergeApiHttpResponse> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/RawAvailableActionsClient.java b/src/main/java/com/merge/api/ats/RawAvailableActionsClient.java index 84e83c9e7..25c90497d 100644 --- a/src/main/java/com/merge/api/ats/RawAvailableActionsClient.java +++ b/src/main/java/com/merge/api/ats/RawAvailableActionsClient.java @@ -44,7 +44,6 @@ public MergeApiHttpResponse retrieve(RequestOptions requestOpt .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/RawCandidatesClient.java b/src/main/java/com/merge/api/ats/RawCandidatesClient.java index 53d96ea23..eb6f9712f 100644 --- a/src/main/java/com/merge/api/ats/RawCandidatesClient.java +++ b/src/main/java/com/merge/api/ats/RawCandidatesClient.java @@ -67,11 +67,11 @@ public MergeApiHttpResponse> list( .addPathSegments("ats/v1/candidates"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -89,22 +89,19 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getLastName().isPresent()) { QueryStringMapper.addQueryParameter( @@ -112,18 +109,15 @@ public MergeApiHttpResponse> list( } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -135,13 +129,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -193,11 +186,11 @@ public MergeApiHttpResponse create( .addPathSegments("ats/v1/candidates"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -264,25 +257,21 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -324,11 +313,11 @@ public MergeApiHttpResponse partialUpdate( .addPathSegment(id); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -438,7 +427,6 @@ public MergeApiHttpResponse metaPatchRetrieve(String id, RequestOp .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -481,7 +469,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/RawDepartmentsClient.java b/src/main/java/com/merge/api/ats/RawDepartmentsClient.java index 368adb383..4befb9e31 100644 --- a/src/main/java/com/merge/api/ats/RawDepartmentsClient.java +++ b/src/main/java/com/merge/api/ats/RawDepartmentsClient.java @@ -57,11 +57,11 @@ public MergeApiHttpResponse> list( .addPathSegments("ats/v1/departments"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -71,37 +71,31 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -111,7 +105,6 @@ public MergeApiHttpResponse> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -173,21 +166,17 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/RawEeocsClient.java b/src/main/java/com/merge/api/ats/RawEeocsClient.java index 1d44611ba..a8858f92e 100644 --- a/src/main/java/com/merge/api/ats/RawEeocsClient.java +++ b/src/main/java/com/merge/api/ats/RawEeocsClient.java @@ -61,11 +61,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -75,41 +75,35 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -117,20 +111,16 @@ public MergeApiHttpResponse> list( } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -191,36 +181,29 @@ public MergeApiHttpResponse retrieve(String id, EeocsRetrieveRequest reque QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/RawFieldMappingClient.java b/src/main/java/com/merge/api/ats/RawFieldMappingClient.java index 3758d7501..774502bcf 100644 --- a/src/main/java/com/merge/api/ats/RawFieldMappingClient.java +++ b/src/main/java/com/merge/api/ats/RawFieldMappingClient.java @@ -65,14 +65,13 @@ public MergeApiHttpResponse fieldMappingsRetrie QueryStringMapper.addQueryParameter( httpUrl, "exclude_remote_field_metadata", - request.getExcludeRemoteFieldMetadata().get().toString(), + request.getExcludeRemoteFieldMetadata().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -117,7 +116,7 @@ public MergeApiHttpResponse fieldMappingsCreate( QueryStringMapper.addQueryParameter( httpUrl, "exclude_remote_field_metadata", - request.getExcludeRemoteFieldMetadata().get().toString(), + request.getExcludeRemoteFieldMetadata().get(), false); } Map properties = new HashMap<>(); @@ -184,7 +183,6 @@ public MergeApiHttpResponse fieldMappingsDestroy( .url(httpUrl) .method("DELETE", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -308,7 +306,6 @@ public MergeApiHttpResponse remoteFieldsRetrieve( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -352,7 +349,6 @@ public MergeApiHttpResponse targetFieldsRetrieve .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/RawForceResyncClient.java b/src/main/java/com/merge/api/ats/RawForceResyncClient.java index cbb10d214..d4ec4a02f 100644 --- a/src/main/java/com/merge/api/ats/RawForceResyncClient.java +++ b/src/main/java/com/merge/api/ats/RawForceResyncClient.java @@ -47,7 +47,6 @@ public MergeApiHttpResponse> syncStatusResyncCreate(RequestOpti .url(httpUrl) .method("POST", RequestBody.create("", null)) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/RawInterviewsClient.java b/src/main/java/com/merge/api/ats/RawInterviewsClient.java index 26c56de9c..d0fb14f5e 100644 --- a/src/main/java/com/merge/api/ats/RawInterviewsClient.java +++ b/src/main/java/com/merge/api/ats/RawInterviewsClient.java @@ -68,11 +68,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -82,22 +82,19 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getJobId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -112,14 +109,11 @@ public MergeApiHttpResponse> list( } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getOrganizerId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -127,7 +121,7 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -143,13 +137,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -201,11 +194,11 @@ public MergeApiHttpResponse create( .addPathSegments("ats/v1/interviews"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -273,15 +266,12 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -293,13 +283,12 @@ public MergeApiHttpResponse retrieve( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -342,7 +331,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/RawIssuesClient.java b/src/main/java/com/merge/api/ats/RawIssuesClient.java index 1b6b451a8..804311293 100644 --- a/src/main/java/com/merge/api/ats/RawIssuesClient.java +++ b/src/main/java/com/merge/api/ats/RawIssuesClient.java @@ -77,14 +77,14 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "first_incident_time_after", - request.getFirstIncidentTimeAfter().get().toString(), + request.getFirstIncidentTimeAfter().get(), false); } if (request.getFirstIncidentTimeBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "first_incident_time_before", - request.getFirstIncidentTimeBefore().get().toString(), + request.getFirstIncidentTimeBefore().get(), false); } if (request.getIncludeMuted().isPresent()) { @@ -99,14 +99,14 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "last_incident_time_after", - request.getLastIncidentTimeAfter().get().toString(), + request.getLastIncidentTimeAfter().get(), false); } if (request.getLastIncidentTimeBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "last_incident_time_before", - request.getLastIncidentTimeBefore().get().toString(), + request.getLastIncidentTimeBefore().get(), false); } if (request.getLinkedAccountId().isPresent()) { @@ -115,7 +115,7 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getStartDate().isPresent()) { QueryStringMapper.addQueryParameter( @@ -123,13 +123,12 @@ public MergeApiHttpResponse> list( } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "status", request.getStatus().get().toString(), false); + httpUrl, "status", request.getStatus().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -184,7 +183,6 @@ public MergeApiHttpResponse retrieve(String id, RequestOptions requestOpt .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/RawJobInterviewStagesClient.java b/src/main/java/com/merge/api/ats/RawJobInterviewStagesClient.java index ef546bacc..05d0939bd 100644 --- a/src/main/java/com/merge/api/ats/RawJobInterviewStagesClient.java +++ b/src/main/java/com/merge/api/ats/RawJobInterviewStagesClient.java @@ -57,11 +57,11 @@ public MergeApiHttpResponse> list( .addPathSegments("ats/v1/job-interview-stages"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -71,22 +71,19 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getJobId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -94,18 +91,15 @@ public MergeApiHttpResponse> list( } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -113,13 +107,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -181,25 +174,21 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/RawJobPostingsClient.java b/src/main/java/com/merge/api/ats/RawJobPostingsClient.java index 8f78b68dd..a134cf1ea 100644 --- a/src/main/java/com/merge/api/ats/RawJobPostingsClient.java +++ b/src/main/java/com/merge/api/ats/RawJobPostingsClient.java @@ -57,11 +57,11 @@ public MergeApiHttpResponse> list( .addPathSegments("ats/v1/job-postings"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -71,37 +71,31 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -109,17 +103,16 @@ public MergeApiHttpResponse> list( } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "status", request.getStatus().get().toString(), false); + httpUrl, "status", request.getStatus().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -181,25 +174,21 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/RawJobsClient.java b/src/main/java/com/merge/api/ats/RawJobsClient.java index 978e68f84..542815d85 100644 --- a/src/main/java/com/merge/api/ats/RawJobsClient.java +++ b/src/main/java/com/merge/api/ats/RawJobsClient.java @@ -63,11 +63,11 @@ public MergeApiHttpResponse> list(JobsListRequest reques } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -77,33 +77,27 @@ public MergeApiHttpResponse> list(JobsListRequest reques QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getOffices().isPresent()) { QueryStringMapper.addQueryParameter( @@ -111,7 +105,7 @@ public MergeApiHttpResponse> list(JobsListRequest reques } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -127,17 +121,16 @@ public MergeApiHttpResponse> list(JobsListRequest reques } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "status", request.getStatus().get().toString(), false); + httpUrl, "status", request.getStatus().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -198,15 +191,12 @@ public MergeApiHttpResponse retrieve(String id, JobsRetrieveRequest request QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -218,13 +208,12 @@ public MergeApiHttpResponse retrieve(String id, JobsRetrieveRequest request } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -282,36 +271,32 @@ public MergeApiHttpResponse> screeningQues QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/RawLinkedAccountsClient.java b/src/main/java/com/merge/api/ats/RawLinkedAccountsClient.java index 262bfae63..d611eb03f 100644 --- a/src/main/java/com/merge/api/ats/RawLinkedAccountsClient.java +++ b/src/main/java/com/merge/api/ats/RawLinkedAccountsClient.java @@ -56,7 +56,7 @@ public MergeApiHttpResponse> list( .addPathSegments("ats/v1/linked-accounts"); if (request.getCategory().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "category", request.getCategory().get().toString(), false); + httpUrl, "category", request.getCategory().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -97,7 +97,7 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_duplicates", - request.getIncludeDuplicates().get().toString(), + request.getIncludeDuplicates().get(), false); } if (request.getIntegrationName().isPresent()) { @@ -110,7 +110,7 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( @@ -120,7 +120,6 @@ public MergeApiHttpResponse> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/RawOffersClient.java b/src/main/java/com/merge/api/ats/RawOffersClient.java index 4d15fb13c..18b4182e4 100644 --- a/src/main/java/com/merge/api/ats/RawOffersClient.java +++ b/src/main/java/com/merge/api/ats/RawOffersClient.java @@ -61,11 +61,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCreatorId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -79,37 +79,31 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -125,13 +119,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -193,15 +186,12 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -213,13 +203,12 @@ public MergeApiHttpResponse retrieve( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/RawOfficesClient.java b/src/main/java/com/merge/api/ats/RawOfficesClient.java index 234519233..0a33a356d 100644 --- a/src/main/java/com/merge/api/ats/RawOfficesClient.java +++ b/src/main/java/com/merge/api/ats/RawOfficesClient.java @@ -57,11 +57,11 @@ public MergeApiHttpResponse> list( .addPathSegments("ats/v1/offices"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -71,37 +71,31 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -111,7 +105,6 @@ public MergeApiHttpResponse> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -173,21 +166,17 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/RawRejectReasonsClient.java b/src/main/java/com/merge/api/ats/RawRejectReasonsClient.java index c374c9a95..ff339be3c 100644 --- a/src/main/java/com/merge/api/ats/RawRejectReasonsClient.java +++ b/src/main/java/com/merge/api/ats/RawRejectReasonsClient.java @@ -57,11 +57,11 @@ public MergeApiHttpResponse> list( .addPathSegments("ats/v1/reject-reasons"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -71,37 +71,31 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -111,7 +105,6 @@ public MergeApiHttpResponse> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -173,21 +166,17 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/RawScopesClient.java b/src/main/java/com/merge/api/ats/RawScopesClient.java index 5a816ef77..38e30f22e 100644 --- a/src/main/java/com/merge/api/ats/RawScopesClient.java +++ b/src/main/java/com/merge/api/ats/RawScopesClient.java @@ -48,7 +48,6 @@ public MergeApiHttpResponse defaultScopesRetrieve(RequestOp .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -92,7 +91,6 @@ public MergeApiHttpResponse linkedAccountScopesRetrieve(Req .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/RawScorecardsClient.java b/src/main/java/com/merge/api/ats/RawScorecardsClient.java index 63f2b6e22..a05f5a1b9 100644 --- a/src/main/java/com/merge/api/ats/RawScorecardsClient.java +++ b/src/main/java/com/merge/api/ats/RawScorecardsClient.java @@ -61,11 +61,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -75,22 +75,19 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getInterviewId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -102,18 +99,15 @@ public MergeApiHttpResponse> list( } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -129,13 +123,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -197,15 +190,12 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -217,13 +207,12 @@ public MergeApiHttpResponse retrieve( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/RawSyncStatusClient.java b/src/main/java/com/merge/api/ats/RawSyncStatusClient.java index f287b4296..160101b73 100644 --- a/src/main/java/com/merge/api/ats/RawSyncStatusClient.java +++ b/src/main/java/com/merge/api/ats/RawSyncStatusClient.java @@ -60,13 +60,12 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/RawTagsClient.java b/src/main/java/com/merge/api/ats/RawTagsClient.java index b0ba7c6d5..47708ca1b 100644 --- a/src/main/java/com/merge/api/ats/RawTagsClient.java +++ b/src/main/java/com/merge/api/ats/RawTagsClient.java @@ -55,11 +55,11 @@ public MergeApiHttpResponse> list(TagsListRequest reques .addPathSegments("ats/v1/tags"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -69,37 +69,31 @@ public MergeApiHttpResponse> list(TagsListRequest reques QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -109,7 +103,6 @@ public MergeApiHttpResponse> list(TagsListRequest reques .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/RawUsersClient.java b/src/main/java/com/merge/api/ats/RawUsersClient.java index d436bfeab..8bbd9f9d5 100644 --- a/src/main/java/com/merge/api/ats/RawUsersClient.java +++ b/src/main/java/com/merge/api/ats/RawUsersClient.java @@ -57,11 +57,11 @@ public MergeApiHttpResponse> list( .addPathSegments("ats/v1/users"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -75,37 +75,31 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -123,7 +117,6 @@ public MergeApiHttpResponse> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -185,15 +178,12 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -207,7 +197,6 @@ public MergeApiHttpResponse retrieve( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/RawWebhookReceiversClient.java b/src/main/java/com/merge/api/ats/RawWebhookReceiversClient.java index 4ce482a74..9d5248ce5 100644 --- a/src/main/java/com/merge/api/ats/RawWebhookReceiversClient.java +++ b/src/main/java/com/merge/api/ats/RawWebhookReceiversClient.java @@ -50,7 +50,6 @@ public MergeApiHttpResponse> list(RequestOptions requestOp .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ats/types/AccountDetailsAndActionsCategory.java b/src/main/java/com/merge/api/ats/types/AccountDetailsAndActionsCategory.java index be5be74c1..00e7433f0 100644 --- a/src/main/java/com/merge/api/ats/types/AccountDetailsAndActionsCategory.java +++ b/src/main/java/com/merge/api/ats/types/AccountDetailsAndActionsCategory.java @@ -84,11 +84,11 @@ public AccountDetailsAndActionsCategory deserialize(JsonParser p, Deserializatio Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CategoryEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/AccountDetailsAndActionsIntegration.java b/src/main/java/com/merge/api/ats/types/AccountDetailsAndActionsIntegration.java index d56732249..581c8a141 100644 --- a/src/main/java/com/merge/api/ats/types/AccountDetailsAndActionsIntegration.java +++ b/src/main/java/com/merge/api/ats/types/AccountDetailsAndActionsIntegration.java @@ -293,7 +293,9 @@ public _FinalStage image(Optional image) { @java.lang.Override public _FinalStage addAllCategories(List categories) { - this.categories.addAll(categories); + if (categories != null) { + this.categories.addAll(categories); + } return this; } diff --git a/src/main/java/com/merge/api/ats/types/AccountDetailsAndActionsStatus.java b/src/main/java/com/merge/api/ats/types/AccountDetailsAndActionsStatus.java index c1c2e7abc..c81a5c25c 100644 --- a/src/main/java/com/merge/api/ats/types/AccountDetailsAndActionsStatus.java +++ b/src/main/java/com/merge/api/ats/types/AccountDetailsAndActionsStatus.java @@ -84,11 +84,11 @@ public AccountDetailsAndActionsStatus deserialize(JsonParser p, DeserializationC Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AccountDetailsAndActionsStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/AccountDetailsCategory.java b/src/main/java/com/merge/api/ats/types/AccountDetailsCategory.java index 7fab74fcd..0291766cc 100644 --- a/src/main/java/com/merge/api/ats/types/AccountDetailsCategory.java +++ b/src/main/java/com/merge/api/ats/types/AccountDetailsCategory.java @@ -83,11 +83,11 @@ public AccountDetailsCategory deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CategoryEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/AccountIntegration.java b/src/main/java/com/merge/api/ats/types/AccountIntegration.java index 0422f155f..c5526ffa6 100644 --- a/src/main/java/com/merge/api/ats/types/AccountIntegration.java +++ b/src/main/java/com/merge/api/ats/types/AccountIntegration.java @@ -197,7 +197,7 @@ public static NameStage builder() { public interface NameStage { /** - * Company name. + *

          Company name.

          */ _FinalStage name(@NotNull String name); @@ -311,7 +311,8 @@ public Builder from(AccountIntegration other) { } /** - * Company name.

          Company name.

          + *

          Company name.

          + *

          Company name.

          * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/ats/types/ActivityActivityType.java b/src/main/java/com/merge/api/ats/types/ActivityActivityType.java index d7bc73402..df2341c8b 100644 --- a/src/main/java/com/merge/api/ats/types/ActivityActivityType.java +++ b/src/main/java/com/merge/api/ats/types/ActivityActivityType.java @@ -83,11 +83,11 @@ public ActivityActivityType deserialize(JsonParser p, DeserializationContext con Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, ActivityTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ActivityRequestUser.java b/src/main/java/com/merge/api/ats/types/ActivityRequestUser.java index 1fb1ebdc4..ad7f615c0 100644 --- a/src/main/java/com/merge/api/ats/types/ActivityRequestUser.java +++ b/src/main/java/com/merge/api/ats/types/ActivityRequestUser.java @@ -83,11 +83,11 @@ public ActivityRequestUser deserialize(JsonParser p, DeserializationContext cont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RemoteUser.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ActivityRequestVisibility.java b/src/main/java/com/merge/api/ats/types/ActivityRequestVisibility.java index 0d8fe41b4..afd5f1c7b 100644 --- a/src/main/java/com/merge/api/ats/types/ActivityRequestVisibility.java +++ b/src/main/java/com/merge/api/ats/types/ActivityRequestVisibility.java @@ -83,11 +83,11 @@ public ActivityRequestVisibility deserialize(JsonParser p, DeserializationContex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, VisibilityEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ActivityResponse.java b/src/main/java/com/merge/api/ats/types/ActivityResponse.java index 85b5789d3..3e1a863cb 100644 --- a/src/main/java/com/merge/api/ats/types/ActivityResponse.java +++ b/src/main/java/com/merge/api/ats/types/ActivityResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/ats/types/ActivityUser.java b/src/main/java/com/merge/api/ats/types/ActivityUser.java index 5108a4aa4..84c9f68cc 100644 --- a/src/main/java/com/merge/api/ats/types/ActivityUser.java +++ b/src/main/java/com/merge/api/ats/types/ActivityUser.java @@ -83,11 +83,11 @@ public ActivityUser deserialize(JsonParser p, DeserializationContext context) th Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RemoteUser.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ActivityVisibility.java b/src/main/java/com/merge/api/ats/types/ActivityVisibility.java index 02f7705a4..d50549c62 100644 --- a/src/main/java/com/merge/api/ats/types/ActivityVisibility.java +++ b/src/main/java/com/merge/api/ats/types/ActivityVisibility.java @@ -83,11 +83,11 @@ public ActivityVisibility deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, VisibilityEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ApplicationCandidate.java b/src/main/java/com/merge/api/ats/types/ApplicationCandidate.java index 1f53da3aa..6d8e6dc8c 100644 --- a/src/main/java/com/merge/api/ats/types/ApplicationCandidate.java +++ b/src/main/java/com/merge/api/ats/types/ApplicationCandidate.java @@ -83,11 +83,11 @@ public ApplicationCandidate deserialize(JsonParser p, DeserializationContext con Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Candidate.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ApplicationCreditedTo.java b/src/main/java/com/merge/api/ats/types/ApplicationCreditedTo.java index 2cbde7486..9169eff54 100644 --- a/src/main/java/com/merge/api/ats/types/ApplicationCreditedTo.java +++ b/src/main/java/com/merge/api/ats/types/ApplicationCreditedTo.java @@ -83,11 +83,11 @@ public ApplicationCreditedTo deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RemoteUser.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ApplicationCurrentStage.java b/src/main/java/com/merge/api/ats/types/ApplicationCurrentStage.java index d251ede4a..7ad490f5d 100644 --- a/src/main/java/com/merge/api/ats/types/ApplicationCurrentStage.java +++ b/src/main/java/com/merge/api/ats/types/ApplicationCurrentStage.java @@ -83,11 +83,11 @@ public ApplicationCurrentStage deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, JobInterviewStage.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ApplicationJob.java b/src/main/java/com/merge/api/ats/types/ApplicationJob.java index 043de68c8..4586970e3 100644 --- a/src/main/java/com/merge/api/ats/types/ApplicationJob.java +++ b/src/main/java/com/merge/api/ats/types/ApplicationJob.java @@ -83,11 +83,11 @@ public ApplicationJob deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Job.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ApplicationOffersItem.java b/src/main/java/com/merge/api/ats/types/ApplicationOffersItem.java index 4ffaee10f..559ac195c 100644 --- a/src/main/java/com/merge/api/ats/types/ApplicationOffersItem.java +++ b/src/main/java/com/merge/api/ats/types/ApplicationOffersItem.java @@ -83,11 +83,11 @@ public ApplicationOffersItem deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Offer.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ApplicationRejectReason.java b/src/main/java/com/merge/api/ats/types/ApplicationRejectReason.java index b3935ff3f..a2c8549c9 100644 --- a/src/main/java/com/merge/api/ats/types/ApplicationRejectReason.java +++ b/src/main/java/com/merge/api/ats/types/ApplicationRejectReason.java @@ -83,11 +83,11 @@ public ApplicationRejectReason deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RejectReason.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ApplicationRequestCandidate.java b/src/main/java/com/merge/api/ats/types/ApplicationRequestCandidate.java index 57495d584..1e24fc467 100644 --- a/src/main/java/com/merge/api/ats/types/ApplicationRequestCandidate.java +++ b/src/main/java/com/merge/api/ats/types/ApplicationRequestCandidate.java @@ -84,11 +84,11 @@ public ApplicationRequestCandidate deserialize(JsonParser p, DeserializationCont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Candidate.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ApplicationRequestCreditedTo.java b/src/main/java/com/merge/api/ats/types/ApplicationRequestCreditedTo.java index 050296ee0..4af016d5b 100644 --- a/src/main/java/com/merge/api/ats/types/ApplicationRequestCreditedTo.java +++ b/src/main/java/com/merge/api/ats/types/ApplicationRequestCreditedTo.java @@ -84,11 +84,11 @@ public ApplicationRequestCreditedTo deserialize(JsonParser p, DeserializationCon Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RemoteUser.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ApplicationRequestCurrentStage.java b/src/main/java/com/merge/api/ats/types/ApplicationRequestCurrentStage.java index 2ceda8d86..cdbedcd3c 100644 --- a/src/main/java/com/merge/api/ats/types/ApplicationRequestCurrentStage.java +++ b/src/main/java/com/merge/api/ats/types/ApplicationRequestCurrentStage.java @@ -84,11 +84,11 @@ public ApplicationRequestCurrentStage deserialize(JsonParser p, DeserializationC Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, JobInterviewStage.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ApplicationRequestJob.java b/src/main/java/com/merge/api/ats/types/ApplicationRequestJob.java index 119fc7ed3..36e378ba0 100644 --- a/src/main/java/com/merge/api/ats/types/ApplicationRequestJob.java +++ b/src/main/java/com/merge/api/ats/types/ApplicationRequestJob.java @@ -83,11 +83,11 @@ public ApplicationRequestJob deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Job.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ApplicationRequestOffersItem.java b/src/main/java/com/merge/api/ats/types/ApplicationRequestOffersItem.java index 043e098df..500b501df 100644 --- a/src/main/java/com/merge/api/ats/types/ApplicationRequestOffersItem.java +++ b/src/main/java/com/merge/api/ats/types/ApplicationRequestOffersItem.java @@ -84,11 +84,11 @@ public ApplicationRequestOffersItem deserialize(JsonParser p, DeserializationCon Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Offer.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ApplicationRequestRejectReason.java b/src/main/java/com/merge/api/ats/types/ApplicationRequestRejectReason.java index a8eb13272..d905ada15 100644 --- a/src/main/java/com/merge/api/ats/types/ApplicationRequestRejectReason.java +++ b/src/main/java/com/merge/api/ats/types/ApplicationRequestRejectReason.java @@ -84,11 +84,11 @@ public ApplicationRequestRejectReason deserialize(JsonParser p, DeserializationC Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RejectReason.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ApplicationRequestScreeningQuestionAnswersItem.java b/src/main/java/com/merge/api/ats/types/ApplicationRequestScreeningQuestionAnswersItem.java index a92ec6cd0..ab803ec85 100644 --- a/src/main/java/com/merge/api/ats/types/ApplicationRequestScreeningQuestionAnswersItem.java +++ b/src/main/java/com/merge/api/ats/types/ApplicationRequestScreeningQuestionAnswersItem.java @@ -85,11 +85,11 @@ public ApplicationRequestScreeningQuestionAnswersItem deserialize(JsonParser p, Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, ScreeningQuestionAnswerRequest.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ApplicationResponse.java b/src/main/java/com/merge/api/ats/types/ApplicationResponse.java index 3f151bb2a..920dbaf65 100644 --- a/src/main/java/com/merge/api/ats/types/ApplicationResponse.java +++ b/src/main/java/com/merge/api/ats/types/ApplicationResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/ats/types/ApplicationScreeningQuestionAnswersItem.java b/src/main/java/com/merge/api/ats/types/ApplicationScreeningQuestionAnswersItem.java index d5e5cd79f..71bd0e67e 100644 --- a/src/main/java/com/merge/api/ats/types/ApplicationScreeningQuestionAnswersItem.java +++ b/src/main/java/com/merge/api/ats/types/ApplicationScreeningQuestionAnswersItem.java @@ -85,11 +85,11 @@ public ApplicationScreeningQuestionAnswersItem deserialize(JsonParser p, Deseria Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, ScreeningQuestionAnswer.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/AsyncPassthroughRetrieveResponse.java b/src/main/java/com/merge/api/ats/types/AsyncPassthroughRetrieveResponse.java index e45b749c4..761b272a1 100644 --- a/src/main/java/com/merge/api/ats/types/AsyncPassthroughRetrieveResponse.java +++ b/src/main/java/com/merge/api/ats/types/AsyncPassthroughRetrieveResponse.java @@ -84,11 +84,11 @@ public AsyncPassthroughRetrieveResponse deserialize(JsonParser p, Deserializatio Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RemoteResponse.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/AttachmentAttachmentType.java b/src/main/java/com/merge/api/ats/types/AttachmentAttachmentType.java index 064435e2b..144a1ddfd 100644 --- a/src/main/java/com/merge/api/ats/types/AttachmentAttachmentType.java +++ b/src/main/java/com/merge/api/ats/types/AttachmentAttachmentType.java @@ -83,11 +83,11 @@ public AttachmentAttachmentType deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AttachmentTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/AttachmentRequestAttachmentType.java b/src/main/java/com/merge/api/ats/types/AttachmentRequestAttachmentType.java index f19d05007..b78c7053f 100644 --- a/src/main/java/com/merge/api/ats/types/AttachmentRequestAttachmentType.java +++ b/src/main/java/com/merge/api/ats/types/AttachmentRequestAttachmentType.java @@ -84,11 +84,11 @@ public AttachmentRequestAttachmentType deserialize(JsonParser p, Deserialization Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AttachmentTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/AttachmentResponse.java b/src/main/java/com/merge/api/ats/types/AttachmentResponse.java index dd7342a89..40d629629 100644 --- a/src/main/java/com/merge/api/ats/types/AttachmentResponse.java +++ b/src/main/java/com/merge/api/ats/types/AttachmentResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/ats/types/AuditLogEvent.java b/src/main/java/com/merge/api/ats/types/AuditLogEvent.java index 189b96781..0e4e3a10e 100644 --- a/src/main/java/com/merge/api/ats/types/AuditLogEvent.java +++ b/src/main/java/com/merge/api/ats/types/AuditLogEvent.java @@ -212,14 +212,15 @@ public static RoleStage builder() { public interface RoleStage { /** - * Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring. - * - * * `ADMIN` - ADMIN - * * `DEVELOPER` - DEVELOPER - * * `MEMBER` - MEMBER - * * `API` - API - * * `SYSTEM` - SYSTEM - * * `MERGE_TEAM` - MERGE_TEAM + *

          Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring.

          + *
            + *
          • ADMIN - ADMIN
            • + *
          • DEVELOPER - DEVELOPER
            • + *
          • MEMBER - MEMBER
            • + *
          • API - API
            • + *
          • SYSTEM - SYSTEM
            • + *
          • MERGE_TEAM - MERGE_TEAM
            • + *
          */ IpAddressStage role(@NotNull AuditLogEventRole role); @@ -232,51 +233,52 @@ public interface IpAddressStage { public interface EventTypeStage { /** - * Designates the type of event that occurred. - * - * * `CREATED_REMOTE_PRODUCTION_API_KEY` - CREATED_REMOTE_PRODUCTION_API_KEY - * * `DELETED_REMOTE_PRODUCTION_API_KEY` - DELETED_REMOTE_PRODUCTION_API_KEY - * * `CREATED_TEST_API_KEY` - CREATED_TEST_API_KEY - * * `DELETED_TEST_API_KEY` - DELETED_TEST_API_KEY - * * `REGENERATED_PRODUCTION_API_KEY` - REGENERATED_PRODUCTION_API_KEY - * * `REGENERATED_WEBHOOK_SIGNATURE` - REGENERATED_WEBHOOK_SIGNATURE - * * `INVITED_USER` - INVITED_USER - * * `TWO_FACTOR_AUTH_ENABLED` - TWO_FACTOR_AUTH_ENABLED - * * `TWO_FACTOR_AUTH_DISABLED` - TWO_FACTOR_AUTH_DISABLED - * * `DELETED_LINKED_ACCOUNT` - DELETED_LINKED_ACCOUNT - * * `DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT` - DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT - * * `CREATED_DESTINATION` - CREATED_DESTINATION - * * `DELETED_DESTINATION` - DELETED_DESTINATION - * * `CHANGED_DESTINATION` - CHANGED_DESTINATION - * * `CHANGED_SCOPES` - CHANGED_SCOPES - * * `CHANGED_PERSONAL_INFORMATION` - CHANGED_PERSONAL_INFORMATION - * * `CHANGED_ORGANIZATION_SETTINGS` - CHANGED_ORGANIZATION_SETTINGS - * * `ENABLED_INTEGRATION` - ENABLED_INTEGRATION - * * `DISABLED_INTEGRATION` - DISABLED_INTEGRATION - * * `ENABLED_CATEGORY` - ENABLED_CATEGORY - * * `DISABLED_CATEGORY` - DISABLED_CATEGORY - * * `CHANGED_PASSWORD` - CHANGED_PASSWORD - * * `RESET_PASSWORD` - RESET_PASSWORD - * * `ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION` - ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - * * `ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT` - ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - * * `DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION` - DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - * * `DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT` - DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - * * `CREATED_INTEGRATION_WIDE_FIELD_MAPPING` - CREATED_INTEGRATION_WIDE_FIELD_MAPPING - * * `CREATED_LINKED_ACCOUNT_FIELD_MAPPING` - CREATED_LINKED_ACCOUNT_FIELD_MAPPING - * * `CHANGED_INTEGRATION_WIDE_FIELD_MAPPING` - CHANGED_INTEGRATION_WIDE_FIELD_MAPPING - * * `CHANGED_LINKED_ACCOUNT_FIELD_MAPPING` - CHANGED_LINKED_ACCOUNT_FIELD_MAPPING - * * `DELETED_INTEGRATION_WIDE_FIELD_MAPPING` - DELETED_INTEGRATION_WIDE_FIELD_MAPPING - * * `DELETED_LINKED_ACCOUNT_FIELD_MAPPING` - DELETED_LINKED_ACCOUNT_FIELD_MAPPING - * * `CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `FORCED_LINKED_ACCOUNT_RESYNC` - FORCED_LINKED_ACCOUNT_RESYNC - * * `MUTED_ISSUE` - MUTED_ISSUE - * * `GENERATED_MAGIC_LINK` - GENERATED_MAGIC_LINK - * * `ENABLED_MERGE_WEBHOOK` - ENABLED_MERGE_WEBHOOK - * * `DISABLED_MERGE_WEBHOOK` - DISABLED_MERGE_WEBHOOK - * * `MERGE_WEBHOOK_TARGET_CHANGED` - MERGE_WEBHOOK_TARGET_CHANGED - * * `END_USER_CREDENTIALS_ACCESSED` - END_USER_CREDENTIALS_ACCESSED + *

          Designates the type of event that occurred.

          + *
            + *
          • CREATED_REMOTE_PRODUCTION_API_KEY - CREATED_REMOTE_PRODUCTION_API_KEY
            • + *
          • DELETED_REMOTE_PRODUCTION_API_KEY - DELETED_REMOTE_PRODUCTION_API_KEY
            • + *
          • CREATED_TEST_API_KEY - CREATED_TEST_API_KEY
            • + *
          • DELETED_TEST_API_KEY - DELETED_TEST_API_KEY
            • + *
          • REGENERATED_PRODUCTION_API_KEY - REGENERATED_PRODUCTION_API_KEY
            • + *
          • REGENERATED_WEBHOOK_SIGNATURE - REGENERATED_WEBHOOK_SIGNATURE
            • + *
          • INVITED_USER - INVITED_USER
            • + *
          • TWO_FACTOR_AUTH_ENABLED - TWO_FACTOR_AUTH_ENABLED
            • + *
          • TWO_FACTOR_AUTH_DISABLED - TWO_FACTOR_AUTH_DISABLED
            • + *
          • DELETED_LINKED_ACCOUNT - DELETED_LINKED_ACCOUNT
            • + *
          • DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT - DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT
            • + *
          • CREATED_DESTINATION - CREATED_DESTINATION
            • + *
          • DELETED_DESTINATION - DELETED_DESTINATION
            • + *
          • CHANGED_DESTINATION - CHANGED_DESTINATION
            • + *
          • CHANGED_SCOPES - CHANGED_SCOPES
            • + *
          • CHANGED_PERSONAL_INFORMATION - CHANGED_PERSONAL_INFORMATION
            • + *
          • CHANGED_ORGANIZATION_SETTINGS - CHANGED_ORGANIZATION_SETTINGS
            • + *
          • ENABLED_INTEGRATION - ENABLED_INTEGRATION
            • + *
          • DISABLED_INTEGRATION - DISABLED_INTEGRATION
            • + *
          • ENABLED_CATEGORY - ENABLED_CATEGORY
            • + *
          • DISABLED_CATEGORY - DISABLED_CATEGORY
            • + *
          • CHANGED_PASSWORD - CHANGED_PASSWORD
            • + *
          • RESET_PASSWORD - RESET_PASSWORD
            • + *
          • ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION
            • + *
          • ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT
            • + *
          • DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION
            • + *
          • DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT
            • + *
          • CREATED_INTEGRATION_WIDE_FIELD_MAPPING - CREATED_INTEGRATION_WIDE_FIELD_MAPPING
            • + *
          • CREATED_LINKED_ACCOUNT_FIELD_MAPPING - CREATED_LINKED_ACCOUNT_FIELD_MAPPING
            • + *
          • CHANGED_INTEGRATION_WIDE_FIELD_MAPPING - CHANGED_INTEGRATION_WIDE_FIELD_MAPPING
            • + *
          • CHANGED_LINKED_ACCOUNT_FIELD_MAPPING - CHANGED_LINKED_ACCOUNT_FIELD_MAPPING
            • + *
          • DELETED_INTEGRATION_WIDE_FIELD_MAPPING - DELETED_INTEGRATION_WIDE_FIELD_MAPPING
            • + *
          • DELETED_LINKED_ACCOUNT_FIELD_MAPPING - DELETED_LINKED_ACCOUNT_FIELD_MAPPING
            • + *
          • CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
            • + *
          • CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
            • + *
          • DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
            • + *
          • FORCED_LINKED_ACCOUNT_RESYNC - FORCED_LINKED_ACCOUNT_RESYNC
            • + *
          • MUTED_ISSUE - MUTED_ISSUE
            • + *
          • GENERATED_MAGIC_LINK - GENERATED_MAGIC_LINK
            • + *
          • ENABLED_MERGE_WEBHOOK - ENABLED_MERGE_WEBHOOK
            • + *
          • DISABLED_MERGE_WEBHOOK - DISABLED_MERGE_WEBHOOK
            • + *
          • MERGE_WEBHOOK_TARGET_CHANGED - MERGE_WEBHOOK_TARGET_CHANGED
            • + *
          • END_USER_CREDENTIALS_ACCESSED - END_USER_CREDENTIALS_ACCESSED
            • + *
          */ EventDescriptionStage eventType(@NotNull AuditLogEventEventType eventType); } @@ -349,14 +351,16 @@ public Builder from(AuditLogEvent other) { } /** - * Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring. - * - * * `ADMIN` - ADMIN - * * `DEVELOPER` - DEVELOPER - * * `MEMBER` - MEMBER - * * `API` - API - * * `SYSTEM` - SYSTEM - * * `MERGE_TEAM` - MERGE_TEAM

          Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring.

          + *

          Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring.

          + *
            + *
          • ADMIN - ADMIN
            • + *
          • DEVELOPER - DEVELOPER
            • + *
          • MEMBER - MEMBER
            • + *
          • API - API
            • + *
          • SYSTEM - SYSTEM
            • + *
          • MERGE_TEAM - MERGE_TEAM
            • + *
          + *

          Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring.

          *
            *
          • ADMIN - ADMIN
            • *
          • DEVELOPER - DEVELOPER
            • @@ -382,51 +386,53 @@ public EventTypeStage ipAddress(@NotNull String ipAddress) { } /** - * Designates the type of event that occurred. - * - * * `CREATED_REMOTE_PRODUCTION_API_KEY` - CREATED_REMOTE_PRODUCTION_API_KEY - * * `DELETED_REMOTE_PRODUCTION_API_KEY` - DELETED_REMOTE_PRODUCTION_API_KEY - * * `CREATED_TEST_API_KEY` - CREATED_TEST_API_KEY - * * `DELETED_TEST_API_KEY` - DELETED_TEST_API_KEY - * * `REGENERATED_PRODUCTION_API_KEY` - REGENERATED_PRODUCTION_API_KEY - * * `REGENERATED_WEBHOOK_SIGNATURE` - REGENERATED_WEBHOOK_SIGNATURE - * * `INVITED_USER` - INVITED_USER - * * `TWO_FACTOR_AUTH_ENABLED` - TWO_FACTOR_AUTH_ENABLED - * * `TWO_FACTOR_AUTH_DISABLED` - TWO_FACTOR_AUTH_DISABLED - * * `DELETED_LINKED_ACCOUNT` - DELETED_LINKED_ACCOUNT - * * `DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT` - DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT - * * `CREATED_DESTINATION` - CREATED_DESTINATION - * * `DELETED_DESTINATION` - DELETED_DESTINATION - * * `CHANGED_DESTINATION` - CHANGED_DESTINATION - * * `CHANGED_SCOPES` - CHANGED_SCOPES - * * `CHANGED_PERSONAL_INFORMATION` - CHANGED_PERSONAL_INFORMATION - * * `CHANGED_ORGANIZATION_SETTINGS` - CHANGED_ORGANIZATION_SETTINGS - * * `ENABLED_INTEGRATION` - ENABLED_INTEGRATION - * * `DISABLED_INTEGRATION` - DISABLED_INTEGRATION - * * `ENABLED_CATEGORY` - ENABLED_CATEGORY - * * `DISABLED_CATEGORY` - DISABLED_CATEGORY - * * `CHANGED_PASSWORD` - CHANGED_PASSWORD - * * `RESET_PASSWORD` - RESET_PASSWORD - * * `ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION` - ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - * * `ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT` - ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - * * `DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION` - DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - * * `DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT` - DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - * * `CREATED_INTEGRATION_WIDE_FIELD_MAPPING` - CREATED_INTEGRATION_WIDE_FIELD_MAPPING - * * `CREATED_LINKED_ACCOUNT_FIELD_MAPPING` - CREATED_LINKED_ACCOUNT_FIELD_MAPPING - * * `CHANGED_INTEGRATION_WIDE_FIELD_MAPPING` - CHANGED_INTEGRATION_WIDE_FIELD_MAPPING - * * `CHANGED_LINKED_ACCOUNT_FIELD_MAPPING` - CHANGED_LINKED_ACCOUNT_FIELD_MAPPING - * * `DELETED_INTEGRATION_WIDE_FIELD_MAPPING` - DELETED_INTEGRATION_WIDE_FIELD_MAPPING - * * `DELETED_LINKED_ACCOUNT_FIELD_MAPPING` - DELETED_LINKED_ACCOUNT_FIELD_MAPPING - * * `CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `FORCED_LINKED_ACCOUNT_RESYNC` - FORCED_LINKED_ACCOUNT_RESYNC - * * `MUTED_ISSUE` - MUTED_ISSUE - * * `GENERATED_MAGIC_LINK` - GENERATED_MAGIC_LINK - * * `ENABLED_MERGE_WEBHOOK` - ENABLED_MERGE_WEBHOOK - * * `DISABLED_MERGE_WEBHOOK` - DISABLED_MERGE_WEBHOOK - * * `MERGE_WEBHOOK_TARGET_CHANGED` - MERGE_WEBHOOK_TARGET_CHANGED - * * `END_USER_CREDENTIALS_ACCESSED` - END_USER_CREDENTIALS_ACCESSED

            Designates the type of event that occurred.

            + *

            Designates the type of event that occurred.

            + *
              + *
            • CREATED_REMOTE_PRODUCTION_API_KEY - CREATED_REMOTE_PRODUCTION_API_KEY
              • + *
            • DELETED_REMOTE_PRODUCTION_API_KEY - DELETED_REMOTE_PRODUCTION_API_KEY
              • + *
            • CREATED_TEST_API_KEY - CREATED_TEST_API_KEY
              • + *
            • DELETED_TEST_API_KEY - DELETED_TEST_API_KEY
              • + *
            • REGENERATED_PRODUCTION_API_KEY - REGENERATED_PRODUCTION_API_KEY
              • + *
            • REGENERATED_WEBHOOK_SIGNATURE - REGENERATED_WEBHOOK_SIGNATURE
              • + *
            • INVITED_USER - INVITED_USER
              • + *
            • TWO_FACTOR_AUTH_ENABLED - TWO_FACTOR_AUTH_ENABLED
              • + *
            • TWO_FACTOR_AUTH_DISABLED - TWO_FACTOR_AUTH_DISABLED
              • + *
            • DELETED_LINKED_ACCOUNT - DELETED_LINKED_ACCOUNT
              • + *
            • DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT - DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT
              • + *
            • CREATED_DESTINATION - CREATED_DESTINATION
              • + *
            • DELETED_DESTINATION - DELETED_DESTINATION
              • + *
            • CHANGED_DESTINATION - CHANGED_DESTINATION
              • + *
            • CHANGED_SCOPES - CHANGED_SCOPES
              • + *
            • CHANGED_PERSONAL_INFORMATION - CHANGED_PERSONAL_INFORMATION
              • + *
            • CHANGED_ORGANIZATION_SETTINGS - CHANGED_ORGANIZATION_SETTINGS
              • + *
            • ENABLED_INTEGRATION - ENABLED_INTEGRATION
              • + *
            • DISABLED_INTEGRATION - DISABLED_INTEGRATION
              • + *
            • ENABLED_CATEGORY - ENABLED_CATEGORY
              • + *
            • DISABLED_CATEGORY - DISABLED_CATEGORY
              • + *
            • CHANGED_PASSWORD - CHANGED_PASSWORD
              • + *
            • RESET_PASSWORD - RESET_PASSWORD
              • + *
            • ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION
              • + *
            • ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT
              • + *
            • DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION
              • + *
            • DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT
              • + *
            • CREATED_INTEGRATION_WIDE_FIELD_MAPPING - CREATED_INTEGRATION_WIDE_FIELD_MAPPING
              • + *
            • CREATED_LINKED_ACCOUNT_FIELD_MAPPING - CREATED_LINKED_ACCOUNT_FIELD_MAPPING
              • + *
            • CHANGED_INTEGRATION_WIDE_FIELD_MAPPING - CHANGED_INTEGRATION_WIDE_FIELD_MAPPING
              • + *
            • CHANGED_LINKED_ACCOUNT_FIELD_MAPPING - CHANGED_LINKED_ACCOUNT_FIELD_MAPPING
              • + *
            • DELETED_INTEGRATION_WIDE_FIELD_MAPPING - DELETED_INTEGRATION_WIDE_FIELD_MAPPING
              • + *
            • DELETED_LINKED_ACCOUNT_FIELD_MAPPING - DELETED_LINKED_ACCOUNT_FIELD_MAPPING
              • + *
            • CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
              • + *
            • CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
              • + *
            • DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
              • + *
            • FORCED_LINKED_ACCOUNT_RESYNC - FORCED_LINKED_ACCOUNT_RESYNC
              • + *
            • MUTED_ISSUE - MUTED_ISSUE
              • + *
            • GENERATED_MAGIC_LINK - GENERATED_MAGIC_LINK
              • + *
            • ENABLED_MERGE_WEBHOOK - ENABLED_MERGE_WEBHOOK
              • + *
            • DISABLED_MERGE_WEBHOOK - DISABLED_MERGE_WEBHOOK
              • + *
            • MERGE_WEBHOOK_TARGET_CHANGED - MERGE_WEBHOOK_TARGET_CHANGED
              • + *
            • END_USER_CREDENTIALS_ACCESSED - END_USER_CREDENTIALS_ACCESSED
              • + *
            + *

            Designates the type of event that occurred.

            *
              *
            • CREATED_REMOTE_PRODUCTION_API_KEY - CREATED_REMOTE_PRODUCTION_API_KEY
              • *
            • DELETED_REMOTE_PRODUCTION_API_KEY - DELETED_REMOTE_PRODUCTION_API_KEY
              • diff --git a/src/main/java/com/merge/api/ats/types/AuditLogEventEventType.java b/src/main/java/com/merge/api/ats/types/AuditLogEventEventType.java index 137d21663..8443470ef 100644 --- a/src/main/java/com/merge/api/ats/types/AuditLogEventEventType.java +++ b/src/main/java/com/merge/api/ats/types/AuditLogEventEventType.java @@ -83,11 +83,11 @@ public AuditLogEventEventType deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, EventTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/AuditLogEventRole.java b/src/main/java/com/merge/api/ats/types/AuditLogEventRole.java index a4d57604f..9ce8a6d42 100644 --- a/src/main/java/com/merge/api/ats/types/AuditLogEventRole.java +++ b/src/main/java/com/merge/api/ats/types/AuditLogEventRole.java @@ -83,11 +83,11 @@ public AuditLogEventRole deserialize(JsonParser p, DeserializationContext contex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RoleEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/CandidateApplicationsItem.java b/src/main/java/com/merge/api/ats/types/CandidateApplicationsItem.java index d114f7baa..531e0006e 100644 --- a/src/main/java/com/merge/api/ats/types/CandidateApplicationsItem.java +++ b/src/main/java/com/merge/api/ats/types/CandidateApplicationsItem.java @@ -83,11 +83,11 @@ public CandidateApplicationsItem deserialize(JsonParser p, DeserializationContex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Application.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/CandidateAttachmentsItem.java b/src/main/java/com/merge/api/ats/types/CandidateAttachmentsItem.java index ac1726741..4a75d3f84 100644 --- a/src/main/java/com/merge/api/ats/types/CandidateAttachmentsItem.java +++ b/src/main/java/com/merge/api/ats/types/CandidateAttachmentsItem.java @@ -83,11 +83,11 @@ public CandidateAttachmentsItem deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Attachment.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/CandidateRequestApplicationsItem.java b/src/main/java/com/merge/api/ats/types/CandidateRequestApplicationsItem.java index e9a1e16f6..2f24553bc 100644 --- a/src/main/java/com/merge/api/ats/types/CandidateRequestApplicationsItem.java +++ b/src/main/java/com/merge/api/ats/types/CandidateRequestApplicationsItem.java @@ -84,11 +84,11 @@ public CandidateRequestApplicationsItem deserialize(JsonParser p, Deserializatio Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Application.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/CandidateRequestAttachmentsItem.java b/src/main/java/com/merge/api/ats/types/CandidateRequestAttachmentsItem.java index 900e75c56..b0cc52d2f 100644 --- a/src/main/java/com/merge/api/ats/types/CandidateRequestAttachmentsItem.java +++ b/src/main/java/com/merge/api/ats/types/CandidateRequestAttachmentsItem.java @@ -84,11 +84,11 @@ public CandidateRequestAttachmentsItem deserialize(JsonParser p, Deserialization Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Attachment.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/CandidateResponse.java b/src/main/java/com/merge/api/ats/types/CandidateResponse.java index d9f5f4e93..3887c2b92 100644 --- a/src/main/java/com/merge/api/ats/types/CandidateResponse.java +++ b/src/main/java/com/merge/api/ats/types/CandidateResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/ats/types/CommonModelScopeApi.java b/src/main/java/com/merge/api/ats/types/CommonModelScopeApi.java index f6574f2de..0bfcfd0ed 100644 --- a/src/main/java/com/merge/api/ats/types/CommonModelScopeApi.java +++ b/src/main/java/com/merge/api/ats/types/CommonModelScopeApi.java @@ -98,7 +98,9 @@ public Builder addCommonModels(IndividualCommonModelScopeDeserializer commonMode } public Builder addAllCommonModels(List commonModels) { - this.commonModels.addAll(commonModels); + if (commonModels != null) { + this.commonModels.addAll(commonModels); + } return this; } diff --git a/src/main/java/com/merge/api/ats/types/CommonModelScopesBodyRequest.java b/src/main/java/com/merge/api/ats/types/CommonModelScopesBodyRequest.java index cbe41cf4b..6c2318554 100644 --- a/src/main/java/com/merge/api/ats/types/CommonModelScopesBodyRequest.java +++ b/src/main/java/com/merge/api/ats/types/CommonModelScopesBodyRequest.java @@ -139,7 +139,9 @@ public _FinalStage modelId(@NotNull String modelId) { @java.lang.Override public _FinalStage addAllDisabledFields(List disabledFields) { - this.disabledFields.addAll(disabledFields); + if (disabledFields != null) { + this.disabledFields.addAll(disabledFields); + } return this; } @@ -159,7 +161,9 @@ public _FinalStage disabledFields(List disabledFields) { @java.lang.Override public _FinalStage addAllEnabledActions(List enabledActions) { - this.enabledActions.addAll(enabledActions); + if (enabledActions != null) { + this.enabledActions.addAll(enabledActions); + } return this; } diff --git a/src/main/java/com/merge/api/ats/types/CreateFieldMappingRequest.java b/src/main/java/com/merge/api/ats/types/CreateFieldMappingRequest.java index 84fb22ffa..0ed30e1d0 100644 --- a/src/main/java/com/merge/api/ats/types/CreateFieldMappingRequest.java +++ b/src/main/java/com/merge/api/ats/types/CreateFieldMappingRequest.java @@ -159,7 +159,7 @@ public static TargetFieldNameStage builder() { public interface TargetFieldNameStage { /** - * The name of the target field you want this remote field to map to. + *

              The name of the target field you want this remote field to map to.

              */ TargetFieldDescriptionStage targetFieldName(@NotNull String targetFieldName); @@ -168,28 +168,28 @@ public interface TargetFieldNameStage { public interface TargetFieldDescriptionStage { /** - * The description of the target field you want this remote field to map to. + *

              The description of the target field you want this remote field to map to.

              */ RemoteMethodStage targetFieldDescription(@NotNull String targetFieldDescription); } public interface RemoteMethodStage { /** - * The method of the remote endpoint where the remote field is coming from. + *

              The method of the remote endpoint where the remote field is coming from.

              */ RemoteUrlPathStage remoteMethod(@NotNull String remoteMethod); } public interface RemoteUrlPathStage { /** - * The path of the remote endpoint where the remote field is coming from. + *

              The path of the remote endpoint where the remote field is coming from.

              */ CommonModelNameStage remoteUrlPath(@NotNull String remoteUrlPath); } public interface CommonModelNameStage { /** - * The name of the Common Model that the remote field corresponds to in a given category. + *

              The name of the Common Model that the remote field corresponds to in a given category.

              */ _FinalStage commonModelName(@NotNull String commonModelName); } @@ -254,7 +254,8 @@ public Builder from(CreateFieldMappingRequest other) { } /** - * The name of the target field you want this remote field to map to.

              The name of the target field you want this remote field to map to.

              + *

              The name of the target field you want this remote field to map to.

              + *

              The name of the target field you want this remote field to map to.

              * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -265,7 +266,8 @@ public TargetFieldDescriptionStage targetFieldName(@NotNull String targetFieldNa } /** - * The description of the target field you want this remote field to map to.

              The description of the target field you want this remote field to map to.

              + *

              The description of the target field you want this remote field to map to.

              + *

              The description of the target field you want this remote field to map to.

              * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -276,7 +278,8 @@ public RemoteMethodStage targetFieldDescription(@NotNull String targetFieldDescr } /** - * The method of the remote endpoint where the remote field is coming from.

              The method of the remote endpoint where the remote field is coming from.

              + *

              The method of the remote endpoint where the remote field is coming from.

              + *

              The method of the remote endpoint where the remote field is coming from.

              * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -287,7 +290,8 @@ public RemoteUrlPathStage remoteMethod(@NotNull String remoteMethod) { } /** - * The path of the remote endpoint where the remote field is coming from.

              The path of the remote endpoint where the remote field is coming from.

              + *

              The path of the remote endpoint where the remote field is coming from.

              + *

              The path of the remote endpoint where the remote field is coming from.

              * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -298,7 +302,8 @@ public CommonModelNameStage remoteUrlPath(@NotNull String remoteUrlPath) { } /** - * The name of the Common Model that the remote field corresponds to in a given category.

              The name of the Common Model that the remote field corresponds to in a given category.

              + *

              The name of the Common Model that the remote field corresponds to in a given category.

              + *

              The name of the Common Model that the remote field corresponds to in a given category.

              * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -314,7 +319,9 @@ public _FinalStage commonModelName(@NotNull String commonModelName) { */ @java.lang.Override public _FinalStage addAllRemoteFieldTraversalPath(List remoteFieldTraversalPath) { - this.remoteFieldTraversalPath.addAll(remoteFieldTraversalPath); + if (remoteFieldTraversalPath != null) { + this.remoteFieldTraversalPath.addAll(remoteFieldTraversalPath); + } return this; } diff --git a/src/main/java/com/merge/api/ats/types/DataPassthroughRequest.java b/src/main/java/com/merge/api/ats/types/DataPassthroughRequest.java index ed1d5c573..0e7c6b49e 100644 --- a/src/main/java/com/merge/api/ats/types/DataPassthroughRequest.java +++ b/src/main/java/com/merge/api/ats/types/DataPassthroughRequest.java @@ -172,7 +172,7 @@ public interface MethodStage { public interface PathStage { /** - * The path of the request in the third party's platform. + *

              The path of the request in the third party's platform.

              */ _FinalStage path(@NotNull String path); } @@ -264,7 +264,8 @@ public PathStage method(@NotNull MethodEnum method) { } /** - * The path of the request in the third party's platform.

              The path of the request in the third party's platform.

              + *

              The path of the request in the third party's platform.

              + *

              The path of the request in the third party's platform.

              * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/ats/types/EeocCandidate.java b/src/main/java/com/merge/api/ats/types/EeocCandidate.java index 70a21c587..42883e0d6 100644 --- a/src/main/java/com/merge/api/ats/types/EeocCandidate.java +++ b/src/main/java/com/merge/api/ats/types/EeocCandidate.java @@ -83,11 +83,11 @@ public EeocCandidate deserialize(JsonParser p, DeserializationContext context) t Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Candidate.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/EeocDisabilityStatus.java b/src/main/java/com/merge/api/ats/types/EeocDisabilityStatus.java index d958c5ae4..c26777d39 100644 --- a/src/main/java/com/merge/api/ats/types/EeocDisabilityStatus.java +++ b/src/main/java/com/merge/api/ats/types/EeocDisabilityStatus.java @@ -83,11 +83,11 @@ public EeocDisabilityStatus deserialize(JsonParser p, DeserializationContext con Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, DisabilityStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/EeocGender.java b/src/main/java/com/merge/api/ats/types/EeocGender.java index 8f675cfe4..5b5296546 100644 --- a/src/main/java/com/merge/api/ats/types/EeocGender.java +++ b/src/main/java/com/merge/api/ats/types/EeocGender.java @@ -83,11 +83,11 @@ public EeocGender deserialize(JsonParser p, DeserializationContext context) thro Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, GenderEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/EeocRace.java b/src/main/java/com/merge/api/ats/types/EeocRace.java index 8280c5876..e3bad16df 100644 --- a/src/main/java/com/merge/api/ats/types/EeocRace.java +++ b/src/main/java/com/merge/api/ats/types/EeocRace.java @@ -83,11 +83,11 @@ public EeocRace deserialize(JsonParser p, DeserializationContext context) throws Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RaceEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/EeocVeteranStatus.java b/src/main/java/com/merge/api/ats/types/EeocVeteranStatus.java index 02f0d6fa6..2d250a1d4 100644 --- a/src/main/java/com/merge/api/ats/types/EeocVeteranStatus.java +++ b/src/main/java/com/merge/api/ats/types/EeocVeteranStatus.java @@ -83,11 +83,11 @@ public EeocVeteranStatus deserialize(JsonParser p, DeserializationContext contex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, VeteranStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/EmailAddressEmailAddressType.java b/src/main/java/com/merge/api/ats/types/EmailAddressEmailAddressType.java index 9e415af38..5426303e4 100644 --- a/src/main/java/com/merge/api/ats/types/EmailAddressEmailAddressType.java +++ b/src/main/java/com/merge/api/ats/types/EmailAddressEmailAddressType.java @@ -84,11 +84,11 @@ public EmailAddressEmailAddressType deserialize(JsonParser p, DeserializationCon Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, EmailAddressTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/EmailAddressRequestEmailAddressType.java b/src/main/java/com/merge/api/ats/types/EmailAddressRequestEmailAddressType.java index c670b036e..283180f15 100644 --- a/src/main/java/com/merge/api/ats/types/EmailAddressRequestEmailAddressType.java +++ b/src/main/java/com/merge/api/ats/types/EmailAddressRequestEmailAddressType.java @@ -85,11 +85,11 @@ public EmailAddressRequestEmailAddressType deserialize(JsonParser p, Deserializa Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, EmailAddressTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/EndUserDetailsRequest.java b/src/main/java/com/merge/api/ats/types/EndUserDetailsRequest.java index 93f461d3e..edbc5bea9 100644 --- a/src/main/java/com/merge/api/ats/types/EndUserDetailsRequest.java +++ b/src/main/java/com/merge/api/ats/types/EndUserDetailsRequest.java @@ -250,7 +250,7 @@ public static EndUserEmailAddressStage builder() { public interface EndUserEmailAddressStage { /** - * Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent. + *

              Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.

              */ EndUserOrganizationNameStage endUserEmailAddress(@NotNull String endUserEmailAddress); @@ -259,14 +259,14 @@ public interface EndUserEmailAddressStage { public interface EndUserOrganizationNameStage { /** - * Your end user's organization. + *

              Your end user's organization.

              */ EndUserOriginIdStage endUserOrganizationName(@NotNull String endUserOrganizationName); } public interface EndUserOriginIdStage { /** - * This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers. + *

              This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.

              */ _FinalStage endUserOriginId(@NotNull String endUserOriginId); } @@ -408,7 +408,8 @@ public Builder from(EndUserDetailsRequest other) { } /** - * Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.

              Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.

              + *

              Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.

              + *

              Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.

              * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -419,7 +420,8 @@ public EndUserOrganizationNameStage endUserEmailAddress(@NotNull String endUserE } /** - * Your end user's organization.

              Your end user's organization.

              + *

              Your end user's organization.

              + *

              Your end user's organization.

              * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -430,7 +432,8 @@ public EndUserOriginIdStage endUserOrganizationName(@NotNull String endUserOrgan } /** - * This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.

              This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.

              + *

              This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.

              + *

              This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.

              * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -637,7 +640,9 @@ public _FinalStage integration(Optional integration) { */ @java.lang.Override public _FinalStage addAllCategories(List categories) { - this.categories.addAll(categories); + if (categories != null) { + this.categories.addAll(categories); + } return this; } diff --git a/src/main/java/com/merge/api/ats/types/EndUserDetailsRequestLanguage.java b/src/main/java/com/merge/api/ats/types/EndUserDetailsRequestLanguage.java index 57c9c65dd..12f8fbc6c 100644 --- a/src/main/java/com/merge/api/ats/types/EndUserDetailsRequestLanguage.java +++ b/src/main/java/com/merge/api/ats/types/EndUserDetailsRequestLanguage.java @@ -84,11 +84,11 @@ public EndUserDetailsRequestLanguage deserialize(JsonParser p, DeserializationCo Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, LanguageEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/FieldMappingInstanceResponse.java b/src/main/java/com/merge/api/ats/types/FieldMappingInstanceResponse.java index ac5055764..a3edb7c4a 100644 --- a/src/main/java/com/merge/api/ats/types/FieldMappingInstanceResponse.java +++ b/src/main/java/com/merge/api/ats/types/FieldMappingInstanceResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/ats/types/GenerateRemoteKeyRequest.java b/src/main/java/com/merge/api/ats/types/GenerateRemoteKeyRequest.java index c69c4919c..b1ec33868 100644 --- a/src/main/java/com/merge/api/ats/types/GenerateRemoteKeyRequest.java +++ b/src/main/java/com/merge/api/ats/types/GenerateRemoteKeyRequest.java @@ -67,7 +67,7 @@ public static NameStage builder() { public interface NameStage { /** - * The name of the remote key + *

              The name of the remote key

              */ _FinalStage name(@NotNull String name); @@ -94,7 +94,8 @@ public Builder from(GenerateRemoteKeyRequest other) { } /** - * The name of the remote key

              The name of the remote key

              + *

              The name of the remote key

              + *

              The name of the remote key

              * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/ats/types/IgnoreCommonModelRequestReason.java b/src/main/java/com/merge/api/ats/types/IgnoreCommonModelRequestReason.java index 9a4b9c2d8..8f64eb623 100644 --- a/src/main/java/com/merge/api/ats/types/IgnoreCommonModelRequestReason.java +++ b/src/main/java/com/merge/api/ats/types/IgnoreCommonModelRequestReason.java @@ -84,11 +84,11 @@ public IgnoreCommonModelRequestReason deserialize(JsonParser p, DeserializationC Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, ReasonEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/IssueStatus.java b/src/main/java/com/merge/api/ats/types/IssueStatus.java index 4807e6c87..025b12b44 100644 --- a/src/main/java/com/merge/api/ats/types/IssueStatus.java +++ b/src/main/java/com/merge/api/ats/types/IssueStatus.java @@ -83,11 +83,11 @@ public IssueStatus deserialize(JsonParser p, DeserializationContext context) thr Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, IssueStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/JobDepartmentsItem.java b/src/main/java/com/merge/api/ats/types/JobDepartmentsItem.java index 04eb1e6b3..117187087 100644 --- a/src/main/java/com/merge/api/ats/types/JobDepartmentsItem.java +++ b/src/main/java/com/merge/api/ats/types/JobDepartmentsItem.java @@ -83,11 +83,11 @@ public JobDepartmentsItem deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Department.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/JobHiringManagersItem.java b/src/main/java/com/merge/api/ats/types/JobHiringManagersItem.java index bbf0b9b49..3c007813b 100644 --- a/src/main/java/com/merge/api/ats/types/JobHiringManagersItem.java +++ b/src/main/java/com/merge/api/ats/types/JobHiringManagersItem.java @@ -83,11 +83,11 @@ public JobHiringManagersItem deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RemoteUser.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/JobInterviewStageJob.java b/src/main/java/com/merge/api/ats/types/JobInterviewStageJob.java index bc6525a36..c03da5e4a 100644 --- a/src/main/java/com/merge/api/ats/types/JobInterviewStageJob.java +++ b/src/main/java/com/merge/api/ats/types/JobInterviewStageJob.java @@ -83,11 +83,11 @@ public JobInterviewStageJob deserialize(JsonParser p, DeserializationContext con Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Job.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/JobOfficesItem.java b/src/main/java/com/merge/api/ats/types/JobOfficesItem.java index 23371d3e6..4c0646e9a 100644 --- a/src/main/java/com/merge/api/ats/types/JobOfficesItem.java +++ b/src/main/java/com/merge/api/ats/types/JobOfficesItem.java @@ -83,11 +83,11 @@ public JobOfficesItem deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Office.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/JobPostingJob.java b/src/main/java/com/merge/api/ats/types/JobPostingJob.java index beced4651..04f1b9406 100644 --- a/src/main/java/com/merge/api/ats/types/JobPostingJob.java +++ b/src/main/java/com/merge/api/ats/types/JobPostingJob.java @@ -83,11 +83,11 @@ public JobPostingJob deserialize(JsonParser p, DeserializationContext context) t Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Job.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/JobPostingJobPostingUrlsItem.java b/src/main/java/com/merge/api/ats/types/JobPostingJobPostingUrlsItem.java index 6b3a1d162..6eb39ced4 100644 --- a/src/main/java/com/merge/api/ats/types/JobPostingJobPostingUrlsItem.java +++ b/src/main/java/com/merge/api/ats/types/JobPostingJobPostingUrlsItem.java @@ -84,11 +84,11 @@ public JobPostingJobPostingUrlsItem deserialize(JsonParser p, DeserializationCon Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Url.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/JobPostingStatus.java b/src/main/java/com/merge/api/ats/types/JobPostingStatus.java index 4bed70011..cecdaa076 100644 --- a/src/main/java/com/merge/api/ats/types/JobPostingStatus.java +++ b/src/main/java/com/merge/api/ats/types/JobPostingStatus.java @@ -83,11 +83,11 @@ public JobPostingStatus deserialize(JsonParser p, DeserializationContext context Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, JobPostingStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/JobRecruitersItem.java b/src/main/java/com/merge/api/ats/types/JobRecruitersItem.java index 1b8f4eebf..971b64818 100644 --- a/src/main/java/com/merge/api/ats/types/JobRecruitersItem.java +++ b/src/main/java/com/merge/api/ats/types/JobRecruitersItem.java @@ -83,11 +83,11 @@ public JobRecruitersItem deserialize(JsonParser p, DeserializationContext contex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RemoteUser.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/JobStatus.java b/src/main/java/com/merge/api/ats/types/JobStatus.java index 4d5eaaca3..ceae5d209 100644 --- a/src/main/java/com/merge/api/ats/types/JobStatus.java +++ b/src/main/java/com/merge/api/ats/types/JobStatus.java @@ -83,11 +83,11 @@ public JobStatus deserialize(JsonParser p, DeserializationContext context) throw Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, JobStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/JobType.java b/src/main/java/com/merge/api/ats/types/JobType.java index e4dd23de6..b152b3109 100644 --- a/src/main/java/com/merge/api/ats/types/JobType.java +++ b/src/main/java/com/merge/api/ats/types/JobType.java @@ -83,11 +83,11 @@ public JobType deserialize(JsonParser p, DeserializationContext context) throws Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, JobTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/LinkedAccountCommonModelScopeDeserializerRequest.java b/src/main/java/com/merge/api/ats/types/LinkedAccountCommonModelScopeDeserializerRequest.java index f7a795bfb..8f0503f34 100644 --- a/src/main/java/com/merge/api/ats/types/LinkedAccountCommonModelScopeDeserializerRequest.java +++ b/src/main/java/com/merge/api/ats/types/LinkedAccountCommonModelScopeDeserializerRequest.java @@ -100,7 +100,9 @@ public Builder addCommonModels(IndividualCommonModelScopeDeserializerRequest com } public Builder addAllCommonModels(List commonModels) { - this.commonModels.addAll(commonModels); + if (commonModels != null) { + this.commonModels.addAll(commonModels); + } return this; } diff --git a/src/main/java/com/merge/api/ats/types/MetaResponse.java b/src/main/java/com/merge/api/ats/types/MetaResponse.java index 60c071eae..38884d8cb 100644 --- a/src/main/java/com/merge/api/ats/types/MetaResponse.java +++ b/src/main/java/com/merge/api/ats/types/MetaResponse.java @@ -216,7 +216,9 @@ public _FinalStage requestSchema(String key, JsonNode value) { @java.lang.Override public _FinalStage putAllRequestSchema(Map requestSchema) { - this.requestSchema.putAll(requestSchema); + if (requestSchema != null) { + this.requestSchema.putAll(requestSchema); + } return this; } diff --git a/src/main/java/com/merge/api/ats/types/ModelOperation.java b/src/main/java/com/merge/api/ats/types/ModelOperation.java index 064a3e13f..781a6feb6 100644 --- a/src/main/java/com/merge/api/ats/types/ModelOperation.java +++ b/src/main/java/com/merge/api/ats/types/ModelOperation.java @@ -159,7 +159,9 @@ public _FinalStage modelName(@NotNull String modelName) { @java.lang.Override public _FinalStage addAllSupportedFields(List supportedFields) { - this.supportedFields.addAll(supportedFields); + if (supportedFields != null) { + this.supportedFields.addAll(supportedFields); + } return this; } @@ -179,7 +181,9 @@ public _FinalStage supportedFields(List supportedFields) { @java.lang.Override public _FinalStage addAllRequiredPostParameters(List requiredPostParameters) { - this.requiredPostParameters.addAll(requiredPostParameters); + if (requiredPostParameters != null) { + this.requiredPostParameters.addAll(requiredPostParameters); + } return this; } @@ -199,7 +203,9 @@ public _FinalStage requiredPostParameters(List requiredPostParameters) { @java.lang.Override public _FinalStage addAllAvailableOperations(List availableOperations) { - this.availableOperations.addAll(availableOperations); + if (availableOperations != null) { + this.availableOperations.addAll(availableOperations); + } return this; } diff --git a/src/main/java/com/merge/api/ats/types/MultipartFormFieldRequest.java b/src/main/java/com/merge/api/ats/types/MultipartFormFieldRequest.java index 5d5ebdd77..41093f1d3 100644 --- a/src/main/java/com/merge/api/ats/types/MultipartFormFieldRequest.java +++ b/src/main/java/com/merge/api/ats/types/MultipartFormFieldRequest.java @@ -128,7 +128,7 @@ public static NameStage builder() { public interface NameStage { /** - * The name of the form field + *

              The name of the form field

              */ DataStage name(@NotNull String name); @@ -137,7 +137,7 @@ public interface NameStage { public interface DataStage { /** - * The data for the form field. + *

              The data for the form field.

              */ _FinalStage data(@NotNull String data); } @@ -200,7 +200,8 @@ public Builder from(MultipartFormFieldRequest other) { } /** - * The name of the form field

              The name of the form field

              + *

              The name of the form field

              + *

              The name of the form field

              * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -211,7 +212,8 @@ public DataStage name(@NotNull String name) { } /** - * The data for the form field.

              The data for the form field.

              + *

              The data for the form field.

              + *

              The data for the form field.

              * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/ats/types/MultipartFormFieldRequestEncoding.java b/src/main/java/com/merge/api/ats/types/MultipartFormFieldRequestEncoding.java index 042655ff5..f748eb397 100644 --- a/src/main/java/com/merge/api/ats/types/MultipartFormFieldRequestEncoding.java +++ b/src/main/java/com/merge/api/ats/types/MultipartFormFieldRequestEncoding.java @@ -84,11 +84,11 @@ public MultipartFormFieldRequestEncoding deserialize(JsonParser p, Deserializati Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, EncodingEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/OfferApplication.java b/src/main/java/com/merge/api/ats/types/OfferApplication.java index f5d3b0257..aa91b7af8 100644 --- a/src/main/java/com/merge/api/ats/types/OfferApplication.java +++ b/src/main/java/com/merge/api/ats/types/OfferApplication.java @@ -83,11 +83,11 @@ public OfferApplication deserialize(JsonParser p, DeserializationContext context Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Application.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/OfferCreator.java b/src/main/java/com/merge/api/ats/types/OfferCreator.java index f4d653d84..15ebb9a0d 100644 --- a/src/main/java/com/merge/api/ats/types/OfferCreator.java +++ b/src/main/java/com/merge/api/ats/types/OfferCreator.java @@ -83,11 +83,11 @@ public OfferCreator deserialize(JsonParser p, DeserializationContext context) th Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RemoteUser.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/OfferStatus.java b/src/main/java/com/merge/api/ats/types/OfferStatus.java index 64aa61de2..c403eb2b4 100644 --- a/src/main/java/com/merge/api/ats/types/OfferStatus.java +++ b/src/main/java/com/merge/api/ats/types/OfferStatus.java @@ -83,11 +83,11 @@ public OfferStatus deserialize(JsonParser p, DeserializationContext context) thr Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, OfferStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/PhoneNumberPhoneNumberType.java b/src/main/java/com/merge/api/ats/types/PhoneNumberPhoneNumberType.java index 1ce9188ba..fa157ff99 100644 --- a/src/main/java/com/merge/api/ats/types/PhoneNumberPhoneNumberType.java +++ b/src/main/java/com/merge/api/ats/types/PhoneNumberPhoneNumberType.java @@ -83,11 +83,11 @@ public PhoneNumberPhoneNumberType deserialize(JsonParser p, DeserializationConte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PhoneNumberTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/PhoneNumberRequestPhoneNumberType.java b/src/main/java/com/merge/api/ats/types/PhoneNumberRequestPhoneNumberType.java index 72545958c..d63362760 100644 --- a/src/main/java/com/merge/api/ats/types/PhoneNumberRequestPhoneNumberType.java +++ b/src/main/java/com/merge/api/ats/types/PhoneNumberRequestPhoneNumberType.java @@ -84,11 +84,11 @@ public PhoneNumberRequestPhoneNumberType deserialize(JsonParser p, Deserializati Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PhoneNumberTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/RemoteData.java b/src/main/java/com/merge/api/ats/types/RemoteData.java index b00ac0737..897d6f542 100644 --- a/src/main/java/com/merge/api/ats/types/RemoteData.java +++ b/src/main/java/com/merge/api/ats/types/RemoteData.java @@ -78,7 +78,7 @@ public static PathStage builder() { public interface PathStage { /** - * The third-party API path that is being called. + *

              The third-party API path that is being called.

              */ _FinalStage path(@NotNull String path); @@ -112,7 +112,8 @@ public Builder from(RemoteData other) { } /** - * The third-party API path that is being called.

              The third-party API path that is being called.

              + *

              The third-party API path that is being called.

              + *

              The third-party API path that is being called.

              * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/ats/types/RemoteEndpointInfo.java b/src/main/java/com/merge/api/ats/types/RemoteEndpointInfo.java index f24b1c7ae..f5e527498 100644 --- a/src/main/java/com/merge/api/ats/types/RemoteEndpointInfo.java +++ b/src/main/java/com/merge/api/ats/types/RemoteEndpointInfo.java @@ -145,7 +145,9 @@ public _FinalStage urlPath(@NotNull String urlPath) { @java.lang.Override public _FinalStage addAllFieldTraversalPath(List fieldTraversalPath) { - this.fieldTraversalPath.addAll(fieldTraversalPath); + if (fieldTraversalPath != null) { + this.fieldTraversalPath.addAll(fieldTraversalPath); + } return this; } diff --git a/src/main/java/com/merge/api/ats/types/RemoteFieldApi.java b/src/main/java/com/merge/api/ats/types/RemoteFieldApi.java index a8066edf0..6bf72b3f2 100644 --- a/src/main/java/com/merge/api/ats/types/RemoteFieldApi.java +++ b/src/main/java/com/merge/api/ats/types/RemoteFieldApi.java @@ -248,7 +248,9 @@ public _FinalStage schema(String key, JsonNode value) { @java.lang.Override public _FinalStage putAllSchema(Map schema) { - this.schema.putAll(schema); + if (schema != null) { + this.schema.putAll(schema); + } return this; } diff --git a/src/main/java/com/merge/api/ats/types/RemoteKeyForRegenerationRequest.java b/src/main/java/com/merge/api/ats/types/RemoteKeyForRegenerationRequest.java index b79e95324..a571ff280 100644 --- a/src/main/java/com/merge/api/ats/types/RemoteKeyForRegenerationRequest.java +++ b/src/main/java/com/merge/api/ats/types/RemoteKeyForRegenerationRequest.java @@ -67,7 +67,7 @@ public static NameStage builder() { public interface NameStage { /** - * The name of the remote key + *

              The name of the remote key

              */ _FinalStage name(@NotNull String name); @@ -94,7 +94,8 @@ public Builder from(RemoteKeyForRegenerationRequest other) { } /** - * The name of the remote key

              The name of the remote key

              + *

              The name of the remote key

              + *

              The name of the remote key

              * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/ats/types/RemoteResponseResponseType.java b/src/main/java/com/merge/api/ats/types/RemoteResponseResponseType.java index 4efba7173..c2700e463 100644 --- a/src/main/java/com/merge/api/ats/types/RemoteResponseResponseType.java +++ b/src/main/java/com/merge/api/ats/types/RemoteResponseResponseType.java @@ -83,11 +83,11 @@ public RemoteResponseResponseType deserialize(JsonParser p, DeserializationConte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, ResponseTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/RemoteUserAccessRole.java b/src/main/java/com/merge/api/ats/types/RemoteUserAccessRole.java index 625cb299d..872b1168b 100644 --- a/src/main/java/com/merge/api/ats/types/RemoteUserAccessRole.java +++ b/src/main/java/com/merge/api/ats/types/RemoteUserAccessRole.java @@ -83,11 +83,11 @@ public RemoteUserAccessRole deserialize(JsonParser p, DeserializationContext con Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AccessRoleEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ScheduledInterviewApplication.java b/src/main/java/com/merge/api/ats/types/ScheduledInterviewApplication.java index 097b71ce5..58ffdfd37 100644 --- a/src/main/java/com/merge/api/ats/types/ScheduledInterviewApplication.java +++ b/src/main/java/com/merge/api/ats/types/ScheduledInterviewApplication.java @@ -84,11 +84,11 @@ public ScheduledInterviewApplication deserialize(JsonParser p, DeserializationCo Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Application.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ScheduledInterviewInterviewersItem.java b/src/main/java/com/merge/api/ats/types/ScheduledInterviewInterviewersItem.java index 25c627396..5e01175a9 100644 --- a/src/main/java/com/merge/api/ats/types/ScheduledInterviewInterviewersItem.java +++ b/src/main/java/com/merge/api/ats/types/ScheduledInterviewInterviewersItem.java @@ -85,11 +85,11 @@ public ScheduledInterviewInterviewersItem deserialize(JsonParser p, Deserializat Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RemoteUser.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ScheduledInterviewJobInterviewStage.java b/src/main/java/com/merge/api/ats/types/ScheduledInterviewJobInterviewStage.java index f9594fcae..f63e61677 100644 --- a/src/main/java/com/merge/api/ats/types/ScheduledInterviewJobInterviewStage.java +++ b/src/main/java/com/merge/api/ats/types/ScheduledInterviewJobInterviewStage.java @@ -85,11 +85,11 @@ public ScheduledInterviewJobInterviewStage deserialize(JsonParser p, Deserializa Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, JobInterviewStage.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ScheduledInterviewOrganizer.java b/src/main/java/com/merge/api/ats/types/ScheduledInterviewOrganizer.java index cdd741441..b48a1d3b7 100644 --- a/src/main/java/com/merge/api/ats/types/ScheduledInterviewOrganizer.java +++ b/src/main/java/com/merge/api/ats/types/ScheduledInterviewOrganizer.java @@ -84,11 +84,11 @@ public ScheduledInterviewOrganizer deserialize(JsonParser p, DeserializationCont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RemoteUser.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ScheduledInterviewRequestApplication.java b/src/main/java/com/merge/api/ats/types/ScheduledInterviewRequestApplication.java index e9f9aad05..ffaee6f6b 100644 --- a/src/main/java/com/merge/api/ats/types/ScheduledInterviewRequestApplication.java +++ b/src/main/java/com/merge/api/ats/types/ScheduledInterviewRequestApplication.java @@ -85,11 +85,11 @@ public ScheduledInterviewRequestApplication deserialize(JsonParser p, Deserializ Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Application.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ScheduledInterviewRequestInterviewersItem.java b/src/main/java/com/merge/api/ats/types/ScheduledInterviewRequestInterviewersItem.java index b43e56ca9..bc61e470e 100644 --- a/src/main/java/com/merge/api/ats/types/ScheduledInterviewRequestInterviewersItem.java +++ b/src/main/java/com/merge/api/ats/types/ScheduledInterviewRequestInterviewersItem.java @@ -85,11 +85,11 @@ public ScheduledInterviewRequestInterviewersItem deserialize(JsonParser p, Deser Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RemoteUser.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ScheduledInterviewRequestJobInterviewStage.java b/src/main/java/com/merge/api/ats/types/ScheduledInterviewRequestJobInterviewStage.java index 768d14b57..5358fcfa3 100644 --- a/src/main/java/com/merge/api/ats/types/ScheduledInterviewRequestJobInterviewStage.java +++ b/src/main/java/com/merge/api/ats/types/ScheduledInterviewRequestJobInterviewStage.java @@ -85,11 +85,11 @@ public ScheduledInterviewRequestJobInterviewStage deserialize(JsonParser p, Dese Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, JobInterviewStage.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ScheduledInterviewRequestOrganizer.java b/src/main/java/com/merge/api/ats/types/ScheduledInterviewRequestOrganizer.java index 939522ed5..ff66d68aa 100644 --- a/src/main/java/com/merge/api/ats/types/ScheduledInterviewRequestOrganizer.java +++ b/src/main/java/com/merge/api/ats/types/ScheduledInterviewRequestOrganizer.java @@ -85,11 +85,11 @@ public ScheduledInterviewRequestOrganizer deserialize(JsonParser p, Deserializat Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RemoteUser.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ScheduledInterviewRequestStatus.java b/src/main/java/com/merge/api/ats/types/ScheduledInterviewRequestStatus.java index d410a8d84..043f8e979 100644 --- a/src/main/java/com/merge/api/ats/types/ScheduledInterviewRequestStatus.java +++ b/src/main/java/com/merge/api/ats/types/ScheduledInterviewRequestStatus.java @@ -84,11 +84,11 @@ public ScheduledInterviewRequestStatus deserialize(JsonParser p, Deserialization Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, ScheduledInterviewStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ScheduledInterviewResponse.java b/src/main/java/com/merge/api/ats/types/ScheduledInterviewResponse.java index d1da42875..532221d23 100644 --- a/src/main/java/com/merge/api/ats/types/ScheduledInterviewResponse.java +++ b/src/main/java/com/merge/api/ats/types/ScheduledInterviewResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/ats/types/ScheduledInterviewStatus.java b/src/main/java/com/merge/api/ats/types/ScheduledInterviewStatus.java index 446bc5974..20953d119 100644 --- a/src/main/java/com/merge/api/ats/types/ScheduledInterviewStatus.java +++ b/src/main/java/com/merge/api/ats/types/ScheduledInterviewStatus.java @@ -83,11 +83,11 @@ public ScheduledInterviewStatus deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, ScheduledInterviewStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ScorecardApplication.java b/src/main/java/com/merge/api/ats/types/ScorecardApplication.java index f7306b5ba..1247d15d6 100644 --- a/src/main/java/com/merge/api/ats/types/ScorecardApplication.java +++ b/src/main/java/com/merge/api/ats/types/ScorecardApplication.java @@ -83,11 +83,11 @@ public ScorecardApplication deserialize(JsonParser p, DeserializationContext con Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Application.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ScorecardInterview.java b/src/main/java/com/merge/api/ats/types/ScorecardInterview.java index 43e081756..58baa42db 100644 --- a/src/main/java/com/merge/api/ats/types/ScorecardInterview.java +++ b/src/main/java/com/merge/api/ats/types/ScorecardInterview.java @@ -83,11 +83,11 @@ public ScorecardInterview deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, ScheduledInterview.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ScorecardInterviewer.java b/src/main/java/com/merge/api/ats/types/ScorecardInterviewer.java index b08328355..aa3bd9ffd 100644 --- a/src/main/java/com/merge/api/ats/types/ScorecardInterviewer.java +++ b/src/main/java/com/merge/api/ats/types/ScorecardInterviewer.java @@ -83,11 +83,11 @@ public ScorecardInterviewer deserialize(JsonParser p, DeserializationContext con Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RemoteUser.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ScorecardOverallRecommendation.java b/src/main/java/com/merge/api/ats/types/ScorecardOverallRecommendation.java index 5630df7dc..603e47671 100644 --- a/src/main/java/com/merge/api/ats/types/ScorecardOverallRecommendation.java +++ b/src/main/java/com/merge/api/ats/types/ScorecardOverallRecommendation.java @@ -84,11 +84,11 @@ public ScorecardOverallRecommendation deserialize(JsonParser p, DeserializationC Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, OverallRecommendationEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ScreeningQuestionAnswerQuestion.java b/src/main/java/com/merge/api/ats/types/ScreeningQuestionAnswerQuestion.java index 5e8a3c67d..a54af1e1d 100644 --- a/src/main/java/com/merge/api/ats/types/ScreeningQuestionAnswerQuestion.java +++ b/src/main/java/com/merge/api/ats/types/ScreeningQuestionAnswerQuestion.java @@ -84,11 +84,11 @@ public ScreeningQuestionAnswerQuestion deserialize(JsonParser p, Deserialization Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, ScreeningQuestion.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ScreeningQuestionAnswerRequestQuestion.java b/src/main/java/com/merge/api/ats/types/ScreeningQuestionAnswerRequestQuestion.java index ca1ed0424..0df27cd02 100644 --- a/src/main/java/com/merge/api/ats/types/ScreeningQuestionAnswerRequestQuestion.java +++ b/src/main/java/com/merge/api/ats/types/ScreeningQuestionAnswerRequestQuestion.java @@ -85,11 +85,11 @@ public ScreeningQuestionAnswerRequestQuestion deserialize(JsonParser p, Deserial Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, ScreeningQuestion.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ScreeningQuestionJob.java b/src/main/java/com/merge/api/ats/types/ScreeningQuestionJob.java index fdf0067cd..dbd81a949 100644 --- a/src/main/java/com/merge/api/ats/types/ScreeningQuestionJob.java +++ b/src/main/java/com/merge/api/ats/types/ScreeningQuestionJob.java @@ -83,11 +83,11 @@ public ScreeningQuestionJob deserialize(JsonParser p, DeserializationContext con Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Job.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/ScreeningQuestionType.java b/src/main/java/com/merge/api/ats/types/ScreeningQuestionType.java index 8c710d304..d506755a8 100644 --- a/src/main/java/com/merge/api/ats/types/ScreeningQuestionType.java +++ b/src/main/java/com/merge/api/ats/types/ScreeningQuestionType.java @@ -83,11 +83,11 @@ public ScreeningQuestionType deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, ScreeningQuestionTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/SyncStatusLastSyncResult.java b/src/main/java/com/merge/api/ats/types/SyncStatusLastSyncResult.java index 15d84418c..7ce821f0c 100644 --- a/src/main/java/com/merge/api/ats/types/SyncStatusLastSyncResult.java +++ b/src/main/java/com/merge/api/ats/types/SyncStatusLastSyncResult.java @@ -83,11 +83,11 @@ public SyncStatusLastSyncResult deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, LastSyncResultEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/SyncStatusStatus.java b/src/main/java/com/merge/api/ats/types/SyncStatusStatus.java index 5409e32b1..f315aac74 100644 --- a/src/main/java/com/merge/api/ats/types/SyncStatusStatus.java +++ b/src/main/java/com/merge/api/ats/types/SyncStatusStatus.java @@ -83,11 +83,11 @@ public SyncStatusStatus deserialize(JsonParser p, DeserializationContext context Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, StatusFd5Enum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/UrlRequestUrlType.java b/src/main/java/com/merge/api/ats/types/UrlRequestUrlType.java index a963cec78..abfb23188 100644 --- a/src/main/java/com/merge/api/ats/types/UrlRequestUrlType.java +++ b/src/main/java/com/merge/api/ats/types/UrlRequestUrlType.java @@ -83,11 +83,11 @@ public UrlRequestUrlType deserialize(JsonParser p, DeserializationContext contex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, UrlTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ats/types/UrlUrlType.java b/src/main/java/com/merge/api/ats/types/UrlUrlType.java index 6a7681b1d..b4d4fc693 100644 --- a/src/main/java/com/merge/api/ats/types/UrlUrlType.java +++ b/src/main/java/com/merge/api/ats/types/UrlUrlType.java @@ -83,11 +83,11 @@ public UrlUrlType deserialize(JsonParser p, DeserializationContext context) thro Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, UrlTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/core/ClientOptions.java b/src/main/java/com/merge/api/core/ClientOptions.java index 1267ed428..2ba818103 100644 --- a/src/main/java/com/merge/api/core/ClientOptions.java +++ b/src/main/java/com/merge/api/core/ClientOptions.java @@ -86,7 +86,7 @@ public static Builder builder() { return new Builder(); } - public static final class Builder { + public static class Builder { private Environment environment; private final Map headers = new HashMap<>(); @@ -167,5 +167,16 @@ public ClientOptions build() { return new ClientOptions(environment, headers, headerSuppliers, httpClient, this.timeout.get()); } + + /** + * Create a new Builder initialized with values from an existing ClientOptions + */ + public static Builder from(ClientOptions clientOptions) { + Builder builder = new Builder(); + builder.environment = clientOptions.environment(); + builder.timeout = Optional.of(clientOptions.timeout(null)); + builder.httpClient = clientOptions.httpClient(); + return builder; + } } } diff --git a/src/main/java/com/merge/api/core/InputStreamRequestBody.java b/src/main/java/com/merge/api/core/InputStreamRequestBody.java index b984fa9aa..8b992c052 100644 --- a/src/main/java/com/merge/api/core/InputStreamRequestBody.java +++ b/src/main/java/com/merge/api/core/InputStreamRequestBody.java @@ -8,7 +8,6 @@ import java.util.Objects; import okhttp3.MediaType; import okhttp3.RequestBody; -import okhttp3.internal.Util; import okio.BufferedSink; import okio.Okio; import okio.Source; @@ -68,12 +67,8 @@ public long contentLength() throws IOException { */ @Override public void writeTo(BufferedSink sink) throws IOException { - Source source = null; - try { - source = Okio.source(inputStream); + try (Source source = Okio.source(inputStream)) { sink.writeAll(source); - } finally { - Util.closeQuietly(Objects.requireNonNull(source)); } } } diff --git a/src/main/java/com/merge/api/core/RequestOptions.java b/src/main/java/com/merge/api/core/RequestOptions.java index d75805313..20748eb7b 100644 --- a/src/main/java/com/merge/api/core/RequestOptions.java +++ b/src/main/java/com/merge/api/core/RequestOptions.java @@ -64,7 +64,7 @@ public static Builder builder() { return new Builder(); } - public static final class Builder { + public static class Builder { private String apiKey = null; private String accountToken = null; diff --git a/src/main/java/com/merge/api/core/Stream.java b/src/main/java/com/merge/api/core/Stream.java index 40f7cc47b..219702457 100644 --- a/src/main/java/com/merge/api/core/Stream.java +++ b/src/main/java/com/merge/api/core/Stream.java @@ -3,6 +3,8 @@ */ package com.merge.api.core; +import java.io.Closeable; +import java.io.IOException; import java.io.Reader; import java.util.Iterator; import java.util.NoSuchElementException; @@ -14,18 +16,28 @@ *

              * {@code Stream} assumes that data is being pushed to the provided {@link Reader} asynchronously and utilizes a * {@code Scanner} to block during iteration if the next object is not available. + * Iterable stream for parsing JSON and Server-Sent Events (SSE) data. + * Supports both newline-delimited JSON and SSE with optional stream termination. * * @param The type of objects in the stream. */ -public final class Stream implements Iterable { - /** - * The {@link Class} of the objects in the stream. - */ +public final class Stream implements Iterable, Closeable { + + private static final String NEWLINE = "\n"; + private static final String DATA_PREFIX = "data:"; + + public enum StreamType { + JSON, + SSE + } + private final Class valueType; - /** - * The {@link Scanner} used for reading from the input stream and blocking when needed during iteration. - */ private final Scanner scanner; + private final StreamType streamType; + private final String messageTerminator; + private final String streamTerminator; + private final Reader sseReader; + private boolean isClosed = false; /** * Constructs a new {@code Stream} with the specified value type, reader, and delimiter. @@ -35,8 +47,61 @@ public final class Stream implements Iterable { * @param delimiter The delimiter used to separate elements in the stream. */ public Stream(Class valueType, Reader reader, String delimiter) { + this.valueType = valueType; this.scanner = new Scanner(reader).useDelimiter(delimiter); + this.streamType = StreamType.JSON; + this.messageTerminator = delimiter; + this.streamTerminator = null; + this.sseReader = null; + } + + private Stream(Class valueType, StreamType type, Reader reader, String terminator) { this.valueType = valueType; + this.streamType = type; + if (type == StreamType.JSON) { + this.scanner = new Scanner(reader).useDelimiter(terminator); + this.messageTerminator = terminator; + this.streamTerminator = null; + this.sseReader = null; + } else { + this.scanner = null; + this.messageTerminator = NEWLINE; + this.streamTerminator = terminator; + this.sseReader = reader; + } + } + + public static Stream fromJson(Class valueType, Reader reader, String delimiter) { + return new Stream<>(valueType, reader, delimiter); + } + + public static Stream fromJson(Class valueType, Reader reader) { + return new Stream<>(valueType, reader, NEWLINE); + } + + public static Stream fromSse(Class valueType, Reader sseReader) { + return new Stream<>(valueType, StreamType.SSE, sseReader, null); + } + + public static Stream fromSse(Class valueType, Reader sseReader, String streamTerminator) { + return new Stream<>(valueType, StreamType.SSE, sseReader, streamTerminator); + } + + @Override + public void close() throws IOException { + if (!isClosed) { + isClosed = true; + if (scanner != null) { + scanner.close(); + } + if (sseReader != null) { + sseReader.close(); + } + } + } + + private boolean isStreamClosed() { + return isClosed; } /** @@ -47,51 +112,161 @@ public Stream(Class valueType, Reader reader, String delimiter) { */ @Override public Iterator iterator() { - return new Iterator() { - /** - * Returns {@code true} if there are more elements in the stream. - *

              - * Will block and wait for input if the stream has not ended and the next object is not yet available. - * - * @return {@code true} if there are more elements, {@code false} otherwise. - */ - @Override - public boolean hasNext() { - return scanner.hasNext(); + if (streamType == StreamType.SSE) { + return new SSEIterator(); + } else { + return new JsonIterator(); + } + } + + private final class JsonIterator implements Iterator { + + /** + * Returns {@code true} if there are more elements in the stream. + *

              + * Will block and wait for input if the stream has not ended and the next object is not yet available. + * + * @return {@code true} if there are more elements, {@code false} otherwise. + */ + @Override + public boolean hasNext() { + if (isStreamClosed()) { + return false; } + return scanner.hasNext(); + } - /** - * Returns the next element in the stream. - *

              - * Will block and wait for input if the stream has not ended and the next object is not yet available. - * - * @return The next element in the stream. - * @throws NoSuchElementException If there are no more elements in the stream. - */ - @Override - public T next() { - if (!scanner.hasNext()) { - throw new NoSuchElementException(); - } else { - try { - T parsedResponse = ObjectMappers.JSON_MAPPER.readValue( - scanner.next().trim(), valueType); - return parsedResponse; - } catch (Exception e) { - throw new RuntimeException(e); - } + /** + * Returns the next element in the stream. + *

              + * Will block and wait for input if the stream has not ended and the next object is not yet available. + * + * @return The next element in the stream. + * @throws NoSuchElementException If there are no more elements in the stream. + */ + @Override + public T next() { + if (isStreamClosed()) { + throw new NoSuchElementException("Stream is closed"); + } + + if (!scanner.hasNext()) { + throw new NoSuchElementException(); + } else { + try { + T parsedResponse = + ObjectMappers.JSON_MAPPER.readValue(scanner.next().trim(), valueType); + return parsedResponse; + } catch (Exception e) { + throw new RuntimeException(e); } } + } + + @Override + public void remove() { + throw new UnsupportedOperationException(); + } + } + + private final class SSEIterator implements Iterator { + private Scanner sseScanner; + private T nextItem; + private boolean hasNextItem = false; + private boolean endOfStream = false; + private StringBuilder buffer = new StringBuilder(); + private boolean prefixSeen = false; + + private SSEIterator() { + if (sseReader != null && !isStreamClosed()) { + this.sseScanner = new Scanner(sseReader); + } else { + this.endOfStream = true; + } + } + + @Override + public boolean hasNext() { + if (isStreamClosed() || endOfStream) { + return false; + } + + if (hasNextItem) { + return true; + } + + return readNextMessage(); + } + + @Override + public T next() { + if (!hasNext()) { + throw new NoSuchElementException("No more elements in stream"); + } + + T result = nextItem; + nextItem = null; + hasNextItem = false; + return result; + } + + @Override + public void remove() { + throw new UnsupportedOperationException(); + } + + private boolean readNextMessage() { + if (sseScanner == null || isStreamClosed()) { + endOfStream = true; + return false; + } + + try { + while (sseScanner.hasNextLine()) { + String chunk = sseScanner.nextLine(); + buffer.append(chunk).append(NEWLINE); + + int terminatorIndex; + while ((terminatorIndex = buffer.indexOf(messageTerminator)) >= 0) { + String line = buffer.substring(0, terminatorIndex + messageTerminator.length()); + buffer.delete(0, terminatorIndex + messageTerminator.length()); + + line = line.trim(); + if (line.isEmpty()) { + continue; + } + + if (!prefixSeen && line.startsWith(DATA_PREFIX)) { + prefixSeen = true; + line = line.substring(DATA_PREFIX.length()).trim(); + } else if (!prefixSeen) { + continue; + } + + if (streamTerminator != null && line.contains(streamTerminator)) { + endOfStream = true; + return false; + } + + try { + nextItem = ObjectMappers.JSON_MAPPER.readValue(line, valueType); + hasNextItem = true; + prefixSeen = false; + return true; + } catch (Exception parseEx) { + continue; + } + } + } + + endOfStream = true; + return false; - /** - * Removing elements from {@code Stream} is not supported. - * - * @throws UnsupportedOperationException Always, as removal is not supported. - */ - @Override - public void remove() { - throw new UnsupportedOperationException(); + } catch (Exception e) { + System.err.println("Failed to parse SSE stream: " + e.getMessage()); + endOfStream = true; + return false; } - }; + } } } diff --git a/src/main/java/com/merge/api/crm/AsyncRawAccountDetailsClient.java b/src/main/java/com/merge/api/crm/AsyncRawAccountDetailsClient.java index 37b009c2d..6d36ff9c6 100644 --- a/src/main/java/com/merge/api/crm/AsyncRawAccountDetailsClient.java +++ b/src/main/java/com/merge/api/crm/AsyncRawAccountDetailsClient.java @@ -48,7 +48,6 @@ public CompletableFuture> retrieve(RequestO .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/AsyncRawAccountTokenClient.java b/src/main/java/com/merge/api/crm/AsyncRawAccountTokenClient.java index e40b22f9a..851535bc3 100644 --- a/src/main/java/com/merge/api/crm/AsyncRawAccountTokenClient.java +++ b/src/main/java/com/merge/api/crm/AsyncRawAccountTokenClient.java @@ -50,7 +50,6 @@ public CompletableFuture> retrieve( .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/AsyncRawAccountsClient.java b/src/main/java/com/merge/api/crm/AsyncRawAccountsClient.java index ff2a48e68..d1d9596e2 100644 --- a/src/main/java/com/merge/api/crm/AsyncRawAccountsClient.java +++ b/src/main/java/com/merge/api/crm/AsyncRawAccountsClient.java @@ -73,11 +73,11 @@ public CompletableFuture>> list .addPathSegments("crm/v1/accounts"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -87,40 +87,34 @@ public CompletableFuture>> list QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getName().isPresent()) { QueryStringMapper.addQueryParameter( @@ -132,7 +126,7 @@ public CompletableFuture>> list } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -140,13 +134,12 @@ public CompletableFuture>> list } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -217,11 +210,11 @@ public CompletableFuture> create( .addPathSegments("crm/v1/accounts"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -301,32 +294,28 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -382,11 +371,11 @@ public CompletableFuture> partialUpdate .addPathSegment(id); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -460,7 +449,6 @@ public CompletableFuture> metaPatchRetrieve( .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -517,7 +505,6 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -587,50 +574,46 @@ public CompletableFuture properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -313,25 +306,21 @@ public CompletableFuture> customObjectClas QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -392,7 +381,6 @@ public CompletableFuture> customObjectClasses .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/AsyncRawAssociationsClient.java b/src/main/java/com/merge/api/crm/AsyncRawAssociationsClient.java index c461c5739..9500a5989 100644 --- a/src/main/java/com/merge/api/crm/AsyncRawAssociationsClient.java +++ b/src/main/java/com/merge/api/crm/AsyncRawAssociationsClient.java @@ -87,11 +87,11 @@ public AsyncRawAssociationsClient(ClientOptions clientOptions) { } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -101,37 +101,31 @@ public AsyncRawAssociationsClient(ClientOptions clientOptions) { QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -139,13 +133,12 @@ public AsyncRawAssociationsClient(ClientOptions clientOptions) { } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -257,17 +250,16 @@ public CompletableFuture> customObjectClassesC .addPathSegment(associationTypeId); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("PUT", RequestBody.create("", null)) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/AsyncRawAsyncPassthroughClient.java b/src/main/java/com/merge/api/crm/AsyncRawAsyncPassthroughClient.java index 2f177532d..d0fc0b252 100644 --- a/src/main/java/com/merge/api/crm/AsyncRawAsyncPassthroughClient.java +++ b/src/main/java/com/merge/api/crm/AsyncRawAsyncPassthroughClient.java @@ -122,7 +122,6 @@ public CompletableFuture> .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/AsyncRawAuditTrailClient.java b/src/main/java/com/merge/api/crm/AsyncRawAuditTrailClient.java index a06892e6c..f2e769166 100644 --- a/src/main/java/com/merge/api/crm/AsyncRawAuditTrailClient.java +++ b/src/main/java/com/merge/api/crm/AsyncRawAuditTrailClient.java @@ -74,7 +74,7 @@ public CompletableFuture> } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getStartDate().isPresent()) { QueryStringMapper.addQueryParameter( @@ -88,7 +88,6 @@ public CompletableFuture> .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/AsyncRawAvailableActionsClient.java b/src/main/java/com/merge/api/crm/AsyncRawAvailableActionsClient.java index 28c02e1df..69c563c6e 100644 --- a/src/main/java/com/merge/api/crm/AsyncRawAvailableActionsClient.java +++ b/src/main/java/com/merge/api/crm/AsyncRawAvailableActionsClient.java @@ -48,7 +48,6 @@ public CompletableFuture> retrieve(Reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/AsyncRawContactsClient.java b/src/main/java/com/merge/api/crm/AsyncRawContactsClient.java index 96e0e2bb2..6784b1c04 100644 --- a/src/main/java/com/merge/api/crm/AsyncRawContactsClient.java +++ b/src/main/java/com/merge/api/crm/AsyncRawContactsClient.java @@ -79,11 +79,11 @@ public CompletableFuture>> list } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -97,44 +97,38 @@ public CompletableFuture>> list QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getPhoneNumbers().isPresent()) { QueryStringMapper.addQueryParameter( @@ -146,13 +140,12 @@ public CompletableFuture>> list } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -223,11 +216,11 @@ public CompletableFuture> create( .addPathSegments("crm/v1/contacts"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -307,32 +300,28 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -388,11 +377,11 @@ public CompletableFuture> partialUpdate .addPathSegment(id); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -530,7 +519,6 @@ public CompletableFuture> metaPatchRetrieve( .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -587,7 +575,6 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -657,50 +644,46 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/AsyncRawCustomObjectsClient.java b/src/main/java/com/merge/api/crm/AsyncRawCustomObjectsClient.java index 0059f5d2a..b3af57e0c 100644 --- a/src/main/java/com/merge/api/crm/AsyncRawCustomObjectsClient.java +++ b/src/main/java/com/merge/api/crm/AsyncRawCustomObjectsClient.java @@ -82,11 +82,11 @@ public AsyncRawCustomObjectsClient(ClientOptions clientOptions) { .addPathSegments("custom-objects"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -96,44 +96,38 @@ public AsyncRawCustomObjectsClient(ClientOptions clientOptions) { QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -143,7 +137,6 @@ public AsyncRawCustomObjectsClient(ClientOptions clientOptions) { .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -219,11 +212,11 @@ public CompletableFuture> customOb .addPathSegments("custom-objects"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -314,28 +307,24 @@ public CompletableFuture> customObjectClasses QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -396,7 +385,6 @@ public CompletableFuture> customObjectClasses .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -471,50 +459,46 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) { QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsCommonModelField().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "is_common_model_field", - request.getIsCommonModelField().get().toString(), + request.getIsCommonModelField().get(), false); } if (request.getIsCustom().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_custom", request.getIsCustom().get().toString(), false); + httpUrl, "is_custom", request.getIsCustom().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/AsyncRawEngagementTypesClient.java b/src/main/java/com/merge/api/crm/AsyncRawEngagementTypesClient.java index 10cf89c53..5445ebcdc 100644 --- a/src/main/java/com/merge/api/crm/AsyncRawEngagementTypesClient.java +++ b/src/main/java/com/merge/api/crm/AsyncRawEngagementTypesClient.java @@ -66,11 +66,11 @@ public CompletableFuture .addPathSegments("crm/v1/engagement-types"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -80,44 +80,38 @@ public CompletableFuture QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -127,7 +121,6 @@ public CompletableFuture .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -210,28 +203,24 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -301,50 +290,46 @@ public CompletableFuture>> l .addPathSegments("crm/v1/engagements"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -88,44 +88,38 @@ public CompletableFuture>> l QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -133,21 +127,20 @@ public CompletableFuture>> l } if (request.getStartedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "started_after", request.getStartedAfter().get().toString(), false); + httpUrl, "started_after", request.getStartedAfter().get(), false); } if (request.getStartedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "started_before", request.getStartedBefore().get().toString(), false); + httpUrl, "started_before", request.getStartedBefore().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -218,11 +211,11 @@ public CompletableFuture> create( .addPathSegments("crm/v1/engagements"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -302,32 +295,28 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -384,11 +373,11 @@ public CompletableFuture> partialUpdate .addPathSegment(id); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -462,7 +451,6 @@ public CompletableFuture> metaPatchRetrieve( .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -519,7 +507,6 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -589,50 +576,46 @@ public CompletableFuture> QueryStringMapper.addQueryParameter( httpUrl, "exclude_remote_field_metadata", - request.getExcludeRemoteFieldMetadata().get().toString(), + request.getExcludeRemoteFieldMetadata().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -135,7 +134,7 @@ public CompletableFuture> fie QueryStringMapper.addQueryParameter( httpUrl, "exclude_remote_field_metadata", - request.getExcludeRemoteFieldMetadata().get().toString(), + request.getExcludeRemoteFieldMetadata().get(), false); } Map properties = new HashMap<>(); @@ -217,7 +216,6 @@ public CompletableFuture> fie .url(httpUrl) .method("DELETE", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -371,7 +369,6 @@ public CompletableFuture> remoteFie .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -430,7 +427,6 @@ public CompletableFuture> t .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/AsyncRawForceResyncClient.java b/src/main/java/com/merge/api/crm/AsyncRawForceResyncClient.java index f4265fd2d..9067c8aa7 100644 --- a/src/main/java/com/merge/api/crm/AsyncRawForceResyncClient.java +++ b/src/main/java/com/merge/api/crm/AsyncRawForceResyncClient.java @@ -52,7 +52,6 @@ public CompletableFuture>> syncStatusResyn .url(httpUrl) .method("POST", RequestBody.create("", null)) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/AsyncRawIssuesClient.java b/src/main/java/com/merge/api/crm/AsyncRawIssuesClient.java index 97664a350..1d126ca01 100644 --- a/src/main/java/com/merge/api/crm/AsyncRawIssuesClient.java +++ b/src/main/java/com/merge/api/crm/AsyncRawIssuesClient.java @@ -82,14 +82,14 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "first_incident_time_after", - request.getFirstIncidentTimeAfter().get().toString(), + request.getFirstIncidentTimeAfter().get(), false); } if (request.getFirstIncidentTimeBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "first_incident_time_before", - request.getFirstIncidentTimeBefore().get().toString(), + request.getFirstIncidentTimeBefore().get(), false); } if (request.getIncludeMuted().isPresent()) { @@ -104,14 +104,14 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "last_incident_time_after", - request.getLastIncidentTimeAfter().get().toString(), + request.getLastIncidentTimeAfter().get(), false); } if (request.getLastIncidentTimeBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "last_incident_time_before", - request.getLastIncidentTimeBefore().get().toString(), + request.getLastIncidentTimeBefore().get(), false); } if (request.getLinkedAccountId().isPresent()) { @@ -120,7 +120,7 @@ public CompletableFuture>> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getStartDate().isPresent()) { QueryStringMapper.addQueryParameter( @@ -128,13 +128,12 @@ public CompletableFuture>> list( } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "status", request.getStatus().get().toString(), false); + httpUrl, "status", request.getStatus().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -208,7 +207,6 @@ public CompletableFuture> retrieve(String id, Reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/AsyncRawLeadsClient.java b/src/main/java/com/merge/api/crm/AsyncRawLeadsClient.java index a658201d0..d14cf0d96 100644 --- a/src/main/java/com/merge/api/crm/AsyncRawLeadsClient.java +++ b/src/main/java/com/merge/api/crm/AsyncRawLeadsClient.java @@ -86,11 +86,11 @@ public CompletableFuture>> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -104,40 +104,34 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getOwnerId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -145,7 +139,7 @@ public CompletableFuture>> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getPhoneNumbers().isPresent()) { QueryStringMapper.addQueryParameter( @@ -157,13 +151,12 @@ public CompletableFuture>> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -234,11 +227,11 @@ public CompletableFuture> create( .addPathSegments("crm/v1/leads"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -318,32 +311,28 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -399,7 +388,6 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -469,50 +457,46 @@ public CompletableFuture>> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -94,40 +94,34 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getOpportunityId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -139,7 +133,7 @@ public CompletableFuture>> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -147,13 +141,12 @@ public CompletableFuture>> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -224,11 +217,11 @@ public CompletableFuture> create( .addPathSegments("crm/v1/notes"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -308,32 +301,28 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -389,7 +378,6 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -459,50 +447,46 @@ public CompletableFuture>> } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -92,40 +92,34 @@ public CompletableFuture>> QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getOwnerId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -133,13 +127,13 @@ public CompletableFuture>> } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "remote_created_after", - request.getRemoteCreatedAfter().get().toString(), + request.getRemoteCreatedAfter().get(), false); } if (request.getRemoteFields().isPresent()) { @@ -160,17 +154,16 @@ public CompletableFuture>> } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "status", request.getStatus().get().toString(), false); + httpUrl, "status", request.getStatus().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -241,11 +234,11 @@ public CompletableFuture> create( .addPathSegments("crm/v1/opportunities"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -326,22 +319,19 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -353,13 +343,12 @@ public CompletableFuture> retrieve( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -416,11 +405,11 @@ public CompletableFuture> partialUpdat .addPathSegment(id); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -494,7 +483,6 @@ public CompletableFuture> metaPatchRetrieve( .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -551,7 +539,6 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -621,50 +608,46 @@ public CompletableFuture> defaultScope .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -111,7 +110,6 @@ public CompletableFuture> linkedAccoun .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/AsyncRawStagesClient.java b/src/main/java/com/merge/api/crm/AsyncRawStagesClient.java index 8a3f74949..f588ca977 100644 --- a/src/main/java/com/merge/api/crm/AsyncRawStagesClient.java +++ b/src/main/java/com/merge/api/crm/AsyncRawStagesClient.java @@ -65,11 +65,11 @@ public CompletableFuture>> list( .addPathSegments("crm/v1/stages"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -79,44 +79,38 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -126,7 +120,6 @@ public CompletableFuture>> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -207,28 +200,24 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -297,50 +286,46 @@ public CompletableFuture> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/AsyncRawTasksClient.java b/src/main/java/com/merge/api/crm/AsyncRawTasksClient.java index 7c26d019b..cdffb5dde 100644 --- a/src/main/java/com/merge/api/crm/AsyncRawTasksClient.java +++ b/src/main/java/com/merge/api/crm/AsyncRawTasksClient.java @@ -73,11 +73,11 @@ public CompletableFuture>> list( .addPathSegments("crm/v1/tasks"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -87,44 +87,38 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -132,13 +126,12 @@ public CompletableFuture>> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -209,11 +202,11 @@ public CompletableFuture> create( .addPathSegments("crm/v1/tasks"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -293,32 +286,28 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -374,11 +363,11 @@ public CompletableFuture> partialUpdate( .addPathSegment(id); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -452,7 +441,6 @@ public CompletableFuture> metaPatchRetrieve( .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -509,7 +497,6 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -579,50 +566,46 @@ public CompletableFuture>> list( .addPathSegments("crm/v1/users"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -87,44 +87,38 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -134,7 +128,6 @@ public CompletableFuture>> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -215,28 +208,24 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -369,50 +358,46 @@ public CompletableFuture>> list(Reque .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/RawAccountDetailsClient.java b/src/main/java/com/merge/api/crm/RawAccountDetailsClient.java index bd7c596ed..81d908b70 100644 --- a/src/main/java/com/merge/api/crm/RawAccountDetailsClient.java +++ b/src/main/java/com/merge/api/crm/RawAccountDetailsClient.java @@ -44,7 +44,6 @@ public MergeApiHttpResponse retrieve(RequestOptions requestOptio .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/RawAccountTokenClient.java b/src/main/java/com/merge/api/crm/RawAccountTokenClient.java index f0790874a..efd6d7f8f 100644 --- a/src/main/java/com/merge/api/crm/RawAccountTokenClient.java +++ b/src/main/java/com/merge/api/crm/RawAccountTokenClient.java @@ -45,7 +45,6 @@ public MergeApiHttpResponse retrieve(String publicToken, RequestOp .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/RawAccountsClient.java b/src/main/java/com/merge/api/crm/RawAccountsClient.java index 19c77bb62..bf40199d0 100644 --- a/src/main/java/com/merge/api/crm/RawAccountsClient.java +++ b/src/main/java/com/merge/api/crm/RawAccountsClient.java @@ -68,11 +68,11 @@ public MergeApiHttpResponse> list( .addPathSegments("crm/v1/accounts"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -82,40 +82,34 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getName().isPresent()) { QueryStringMapper.addQueryParameter( @@ -127,7 +121,7 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -135,13 +129,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -193,11 +186,11 @@ public MergeApiHttpResponse create( .addPathSegments("crm/v1/accounts"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -263,32 +256,28 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -330,11 +319,11 @@ public MergeApiHttpResponse partialUpdate( .addPathSegment(id); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -393,7 +382,6 @@ public MergeApiHttpResponse metaPatchRetrieve(String id, RequestOp .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -436,7 +424,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -492,50 +479,46 @@ public MergeApiHttpResponse> remoteFieldCla QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsCommonModelField().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "is_common_model_field", - request.getIsCommonModelField().get().toString(), + request.getIsCommonModelField().get(), false); } if (request.getIsCustom().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_custom", request.getIsCustom().get().toString(), false); + httpUrl, "is_custom", request.getIsCustom().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/RawAssociationTypesClient.java b/src/main/java/com/merge/api/crm/RawAssociationTypesClient.java index 170f52f2d..9b4322f66 100644 --- a/src/main/java/com/merge/api/crm/RawAssociationTypesClient.java +++ b/src/main/java/com/merge/api/crm/RawAssociationTypesClient.java @@ -72,11 +72,11 @@ public MergeApiHttpResponse> customObjectCla .addPathSegments("association-types"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -86,37 +86,31 @@ public MergeApiHttpResponse> customObjectCla QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -124,13 +118,12 @@ public MergeApiHttpResponse> customObjectCla } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -187,11 +180,11 @@ public MergeApiHttpResponse customObjectClassesAssoc .addPathSegments("association-types"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -268,25 +261,21 @@ public MergeApiHttpResponse customObjectClassesAssociationTypes QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -333,7 +322,6 @@ public MergeApiHttpResponse customObjectClassesAssociationTypesMet .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/RawAssociationsClient.java b/src/main/java/com/merge/api/crm/RawAssociationsClient.java index db2c95d5b..b9dbfeaba 100644 --- a/src/main/java/com/merge/api/crm/RawAssociationsClient.java +++ b/src/main/java/com/merge/api/crm/RawAssociationsClient.java @@ -80,11 +80,11 @@ public MergeApiHttpResponse> customObjectClasses } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -94,37 +94,31 @@ public MergeApiHttpResponse> customObjectClasses QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -132,13 +126,12 @@ public MergeApiHttpResponse> customObjectClasses } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -233,17 +226,16 @@ public MergeApiHttpResponse customObjectClassesCustomObjectsAssocia .addPathSegment(associationTypeId); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("PUT", RequestBody.create("", null)) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/RawAsyncPassthroughClient.java b/src/main/java/com/merge/api/crm/RawAsyncPassthroughClient.java index f7ed8020d..d3b7a0b72 100644 --- a/src/main/java/com/merge/api/crm/RawAsyncPassthroughClient.java +++ b/src/main/java/com/merge/api/crm/RawAsyncPassthroughClient.java @@ -103,7 +103,6 @@ public MergeApiHttpResponse retrieve( .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/RawAuditTrailClient.java b/src/main/java/com/merge/api/crm/RawAuditTrailClient.java index 98836d209..9376c2d7c 100644 --- a/src/main/java/com/merge/api/crm/RawAuditTrailClient.java +++ b/src/main/java/com/merge/api/crm/RawAuditTrailClient.java @@ -68,7 +68,7 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getStartDate().isPresent()) { QueryStringMapper.addQueryParameter( @@ -82,7 +82,6 @@ public MergeApiHttpResponse> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/RawAvailableActionsClient.java b/src/main/java/com/merge/api/crm/RawAvailableActionsClient.java index b8631901b..ca7d3cee0 100644 --- a/src/main/java/com/merge/api/crm/RawAvailableActionsClient.java +++ b/src/main/java/com/merge/api/crm/RawAvailableActionsClient.java @@ -44,7 +44,6 @@ public MergeApiHttpResponse retrieve(RequestOptions requestOpt .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/RawContactsClient.java b/src/main/java/com/merge/api/crm/RawContactsClient.java index 170b1bb63..9a63850fd 100644 --- a/src/main/java/com/merge/api/crm/RawContactsClient.java +++ b/src/main/java/com/merge/api/crm/RawContactsClient.java @@ -74,11 +74,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -92,44 +92,38 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getPhoneNumbers().isPresent()) { QueryStringMapper.addQueryParameter( @@ -141,13 +135,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -199,11 +192,11 @@ public MergeApiHttpResponse create( .addPathSegments("crm/v1/contacts"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -269,32 +262,28 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -336,11 +325,11 @@ public MergeApiHttpResponse partialUpdate( .addPathSegment(id); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -449,7 +438,6 @@ public MergeApiHttpResponse metaPatchRetrieve(String id, RequestOp .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -492,7 +480,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -548,50 +535,46 @@ public MergeApiHttpResponse> remoteFieldCla QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsCommonModelField().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "is_common_model_field", - request.getIsCommonModelField().get().toString(), + request.getIsCommonModelField().get(), false); } if (request.getIsCustom().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_custom", request.getIsCustom().get().toString(), false); + httpUrl, "is_custom", request.getIsCustom().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/RawCustomObjectClassesClient.java b/src/main/java/com/merge/api/crm/RawCustomObjectClassesClient.java index a46ede095..d7424dced 100644 --- a/src/main/java/com/merge/api/crm/RawCustomObjectClassesClient.java +++ b/src/main/java/com/merge/api/crm/RawCustomObjectClassesClient.java @@ -57,11 +57,11 @@ public MergeApiHttpResponse> list( .addPathSegments("crm/v1/custom-object-classes"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -71,37 +71,31 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -109,13 +103,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -177,25 +170,21 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/RawCustomObjectsClient.java b/src/main/java/com/merge/api/crm/RawCustomObjectsClient.java index a0e172732..2a38f4c17 100644 --- a/src/main/java/com/merge/api/crm/RawCustomObjectsClient.java +++ b/src/main/java/com/merge/api/crm/RawCustomObjectsClient.java @@ -75,11 +75,11 @@ public MergeApiHttpResponse> customObjectClasse .addPathSegments("custom-objects"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -89,44 +89,38 @@ public MergeApiHttpResponse> customObjectClasse QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -136,7 +130,6 @@ public MergeApiHttpResponse> customObjectClasse .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -193,11 +186,11 @@ public MergeApiHttpResponse customObjectClassesCustomOb .addPathSegments("custom-objects"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -274,28 +267,24 @@ public MergeApiHttpResponse customObjectClassesCustomObjectsRetrie QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -342,7 +331,6 @@ public MergeApiHttpResponse customObjectClassesCustomObjectsMetaPo .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -403,50 +391,46 @@ public MergeApiHttpResponse customObjectClassesCustomObjectsMetaPo QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsCommonModelField().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "is_common_model_field", - request.getIsCommonModelField().get().toString(), + request.getIsCommonModelField().get(), false); } if (request.getIsCustom().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_custom", request.getIsCustom().get().toString(), false); + httpUrl, "is_custom", request.getIsCustom().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/RawEngagementTypesClient.java b/src/main/java/com/merge/api/crm/RawEngagementTypesClient.java index 8851995cc..7a7739822 100644 --- a/src/main/java/com/merge/api/crm/RawEngagementTypesClient.java +++ b/src/main/java/com/merge/api/crm/RawEngagementTypesClient.java @@ -60,11 +60,11 @@ public MergeApiHttpResponse> list( .addPathSegments("crm/v1/engagement-types"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -74,44 +74,38 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -121,7 +115,6 @@ public MergeApiHttpResponse> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -183,28 +176,24 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -260,50 +249,46 @@ public MergeApiHttpResponse> remoteFieldCla QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsCommonModelField().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "is_common_model_field", - request.getIsCommonModelField().get().toString(), + request.getIsCommonModelField().get(), false); } if (request.getIsCustom().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_custom", request.getIsCustom().get().toString(), false); + httpUrl, "is_custom", request.getIsCustom().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/RawEngagementsClient.java b/src/main/java/com/merge/api/crm/RawEngagementsClient.java index 99e940875..645d2d18f 100644 --- a/src/main/java/com/merge/api/crm/RawEngagementsClient.java +++ b/src/main/java/com/merge/api/crm/RawEngagementsClient.java @@ -68,11 +68,11 @@ public MergeApiHttpResponse> list( .addPathSegments("crm/v1/engagements"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -82,44 +82,38 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -127,21 +121,20 @@ public MergeApiHttpResponse> list( } if (request.getStartedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "started_after", request.getStartedAfter().get().toString(), false); + httpUrl, "started_after", request.getStartedAfter().get(), false); } if (request.getStartedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "started_before", request.getStartedBefore().get().toString(), false); + httpUrl, "started_before", request.getStartedBefore().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -193,11 +186,11 @@ public MergeApiHttpResponse create( .addPathSegments("crm/v1/engagements"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -263,32 +256,28 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -330,11 +319,11 @@ public MergeApiHttpResponse partialUpdate( .addPathSegment(id); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -393,7 +382,6 @@ public MergeApiHttpResponse metaPatchRetrieve(String id, RequestOp .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -436,7 +424,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -492,50 +479,46 @@ public MergeApiHttpResponse> remoteFieldCla QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsCommonModelField().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "is_common_model_field", - request.getIsCommonModelField().get().toString(), + request.getIsCommonModelField().get(), false); } if (request.getIsCustom().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_custom", request.getIsCustom().get().toString(), false); + httpUrl, "is_custom", request.getIsCustom().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/RawFieldMappingClient.java b/src/main/java/com/merge/api/crm/RawFieldMappingClient.java index 5b456e362..ee9a91ba4 100644 --- a/src/main/java/com/merge/api/crm/RawFieldMappingClient.java +++ b/src/main/java/com/merge/api/crm/RawFieldMappingClient.java @@ -65,14 +65,13 @@ public MergeApiHttpResponse fieldMappingsRetrie QueryStringMapper.addQueryParameter( httpUrl, "exclude_remote_field_metadata", - request.getExcludeRemoteFieldMetadata().get().toString(), + request.getExcludeRemoteFieldMetadata().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -117,7 +116,7 @@ public MergeApiHttpResponse fieldMappingsCreate( QueryStringMapper.addQueryParameter( httpUrl, "exclude_remote_field_metadata", - request.getExcludeRemoteFieldMetadata().get().toString(), + request.getExcludeRemoteFieldMetadata().get(), false); } Map properties = new HashMap<>(); @@ -184,7 +183,6 @@ public MergeApiHttpResponse fieldMappingsDestroy( .url(httpUrl) .method("DELETE", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -308,7 +306,6 @@ public MergeApiHttpResponse remoteFieldsRetrieve( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -352,7 +349,6 @@ public MergeApiHttpResponse targetFieldsRetrieve .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/RawForceResyncClient.java b/src/main/java/com/merge/api/crm/RawForceResyncClient.java index 5d2e118e3..3d17a10af 100644 --- a/src/main/java/com/merge/api/crm/RawForceResyncClient.java +++ b/src/main/java/com/merge/api/crm/RawForceResyncClient.java @@ -47,7 +47,6 @@ public MergeApiHttpResponse> syncStatusResyncCreate(RequestOpti .url(httpUrl) .method("POST", RequestBody.create("", null)) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/RawIssuesClient.java b/src/main/java/com/merge/api/crm/RawIssuesClient.java index dbe524238..472ea84bf 100644 --- a/src/main/java/com/merge/api/crm/RawIssuesClient.java +++ b/src/main/java/com/merge/api/crm/RawIssuesClient.java @@ -77,14 +77,14 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "first_incident_time_after", - request.getFirstIncidentTimeAfter().get().toString(), + request.getFirstIncidentTimeAfter().get(), false); } if (request.getFirstIncidentTimeBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "first_incident_time_before", - request.getFirstIncidentTimeBefore().get().toString(), + request.getFirstIncidentTimeBefore().get(), false); } if (request.getIncludeMuted().isPresent()) { @@ -99,14 +99,14 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "last_incident_time_after", - request.getLastIncidentTimeAfter().get().toString(), + request.getLastIncidentTimeAfter().get(), false); } if (request.getLastIncidentTimeBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "last_incident_time_before", - request.getLastIncidentTimeBefore().get().toString(), + request.getLastIncidentTimeBefore().get(), false); } if (request.getLinkedAccountId().isPresent()) { @@ -115,7 +115,7 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getStartDate().isPresent()) { QueryStringMapper.addQueryParameter( @@ -123,13 +123,12 @@ public MergeApiHttpResponse> list( } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "status", request.getStatus().get().toString(), false); + httpUrl, "status", request.getStatus().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -184,7 +183,6 @@ public MergeApiHttpResponse retrieve(String id, RequestOptions requestOpt .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/RawLeadsClient.java b/src/main/java/com/merge/api/crm/RawLeadsClient.java index cbe3f1cbf..83c89a1d0 100644 --- a/src/main/java/com/merge/api/crm/RawLeadsClient.java +++ b/src/main/java/com/merge/api/crm/RawLeadsClient.java @@ -81,11 +81,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -99,40 +99,34 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getOwnerId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -140,7 +134,7 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getPhoneNumbers().isPresent()) { QueryStringMapper.addQueryParameter( @@ -152,13 +146,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -209,11 +202,11 @@ public MergeApiHttpResponse create(LeadEndpointRequest request, Re .addPathSegments("crm/v1/leads"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -278,32 +271,28 @@ public MergeApiHttpResponse retrieve(String id, LeadsRetrieveRequest reque QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -346,7 +335,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -402,50 +390,46 @@ public MergeApiHttpResponse> remoteFieldCla QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsCommonModelField().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "is_common_model_field", - request.getIsCommonModelField().get().toString(), + request.getIsCommonModelField().get(), false); } if (request.getIsCustom().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_custom", request.getIsCustom().get().toString(), false); + httpUrl, "is_custom", request.getIsCustom().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/RawLinkedAccountsClient.java b/src/main/java/com/merge/api/crm/RawLinkedAccountsClient.java index 298248b9d..d92ca63a3 100644 --- a/src/main/java/com/merge/api/crm/RawLinkedAccountsClient.java +++ b/src/main/java/com/merge/api/crm/RawLinkedAccountsClient.java @@ -56,7 +56,7 @@ public MergeApiHttpResponse> list( .addPathSegments("crm/v1/linked-accounts"); if (request.getCategory().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "category", request.getCategory().get().toString(), false); + httpUrl, "category", request.getCategory().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -97,7 +97,7 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_duplicates", - request.getIncludeDuplicates().get().toString(), + request.getIncludeDuplicates().get(), false); } if (request.getIntegrationName().isPresent()) { @@ -110,7 +110,7 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( @@ -120,7 +120,6 @@ public MergeApiHttpResponse> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/RawNotesClient.java b/src/main/java/com/merge/api/crm/RawNotesClient.java index bfcbe89f1..dae4907d2 100644 --- a/src/main/java/com/merge/api/crm/RawNotesClient.java +++ b/src/main/java/com/merge/api/crm/RawNotesClient.java @@ -75,11 +75,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -89,40 +89,34 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getOpportunityId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -134,7 +128,7 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -142,13 +136,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -199,11 +192,11 @@ public MergeApiHttpResponse create(NoteEndpointRequest request, Re .addPathSegments("crm/v1/notes"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -268,32 +261,28 @@ public MergeApiHttpResponse retrieve(String id, NotesRetrieveRequest reque QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -336,7 +325,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -392,50 +380,46 @@ public MergeApiHttpResponse> remoteFieldCla QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsCommonModelField().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "is_common_model_field", - request.getIsCommonModelField().get().toString(), + request.getIsCommonModelField().get(), false); } if (request.getIsCustom().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_custom", request.getIsCustom().get().toString(), false); + httpUrl, "is_custom", request.getIsCustom().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/RawOpportunitiesClient.java b/src/main/java/com/merge/api/crm/RawOpportunitiesClient.java index c497b217c..c05e8112a 100644 --- a/src/main/java/com/merge/api/crm/RawOpportunitiesClient.java +++ b/src/main/java/com/merge/api/crm/RawOpportunitiesClient.java @@ -72,11 +72,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -86,40 +86,34 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getOwnerId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -127,13 +121,13 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "remote_created_after", - request.getRemoteCreatedAfter().get().toString(), + request.getRemoteCreatedAfter().get(), false); } if (request.getRemoteFields().isPresent()) { @@ -154,17 +148,16 @@ public MergeApiHttpResponse> list( } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "status", request.getStatus().get().toString(), false); + httpUrl, "status", request.getStatus().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -216,11 +209,11 @@ public MergeApiHttpResponse create( .addPathSegments("crm/v1/opportunities"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -287,22 +280,19 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -314,13 +304,12 @@ public MergeApiHttpResponse retrieve( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -363,11 +352,11 @@ public MergeApiHttpResponse partialUpdate( .addPathSegment(id); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -427,7 +416,6 @@ public MergeApiHttpResponse metaPatchRetrieve(String id, RequestOp .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -470,7 +458,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -526,50 +513,46 @@ public MergeApiHttpResponse> remoteFieldCla QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsCommonModelField().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "is_common_model_field", - request.getIsCommonModelField().get().toString(), + request.getIsCommonModelField().get(), false); } if (request.getIsCustom().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_custom", request.getIsCustom().get().toString(), false); + httpUrl, "is_custom", request.getIsCustom().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/RawScopesClient.java b/src/main/java/com/merge/api/crm/RawScopesClient.java index 64bdcfb42..6fb028620 100644 --- a/src/main/java/com/merge/api/crm/RawScopesClient.java +++ b/src/main/java/com/merge/api/crm/RawScopesClient.java @@ -48,7 +48,6 @@ public MergeApiHttpResponse defaultScopesRetrieve(RequestOp .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -92,7 +91,6 @@ public MergeApiHttpResponse linkedAccountScopesRetrieve(Req .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/RawStagesClient.java b/src/main/java/com/merge/api/crm/RawStagesClient.java index 5c463035d..8a3c203a9 100644 --- a/src/main/java/com/merge/api/crm/RawStagesClient.java +++ b/src/main/java/com/merge/api/crm/RawStagesClient.java @@ -60,11 +60,11 @@ public MergeApiHttpResponse> list( .addPathSegments("crm/v1/stages"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -74,44 +74,38 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -121,7 +115,6 @@ public MergeApiHttpResponse> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -183,28 +176,24 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -260,50 +249,46 @@ public MergeApiHttpResponse> remoteFieldCla QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsCommonModelField().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "is_common_model_field", - request.getIsCommonModelField().get().toString(), + request.getIsCommonModelField().get(), false); } if (request.getIsCustom().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_custom", request.getIsCustom().get().toString(), false); + httpUrl, "is_custom", request.getIsCustom().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/RawSyncStatusClient.java b/src/main/java/com/merge/api/crm/RawSyncStatusClient.java index d3c0f3b69..47e8ab767 100644 --- a/src/main/java/com/merge/api/crm/RawSyncStatusClient.java +++ b/src/main/java/com/merge/api/crm/RawSyncStatusClient.java @@ -55,13 +55,12 @@ public MergeApiHttpResponse list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/RawTasksClient.java b/src/main/java/com/merge/api/crm/RawTasksClient.java index 92304df54..1f5d62a82 100644 --- a/src/main/java/com/merge/api/crm/RawTasksClient.java +++ b/src/main/java/com/merge/api/crm/RawTasksClient.java @@ -68,11 +68,11 @@ public MergeApiHttpResponse> list( .addPathSegments("crm/v1/tasks"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -82,44 +82,38 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -127,13 +121,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -184,11 +177,11 @@ public MergeApiHttpResponse create(TaskEndpointRequest request, Re .addPathSegments("crm/v1/tasks"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -253,32 +246,28 @@ public MergeApiHttpResponse retrieve(String id, TasksRetrieveRequest reque QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -320,11 +309,11 @@ public MergeApiHttpResponse partialUpdate( .addPathSegment(id); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -383,7 +372,6 @@ public MergeApiHttpResponse metaPatchRetrieve(String id, RequestOp .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -426,7 +414,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -482,50 +469,46 @@ public MergeApiHttpResponse> remoteFieldCla QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsCommonModelField().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "is_common_model_field", - request.getIsCommonModelField().get().toString(), + request.getIsCommonModelField().get(), false); } if (request.getIsCustom().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_custom", request.getIsCustom().get().toString(), false); + httpUrl, "is_custom", request.getIsCustom().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/RawUsersClient.java b/src/main/java/com/merge/api/crm/RawUsersClient.java index 1715a3eca..99eb6e894 100644 --- a/src/main/java/com/merge/api/crm/RawUsersClient.java +++ b/src/main/java/com/merge/api/crm/RawUsersClient.java @@ -64,11 +64,11 @@ public MergeApiHttpResponse> list( .addPathSegments("crm/v1/users"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -82,44 +82,38 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -129,7 +123,6 @@ public MergeApiHttpResponse> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -190,28 +183,24 @@ public MergeApiHttpResponse retrieve(String id, UsersRetrieveRequest reque QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -317,50 +306,46 @@ public MergeApiHttpResponse> remoteFieldCla QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsCommonModelField().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "is_common_model_field", - request.getIsCommonModelField().get().toString(), + request.getIsCommonModelField().get(), false); } if (request.getIsCustom().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_custom", request.getIsCustom().get().toString(), false); + httpUrl, "is_custom", request.getIsCustom().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/RawWebhookReceiversClient.java b/src/main/java/com/merge/api/crm/RawWebhookReceiversClient.java index 47805df49..a61971575 100644 --- a/src/main/java/com/merge/api/crm/RawWebhookReceiversClient.java +++ b/src/main/java/com/merge/api/crm/RawWebhookReceiversClient.java @@ -50,7 +50,6 @@ public MergeApiHttpResponse> list(RequestOptions requestOp .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/crm/types/AccountDetailsAndActionsCategory.java b/src/main/java/com/merge/api/crm/types/AccountDetailsAndActionsCategory.java index 39b14c6b8..c1db78ae0 100644 --- a/src/main/java/com/merge/api/crm/types/AccountDetailsAndActionsCategory.java +++ b/src/main/java/com/merge/api/crm/types/AccountDetailsAndActionsCategory.java @@ -84,11 +84,11 @@ public AccountDetailsAndActionsCategory deserialize(JsonParser p, Deserializatio Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CategoryEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/AccountDetailsAndActionsIntegration.java b/src/main/java/com/merge/api/crm/types/AccountDetailsAndActionsIntegration.java index c7c9e8ef7..4f2a5b2c0 100644 --- a/src/main/java/com/merge/api/crm/types/AccountDetailsAndActionsIntegration.java +++ b/src/main/java/com/merge/api/crm/types/AccountDetailsAndActionsIntegration.java @@ -293,7 +293,9 @@ public _FinalStage image(Optional image) { @java.lang.Override public _FinalStage addAllCategories(List categories) { - this.categories.addAll(categories); + if (categories != null) { + this.categories.addAll(categories); + } return this; } diff --git a/src/main/java/com/merge/api/crm/types/AccountDetailsAndActionsStatus.java b/src/main/java/com/merge/api/crm/types/AccountDetailsAndActionsStatus.java index 4657096ad..1a0ae9b80 100644 --- a/src/main/java/com/merge/api/crm/types/AccountDetailsAndActionsStatus.java +++ b/src/main/java/com/merge/api/crm/types/AccountDetailsAndActionsStatus.java @@ -84,11 +84,11 @@ public AccountDetailsAndActionsStatus deserialize(JsonParser p, DeserializationC Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AccountDetailsAndActionsStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/AccountDetailsCategory.java b/src/main/java/com/merge/api/crm/types/AccountDetailsCategory.java index a4b1d2f62..e164fd6b3 100644 --- a/src/main/java/com/merge/api/crm/types/AccountDetailsCategory.java +++ b/src/main/java/com/merge/api/crm/types/AccountDetailsCategory.java @@ -83,11 +83,11 @@ public AccountDetailsCategory deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CategoryEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/AccountIntegration.java b/src/main/java/com/merge/api/crm/types/AccountIntegration.java index a12c9158c..61d16d4b1 100644 --- a/src/main/java/com/merge/api/crm/types/AccountIntegration.java +++ b/src/main/java/com/merge/api/crm/types/AccountIntegration.java @@ -197,7 +197,7 @@ public static NameStage builder() { public interface NameStage { /** - * Company name. + *

              Company name.

              */ _FinalStage name(@NotNull String name); @@ -311,7 +311,8 @@ public Builder from(AccountIntegration other) { } /** - * Company name.

              Company name.

              + *

              Company name.

              + *

              Company name.

              * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/crm/types/AccountOwner.java b/src/main/java/com/merge/api/crm/types/AccountOwner.java index bd1f7727a..7e387250f 100644 --- a/src/main/java/com/merge/api/crm/types/AccountOwner.java +++ b/src/main/java/com/merge/api/crm/types/AccountOwner.java @@ -83,11 +83,11 @@ public AccountOwner deserialize(JsonParser p, DeserializationContext context) th Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, User.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/AccountRequestOwner.java b/src/main/java/com/merge/api/crm/types/AccountRequestOwner.java index e91dcf672..de99da4f6 100644 --- a/src/main/java/com/merge/api/crm/types/AccountRequestOwner.java +++ b/src/main/java/com/merge/api/crm/types/AccountRequestOwner.java @@ -83,11 +83,11 @@ public AccountRequestOwner deserialize(JsonParser p, DeserializationContext cont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, User.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/AddressAddressType.java b/src/main/java/com/merge/api/crm/types/AddressAddressType.java index 9e09661f8..efd4fab86 100644 --- a/src/main/java/com/merge/api/crm/types/AddressAddressType.java +++ b/src/main/java/com/merge/api/crm/types/AddressAddressType.java @@ -83,11 +83,11 @@ public AddressAddressType deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AddressTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/AddressCountry.java b/src/main/java/com/merge/api/crm/types/AddressCountry.java index e314d027a..fc625cd9d 100644 --- a/src/main/java/com/merge/api/crm/types/AddressCountry.java +++ b/src/main/java/com/merge/api/crm/types/AddressCountry.java @@ -83,11 +83,11 @@ public AddressCountry deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CountryEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/AddressRequestAddressType.java b/src/main/java/com/merge/api/crm/types/AddressRequestAddressType.java index 95717d5e7..85120da5f 100644 --- a/src/main/java/com/merge/api/crm/types/AddressRequestAddressType.java +++ b/src/main/java/com/merge/api/crm/types/AddressRequestAddressType.java @@ -83,11 +83,11 @@ public AddressRequestAddressType deserialize(JsonParser p, DeserializationContex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AddressTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/AddressRequestCountry.java b/src/main/java/com/merge/api/crm/types/AddressRequestCountry.java index d75dd33d3..755bd8ba1 100644 --- a/src/main/java/com/merge/api/crm/types/AddressRequestCountry.java +++ b/src/main/java/com/merge/api/crm/types/AddressRequestCountry.java @@ -83,11 +83,11 @@ public AddressRequestCountry deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CountryEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/AssociationAssociationType.java b/src/main/java/com/merge/api/crm/types/AssociationAssociationType.java index ebab89ae0..96baf5c13 100644 --- a/src/main/java/com/merge/api/crm/types/AssociationAssociationType.java +++ b/src/main/java/com/merge/api/crm/types/AssociationAssociationType.java @@ -83,11 +83,11 @@ public AssociationAssociationType deserialize(JsonParser p, DeserializationConte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AssociationType.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/AssociationTypeCardinality.java b/src/main/java/com/merge/api/crm/types/AssociationTypeCardinality.java index fa2204795..02f26c67e 100644 --- a/src/main/java/com/merge/api/crm/types/AssociationTypeCardinality.java +++ b/src/main/java/com/merge/api/crm/types/AssociationTypeCardinality.java @@ -83,11 +83,11 @@ public AssociationTypeCardinality deserialize(JsonParser p, DeserializationConte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CardinalityEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/AssociationTypeRequestRequest.java b/src/main/java/com/merge/api/crm/types/AssociationTypeRequestRequest.java index 6a3f013c8..4406ad529 100644 --- a/src/main/java/com/merge/api/crm/types/AssociationTypeRequestRequest.java +++ b/src/main/java/com/merge/api/crm/types/AssociationTypeRequestRequest.java @@ -241,7 +241,9 @@ public _FinalStage displayName(Optional displayName) { @java.lang.Override public _FinalStage addAllTargetObjectClasses(List targetObjectClasses) { - this.targetObjectClasses.addAll(targetObjectClasses); + if (targetObjectClasses != null) { + this.targetObjectClasses.addAll(targetObjectClasses); + } return this; } diff --git a/src/main/java/com/merge/api/crm/types/AsyncPassthroughRetrieveResponse.java b/src/main/java/com/merge/api/crm/types/AsyncPassthroughRetrieveResponse.java index 46bbf3dab..ce174d9cb 100644 --- a/src/main/java/com/merge/api/crm/types/AsyncPassthroughRetrieveResponse.java +++ b/src/main/java/com/merge/api/crm/types/AsyncPassthroughRetrieveResponse.java @@ -84,11 +84,11 @@ public AsyncPassthroughRetrieveResponse deserialize(JsonParser p, Deserializatio Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RemoteResponse.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/AuditLogEvent.java b/src/main/java/com/merge/api/crm/types/AuditLogEvent.java index 8aa974ff7..7792d735f 100644 --- a/src/main/java/com/merge/api/crm/types/AuditLogEvent.java +++ b/src/main/java/com/merge/api/crm/types/AuditLogEvent.java @@ -212,14 +212,15 @@ public static RoleStage builder() { public interface RoleStage { /** - * Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring. - * - * * `ADMIN` - ADMIN - * * `DEVELOPER` - DEVELOPER - * * `MEMBER` - MEMBER - * * `API` - API - * * `SYSTEM` - SYSTEM - * * `MERGE_TEAM` - MERGE_TEAM + *

              Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring.

              + *
                + *
              • ADMIN - ADMIN
                • + *
              • DEVELOPER - DEVELOPER
                • + *
              • MEMBER - MEMBER
                • + *
              • API - API
                • + *
              • SYSTEM - SYSTEM
                • + *
              • MERGE_TEAM - MERGE_TEAM
                • + *
              */ IpAddressStage role(@NotNull AuditLogEventRole role); @@ -232,51 +233,52 @@ public interface IpAddressStage { public interface EventTypeStage { /** - * Designates the type of event that occurred. - * - * * `CREATED_REMOTE_PRODUCTION_API_KEY` - CREATED_REMOTE_PRODUCTION_API_KEY - * * `DELETED_REMOTE_PRODUCTION_API_KEY` - DELETED_REMOTE_PRODUCTION_API_KEY - * * `CREATED_TEST_API_KEY` - CREATED_TEST_API_KEY - * * `DELETED_TEST_API_KEY` - DELETED_TEST_API_KEY - * * `REGENERATED_PRODUCTION_API_KEY` - REGENERATED_PRODUCTION_API_KEY - * * `REGENERATED_WEBHOOK_SIGNATURE` - REGENERATED_WEBHOOK_SIGNATURE - * * `INVITED_USER` - INVITED_USER - * * `TWO_FACTOR_AUTH_ENABLED` - TWO_FACTOR_AUTH_ENABLED - * * `TWO_FACTOR_AUTH_DISABLED` - TWO_FACTOR_AUTH_DISABLED - * * `DELETED_LINKED_ACCOUNT` - DELETED_LINKED_ACCOUNT - * * `DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT` - DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT - * * `CREATED_DESTINATION` - CREATED_DESTINATION - * * `DELETED_DESTINATION` - DELETED_DESTINATION - * * `CHANGED_DESTINATION` - CHANGED_DESTINATION - * * `CHANGED_SCOPES` - CHANGED_SCOPES - * * `CHANGED_PERSONAL_INFORMATION` - CHANGED_PERSONAL_INFORMATION - * * `CHANGED_ORGANIZATION_SETTINGS` - CHANGED_ORGANIZATION_SETTINGS - * * `ENABLED_INTEGRATION` - ENABLED_INTEGRATION - * * `DISABLED_INTEGRATION` - DISABLED_INTEGRATION - * * `ENABLED_CATEGORY` - ENABLED_CATEGORY - * * `DISABLED_CATEGORY` - DISABLED_CATEGORY - * * `CHANGED_PASSWORD` - CHANGED_PASSWORD - * * `RESET_PASSWORD` - RESET_PASSWORD - * * `ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION` - ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - * * `ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT` - ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - * * `DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION` - DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - * * `DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT` - DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - * * `CREATED_INTEGRATION_WIDE_FIELD_MAPPING` - CREATED_INTEGRATION_WIDE_FIELD_MAPPING - * * `CREATED_LINKED_ACCOUNT_FIELD_MAPPING` - CREATED_LINKED_ACCOUNT_FIELD_MAPPING - * * `CHANGED_INTEGRATION_WIDE_FIELD_MAPPING` - CHANGED_INTEGRATION_WIDE_FIELD_MAPPING - * * `CHANGED_LINKED_ACCOUNT_FIELD_MAPPING` - CHANGED_LINKED_ACCOUNT_FIELD_MAPPING - * * `DELETED_INTEGRATION_WIDE_FIELD_MAPPING` - DELETED_INTEGRATION_WIDE_FIELD_MAPPING - * * `DELETED_LINKED_ACCOUNT_FIELD_MAPPING` - DELETED_LINKED_ACCOUNT_FIELD_MAPPING - * * `CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `FORCED_LINKED_ACCOUNT_RESYNC` - FORCED_LINKED_ACCOUNT_RESYNC - * * `MUTED_ISSUE` - MUTED_ISSUE - * * `GENERATED_MAGIC_LINK` - GENERATED_MAGIC_LINK - * * `ENABLED_MERGE_WEBHOOK` - ENABLED_MERGE_WEBHOOK - * * `DISABLED_MERGE_WEBHOOK` - DISABLED_MERGE_WEBHOOK - * * `MERGE_WEBHOOK_TARGET_CHANGED` - MERGE_WEBHOOK_TARGET_CHANGED - * * `END_USER_CREDENTIALS_ACCESSED` - END_USER_CREDENTIALS_ACCESSED + *

              Designates the type of event that occurred.

              + *
                + *
              • CREATED_REMOTE_PRODUCTION_API_KEY - CREATED_REMOTE_PRODUCTION_API_KEY
                • + *
              • DELETED_REMOTE_PRODUCTION_API_KEY - DELETED_REMOTE_PRODUCTION_API_KEY
                • + *
              • CREATED_TEST_API_KEY - CREATED_TEST_API_KEY
                • + *
              • DELETED_TEST_API_KEY - DELETED_TEST_API_KEY
                • + *
              • REGENERATED_PRODUCTION_API_KEY - REGENERATED_PRODUCTION_API_KEY
                • + *
              • REGENERATED_WEBHOOK_SIGNATURE - REGENERATED_WEBHOOK_SIGNATURE
                • + *
              • INVITED_USER - INVITED_USER
                • + *
              • TWO_FACTOR_AUTH_ENABLED - TWO_FACTOR_AUTH_ENABLED
                • + *
              • TWO_FACTOR_AUTH_DISABLED - TWO_FACTOR_AUTH_DISABLED
                • + *
              • DELETED_LINKED_ACCOUNT - DELETED_LINKED_ACCOUNT
                • + *
              • DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT - DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT
                • + *
              • CREATED_DESTINATION - CREATED_DESTINATION
                • + *
              • DELETED_DESTINATION - DELETED_DESTINATION
                • + *
              • CHANGED_DESTINATION - CHANGED_DESTINATION
                • + *
              • CHANGED_SCOPES - CHANGED_SCOPES
                • + *
              • CHANGED_PERSONAL_INFORMATION - CHANGED_PERSONAL_INFORMATION
                • + *
              • CHANGED_ORGANIZATION_SETTINGS - CHANGED_ORGANIZATION_SETTINGS
                • + *
              • ENABLED_INTEGRATION - ENABLED_INTEGRATION
                • + *
              • DISABLED_INTEGRATION - DISABLED_INTEGRATION
                • + *
              • ENABLED_CATEGORY - ENABLED_CATEGORY
                • + *
              • DISABLED_CATEGORY - DISABLED_CATEGORY
                • + *
              • CHANGED_PASSWORD - CHANGED_PASSWORD
                • + *
              • RESET_PASSWORD - RESET_PASSWORD
                • + *
              • ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION
                • + *
              • ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT
                • + *
              • DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION
                • + *
              • DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT
                • + *
              • CREATED_INTEGRATION_WIDE_FIELD_MAPPING - CREATED_INTEGRATION_WIDE_FIELD_MAPPING
                • + *
              • CREATED_LINKED_ACCOUNT_FIELD_MAPPING - CREATED_LINKED_ACCOUNT_FIELD_MAPPING
                • + *
              • CHANGED_INTEGRATION_WIDE_FIELD_MAPPING - CHANGED_INTEGRATION_WIDE_FIELD_MAPPING
                • + *
              • CHANGED_LINKED_ACCOUNT_FIELD_MAPPING - CHANGED_LINKED_ACCOUNT_FIELD_MAPPING
                • + *
              • DELETED_INTEGRATION_WIDE_FIELD_MAPPING - DELETED_INTEGRATION_WIDE_FIELD_MAPPING
                • + *
              • DELETED_LINKED_ACCOUNT_FIELD_MAPPING - DELETED_LINKED_ACCOUNT_FIELD_MAPPING
                • + *
              • CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
                • + *
              • CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
                • + *
              • DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
                • + *
              • FORCED_LINKED_ACCOUNT_RESYNC - FORCED_LINKED_ACCOUNT_RESYNC
                • + *
              • MUTED_ISSUE - MUTED_ISSUE
                • + *
              • GENERATED_MAGIC_LINK - GENERATED_MAGIC_LINK
                • + *
              • ENABLED_MERGE_WEBHOOK - ENABLED_MERGE_WEBHOOK
                • + *
              • DISABLED_MERGE_WEBHOOK - DISABLED_MERGE_WEBHOOK
                • + *
              • MERGE_WEBHOOK_TARGET_CHANGED - MERGE_WEBHOOK_TARGET_CHANGED
                • + *
              • END_USER_CREDENTIALS_ACCESSED - END_USER_CREDENTIALS_ACCESSED
                • + *
              */ EventDescriptionStage eventType(@NotNull AuditLogEventEventType eventType); } @@ -349,14 +351,16 @@ public Builder from(AuditLogEvent other) { } /** - * Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring. - * - * * `ADMIN` - ADMIN - * * `DEVELOPER` - DEVELOPER - * * `MEMBER` - MEMBER - * * `API` - API - * * `SYSTEM` - SYSTEM - * * `MERGE_TEAM` - MERGE_TEAM

              Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring.

              + *

              Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring.

              + *
                + *
              • ADMIN - ADMIN
                • + *
              • DEVELOPER - DEVELOPER
                • + *
              • MEMBER - MEMBER
                • + *
              • API - API
                • + *
              • SYSTEM - SYSTEM
                • + *
              • MERGE_TEAM - MERGE_TEAM
                • + *
              + *

              Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring.

              *
                *
              • ADMIN - ADMIN
                • *
              • DEVELOPER - DEVELOPER
                • @@ -382,51 +386,53 @@ public EventTypeStage ipAddress(@NotNull String ipAddress) { } /** - * Designates the type of event that occurred. - * - * * `CREATED_REMOTE_PRODUCTION_API_KEY` - CREATED_REMOTE_PRODUCTION_API_KEY - * * `DELETED_REMOTE_PRODUCTION_API_KEY` - DELETED_REMOTE_PRODUCTION_API_KEY - * * `CREATED_TEST_API_KEY` - CREATED_TEST_API_KEY - * * `DELETED_TEST_API_KEY` - DELETED_TEST_API_KEY - * * `REGENERATED_PRODUCTION_API_KEY` - REGENERATED_PRODUCTION_API_KEY - * * `REGENERATED_WEBHOOK_SIGNATURE` - REGENERATED_WEBHOOK_SIGNATURE - * * `INVITED_USER` - INVITED_USER - * * `TWO_FACTOR_AUTH_ENABLED` - TWO_FACTOR_AUTH_ENABLED - * * `TWO_FACTOR_AUTH_DISABLED` - TWO_FACTOR_AUTH_DISABLED - * * `DELETED_LINKED_ACCOUNT` - DELETED_LINKED_ACCOUNT - * * `DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT` - DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT - * * `CREATED_DESTINATION` - CREATED_DESTINATION - * * `DELETED_DESTINATION` - DELETED_DESTINATION - * * `CHANGED_DESTINATION` - CHANGED_DESTINATION - * * `CHANGED_SCOPES` - CHANGED_SCOPES - * * `CHANGED_PERSONAL_INFORMATION` - CHANGED_PERSONAL_INFORMATION - * * `CHANGED_ORGANIZATION_SETTINGS` - CHANGED_ORGANIZATION_SETTINGS - * * `ENABLED_INTEGRATION` - ENABLED_INTEGRATION - * * `DISABLED_INTEGRATION` - DISABLED_INTEGRATION - * * `ENABLED_CATEGORY` - ENABLED_CATEGORY - * * `DISABLED_CATEGORY` - DISABLED_CATEGORY - * * `CHANGED_PASSWORD` - CHANGED_PASSWORD - * * `RESET_PASSWORD` - RESET_PASSWORD - * * `ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION` - ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - * * `ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT` - ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - * * `DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION` - DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - * * `DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT` - DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - * * `CREATED_INTEGRATION_WIDE_FIELD_MAPPING` - CREATED_INTEGRATION_WIDE_FIELD_MAPPING - * * `CREATED_LINKED_ACCOUNT_FIELD_MAPPING` - CREATED_LINKED_ACCOUNT_FIELD_MAPPING - * * `CHANGED_INTEGRATION_WIDE_FIELD_MAPPING` - CHANGED_INTEGRATION_WIDE_FIELD_MAPPING - * * `CHANGED_LINKED_ACCOUNT_FIELD_MAPPING` - CHANGED_LINKED_ACCOUNT_FIELD_MAPPING - * * `DELETED_INTEGRATION_WIDE_FIELD_MAPPING` - DELETED_INTEGRATION_WIDE_FIELD_MAPPING - * * `DELETED_LINKED_ACCOUNT_FIELD_MAPPING` - DELETED_LINKED_ACCOUNT_FIELD_MAPPING - * * `CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `FORCED_LINKED_ACCOUNT_RESYNC` - FORCED_LINKED_ACCOUNT_RESYNC - * * `MUTED_ISSUE` - MUTED_ISSUE - * * `GENERATED_MAGIC_LINK` - GENERATED_MAGIC_LINK - * * `ENABLED_MERGE_WEBHOOK` - ENABLED_MERGE_WEBHOOK - * * `DISABLED_MERGE_WEBHOOK` - DISABLED_MERGE_WEBHOOK - * * `MERGE_WEBHOOK_TARGET_CHANGED` - MERGE_WEBHOOK_TARGET_CHANGED - * * `END_USER_CREDENTIALS_ACCESSED` - END_USER_CREDENTIALS_ACCESSED

                Designates the type of event that occurred.

                + *

                Designates the type of event that occurred.

                + *
                  + *
                • CREATED_REMOTE_PRODUCTION_API_KEY - CREATED_REMOTE_PRODUCTION_API_KEY
                  • + *
                • DELETED_REMOTE_PRODUCTION_API_KEY - DELETED_REMOTE_PRODUCTION_API_KEY
                  • + *
                • CREATED_TEST_API_KEY - CREATED_TEST_API_KEY
                  • + *
                • DELETED_TEST_API_KEY - DELETED_TEST_API_KEY
                  • + *
                • REGENERATED_PRODUCTION_API_KEY - REGENERATED_PRODUCTION_API_KEY
                  • + *
                • REGENERATED_WEBHOOK_SIGNATURE - REGENERATED_WEBHOOK_SIGNATURE
                  • + *
                • INVITED_USER - INVITED_USER
                  • + *
                • TWO_FACTOR_AUTH_ENABLED - TWO_FACTOR_AUTH_ENABLED
                  • + *
                • TWO_FACTOR_AUTH_DISABLED - TWO_FACTOR_AUTH_DISABLED
                  • + *
                • DELETED_LINKED_ACCOUNT - DELETED_LINKED_ACCOUNT
                  • + *
                • DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT - DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT
                  • + *
                • CREATED_DESTINATION - CREATED_DESTINATION
                  • + *
                • DELETED_DESTINATION - DELETED_DESTINATION
                  • + *
                • CHANGED_DESTINATION - CHANGED_DESTINATION
                  • + *
                • CHANGED_SCOPES - CHANGED_SCOPES
                  • + *
                • CHANGED_PERSONAL_INFORMATION - CHANGED_PERSONAL_INFORMATION
                  • + *
                • CHANGED_ORGANIZATION_SETTINGS - CHANGED_ORGANIZATION_SETTINGS
                  • + *
                • ENABLED_INTEGRATION - ENABLED_INTEGRATION
                  • + *
                • DISABLED_INTEGRATION - DISABLED_INTEGRATION
                  • + *
                • ENABLED_CATEGORY - ENABLED_CATEGORY
                  • + *
                • DISABLED_CATEGORY - DISABLED_CATEGORY
                  • + *
                • CHANGED_PASSWORD - CHANGED_PASSWORD
                  • + *
                • RESET_PASSWORD - RESET_PASSWORD
                  • + *
                • ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION
                  • + *
                • ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT
                  • + *
                • DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION
                  • + *
                • DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT
                  • + *
                • CREATED_INTEGRATION_WIDE_FIELD_MAPPING - CREATED_INTEGRATION_WIDE_FIELD_MAPPING
                  • + *
                • CREATED_LINKED_ACCOUNT_FIELD_MAPPING - CREATED_LINKED_ACCOUNT_FIELD_MAPPING
                  • + *
                • CHANGED_INTEGRATION_WIDE_FIELD_MAPPING - CHANGED_INTEGRATION_WIDE_FIELD_MAPPING
                  • + *
                • CHANGED_LINKED_ACCOUNT_FIELD_MAPPING - CHANGED_LINKED_ACCOUNT_FIELD_MAPPING
                  • + *
                • DELETED_INTEGRATION_WIDE_FIELD_MAPPING - DELETED_INTEGRATION_WIDE_FIELD_MAPPING
                  • + *
                • DELETED_LINKED_ACCOUNT_FIELD_MAPPING - DELETED_LINKED_ACCOUNT_FIELD_MAPPING
                  • + *
                • CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
                  • + *
                • CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
                  • + *
                • DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
                  • + *
                • FORCED_LINKED_ACCOUNT_RESYNC - FORCED_LINKED_ACCOUNT_RESYNC
                  • + *
                • MUTED_ISSUE - MUTED_ISSUE
                  • + *
                • GENERATED_MAGIC_LINK - GENERATED_MAGIC_LINK
                  • + *
                • ENABLED_MERGE_WEBHOOK - ENABLED_MERGE_WEBHOOK
                  • + *
                • DISABLED_MERGE_WEBHOOK - DISABLED_MERGE_WEBHOOK
                  • + *
                • MERGE_WEBHOOK_TARGET_CHANGED - MERGE_WEBHOOK_TARGET_CHANGED
                  • + *
                • END_USER_CREDENTIALS_ACCESSED - END_USER_CREDENTIALS_ACCESSED
                  • + *
                + *

                Designates the type of event that occurred.

                *
                  *
                • CREATED_REMOTE_PRODUCTION_API_KEY - CREATED_REMOTE_PRODUCTION_API_KEY
                  • *
                • DELETED_REMOTE_PRODUCTION_API_KEY - DELETED_REMOTE_PRODUCTION_API_KEY
                  • diff --git a/src/main/java/com/merge/api/crm/types/AuditLogEventEventType.java b/src/main/java/com/merge/api/crm/types/AuditLogEventEventType.java index 38f2a1363..6a5ab9ff5 100644 --- a/src/main/java/com/merge/api/crm/types/AuditLogEventEventType.java +++ b/src/main/java/com/merge/api/crm/types/AuditLogEventEventType.java @@ -83,11 +83,11 @@ public AuditLogEventEventType deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, EventTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/AuditLogEventRole.java b/src/main/java/com/merge/api/crm/types/AuditLogEventRole.java index a7ff6b828..91249360a 100644 --- a/src/main/java/com/merge/api/crm/types/AuditLogEventRole.java +++ b/src/main/java/com/merge/api/crm/types/AuditLogEventRole.java @@ -83,11 +83,11 @@ public AuditLogEventRole deserialize(JsonParser p, DeserializationContext contex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RoleEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/CommonModelScopeApi.java b/src/main/java/com/merge/api/crm/types/CommonModelScopeApi.java index d691b2ae5..44a859dcb 100644 --- a/src/main/java/com/merge/api/crm/types/CommonModelScopeApi.java +++ b/src/main/java/com/merge/api/crm/types/CommonModelScopeApi.java @@ -98,7 +98,9 @@ public Builder addCommonModels(IndividualCommonModelScopeDeserializer commonMode } public Builder addAllCommonModels(List commonModels) { - this.commonModels.addAll(commonModels); + if (commonModels != null) { + this.commonModels.addAll(commonModels); + } return this; } diff --git a/src/main/java/com/merge/api/crm/types/CommonModelScopesBodyRequest.java b/src/main/java/com/merge/api/crm/types/CommonModelScopesBodyRequest.java index f9f6f72f7..1058c3727 100644 --- a/src/main/java/com/merge/api/crm/types/CommonModelScopesBodyRequest.java +++ b/src/main/java/com/merge/api/crm/types/CommonModelScopesBodyRequest.java @@ -139,7 +139,9 @@ public _FinalStage modelId(@NotNull String modelId) { @java.lang.Override public _FinalStage addAllDisabledFields(List disabledFields) { - this.disabledFields.addAll(disabledFields); + if (disabledFields != null) { + this.disabledFields.addAll(disabledFields); + } return this; } @@ -159,7 +161,9 @@ public _FinalStage disabledFields(List disabledFields) { @java.lang.Override public _FinalStage addAllEnabledActions(List enabledActions) { - this.enabledActions.addAll(enabledActions); + if (enabledActions != null) { + this.enabledActions.addAll(enabledActions); + } return this; } diff --git a/src/main/java/com/merge/api/crm/types/ContactAccount.java b/src/main/java/com/merge/api/crm/types/ContactAccount.java index 1074c339b..d32cbc2a0 100644 --- a/src/main/java/com/merge/api/crm/types/ContactAccount.java +++ b/src/main/java/com/merge/api/crm/types/ContactAccount.java @@ -83,11 +83,11 @@ public ContactAccount deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/ContactOwner.java b/src/main/java/com/merge/api/crm/types/ContactOwner.java index 2816ebc32..ad3c49c4a 100644 --- a/src/main/java/com/merge/api/crm/types/ContactOwner.java +++ b/src/main/java/com/merge/api/crm/types/ContactOwner.java @@ -83,11 +83,11 @@ public ContactOwner deserialize(JsonParser p, DeserializationContext context) th Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, User.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/ContactRequestAccount.java b/src/main/java/com/merge/api/crm/types/ContactRequestAccount.java index 5a82a4e6e..0e92099a0 100644 --- a/src/main/java/com/merge/api/crm/types/ContactRequestAccount.java +++ b/src/main/java/com/merge/api/crm/types/ContactRequestAccount.java @@ -83,11 +83,11 @@ public ContactRequestAccount deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/ContactRequestOwner.java b/src/main/java/com/merge/api/crm/types/ContactRequestOwner.java index 74d921650..fbf45d7e1 100644 --- a/src/main/java/com/merge/api/crm/types/ContactRequestOwner.java +++ b/src/main/java/com/merge/api/crm/types/ContactRequestOwner.java @@ -83,11 +83,11 @@ public ContactRequestOwner deserialize(JsonParser p, DeserializationContext cont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, User.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/CreateFieldMappingRequest.java b/src/main/java/com/merge/api/crm/types/CreateFieldMappingRequest.java index 5261ac496..11aabfe99 100644 --- a/src/main/java/com/merge/api/crm/types/CreateFieldMappingRequest.java +++ b/src/main/java/com/merge/api/crm/types/CreateFieldMappingRequest.java @@ -159,7 +159,7 @@ public static TargetFieldNameStage builder() { public interface TargetFieldNameStage { /** - * The name of the target field you want this remote field to map to. + *

                  The name of the target field you want this remote field to map to.

                  */ TargetFieldDescriptionStage targetFieldName(@NotNull String targetFieldName); @@ -168,28 +168,28 @@ public interface TargetFieldNameStage { public interface TargetFieldDescriptionStage { /** - * The description of the target field you want this remote field to map to. + *

                  The description of the target field you want this remote field to map to.

                  */ RemoteMethodStage targetFieldDescription(@NotNull String targetFieldDescription); } public interface RemoteMethodStage { /** - * The method of the remote endpoint where the remote field is coming from. + *

                  The method of the remote endpoint where the remote field is coming from.

                  */ RemoteUrlPathStage remoteMethod(@NotNull String remoteMethod); } public interface RemoteUrlPathStage { /** - * The path of the remote endpoint where the remote field is coming from. + *

                  The path of the remote endpoint where the remote field is coming from.

                  */ CommonModelNameStage remoteUrlPath(@NotNull String remoteUrlPath); } public interface CommonModelNameStage { /** - * The name of the Common Model that the remote field corresponds to in a given category. + *

                  The name of the Common Model that the remote field corresponds to in a given category.

                  */ _FinalStage commonModelName(@NotNull String commonModelName); } @@ -254,7 +254,8 @@ public Builder from(CreateFieldMappingRequest other) { } /** - * The name of the target field you want this remote field to map to.

                  The name of the target field you want this remote field to map to.

                  + *

                  The name of the target field you want this remote field to map to.

                  + *

                  The name of the target field you want this remote field to map to.

                  * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -265,7 +266,8 @@ public TargetFieldDescriptionStage targetFieldName(@NotNull String targetFieldNa } /** - * The description of the target field you want this remote field to map to.

                  The description of the target field you want this remote field to map to.

                  + *

                  The description of the target field you want this remote field to map to.

                  + *

                  The description of the target field you want this remote field to map to.

                  * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -276,7 +278,8 @@ public RemoteMethodStage targetFieldDescription(@NotNull String targetFieldDescr } /** - * The method of the remote endpoint where the remote field is coming from.

                  The method of the remote endpoint where the remote field is coming from.

                  + *

                  The method of the remote endpoint where the remote field is coming from.

                  + *

                  The method of the remote endpoint where the remote field is coming from.

                  * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -287,7 +290,8 @@ public RemoteUrlPathStage remoteMethod(@NotNull String remoteMethod) { } /** - * The path of the remote endpoint where the remote field is coming from.

                  The path of the remote endpoint where the remote field is coming from.

                  + *

                  The path of the remote endpoint where the remote field is coming from.

                  + *

                  The path of the remote endpoint where the remote field is coming from.

                  * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -298,7 +302,8 @@ public CommonModelNameStage remoteUrlPath(@NotNull String remoteUrlPath) { } /** - * The name of the Common Model that the remote field corresponds to in a given category.

                  The name of the Common Model that the remote field corresponds to in a given category.

                  + *

                  The name of the Common Model that the remote field corresponds to in a given category.

                  + *

                  The name of the Common Model that the remote field corresponds to in a given category.

                  * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -314,7 +319,9 @@ public _FinalStage commonModelName(@NotNull String commonModelName) { */ @java.lang.Override public _FinalStage addAllRemoteFieldTraversalPath(List remoteFieldTraversalPath) { - this.remoteFieldTraversalPath.addAll(remoteFieldTraversalPath); + if (remoteFieldTraversalPath != null) { + this.remoteFieldTraversalPath.addAll(remoteFieldTraversalPath); + } return this; } diff --git a/src/main/java/com/merge/api/crm/types/CrmAccountResponse.java b/src/main/java/com/merge/api/crm/types/CrmAccountResponse.java index 3de57f53d..a7709bd7c 100644 --- a/src/main/java/com/merge/api/crm/types/CrmAccountResponse.java +++ b/src/main/java/com/merge/api/crm/types/CrmAccountResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/crm/types/CrmAssociationTypeResponse.java b/src/main/java/com/merge/api/crm/types/CrmAssociationTypeResponse.java index ca111bd51..26281b424 100644 --- a/src/main/java/com/merge/api/crm/types/CrmAssociationTypeResponse.java +++ b/src/main/java/com/merge/api/crm/types/CrmAssociationTypeResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/crm/types/CrmContactResponse.java b/src/main/java/com/merge/api/crm/types/CrmContactResponse.java index b9eadf788..e7b3897fc 100644 --- a/src/main/java/com/merge/api/crm/types/CrmContactResponse.java +++ b/src/main/java/com/merge/api/crm/types/CrmContactResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/crm/types/CrmCustomObjectResponse.java b/src/main/java/com/merge/api/crm/types/CrmCustomObjectResponse.java index 3e7866230..63eef442a 100644 --- a/src/main/java/com/merge/api/crm/types/CrmCustomObjectResponse.java +++ b/src/main/java/com/merge/api/crm/types/CrmCustomObjectResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/crm/types/CustomObjectRequest.java b/src/main/java/com/merge/api/crm/types/CustomObjectRequest.java index 48bb3849b..fd34425de 100644 --- a/src/main/java/com/merge/api/crm/types/CustomObjectRequest.java +++ b/src/main/java/com/merge/api/crm/types/CustomObjectRequest.java @@ -115,7 +115,9 @@ public Builder fields(Map fields) { } public Builder putAllFields(Map fields) { - this.fields.putAll(fields); + if (fields != null) { + this.fields.putAll(fields); + } return this; } diff --git a/src/main/java/com/merge/api/crm/types/DataPassthroughRequest.java b/src/main/java/com/merge/api/crm/types/DataPassthroughRequest.java index 2b753e764..8eb93f6ad 100644 --- a/src/main/java/com/merge/api/crm/types/DataPassthroughRequest.java +++ b/src/main/java/com/merge/api/crm/types/DataPassthroughRequest.java @@ -172,7 +172,7 @@ public interface MethodStage { public interface PathStage { /** - * The path of the request in the third party's platform. + *

                  The path of the request in the third party's platform.

                  */ _FinalStage path(@NotNull String path); } @@ -264,7 +264,8 @@ public PathStage method(@NotNull MethodEnum method) { } /** - * The path of the request in the third party's platform.

                  The path of the request in the third party's platform.

                  + *

                  The path of the request in the third party's platform.

                  + *

                  The path of the request in the third party's platform.

                  * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/crm/types/EndUserDetailsRequest.java b/src/main/java/com/merge/api/crm/types/EndUserDetailsRequest.java index 4bf1c6e7c..f657e0948 100644 --- a/src/main/java/com/merge/api/crm/types/EndUserDetailsRequest.java +++ b/src/main/java/com/merge/api/crm/types/EndUserDetailsRequest.java @@ -250,7 +250,7 @@ public static EndUserEmailAddressStage builder() { public interface EndUserEmailAddressStage { /** - * Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent. + *

                  Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.

                  */ EndUserOrganizationNameStage endUserEmailAddress(@NotNull String endUserEmailAddress); @@ -259,14 +259,14 @@ public interface EndUserEmailAddressStage { public interface EndUserOrganizationNameStage { /** - * Your end user's organization. + *

                  Your end user's organization.

                  */ EndUserOriginIdStage endUserOrganizationName(@NotNull String endUserOrganizationName); } public interface EndUserOriginIdStage { /** - * This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers. + *

                  This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.

                  */ _FinalStage endUserOriginId(@NotNull String endUserOriginId); } @@ -408,7 +408,8 @@ public Builder from(EndUserDetailsRequest other) { } /** - * Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.

                  Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.

                  + *

                  Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.

                  + *

                  Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.

                  * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -419,7 +420,8 @@ public EndUserOrganizationNameStage endUserEmailAddress(@NotNull String endUserE } /** - * Your end user's organization.

                  Your end user's organization.

                  + *

                  Your end user's organization.

                  + *

                  Your end user's organization.

                  * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -430,7 +432,8 @@ public EndUserOriginIdStage endUserOrganizationName(@NotNull String endUserOrgan } /** - * This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.

                  This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.

                  + *

                  This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.

                  + *

                  This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.

                  * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -637,7 +640,9 @@ public _FinalStage integration(Optional integration) { */ @java.lang.Override public _FinalStage addAllCategories(List categories) { - this.categories.addAll(categories); + if (categories != null) { + this.categories.addAll(categories); + } return this; } diff --git a/src/main/java/com/merge/api/crm/types/EndUserDetailsRequestLanguage.java b/src/main/java/com/merge/api/crm/types/EndUserDetailsRequestLanguage.java index 4a9b70e69..354532735 100644 --- a/src/main/java/com/merge/api/crm/types/EndUserDetailsRequestLanguage.java +++ b/src/main/java/com/merge/api/crm/types/EndUserDetailsRequestLanguage.java @@ -84,11 +84,11 @@ public EndUserDetailsRequestLanguage deserialize(JsonParser p, DeserializationCo Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, LanguageEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/EngagementAccount.java b/src/main/java/com/merge/api/crm/types/EngagementAccount.java index 6d9f118f3..dd81ba4fa 100644 --- a/src/main/java/com/merge/api/crm/types/EngagementAccount.java +++ b/src/main/java/com/merge/api/crm/types/EngagementAccount.java @@ -83,11 +83,11 @@ public EngagementAccount deserialize(JsonParser p, DeserializationContext contex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/EngagementContactsItem.java b/src/main/java/com/merge/api/crm/types/EngagementContactsItem.java index 778f5c1de..ae1189693 100644 --- a/src/main/java/com/merge/api/crm/types/EngagementContactsItem.java +++ b/src/main/java/com/merge/api/crm/types/EngagementContactsItem.java @@ -83,11 +83,11 @@ public EngagementContactsItem deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/EngagementDirection.java b/src/main/java/com/merge/api/crm/types/EngagementDirection.java index abe4d56d2..158956837 100644 --- a/src/main/java/com/merge/api/crm/types/EngagementDirection.java +++ b/src/main/java/com/merge/api/crm/types/EngagementDirection.java @@ -83,11 +83,11 @@ public EngagementDirection deserialize(JsonParser p, DeserializationContext cont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, DirectionEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/EngagementEngagementType.java b/src/main/java/com/merge/api/crm/types/EngagementEngagementType.java index cb5880e92..22905fe00 100644 --- a/src/main/java/com/merge/api/crm/types/EngagementEngagementType.java +++ b/src/main/java/com/merge/api/crm/types/EngagementEngagementType.java @@ -83,11 +83,11 @@ public EngagementEngagementType deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, EngagementType.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/EngagementOwner.java b/src/main/java/com/merge/api/crm/types/EngagementOwner.java index 293916fd8..3781db7b0 100644 --- a/src/main/java/com/merge/api/crm/types/EngagementOwner.java +++ b/src/main/java/com/merge/api/crm/types/EngagementOwner.java @@ -83,11 +83,11 @@ public EngagementOwner deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, User.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/EngagementRequestAccount.java b/src/main/java/com/merge/api/crm/types/EngagementRequestAccount.java index 1c04673ee..04751ce27 100644 --- a/src/main/java/com/merge/api/crm/types/EngagementRequestAccount.java +++ b/src/main/java/com/merge/api/crm/types/EngagementRequestAccount.java @@ -83,11 +83,11 @@ public EngagementRequestAccount deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/EngagementRequestContactsItem.java b/src/main/java/com/merge/api/crm/types/EngagementRequestContactsItem.java index bcddcb18f..4643d1b8b 100644 --- a/src/main/java/com/merge/api/crm/types/EngagementRequestContactsItem.java +++ b/src/main/java/com/merge/api/crm/types/EngagementRequestContactsItem.java @@ -84,11 +84,11 @@ public EngagementRequestContactsItem deserialize(JsonParser p, DeserializationCo Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/EngagementRequestDirection.java b/src/main/java/com/merge/api/crm/types/EngagementRequestDirection.java index c5b6d6f93..3af119226 100644 --- a/src/main/java/com/merge/api/crm/types/EngagementRequestDirection.java +++ b/src/main/java/com/merge/api/crm/types/EngagementRequestDirection.java @@ -83,11 +83,11 @@ public EngagementRequestDirection deserialize(JsonParser p, DeserializationConte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, DirectionEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/EngagementRequestEngagementType.java b/src/main/java/com/merge/api/crm/types/EngagementRequestEngagementType.java index 6f31a1d8d..97e4f2b95 100644 --- a/src/main/java/com/merge/api/crm/types/EngagementRequestEngagementType.java +++ b/src/main/java/com/merge/api/crm/types/EngagementRequestEngagementType.java @@ -84,11 +84,11 @@ public EngagementRequestEngagementType deserialize(JsonParser p, Deserialization Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, EngagementType.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/EngagementRequestOwner.java b/src/main/java/com/merge/api/crm/types/EngagementRequestOwner.java index 6b5970a4d..331ba0fcb 100644 --- a/src/main/java/com/merge/api/crm/types/EngagementRequestOwner.java +++ b/src/main/java/com/merge/api/crm/types/EngagementRequestOwner.java @@ -83,11 +83,11 @@ public EngagementRequestOwner deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, User.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/EngagementResponse.java b/src/main/java/com/merge/api/crm/types/EngagementResponse.java index da16dab9c..71e4c956d 100644 --- a/src/main/java/com/merge/api/crm/types/EngagementResponse.java +++ b/src/main/java/com/merge/api/crm/types/EngagementResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/crm/types/EngagementTypeActivityType.java b/src/main/java/com/merge/api/crm/types/EngagementTypeActivityType.java index 85aac2fc4..5db6af3bd 100644 --- a/src/main/java/com/merge/api/crm/types/EngagementTypeActivityType.java +++ b/src/main/java/com/merge/api/crm/types/EngagementTypeActivityType.java @@ -83,11 +83,11 @@ public EngagementTypeActivityType deserialize(JsonParser p, DeserializationConte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, ActivityTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/FieldMappingInstanceResponse.java b/src/main/java/com/merge/api/crm/types/FieldMappingInstanceResponse.java index 09d761c70..ec3121543 100644 --- a/src/main/java/com/merge/api/crm/types/FieldMappingInstanceResponse.java +++ b/src/main/java/com/merge/api/crm/types/FieldMappingInstanceResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/crm/types/GenerateRemoteKeyRequest.java b/src/main/java/com/merge/api/crm/types/GenerateRemoteKeyRequest.java index 9fc64996a..e86d8a2e7 100644 --- a/src/main/java/com/merge/api/crm/types/GenerateRemoteKeyRequest.java +++ b/src/main/java/com/merge/api/crm/types/GenerateRemoteKeyRequest.java @@ -67,7 +67,7 @@ public static NameStage builder() { public interface NameStage { /** - * The name of the remote key + *

                  The name of the remote key

                  */ _FinalStage name(@NotNull String name); @@ -94,7 +94,8 @@ public Builder from(GenerateRemoteKeyRequest other) { } /** - * The name of the remote key

                  The name of the remote key

                  + *

                  The name of the remote key

                  + *

                  The name of the remote key

                  * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/crm/types/IgnoreCommonModelRequestReason.java b/src/main/java/com/merge/api/crm/types/IgnoreCommonModelRequestReason.java index 16b1996bf..b0156c4f4 100644 --- a/src/main/java/com/merge/api/crm/types/IgnoreCommonModelRequestReason.java +++ b/src/main/java/com/merge/api/crm/types/IgnoreCommonModelRequestReason.java @@ -84,11 +84,11 @@ public IgnoreCommonModelRequestReason deserialize(JsonParser p, DeserializationC Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, ReasonEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/IssueStatus.java b/src/main/java/com/merge/api/crm/types/IssueStatus.java index c69ec0311..c6f408fe0 100644 --- a/src/main/java/com/merge/api/crm/types/IssueStatus.java +++ b/src/main/java/com/merge/api/crm/types/IssueStatus.java @@ -83,11 +83,11 @@ public IssueStatus deserialize(JsonParser p, DeserializationContext context) thr Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, IssueStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/LeadConvertedAccount.java b/src/main/java/com/merge/api/crm/types/LeadConvertedAccount.java index f0a277795..9b814e35b 100644 --- a/src/main/java/com/merge/api/crm/types/LeadConvertedAccount.java +++ b/src/main/java/com/merge/api/crm/types/LeadConvertedAccount.java @@ -83,11 +83,11 @@ public LeadConvertedAccount deserialize(JsonParser p, DeserializationContext con Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/LeadConvertedContact.java b/src/main/java/com/merge/api/crm/types/LeadConvertedContact.java index a4f2a8ed1..2ef508fa9 100644 --- a/src/main/java/com/merge/api/crm/types/LeadConvertedContact.java +++ b/src/main/java/com/merge/api/crm/types/LeadConvertedContact.java @@ -83,11 +83,11 @@ public LeadConvertedContact deserialize(JsonParser p, DeserializationContext con Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/LeadOwner.java b/src/main/java/com/merge/api/crm/types/LeadOwner.java index 1b5c574bd..d02a4ed1b 100644 --- a/src/main/java/com/merge/api/crm/types/LeadOwner.java +++ b/src/main/java/com/merge/api/crm/types/LeadOwner.java @@ -83,11 +83,11 @@ public LeadOwner deserialize(JsonParser p, DeserializationContext context) throw Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, User.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/LeadRequestConvertedAccount.java b/src/main/java/com/merge/api/crm/types/LeadRequestConvertedAccount.java index 2d53b5b17..ea3eb0d5b 100644 --- a/src/main/java/com/merge/api/crm/types/LeadRequestConvertedAccount.java +++ b/src/main/java/com/merge/api/crm/types/LeadRequestConvertedAccount.java @@ -84,11 +84,11 @@ public LeadRequestConvertedAccount deserialize(JsonParser p, DeserializationCont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/LeadRequestConvertedContact.java b/src/main/java/com/merge/api/crm/types/LeadRequestConvertedContact.java index 06dcf6495..c999dd9f5 100644 --- a/src/main/java/com/merge/api/crm/types/LeadRequestConvertedContact.java +++ b/src/main/java/com/merge/api/crm/types/LeadRequestConvertedContact.java @@ -84,11 +84,11 @@ public LeadRequestConvertedContact deserialize(JsonParser p, DeserializationCont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/LeadRequestOwner.java b/src/main/java/com/merge/api/crm/types/LeadRequestOwner.java index 89757ad8b..1f32a680b 100644 --- a/src/main/java/com/merge/api/crm/types/LeadRequestOwner.java +++ b/src/main/java/com/merge/api/crm/types/LeadRequestOwner.java @@ -83,11 +83,11 @@ public LeadRequestOwner deserialize(JsonParser p, DeserializationContext context Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, User.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/LeadResponse.java b/src/main/java/com/merge/api/crm/types/LeadResponse.java index 89949e980..f77e20d2e 100644 --- a/src/main/java/com/merge/api/crm/types/LeadResponse.java +++ b/src/main/java/com/merge/api/crm/types/LeadResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/crm/types/LinkedAccountCommonModelScopeDeserializerRequest.java b/src/main/java/com/merge/api/crm/types/LinkedAccountCommonModelScopeDeserializerRequest.java index 545aea1db..10e19313d 100644 --- a/src/main/java/com/merge/api/crm/types/LinkedAccountCommonModelScopeDeserializerRequest.java +++ b/src/main/java/com/merge/api/crm/types/LinkedAccountCommonModelScopeDeserializerRequest.java @@ -100,7 +100,9 @@ public Builder addCommonModels(IndividualCommonModelScopeDeserializerRequest com } public Builder addAllCommonModels(List commonModels) { - this.commonModels.addAll(commonModels); + if (commonModels != null) { + this.commonModels.addAll(commonModels); + } return this; } diff --git a/src/main/java/com/merge/api/crm/types/MetaResponse.java b/src/main/java/com/merge/api/crm/types/MetaResponse.java index 8468d3017..2108c8c03 100644 --- a/src/main/java/com/merge/api/crm/types/MetaResponse.java +++ b/src/main/java/com/merge/api/crm/types/MetaResponse.java @@ -216,7 +216,9 @@ public _FinalStage requestSchema(String key, JsonNode value) { @java.lang.Override public _FinalStage putAllRequestSchema(Map requestSchema) { - this.requestSchema.putAll(requestSchema); + if (requestSchema != null) { + this.requestSchema.putAll(requestSchema); + } return this; } diff --git a/src/main/java/com/merge/api/crm/types/ModelOperation.java b/src/main/java/com/merge/api/crm/types/ModelOperation.java index e609b95b6..a1a1a3b88 100644 --- a/src/main/java/com/merge/api/crm/types/ModelOperation.java +++ b/src/main/java/com/merge/api/crm/types/ModelOperation.java @@ -159,7 +159,9 @@ public _FinalStage modelName(@NotNull String modelName) { @java.lang.Override public _FinalStage addAllSupportedFields(List supportedFields) { - this.supportedFields.addAll(supportedFields); + if (supportedFields != null) { + this.supportedFields.addAll(supportedFields); + } return this; } @@ -179,7 +181,9 @@ public _FinalStage supportedFields(List supportedFields) { @java.lang.Override public _FinalStage addAllRequiredPostParameters(List requiredPostParameters) { - this.requiredPostParameters.addAll(requiredPostParameters); + if (requiredPostParameters != null) { + this.requiredPostParameters.addAll(requiredPostParameters); + } return this; } @@ -199,7 +203,9 @@ public _FinalStage requiredPostParameters(List requiredPostParameters) { @java.lang.Override public _FinalStage addAllAvailableOperations(List availableOperations) { - this.availableOperations.addAll(availableOperations); + if (availableOperations != null) { + this.availableOperations.addAll(availableOperations); + } return this; } diff --git a/src/main/java/com/merge/api/crm/types/MultipartFormFieldRequest.java b/src/main/java/com/merge/api/crm/types/MultipartFormFieldRequest.java index c04ebb5bc..9ae0c1056 100644 --- a/src/main/java/com/merge/api/crm/types/MultipartFormFieldRequest.java +++ b/src/main/java/com/merge/api/crm/types/MultipartFormFieldRequest.java @@ -128,7 +128,7 @@ public static NameStage builder() { public interface NameStage { /** - * The name of the form field + *

                  The name of the form field

                  */ DataStage name(@NotNull String name); @@ -137,7 +137,7 @@ public interface NameStage { public interface DataStage { /** - * The data for the form field. + *

                  The data for the form field.

                  */ _FinalStage data(@NotNull String data); } @@ -200,7 +200,8 @@ public Builder from(MultipartFormFieldRequest other) { } /** - * The name of the form field

                  The name of the form field

                  + *

                  The name of the form field

                  + *

                  The name of the form field

                  * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -211,7 +212,8 @@ public DataStage name(@NotNull String name) { } /** - * The data for the form field.

                  The data for the form field.

                  + *

                  The data for the form field.

                  + *

                  The data for the form field.

                  * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/crm/types/MultipartFormFieldRequestEncoding.java b/src/main/java/com/merge/api/crm/types/MultipartFormFieldRequestEncoding.java index 7d799c535..a860daedc 100644 --- a/src/main/java/com/merge/api/crm/types/MultipartFormFieldRequestEncoding.java +++ b/src/main/java/com/merge/api/crm/types/MultipartFormFieldRequestEncoding.java @@ -84,11 +84,11 @@ public MultipartFormFieldRequestEncoding deserialize(JsonParser p, Deserializati Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, EncodingEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/NoteAccount.java b/src/main/java/com/merge/api/crm/types/NoteAccount.java index 43d08f114..684f81484 100644 --- a/src/main/java/com/merge/api/crm/types/NoteAccount.java +++ b/src/main/java/com/merge/api/crm/types/NoteAccount.java @@ -83,11 +83,11 @@ public NoteAccount deserialize(JsonParser p, DeserializationContext context) thr Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/NoteContact.java b/src/main/java/com/merge/api/crm/types/NoteContact.java index f8a1d1fb9..6c2a9dd5e 100644 --- a/src/main/java/com/merge/api/crm/types/NoteContact.java +++ b/src/main/java/com/merge/api/crm/types/NoteContact.java @@ -83,11 +83,11 @@ public NoteContact deserialize(JsonParser p, DeserializationContext context) thr Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/NoteOpportunity.java b/src/main/java/com/merge/api/crm/types/NoteOpportunity.java index 10a702bc5..4aa7f57dc 100644 --- a/src/main/java/com/merge/api/crm/types/NoteOpportunity.java +++ b/src/main/java/com/merge/api/crm/types/NoteOpportunity.java @@ -83,11 +83,11 @@ public NoteOpportunity deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Opportunity.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/NoteOwner.java b/src/main/java/com/merge/api/crm/types/NoteOwner.java index e975e6842..ba27041de 100644 --- a/src/main/java/com/merge/api/crm/types/NoteOwner.java +++ b/src/main/java/com/merge/api/crm/types/NoteOwner.java @@ -83,11 +83,11 @@ public NoteOwner deserialize(JsonParser p, DeserializationContext context) throw Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, User.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/NoteRequestAccount.java b/src/main/java/com/merge/api/crm/types/NoteRequestAccount.java index a4d7c88b0..420e78be0 100644 --- a/src/main/java/com/merge/api/crm/types/NoteRequestAccount.java +++ b/src/main/java/com/merge/api/crm/types/NoteRequestAccount.java @@ -83,11 +83,11 @@ public NoteRequestAccount deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/NoteRequestContact.java b/src/main/java/com/merge/api/crm/types/NoteRequestContact.java index e94cce250..ceae63999 100644 --- a/src/main/java/com/merge/api/crm/types/NoteRequestContact.java +++ b/src/main/java/com/merge/api/crm/types/NoteRequestContact.java @@ -83,11 +83,11 @@ public NoteRequestContact deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/NoteRequestOpportunity.java b/src/main/java/com/merge/api/crm/types/NoteRequestOpportunity.java index bfa35bc65..a8b8bfea0 100644 --- a/src/main/java/com/merge/api/crm/types/NoteRequestOpportunity.java +++ b/src/main/java/com/merge/api/crm/types/NoteRequestOpportunity.java @@ -83,11 +83,11 @@ public NoteRequestOpportunity deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Opportunity.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/NoteRequestOwner.java b/src/main/java/com/merge/api/crm/types/NoteRequestOwner.java index 940b89286..879cc1211 100644 --- a/src/main/java/com/merge/api/crm/types/NoteRequestOwner.java +++ b/src/main/java/com/merge/api/crm/types/NoteRequestOwner.java @@ -83,11 +83,11 @@ public NoteRequestOwner deserialize(JsonParser p, DeserializationContext context Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, User.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/NoteResponse.java b/src/main/java/com/merge/api/crm/types/NoteResponse.java index ee45153da..d1056c928 100644 --- a/src/main/java/com/merge/api/crm/types/NoteResponse.java +++ b/src/main/java/com/merge/api/crm/types/NoteResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/crm/types/OpportunityAccount.java b/src/main/java/com/merge/api/crm/types/OpportunityAccount.java index 45155e279..ea49b61cf 100644 --- a/src/main/java/com/merge/api/crm/types/OpportunityAccount.java +++ b/src/main/java/com/merge/api/crm/types/OpportunityAccount.java @@ -83,11 +83,11 @@ public OpportunityAccount deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/OpportunityOwner.java b/src/main/java/com/merge/api/crm/types/OpportunityOwner.java index 9433b7210..88f55312d 100644 --- a/src/main/java/com/merge/api/crm/types/OpportunityOwner.java +++ b/src/main/java/com/merge/api/crm/types/OpportunityOwner.java @@ -83,11 +83,11 @@ public OpportunityOwner deserialize(JsonParser p, DeserializationContext context Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, User.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/OpportunityRequestAccount.java b/src/main/java/com/merge/api/crm/types/OpportunityRequestAccount.java index 985f9beca..a387cd326 100644 --- a/src/main/java/com/merge/api/crm/types/OpportunityRequestAccount.java +++ b/src/main/java/com/merge/api/crm/types/OpportunityRequestAccount.java @@ -83,11 +83,11 @@ public OpportunityRequestAccount deserialize(JsonParser p, DeserializationContex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/OpportunityRequestOwner.java b/src/main/java/com/merge/api/crm/types/OpportunityRequestOwner.java index 53bfa8b4a..71ed8afe1 100644 --- a/src/main/java/com/merge/api/crm/types/OpportunityRequestOwner.java +++ b/src/main/java/com/merge/api/crm/types/OpportunityRequestOwner.java @@ -83,11 +83,11 @@ public OpportunityRequestOwner deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, User.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/OpportunityRequestStage.java b/src/main/java/com/merge/api/crm/types/OpportunityRequestStage.java index 2ef395739..0d02f16fb 100644 --- a/src/main/java/com/merge/api/crm/types/OpportunityRequestStage.java +++ b/src/main/java/com/merge/api/crm/types/OpportunityRequestStage.java @@ -83,11 +83,11 @@ public OpportunityRequestStage deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Stage.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/OpportunityRequestStatus.java b/src/main/java/com/merge/api/crm/types/OpportunityRequestStatus.java index a161fd1f0..99efeb4d1 100644 --- a/src/main/java/com/merge/api/crm/types/OpportunityRequestStatus.java +++ b/src/main/java/com/merge/api/crm/types/OpportunityRequestStatus.java @@ -83,11 +83,11 @@ public OpportunityRequestStatus deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, OpportunityStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/OpportunityResponse.java b/src/main/java/com/merge/api/crm/types/OpportunityResponse.java index cc31f724c..8cd070dcd 100644 --- a/src/main/java/com/merge/api/crm/types/OpportunityResponse.java +++ b/src/main/java/com/merge/api/crm/types/OpportunityResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/crm/types/OpportunityStage.java b/src/main/java/com/merge/api/crm/types/OpportunityStage.java index 684a518e5..389471a71 100644 --- a/src/main/java/com/merge/api/crm/types/OpportunityStage.java +++ b/src/main/java/com/merge/api/crm/types/OpportunityStage.java @@ -83,11 +83,11 @@ public OpportunityStage deserialize(JsonParser p, DeserializationContext context Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Stage.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/OpportunityStatus.java b/src/main/java/com/merge/api/crm/types/OpportunityStatus.java index a1ad3fb12..8957ea0ed 100644 --- a/src/main/java/com/merge/api/crm/types/OpportunityStatus.java +++ b/src/main/java/com/merge/api/crm/types/OpportunityStatus.java @@ -83,11 +83,11 @@ public OpportunityStatus deserialize(JsonParser p, DeserializationContext contex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, OpportunityStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/PatchedContactRequestOwner.java b/src/main/java/com/merge/api/crm/types/PatchedContactRequestOwner.java index 845a79f0e..95f2be97e 100644 --- a/src/main/java/com/merge/api/crm/types/PatchedContactRequestOwner.java +++ b/src/main/java/com/merge/api/crm/types/PatchedContactRequestOwner.java @@ -83,11 +83,11 @@ public PatchedContactRequestOwner deserialize(JsonParser p, DeserializationConte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, User.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/PatchedEngagementRequestDirection.java b/src/main/java/com/merge/api/crm/types/PatchedEngagementRequestDirection.java index bd7232c0c..7062f9f4c 100644 --- a/src/main/java/com/merge/api/crm/types/PatchedEngagementRequestDirection.java +++ b/src/main/java/com/merge/api/crm/types/PatchedEngagementRequestDirection.java @@ -84,11 +84,11 @@ public PatchedEngagementRequestDirection deserialize(JsonParser p, Deserializati Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, DirectionEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/PatchedOpportunityRequestStatus.java b/src/main/java/com/merge/api/crm/types/PatchedOpportunityRequestStatus.java index b308df5bb..4856536c1 100644 --- a/src/main/java/com/merge/api/crm/types/PatchedOpportunityRequestStatus.java +++ b/src/main/java/com/merge/api/crm/types/PatchedOpportunityRequestStatus.java @@ -84,11 +84,11 @@ public PatchedOpportunityRequestStatus deserialize(JsonParser p, Deserialization Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, OpportunityStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/PatchedTaskRequestStatus.java b/src/main/java/com/merge/api/crm/types/PatchedTaskRequestStatus.java index 31287cfc1..2b4676430 100644 --- a/src/main/java/com/merge/api/crm/types/PatchedTaskRequestStatus.java +++ b/src/main/java/com/merge/api/crm/types/PatchedTaskRequestStatus.java @@ -83,11 +83,11 @@ public PatchedTaskRequestStatus deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TaskStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/RemoteData.java b/src/main/java/com/merge/api/crm/types/RemoteData.java index b964aaa67..327e796bd 100644 --- a/src/main/java/com/merge/api/crm/types/RemoteData.java +++ b/src/main/java/com/merge/api/crm/types/RemoteData.java @@ -78,7 +78,7 @@ public static PathStage builder() { public interface PathStage { /** - * The third-party API path that is being called. + *

                  The third-party API path that is being called.

                  */ _FinalStage path(@NotNull String path); @@ -112,7 +112,8 @@ public Builder from(RemoteData other) { } /** - * The third-party API path that is being called.

                  The third-party API path that is being called.

                  + *

                  The third-party API path that is being called.

                  + *

                  The third-party API path that is being called.

                  * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/crm/types/RemoteEndpointInfo.java b/src/main/java/com/merge/api/crm/types/RemoteEndpointInfo.java index fab04babc..4cd00bb24 100644 --- a/src/main/java/com/merge/api/crm/types/RemoteEndpointInfo.java +++ b/src/main/java/com/merge/api/crm/types/RemoteEndpointInfo.java @@ -145,7 +145,9 @@ public _FinalStage urlPath(@NotNull String urlPath) { @java.lang.Override public _FinalStage addAllFieldTraversalPath(List fieldTraversalPath) { - this.fieldTraversalPath.addAll(fieldTraversalPath); + if (fieldTraversalPath != null) { + this.fieldTraversalPath.addAll(fieldTraversalPath); + } return this; } diff --git a/src/main/java/com/merge/api/crm/types/RemoteFieldApi.java b/src/main/java/com/merge/api/crm/types/RemoteFieldApi.java index 525a79746..e692598de 100644 --- a/src/main/java/com/merge/api/crm/types/RemoteFieldApi.java +++ b/src/main/java/com/merge/api/crm/types/RemoteFieldApi.java @@ -248,7 +248,9 @@ public _FinalStage schema(String key, JsonNode value) { @java.lang.Override public _FinalStage putAllSchema(Map schema) { - this.schema.putAll(schema); + if (schema != null) { + this.schema.putAll(schema); + } return this; } diff --git a/src/main/java/com/merge/api/crm/types/RemoteFieldClassForCustomObjectClassFieldFormat.java b/src/main/java/com/merge/api/crm/types/RemoteFieldClassForCustomObjectClassFieldFormat.java index 67c74f267..c92956039 100644 --- a/src/main/java/com/merge/api/crm/types/RemoteFieldClassForCustomObjectClassFieldFormat.java +++ b/src/main/java/com/merge/api/crm/types/RemoteFieldClassForCustomObjectClassFieldFormat.java @@ -85,11 +85,11 @@ public RemoteFieldClassForCustomObjectClassFieldFormat deserialize(JsonParser p, Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, FieldFormatEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/RemoteFieldClassForCustomObjectClassFieldType.java b/src/main/java/com/merge/api/crm/types/RemoteFieldClassForCustomObjectClassFieldType.java index 4db1db624..a0c6ba5bf 100644 --- a/src/main/java/com/merge/api/crm/types/RemoteFieldClassForCustomObjectClassFieldType.java +++ b/src/main/java/com/merge/api/crm/types/RemoteFieldClassForCustomObjectClassFieldType.java @@ -85,11 +85,11 @@ public RemoteFieldClassForCustomObjectClassFieldType deserialize(JsonParser p, D Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, FieldTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/RemoteFieldRemoteFieldClass.java b/src/main/java/com/merge/api/crm/types/RemoteFieldRemoteFieldClass.java index abaa38a0a..255cdbbf8 100644 --- a/src/main/java/com/merge/api/crm/types/RemoteFieldRemoteFieldClass.java +++ b/src/main/java/com/merge/api/crm/types/RemoteFieldRemoteFieldClass.java @@ -84,11 +84,11 @@ public RemoteFieldRemoteFieldClass deserialize(JsonParser p, DeserializationCont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RemoteFieldClass.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/RemoteFieldRequestRemoteFieldClass.java b/src/main/java/com/merge/api/crm/types/RemoteFieldRequestRemoteFieldClass.java index 12418fdc4..f67bfb858 100644 --- a/src/main/java/com/merge/api/crm/types/RemoteFieldRequestRemoteFieldClass.java +++ b/src/main/java/com/merge/api/crm/types/RemoteFieldRequestRemoteFieldClass.java @@ -85,11 +85,11 @@ public RemoteFieldRequestRemoteFieldClass deserialize(JsonParser p, Deserializat Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RemoteFieldClass.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/RemoteKeyForRegenerationRequest.java b/src/main/java/com/merge/api/crm/types/RemoteKeyForRegenerationRequest.java index 674ca7890..b2e3f788d 100644 --- a/src/main/java/com/merge/api/crm/types/RemoteKeyForRegenerationRequest.java +++ b/src/main/java/com/merge/api/crm/types/RemoteKeyForRegenerationRequest.java @@ -67,7 +67,7 @@ public static NameStage builder() { public interface NameStage { /** - * The name of the remote key + *

                  The name of the remote key

                  */ _FinalStage name(@NotNull String name); @@ -94,7 +94,8 @@ public Builder from(RemoteKeyForRegenerationRequest other) { } /** - * The name of the remote key

                  The name of the remote key

                  + *

                  The name of the remote key

                  + *

                  The name of the remote key

                  * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/crm/types/RemoteResponseResponseType.java b/src/main/java/com/merge/api/crm/types/RemoteResponseResponseType.java index 4914ce1ff..c716cc233 100644 --- a/src/main/java/com/merge/api/crm/types/RemoteResponseResponseType.java +++ b/src/main/java/com/merge/api/crm/types/RemoteResponseResponseType.java @@ -83,11 +83,11 @@ public RemoteResponseResponseType deserialize(JsonParser p, DeserializationConte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, ResponseTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/SyncStatusLastSyncResult.java b/src/main/java/com/merge/api/crm/types/SyncStatusLastSyncResult.java index d557f4781..357593c8d 100644 --- a/src/main/java/com/merge/api/crm/types/SyncStatusLastSyncResult.java +++ b/src/main/java/com/merge/api/crm/types/SyncStatusLastSyncResult.java @@ -83,11 +83,11 @@ public SyncStatusLastSyncResult deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, LastSyncResultEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/SyncStatusStatus.java b/src/main/java/com/merge/api/crm/types/SyncStatusStatus.java index 5dc832b84..eb6bb4db5 100644 --- a/src/main/java/com/merge/api/crm/types/SyncStatusStatus.java +++ b/src/main/java/com/merge/api/crm/types/SyncStatusStatus.java @@ -83,11 +83,11 @@ public SyncStatusStatus deserialize(JsonParser p, DeserializationContext context Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, StatusFd5Enum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/TaskAccount.java b/src/main/java/com/merge/api/crm/types/TaskAccount.java index 261c44030..f0bfa3658 100644 --- a/src/main/java/com/merge/api/crm/types/TaskAccount.java +++ b/src/main/java/com/merge/api/crm/types/TaskAccount.java @@ -83,11 +83,11 @@ public TaskAccount deserialize(JsonParser p, DeserializationContext context) thr Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/TaskOpportunity.java b/src/main/java/com/merge/api/crm/types/TaskOpportunity.java index f0a5ccf88..f37570135 100644 --- a/src/main/java/com/merge/api/crm/types/TaskOpportunity.java +++ b/src/main/java/com/merge/api/crm/types/TaskOpportunity.java @@ -83,11 +83,11 @@ public TaskOpportunity deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Opportunity.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/TaskOwner.java b/src/main/java/com/merge/api/crm/types/TaskOwner.java index 5f70195d2..67128d9c3 100644 --- a/src/main/java/com/merge/api/crm/types/TaskOwner.java +++ b/src/main/java/com/merge/api/crm/types/TaskOwner.java @@ -83,11 +83,11 @@ public TaskOwner deserialize(JsonParser p, DeserializationContext context) throw Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, User.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/TaskRequestAccount.java b/src/main/java/com/merge/api/crm/types/TaskRequestAccount.java index cab4f9b78..a6a3e7102 100644 --- a/src/main/java/com/merge/api/crm/types/TaskRequestAccount.java +++ b/src/main/java/com/merge/api/crm/types/TaskRequestAccount.java @@ -83,11 +83,11 @@ public TaskRequestAccount deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/TaskRequestOpportunity.java b/src/main/java/com/merge/api/crm/types/TaskRequestOpportunity.java index 19e1f5b6f..271fb4e8d 100644 --- a/src/main/java/com/merge/api/crm/types/TaskRequestOpportunity.java +++ b/src/main/java/com/merge/api/crm/types/TaskRequestOpportunity.java @@ -83,11 +83,11 @@ public TaskRequestOpportunity deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Opportunity.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/TaskRequestOwner.java b/src/main/java/com/merge/api/crm/types/TaskRequestOwner.java index e7913cba0..57b583684 100644 --- a/src/main/java/com/merge/api/crm/types/TaskRequestOwner.java +++ b/src/main/java/com/merge/api/crm/types/TaskRequestOwner.java @@ -83,11 +83,11 @@ public TaskRequestOwner deserialize(JsonParser p, DeserializationContext context Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, User.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/TaskRequestStatus.java b/src/main/java/com/merge/api/crm/types/TaskRequestStatus.java index e38736514..4fce10ba0 100644 --- a/src/main/java/com/merge/api/crm/types/TaskRequestStatus.java +++ b/src/main/java/com/merge/api/crm/types/TaskRequestStatus.java @@ -83,11 +83,11 @@ public TaskRequestStatus deserialize(JsonParser p, DeserializationContext contex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TaskStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/crm/types/TaskResponse.java b/src/main/java/com/merge/api/crm/types/TaskResponse.java index f73f7c0c4..1c04abf9b 100644 --- a/src/main/java/com/merge/api/crm/types/TaskResponse.java +++ b/src/main/java/com/merge/api/crm/types/TaskResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/crm/types/TaskStatus.java b/src/main/java/com/merge/api/crm/types/TaskStatus.java index 5b65d61ba..20bced0f9 100644 --- a/src/main/java/com/merge/api/crm/types/TaskStatus.java +++ b/src/main/java/com/merge/api/crm/types/TaskStatus.java @@ -83,11 +83,11 @@ public TaskStatus deserialize(JsonParser p, DeserializationContext context) thro Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TaskStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/AsyncRawAccountDetailsClient.java b/src/main/java/com/merge/api/filestorage/AsyncRawAccountDetailsClient.java index 8adc4b577..3b63d99a9 100644 --- a/src/main/java/com/merge/api/filestorage/AsyncRawAccountDetailsClient.java +++ b/src/main/java/com/merge/api/filestorage/AsyncRawAccountDetailsClient.java @@ -48,7 +48,6 @@ public CompletableFuture> retrieve(RequestO .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/AsyncRawAccountTokenClient.java b/src/main/java/com/merge/api/filestorage/AsyncRawAccountTokenClient.java index 38f463df2..2c584f1eb 100644 --- a/src/main/java/com/merge/api/filestorage/AsyncRawAccountTokenClient.java +++ b/src/main/java/com/merge/api/filestorage/AsyncRawAccountTokenClient.java @@ -50,7 +50,6 @@ public CompletableFuture> retrieve( .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/AsyncRawAsyncPassthroughClient.java b/src/main/java/com/merge/api/filestorage/AsyncRawAsyncPassthroughClient.java index 08bb0615e..a8678980d 100644 --- a/src/main/java/com/merge/api/filestorage/AsyncRawAsyncPassthroughClient.java +++ b/src/main/java/com/merge/api/filestorage/AsyncRawAsyncPassthroughClient.java @@ -122,7 +122,6 @@ public CompletableFuture> .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/AsyncRawAuditTrailClient.java b/src/main/java/com/merge/api/filestorage/AsyncRawAuditTrailClient.java index a491c5ca8..fe0eb920a 100644 --- a/src/main/java/com/merge/api/filestorage/AsyncRawAuditTrailClient.java +++ b/src/main/java/com/merge/api/filestorage/AsyncRawAuditTrailClient.java @@ -74,7 +74,7 @@ public CompletableFuture> } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getStartDate().isPresent()) { QueryStringMapper.addQueryParameter( @@ -88,7 +88,6 @@ public CompletableFuture> .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/AsyncRawAvailableActionsClient.java b/src/main/java/com/merge/api/filestorage/AsyncRawAvailableActionsClient.java index 17f8b92f4..9a5e18bce 100644 --- a/src/main/java/com/merge/api/filestorage/AsyncRawAvailableActionsClient.java +++ b/src/main/java/com/merge/api/filestorage/AsyncRawAvailableActionsClient.java @@ -48,7 +48,6 @@ public CompletableFuture> retrieve(Reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/AsyncRawDrivesClient.java b/src/main/java/com/merge/api/filestorage/AsyncRawDrivesClient.java index 01d7fefa4..c31e8e9a9 100644 --- a/src/main/java/com/merge/api/filestorage/AsyncRawDrivesClient.java +++ b/src/main/java/com/merge/api/filestorage/AsyncRawDrivesClient.java @@ -62,11 +62,11 @@ public CompletableFuture>> list( .addPathSegments("filestorage/v1/drives"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -76,33 +76,27 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getName().isPresent()) { QueryStringMapper.addQueryParameter( @@ -110,7 +104,7 @@ public CompletableFuture>> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -120,7 +114,6 @@ public CompletableFuture>> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -201,21 +194,17 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/AsyncRawFieldMappingClient.java b/src/main/java/com/merge/api/filestorage/AsyncRawFieldMappingClient.java index 3e1d9457e..b40188876 100644 --- a/src/main/java/com/merge/api/filestorage/AsyncRawFieldMappingClient.java +++ b/src/main/java/com/merge/api/filestorage/AsyncRawFieldMappingClient.java @@ -69,14 +69,13 @@ public CompletableFuture> QueryStringMapper.addQueryParameter( httpUrl, "exclude_remote_field_metadata", - request.getExcludeRemoteFieldMetadata().get().toString(), + request.getExcludeRemoteFieldMetadata().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -135,7 +134,7 @@ public CompletableFuture> fie QueryStringMapper.addQueryParameter( httpUrl, "exclude_remote_field_metadata", - request.getExcludeRemoteFieldMetadata().get().toString(), + request.getExcludeRemoteFieldMetadata().get(), false); } Map properties = new HashMap<>(); @@ -217,7 +216,6 @@ public CompletableFuture> fie .url(httpUrl) .method("DELETE", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -371,7 +369,6 @@ public CompletableFuture> remoteFie .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -430,7 +427,6 @@ public CompletableFuture> t .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/AsyncRawFilesClient.java b/src/main/java/com/merge/api/filestorage/AsyncRawFilesClient.java index 153000623..a026f4ad0 100644 --- a/src/main/java/com/merge/api/filestorage/AsyncRawFilesClient.java +++ b/src/main/java/com/merge/api/filestorage/AsyncRawFilesClient.java @@ -76,11 +76,11 @@ public CompletableFuture>> list( .addPathSegments("filestorage/v1/files"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -98,22 +98,19 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getMimeType().isPresent()) { QueryStringMapper.addQueryParameter( @@ -121,14 +118,11 @@ public CompletableFuture>> list( } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getName().isPresent()) { QueryStringMapper.addQueryParameter( @@ -136,11 +130,11 @@ public CompletableFuture>> list( } if (request.getOrderBy().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "order_by", request.getOrderBy().get().toString(), false); + httpUrl, "order_by", request.getOrderBy().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -148,13 +142,12 @@ public CompletableFuture>> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -226,11 +219,11 @@ public CompletableFuture> create( .addPathSegments("filestorage/v1/files"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -311,25 +304,21 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -393,10 +382,7 @@ public CompletableFuture> downloadRetrieve( .addPathSegments("download"); if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getMimeType().isPresent()) { QueryStringMapper.addQueryParameter( @@ -405,8 +391,7 @@ public CompletableFuture> downloadRetrieve( Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) - .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json"); + .headers(Headers.of(clientOptions.headers(requestOptions))); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); if (requestOptions != null && requestOptions.getTimeout().isPresent()) { @@ -476,7 +461,6 @@ public CompletableFuture> downloadRequ .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -554,7 +538,7 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/AsyncRawFoldersClient.java b/src/main/java/com/merge/api/filestorage/AsyncRawFoldersClient.java index b9d2347a2..ec254ac0e 100644 --- a/src/main/java/com/merge/api/filestorage/AsyncRawFoldersClient.java +++ b/src/main/java/com/merge/api/filestorage/AsyncRawFoldersClient.java @@ -69,11 +69,11 @@ public CompletableFuture>> list( .addPathSegments("filestorage/v1/folders"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -87,33 +87,27 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getName().isPresent()) { QueryStringMapper.addQueryParameter( @@ -121,7 +115,7 @@ public CompletableFuture>> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getParentFolderId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -133,13 +127,12 @@ public CompletableFuture>> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -211,11 +204,11 @@ public CompletableFuture> create .addPathSegments("filestorage/v1/folders"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -296,25 +289,21 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -370,7 +359,6 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/AsyncRawForceResyncClient.java b/src/main/java/com/merge/api/filestorage/AsyncRawForceResyncClient.java index debbd8a0a..c60e573c1 100644 --- a/src/main/java/com/merge/api/filestorage/AsyncRawForceResyncClient.java +++ b/src/main/java/com/merge/api/filestorage/AsyncRawForceResyncClient.java @@ -52,7 +52,6 @@ public CompletableFuture>> syncStatusResyn .url(httpUrl) .method("POST", RequestBody.create("", null)) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/AsyncRawGroupsClient.java b/src/main/java/com/merge/api/filestorage/AsyncRawGroupsClient.java index 577454dbf..ec91e62a4 100644 --- a/src/main/java/com/merge/api/filestorage/AsyncRawGroupsClient.java +++ b/src/main/java/com/merge/api/filestorage/AsyncRawGroupsClient.java @@ -62,11 +62,11 @@ public CompletableFuture>> list( .addPathSegments("filestorage/v1/groups"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -76,37 +76,31 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -114,13 +108,12 @@ public CompletableFuture>> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -201,25 +194,21 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/AsyncRawIssuesClient.java b/src/main/java/com/merge/api/filestorage/AsyncRawIssuesClient.java index 68baf5cf8..156b949f1 100644 --- a/src/main/java/com/merge/api/filestorage/AsyncRawIssuesClient.java +++ b/src/main/java/com/merge/api/filestorage/AsyncRawIssuesClient.java @@ -82,14 +82,14 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "first_incident_time_after", - request.getFirstIncidentTimeAfter().get().toString(), + request.getFirstIncidentTimeAfter().get(), false); } if (request.getFirstIncidentTimeBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "first_incident_time_before", - request.getFirstIncidentTimeBefore().get().toString(), + request.getFirstIncidentTimeBefore().get(), false); } if (request.getIncludeMuted().isPresent()) { @@ -104,14 +104,14 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "last_incident_time_after", - request.getLastIncidentTimeAfter().get().toString(), + request.getLastIncidentTimeAfter().get(), false); } if (request.getLastIncidentTimeBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "last_incident_time_before", - request.getLastIncidentTimeBefore().get().toString(), + request.getLastIncidentTimeBefore().get(), false); } if (request.getLinkedAccountId().isPresent()) { @@ -120,7 +120,7 @@ public CompletableFuture>> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getStartDate().isPresent()) { QueryStringMapper.addQueryParameter( @@ -128,13 +128,12 @@ public CompletableFuture>> list( } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "status", request.getStatus().get().toString(), false); + httpUrl, "status", request.getStatus().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -208,7 +207,6 @@ public CompletableFuture> retrieve(String id, Reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/AsyncRawLinkedAccountsClient.java b/src/main/java/com/merge/api/filestorage/AsyncRawLinkedAccountsClient.java index ef0115922..c1ca2c970 100644 --- a/src/main/java/com/merge/api/filestorage/AsyncRawLinkedAccountsClient.java +++ b/src/main/java/com/merge/api/filestorage/AsyncRawLinkedAccountsClient.java @@ -62,7 +62,7 @@ public CompletableFuture> defaultScope .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -111,7 +110,6 @@ public CompletableFuture> linkedAccoun .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/AsyncRawSyncStatusClient.java b/src/main/java/com/merge/api/filestorage/AsyncRawSyncStatusClient.java index 78b503328..d26cf6ccf 100644 --- a/src/main/java/com/merge/api/filestorage/AsyncRawSyncStatusClient.java +++ b/src/main/java/com/merge/api/filestorage/AsyncRawSyncStatusClient.java @@ -65,13 +65,12 @@ public CompletableFuture>> l } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/AsyncRawUsersClient.java b/src/main/java/com/merge/api/filestorage/AsyncRawUsersClient.java index 05f7cf3b4..7e73d25ca 100644 --- a/src/main/java/com/merge/api/filestorage/AsyncRawUsersClient.java +++ b/src/main/java/com/merge/api/filestorage/AsyncRawUsersClient.java @@ -62,11 +62,11 @@ public CompletableFuture>> list( .addPathSegments("filestorage/v1/users"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -76,22 +76,19 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsMe().isPresent()) { QueryStringMapper.addQueryParameter( @@ -99,18 +96,15 @@ public CompletableFuture>> list( } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -120,7 +114,6 @@ public CompletableFuture>> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -201,21 +194,17 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/AsyncRawWebhookReceiversClient.java b/src/main/java/com/merge/api/filestorage/AsyncRawWebhookReceiversClient.java index 014d07f26..c938d1654 100644 --- a/src/main/java/com/merge/api/filestorage/AsyncRawWebhookReceiversClient.java +++ b/src/main/java/com/merge/api/filestorage/AsyncRawWebhookReceiversClient.java @@ -54,7 +54,6 @@ public CompletableFuture>> list(Reque .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/RawAccountDetailsClient.java b/src/main/java/com/merge/api/filestorage/RawAccountDetailsClient.java index 941c7cc8b..56b477b37 100644 --- a/src/main/java/com/merge/api/filestorage/RawAccountDetailsClient.java +++ b/src/main/java/com/merge/api/filestorage/RawAccountDetailsClient.java @@ -44,7 +44,6 @@ public MergeApiHttpResponse retrieve(RequestOptions requestOptio .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/RawAccountTokenClient.java b/src/main/java/com/merge/api/filestorage/RawAccountTokenClient.java index 7e9dfc89d..e13c72499 100644 --- a/src/main/java/com/merge/api/filestorage/RawAccountTokenClient.java +++ b/src/main/java/com/merge/api/filestorage/RawAccountTokenClient.java @@ -45,7 +45,6 @@ public MergeApiHttpResponse retrieve(String publicToken, RequestOp .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/RawAsyncPassthroughClient.java b/src/main/java/com/merge/api/filestorage/RawAsyncPassthroughClient.java index e700f3afe..9a3d75e3f 100644 --- a/src/main/java/com/merge/api/filestorage/RawAsyncPassthroughClient.java +++ b/src/main/java/com/merge/api/filestorage/RawAsyncPassthroughClient.java @@ -103,7 +103,6 @@ public MergeApiHttpResponse retrieve( .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/RawAuditTrailClient.java b/src/main/java/com/merge/api/filestorage/RawAuditTrailClient.java index 59c3b1118..71a712597 100644 --- a/src/main/java/com/merge/api/filestorage/RawAuditTrailClient.java +++ b/src/main/java/com/merge/api/filestorage/RawAuditTrailClient.java @@ -68,7 +68,7 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getStartDate().isPresent()) { QueryStringMapper.addQueryParameter( @@ -82,7 +82,6 @@ public MergeApiHttpResponse> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/RawAvailableActionsClient.java b/src/main/java/com/merge/api/filestorage/RawAvailableActionsClient.java index 6fb2bb755..98768b638 100644 --- a/src/main/java/com/merge/api/filestorage/RawAvailableActionsClient.java +++ b/src/main/java/com/merge/api/filestorage/RawAvailableActionsClient.java @@ -44,7 +44,6 @@ public MergeApiHttpResponse retrieve(RequestOptions requestOpt .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/RawDrivesClient.java b/src/main/java/com/merge/api/filestorage/RawDrivesClient.java index 6fae567b0..f6dac33ac 100644 --- a/src/main/java/com/merge/api/filestorage/RawDrivesClient.java +++ b/src/main/java/com/merge/api/filestorage/RawDrivesClient.java @@ -57,11 +57,11 @@ public MergeApiHttpResponse> list( .addPathSegments("filestorage/v1/drives"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -71,33 +71,27 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getName().isPresent()) { QueryStringMapper.addQueryParameter( @@ -105,7 +99,7 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -115,7 +109,6 @@ public MergeApiHttpResponse> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -177,21 +170,17 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/RawFieldMappingClient.java b/src/main/java/com/merge/api/filestorage/RawFieldMappingClient.java index 10ab17771..fb475fffc 100644 --- a/src/main/java/com/merge/api/filestorage/RawFieldMappingClient.java +++ b/src/main/java/com/merge/api/filestorage/RawFieldMappingClient.java @@ -65,14 +65,13 @@ public MergeApiHttpResponse fieldMappingsRetrie QueryStringMapper.addQueryParameter( httpUrl, "exclude_remote_field_metadata", - request.getExcludeRemoteFieldMetadata().get().toString(), + request.getExcludeRemoteFieldMetadata().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -117,7 +116,7 @@ public MergeApiHttpResponse fieldMappingsCreate( QueryStringMapper.addQueryParameter( httpUrl, "exclude_remote_field_metadata", - request.getExcludeRemoteFieldMetadata().get().toString(), + request.getExcludeRemoteFieldMetadata().get(), false); } Map properties = new HashMap<>(); @@ -184,7 +183,6 @@ public MergeApiHttpResponse fieldMappingsDestroy( .url(httpUrl) .method("DELETE", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -308,7 +306,6 @@ public MergeApiHttpResponse remoteFieldsRetrieve( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -352,7 +349,6 @@ public MergeApiHttpResponse targetFieldsRetrieve .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/RawFilesClient.java b/src/main/java/com/merge/api/filestorage/RawFilesClient.java index 93f4681d3..23081da39 100644 --- a/src/main/java/com/merge/api/filestorage/RawFilesClient.java +++ b/src/main/java/com/merge/api/filestorage/RawFilesClient.java @@ -71,11 +71,11 @@ public MergeApiHttpResponse> list( .addPathSegments("filestorage/v1/files"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -93,22 +93,19 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getMimeType().isPresent()) { QueryStringMapper.addQueryParameter( @@ -116,14 +113,11 @@ public MergeApiHttpResponse> list( } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getName().isPresent()) { QueryStringMapper.addQueryParameter( @@ -131,11 +125,11 @@ public MergeApiHttpResponse> list( } if (request.getOrderBy().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "order_by", request.getOrderBy().get().toString(), false); + httpUrl, "order_by", request.getOrderBy().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -143,13 +137,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -201,11 +194,11 @@ public MergeApiHttpResponse create( .addPathSegments("filestorage/v1/files"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -271,25 +264,21 @@ public MergeApiHttpResponse retrieve(String id, FilesRetrieveRequest reque QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -339,10 +328,7 @@ public MergeApiHttpResponse downloadRetrieve( .addPathSegments("download"); if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getMimeType().isPresent()) { QueryStringMapper.addQueryParameter( @@ -351,8 +337,7 @@ public MergeApiHttpResponse downloadRetrieve( Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) - .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json"); + .headers(Headers.of(clientOptions.headers(requestOptions))); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); if (requestOptions != null && requestOptions.getTimeout().isPresent()) { @@ -409,7 +394,6 @@ public MergeApiHttpResponse downloadRequestMetaRetrieve( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -474,7 +458,7 @@ public MergeApiHttpResponse> downloadReq QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getMimeTypes().isPresent()) { @@ -491,17 +475,16 @@ public MergeApiHttpResponse> downloadReq } if (request.getOrderBy().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "order_by", request.getOrderBy().get().toString(), false); + httpUrl, "order_by", request.getOrderBy().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -556,7 +539,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/RawFoldersClient.java b/src/main/java/com/merge/api/filestorage/RawFoldersClient.java index c65476b78..5ecccb449 100644 --- a/src/main/java/com/merge/api/filestorage/RawFoldersClient.java +++ b/src/main/java/com/merge/api/filestorage/RawFoldersClient.java @@ -64,11 +64,11 @@ public MergeApiHttpResponse> list( .addPathSegments("filestorage/v1/folders"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -82,33 +82,27 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getName().isPresent()) { QueryStringMapper.addQueryParameter( @@ -116,7 +110,7 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getParentFolderId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -128,13 +122,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -186,11 +179,11 @@ public MergeApiHttpResponse create( .addPathSegments("filestorage/v1/folders"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -257,25 +250,21 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -318,7 +307,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/RawForceResyncClient.java b/src/main/java/com/merge/api/filestorage/RawForceResyncClient.java index 19bbeba7c..7ada77eb0 100644 --- a/src/main/java/com/merge/api/filestorage/RawForceResyncClient.java +++ b/src/main/java/com/merge/api/filestorage/RawForceResyncClient.java @@ -47,7 +47,6 @@ public MergeApiHttpResponse> syncStatusResyncCreate(RequestOpti .url(httpUrl) .method("POST", RequestBody.create("", null)) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/RawGroupsClient.java b/src/main/java/com/merge/api/filestorage/RawGroupsClient.java index f3b89e3f5..ce4f01f30 100644 --- a/src/main/java/com/merge/api/filestorage/RawGroupsClient.java +++ b/src/main/java/com/merge/api/filestorage/RawGroupsClient.java @@ -57,11 +57,11 @@ public MergeApiHttpResponse> list( .addPathSegments("filestorage/v1/groups"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -71,37 +71,31 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -109,13 +103,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -177,25 +170,21 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/RawIssuesClient.java b/src/main/java/com/merge/api/filestorage/RawIssuesClient.java index 34be61618..74abd7f49 100644 --- a/src/main/java/com/merge/api/filestorage/RawIssuesClient.java +++ b/src/main/java/com/merge/api/filestorage/RawIssuesClient.java @@ -77,14 +77,14 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "first_incident_time_after", - request.getFirstIncidentTimeAfter().get().toString(), + request.getFirstIncidentTimeAfter().get(), false); } if (request.getFirstIncidentTimeBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "first_incident_time_before", - request.getFirstIncidentTimeBefore().get().toString(), + request.getFirstIncidentTimeBefore().get(), false); } if (request.getIncludeMuted().isPresent()) { @@ -99,14 +99,14 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "last_incident_time_after", - request.getLastIncidentTimeAfter().get().toString(), + request.getLastIncidentTimeAfter().get(), false); } if (request.getLastIncidentTimeBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "last_incident_time_before", - request.getLastIncidentTimeBefore().get().toString(), + request.getLastIncidentTimeBefore().get(), false); } if (request.getLinkedAccountId().isPresent()) { @@ -115,7 +115,7 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getStartDate().isPresent()) { QueryStringMapper.addQueryParameter( @@ -123,13 +123,12 @@ public MergeApiHttpResponse> list( } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "status", request.getStatus().get().toString(), false); + httpUrl, "status", request.getStatus().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -184,7 +183,6 @@ public MergeApiHttpResponse retrieve(String id, RequestOptions requestOpt .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/RawLinkedAccountsClient.java b/src/main/java/com/merge/api/filestorage/RawLinkedAccountsClient.java index 1b99a853c..2e51add7b 100644 --- a/src/main/java/com/merge/api/filestorage/RawLinkedAccountsClient.java +++ b/src/main/java/com/merge/api/filestorage/RawLinkedAccountsClient.java @@ -56,7 +56,7 @@ public MergeApiHttpResponse> list( .addPathSegments("filestorage/v1/linked-accounts"); if (request.getCategory().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "category", request.getCategory().get().toString(), false); + httpUrl, "category", request.getCategory().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -97,7 +97,7 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_duplicates", - request.getIncludeDuplicates().get().toString(), + request.getIncludeDuplicates().get(), false); } if (request.getIntegrationName().isPresent()) { @@ -110,7 +110,7 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( @@ -120,7 +120,6 @@ public MergeApiHttpResponse> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/RawScopesClient.java b/src/main/java/com/merge/api/filestorage/RawScopesClient.java index 9988d6b56..bdc33abbe 100644 --- a/src/main/java/com/merge/api/filestorage/RawScopesClient.java +++ b/src/main/java/com/merge/api/filestorage/RawScopesClient.java @@ -48,7 +48,6 @@ public MergeApiHttpResponse defaultScopesRetrieve(RequestOp .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -92,7 +91,6 @@ public MergeApiHttpResponse linkedAccountScopesRetrieve(Req .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/RawSyncStatusClient.java b/src/main/java/com/merge/api/filestorage/RawSyncStatusClient.java index be05175a3..0cf0dd0ed 100644 --- a/src/main/java/com/merge/api/filestorage/RawSyncStatusClient.java +++ b/src/main/java/com/merge/api/filestorage/RawSyncStatusClient.java @@ -60,13 +60,12 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/RawUsersClient.java b/src/main/java/com/merge/api/filestorage/RawUsersClient.java index 66e62dd79..a81fa00d0 100644 --- a/src/main/java/com/merge/api/filestorage/RawUsersClient.java +++ b/src/main/java/com/merge/api/filestorage/RawUsersClient.java @@ -57,11 +57,11 @@ public MergeApiHttpResponse> list( .addPathSegments("filestorage/v1/users"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -71,22 +71,19 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsMe().isPresent()) { QueryStringMapper.addQueryParameter( @@ -94,18 +91,15 @@ public MergeApiHttpResponse> list( } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -115,7 +109,6 @@ public MergeApiHttpResponse> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -176,21 +169,17 @@ public MergeApiHttpResponse retrieve(String id, UsersRetrieveRequest reque QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/RawWebhookReceiversClient.java b/src/main/java/com/merge/api/filestorage/RawWebhookReceiversClient.java index 598391364..01cff8aaa 100644 --- a/src/main/java/com/merge/api/filestorage/RawWebhookReceiversClient.java +++ b/src/main/java/com/merge/api/filestorage/RawWebhookReceiversClient.java @@ -50,7 +50,6 @@ public MergeApiHttpResponse> list(RequestOptions requestOp .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/filestorage/types/AccountDetailsAndActionsCategory.java b/src/main/java/com/merge/api/filestorage/types/AccountDetailsAndActionsCategory.java index 6c4898493..850b0becd 100644 --- a/src/main/java/com/merge/api/filestorage/types/AccountDetailsAndActionsCategory.java +++ b/src/main/java/com/merge/api/filestorage/types/AccountDetailsAndActionsCategory.java @@ -84,11 +84,11 @@ public AccountDetailsAndActionsCategory deserialize(JsonParser p, Deserializatio Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CategoryEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/AccountDetailsAndActionsIntegration.java b/src/main/java/com/merge/api/filestorage/types/AccountDetailsAndActionsIntegration.java index bce43804d..495b78d16 100644 --- a/src/main/java/com/merge/api/filestorage/types/AccountDetailsAndActionsIntegration.java +++ b/src/main/java/com/merge/api/filestorage/types/AccountDetailsAndActionsIntegration.java @@ -293,7 +293,9 @@ public _FinalStage image(Optional image) { @java.lang.Override public _FinalStage addAllCategories(List categories) { - this.categories.addAll(categories); + if (categories != null) { + this.categories.addAll(categories); + } return this; } diff --git a/src/main/java/com/merge/api/filestorage/types/AccountDetailsAndActionsStatus.java b/src/main/java/com/merge/api/filestorage/types/AccountDetailsAndActionsStatus.java index 46cc791da..a4a0ac323 100644 --- a/src/main/java/com/merge/api/filestorage/types/AccountDetailsAndActionsStatus.java +++ b/src/main/java/com/merge/api/filestorage/types/AccountDetailsAndActionsStatus.java @@ -84,11 +84,11 @@ public AccountDetailsAndActionsStatus deserialize(JsonParser p, DeserializationC Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AccountDetailsAndActionsStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/AccountDetailsCategory.java b/src/main/java/com/merge/api/filestorage/types/AccountDetailsCategory.java index f62ccc843..bd3fdcf6f 100644 --- a/src/main/java/com/merge/api/filestorage/types/AccountDetailsCategory.java +++ b/src/main/java/com/merge/api/filestorage/types/AccountDetailsCategory.java @@ -83,11 +83,11 @@ public AccountDetailsCategory deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CategoryEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/AccountIntegration.java b/src/main/java/com/merge/api/filestorage/types/AccountIntegration.java index 0649154b7..837a5fafd 100644 --- a/src/main/java/com/merge/api/filestorage/types/AccountIntegration.java +++ b/src/main/java/com/merge/api/filestorage/types/AccountIntegration.java @@ -197,7 +197,7 @@ public static NameStage builder() { public interface NameStage { /** - * Company name. + *

                  Company name.

                  */ _FinalStage name(@NotNull String name); @@ -311,7 +311,8 @@ public Builder from(AccountIntegration other) { } /** - * Company name.

                  Company name.

                  + *

                  Company name.

                  + *

                  Company name.

                  * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/filestorage/types/AsyncPassthroughRetrieveResponse.java b/src/main/java/com/merge/api/filestorage/types/AsyncPassthroughRetrieveResponse.java index a84a06b3b..ba6dd4f32 100644 --- a/src/main/java/com/merge/api/filestorage/types/AsyncPassthroughRetrieveResponse.java +++ b/src/main/java/com/merge/api/filestorage/types/AsyncPassthroughRetrieveResponse.java @@ -84,11 +84,11 @@ public AsyncPassthroughRetrieveResponse deserialize(JsonParser p, Deserializatio Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RemoteResponse.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/AuditLogEvent.java b/src/main/java/com/merge/api/filestorage/types/AuditLogEvent.java index 335290fd5..348b77f1a 100644 --- a/src/main/java/com/merge/api/filestorage/types/AuditLogEvent.java +++ b/src/main/java/com/merge/api/filestorage/types/AuditLogEvent.java @@ -212,14 +212,15 @@ public static RoleStage builder() { public interface RoleStage { /** - * Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring. - * - * * `ADMIN` - ADMIN - * * `DEVELOPER` - DEVELOPER - * * `MEMBER` - MEMBER - * * `API` - API - * * `SYSTEM` - SYSTEM - * * `MERGE_TEAM` - MERGE_TEAM + *

                  Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring.

                  + *
                    + *
                  • ADMIN - ADMIN
                    • + *
                  • DEVELOPER - DEVELOPER
                    • + *
                  • MEMBER - MEMBER
                    • + *
                  • API - API
                    • + *
                  • SYSTEM - SYSTEM
                    • + *
                  • MERGE_TEAM - MERGE_TEAM
                    • + *
                  */ IpAddressStage role(@NotNull AuditLogEventRole role); @@ -232,51 +233,52 @@ public interface IpAddressStage { public interface EventTypeStage { /** - * Designates the type of event that occurred. - * - * * `CREATED_REMOTE_PRODUCTION_API_KEY` - CREATED_REMOTE_PRODUCTION_API_KEY - * * `DELETED_REMOTE_PRODUCTION_API_KEY` - DELETED_REMOTE_PRODUCTION_API_KEY - * * `CREATED_TEST_API_KEY` - CREATED_TEST_API_KEY - * * `DELETED_TEST_API_KEY` - DELETED_TEST_API_KEY - * * `REGENERATED_PRODUCTION_API_KEY` - REGENERATED_PRODUCTION_API_KEY - * * `REGENERATED_WEBHOOK_SIGNATURE` - REGENERATED_WEBHOOK_SIGNATURE - * * `INVITED_USER` - INVITED_USER - * * `TWO_FACTOR_AUTH_ENABLED` - TWO_FACTOR_AUTH_ENABLED - * * `TWO_FACTOR_AUTH_DISABLED` - TWO_FACTOR_AUTH_DISABLED - * * `DELETED_LINKED_ACCOUNT` - DELETED_LINKED_ACCOUNT - * * `DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT` - DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT - * * `CREATED_DESTINATION` - CREATED_DESTINATION - * * `DELETED_DESTINATION` - DELETED_DESTINATION - * * `CHANGED_DESTINATION` - CHANGED_DESTINATION - * * `CHANGED_SCOPES` - CHANGED_SCOPES - * * `CHANGED_PERSONAL_INFORMATION` - CHANGED_PERSONAL_INFORMATION - * * `CHANGED_ORGANIZATION_SETTINGS` - CHANGED_ORGANIZATION_SETTINGS - * * `ENABLED_INTEGRATION` - ENABLED_INTEGRATION - * * `DISABLED_INTEGRATION` - DISABLED_INTEGRATION - * * `ENABLED_CATEGORY` - ENABLED_CATEGORY - * * `DISABLED_CATEGORY` - DISABLED_CATEGORY - * * `CHANGED_PASSWORD` - CHANGED_PASSWORD - * * `RESET_PASSWORD` - RESET_PASSWORD - * * `ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION` - ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - * * `ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT` - ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - * * `DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION` - DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - * * `DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT` - DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - * * `CREATED_INTEGRATION_WIDE_FIELD_MAPPING` - CREATED_INTEGRATION_WIDE_FIELD_MAPPING - * * `CREATED_LINKED_ACCOUNT_FIELD_MAPPING` - CREATED_LINKED_ACCOUNT_FIELD_MAPPING - * * `CHANGED_INTEGRATION_WIDE_FIELD_MAPPING` - CHANGED_INTEGRATION_WIDE_FIELD_MAPPING - * * `CHANGED_LINKED_ACCOUNT_FIELD_MAPPING` - CHANGED_LINKED_ACCOUNT_FIELD_MAPPING - * * `DELETED_INTEGRATION_WIDE_FIELD_MAPPING` - DELETED_INTEGRATION_WIDE_FIELD_MAPPING - * * `DELETED_LINKED_ACCOUNT_FIELD_MAPPING` - DELETED_LINKED_ACCOUNT_FIELD_MAPPING - * * `CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `FORCED_LINKED_ACCOUNT_RESYNC` - FORCED_LINKED_ACCOUNT_RESYNC - * * `MUTED_ISSUE` - MUTED_ISSUE - * * `GENERATED_MAGIC_LINK` - GENERATED_MAGIC_LINK - * * `ENABLED_MERGE_WEBHOOK` - ENABLED_MERGE_WEBHOOK - * * `DISABLED_MERGE_WEBHOOK` - DISABLED_MERGE_WEBHOOK - * * `MERGE_WEBHOOK_TARGET_CHANGED` - MERGE_WEBHOOK_TARGET_CHANGED - * * `END_USER_CREDENTIALS_ACCESSED` - END_USER_CREDENTIALS_ACCESSED + *

                  Designates the type of event that occurred.

                  + *
                    + *
                  • CREATED_REMOTE_PRODUCTION_API_KEY - CREATED_REMOTE_PRODUCTION_API_KEY
                    • + *
                  • DELETED_REMOTE_PRODUCTION_API_KEY - DELETED_REMOTE_PRODUCTION_API_KEY
                    • + *
                  • CREATED_TEST_API_KEY - CREATED_TEST_API_KEY
                    • + *
                  • DELETED_TEST_API_KEY - DELETED_TEST_API_KEY
                    • + *
                  • REGENERATED_PRODUCTION_API_KEY - REGENERATED_PRODUCTION_API_KEY
                    • + *
                  • REGENERATED_WEBHOOK_SIGNATURE - REGENERATED_WEBHOOK_SIGNATURE
                    • + *
                  • INVITED_USER - INVITED_USER
                    • + *
                  • TWO_FACTOR_AUTH_ENABLED - TWO_FACTOR_AUTH_ENABLED
                    • + *
                  • TWO_FACTOR_AUTH_DISABLED - TWO_FACTOR_AUTH_DISABLED
                    • + *
                  • DELETED_LINKED_ACCOUNT - DELETED_LINKED_ACCOUNT
                    • + *
                  • DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT - DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT
                    • + *
                  • CREATED_DESTINATION - CREATED_DESTINATION
                    • + *
                  • DELETED_DESTINATION - DELETED_DESTINATION
                    • + *
                  • CHANGED_DESTINATION - CHANGED_DESTINATION
                    • + *
                  • CHANGED_SCOPES - CHANGED_SCOPES
                    • + *
                  • CHANGED_PERSONAL_INFORMATION - CHANGED_PERSONAL_INFORMATION
                    • + *
                  • CHANGED_ORGANIZATION_SETTINGS - CHANGED_ORGANIZATION_SETTINGS
                    • + *
                  • ENABLED_INTEGRATION - ENABLED_INTEGRATION
                    • + *
                  • DISABLED_INTEGRATION - DISABLED_INTEGRATION
                    • + *
                  • ENABLED_CATEGORY - ENABLED_CATEGORY
                    • + *
                  • DISABLED_CATEGORY - DISABLED_CATEGORY
                    • + *
                  • CHANGED_PASSWORD - CHANGED_PASSWORD
                    • + *
                  • RESET_PASSWORD - RESET_PASSWORD
                    • + *
                  • ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION
                    • + *
                  • ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT
                    • + *
                  • DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION
                    • + *
                  • DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT
                    • + *
                  • CREATED_INTEGRATION_WIDE_FIELD_MAPPING - CREATED_INTEGRATION_WIDE_FIELD_MAPPING
                    • + *
                  • CREATED_LINKED_ACCOUNT_FIELD_MAPPING - CREATED_LINKED_ACCOUNT_FIELD_MAPPING
                    • + *
                  • CHANGED_INTEGRATION_WIDE_FIELD_MAPPING - CHANGED_INTEGRATION_WIDE_FIELD_MAPPING
                    • + *
                  • CHANGED_LINKED_ACCOUNT_FIELD_MAPPING - CHANGED_LINKED_ACCOUNT_FIELD_MAPPING
                    • + *
                  • DELETED_INTEGRATION_WIDE_FIELD_MAPPING - DELETED_INTEGRATION_WIDE_FIELD_MAPPING
                    • + *
                  • DELETED_LINKED_ACCOUNT_FIELD_MAPPING - DELETED_LINKED_ACCOUNT_FIELD_MAPPING
                    • + *
                  • CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
                    • + *
                  • CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
                    • + *
                  • DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
                    • + *
                  • FORCED_LINKED_ACCOUNT_RESYNC - FORCED_LINKED_ACCOUNT_RESYNC
                    • + *
                  • MUTED_ISSUE - MUTED_ISSUE
                    • + *
                  • GENERATED_MAGIC_LINK - GENERATED_MAGIC_LINK
                    • + *
                  • ENABLED_MERGE_WEBHOOK - ENABLED_MERGE_WEBHOOK
                    • + *
                  • DISABLED_MERGE_WEBHOOK - DISABLED_MERGE_WEBHOOK
                    • + *
                  • MERGE_WEBHOOK_TARGET_CHANGED - MERGE_WEBHOOK_TARGET_CHANGED
                    • + *
                  • END_USER_CREDENTIALS_ACCESSED - END_USER_CREDENTIALS_ACCESSED
                    • + *
                  */ EventDescriptionStage eventType(@NotNull AuditLogEventEventType eventType); } @@ -349,14 +351,16 @@ public Builder from(AuditLogEvent other) { } /** - * Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring. - * - * * `ADMIN` - ADMIN - * * `DEVELOPER` - DEVELOPER - * * `MEMBER` - MEMBER - * * `API` - API - * * `SYSTEM` - SYSTEM - * * `MERGE_TEAM` - MERGE_TEAM

                  Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring.

                  + *

                  Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring.

                  + *
                    + *
                  • ADMIN - ADMIN
                    • + *
                  • DEVELOPER - DEVELOPER
                    • + *
                  • MEMBER - MEMBER
                    • + *
                  • API - API
                    • + *
                  • SYSTEM - SYSTEM
                    • + *
                  • MERGE_TEAM - MERGE_TEAM
                    • + *
                  + *

                  Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring.

                  *
                    *
                  • ADMIN - ADMIN
                    • *
                  • DEVELOPER - DEVELOPER
                    • @@ -382,51 +386,53 @@ public EventTypeStage ipAddress(@NotNull String ipAddress) { } /** - * Designates the type of event that occurred. - * - * * `CREATED_REMOTE_PRODUCTION_API_KEY` - CREATED_REMOTE_PRODUCTION_API_KEY - * * `DELETED_REMOTE_PRODUCTION_API_KEY` - DELETED_REMOTE_PRODUCTION_API_KEY - * * `CREATED_TEST_API_KEY` - CREATED_TEST_API_KEY - * * `DELETED_TEST_API_KEY` - DELETED_TEST_API_KEY - * * `REGENERATED_PRODUCTION_API_KEY` - REGENERATED_PRODUCTION_API_KEY - * * `REGENERATED_WEBHOOK_SIGNATURE` - REGENERATED_WEBHOOK_SIGNATURE - * * `INVITED_USER` - INVITED_USER - * * `TWO_FACTOR_AUTH_ENABLED` - TWO_FACTOR_AUTH_ENABLED - * * `TWO_FACTOR_AUTH_DISABLED` - TWO_FACTOR_AUTH_DISABLED - * * `DELETED_LINKED_ACCOUNT` - DELETED_LINKED_ACCOUNT - * * `DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT` - DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT - * * `CREATED_DESTINATION` - CREATED_DESTINATION - * * `DELETED_DESTINATION` - DELETED_DESTINATION - * * `CHANGED_DESTINATION` - CHANGED_DESTINATION - * * `CHANGED_SCOPES` - CHANGED_SCOPES - * * `CHANGED_PERSONAL_INFORMATION` - CHANGED_PERSONAL_INFORMATION - * * `CHANGED_ORGANIZATION_SETTINGS` - CHANGED_ORGANIZATION_SETTINGS - * * `ENABLED_INTEGRATION` - ENABLED_INTEGRATION - * * `DISABLED_INTEGRATION` - DISABLED_INTEGRATION - * * `ENABLED_CATEGORY` - ENABLED_CATEGORY - * * `DISABLED_CATEGORY` - DISABLED_CATEGORY - * * `CHANGED_PASSWORD` - CHANGED_PASSWORD - * * `RESET_PASSWORD` - RESET_PASSWORD - * * `ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION` - ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - * * `ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT` - ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - * * `DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION` - DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - * * `DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT` - DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - * * `CREATED_INTEGRATION_WIDE_FIELD_MAPPING` - CREATED_INTEGRATION_WIDE_FIELD_MAPPING - * * `CREATED_LINKED_ACCOUNT_FIELD_MAPPING` - CREATED_LINKED_ACCOUNT_FIELD_MAPPING - * * `CHANGED_INTEGRATION_WIDE_FIELD_MAPPING` - CHANGED_INTEGRATION_WIDE_FIELD_MAPPING - * * `CHANGED_LINKED_ACCOUNT_FIELD_MAPPING` - CHANGED_LINKED_ACCOUNT_FIELD_MAPPING - * * `DELETED_INTEGRATION_WIDE_FIELD_MAPPING` - DELETED_INTEGRATION_WIDE_FIELD_MAPPING - * * `DELETED_LINKED_ACCOUNT_FIELD_MAPPING` - DELETED_LINKED_ACCOUNT_FIELD_MAPPING - * * `CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `FORCED_LINKED_ACCOUNT_RESYNC` - FORCED_LINKED_ACCOUNT_RESYNC - * * `MUTED_ISSUE` - MUTED_ISSUE - * * `GENERATED_MAGIC_LINK` - GENERATED_MAGIC_LINK - * * `ENABLED_MERGE_WEBHOOK` - ENABLED_MERGE_WEBHOOK - * * `DISABLED_MERGE_WEBHOOK` - DISABLED_MERGE_WEBHOOK - * * `MERGE_WEBHOOK_TARGET_CHANGED` - MERGE_WEBHOOK_TARGET_CHANGED - * * `END_USER_CREDENTIALS_ACCESSED` - END_USER_CREDENTIALS_ACCESSED

                    Designates the type of event that occurred.

                    + *

                    Designates the type of event that occurred.

                    + *
                      + *
                    • CREATED_REMOTE_PRODUCTION_API_KEY - CREATED_REMOTE_PRODUCTION_API_KEY
                      • + *
                    • DELETED_REMOTE_PRODUCTION_API_KEY - DELETED_REMOTE_PRODUCTION_API_KEY
                      • + *
                    • CREATED_TEST_API_KEY - CREATED_TEST_API_KEY
                      • + *
                    • DELETED_TEST_API_KEY - DELETED_TEST_API_KEY
                      • + *
                    • REGENERATED_PRODUCTION_API_KEY - REGENERATED_PRODUCTION_API_KEY
                      • + *
                    • REGENERATED_WEBHOOK_SIGNATURE - REGENERATED_WEBHOOK_SIGNATURE
                      • + *
                    • INVITED_USER - INVITED_USER
                      • + *
                    • TWO_FACTOR_AUTH_ENABLED - TWO_FACTOR_AUTH_ENABLED
                      • + *
                    • TWO_FACTOR_AUTH_DISABLED - TWO_FACTOR_AUTH_DISABLED
                      • + *
                    • DELETED_LINKED_ACCOUNT - DELETED_LINKED_ACCOUNT
                      • + *
                    • DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT - DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT
                      • + *
                    • CREATED_DESTINATION - CREATED_DESTINATION
                      • + *
                    • DELETED_DESTINATION - DELETED_DESTINATION
                      • + *
                    • CHANGED_DESTINATION - CHANGED_DESTINATION
                      • + *
                    • CHANGED_SCOPES - CHANGED_SCOPES
                      • + *
                    • CHANGED_PERSONAL_INFORMATION - CHANGED_PERSONAL_INFORMATION
                      • + *
                    • CHANGED_ORGANIZATION_SETTINGS - CHANGED_ORGANIZATION_SETTINGS
                      • + *
                    • ENABLED_INTEGRATION - ENABLED_INTEGRATION
                      • + *
                    • DISABLED_INTEGRATION - DISABLED_INTEGRATION
                      • + *
                    • ENABLED_CATEGORY - ENABLED_CATEGORY
                      • + *
                    • DISABLED_CATEGORY - DISABLED_CATEGORY
                      • + *
                    • CHANGED_PASSWORD - CHANGED_PASSWORD
                      • + *
                    • RESET_PASSWORD - RESET_PASSWORD
                      • + *
                    • ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION
                      • + *
                    • ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT
                      • + *
                    • DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION
                      • + *
                    • DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT
                      • + *
                    • CREATED_INTEGRATION_WIDE_FIELD_MAPPING - CREATED_INTEGRATION_WIDE_FIELD_MAPPING
                      • + *
                    • CREATED_LINKED_ACCOUNT_FIELD_MAPPING - CREATED_LINKED_ACCOUNT_FIELD_MAPPING
                      • + *
                    • CHANGED_INTEGRATION_WIDE_FIELD_MAPPING - CHANGED_INTEGRATION_WIDE_FIELD_MAPPING
                      • + *
                    • CHANGED_LINKED_ACCOUNT_FIELD_MAPPING - CHANGED_LINKED_ACCOUNT_FIELD_MAPPING
                      • + *
                    • DELETED_INTEGRATION_WIDE_FIELD_MAPPING - DELETED_INTEGRATION_WIDE_FIELD_MAPPING
                      • + *
                    • DELETED_LINKED_ACCOUNT_FIELD_MAPPING - DELETED_LINKED_ACCOUNT_FIELD_MAPPING
                      • + *
                    • CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
                      • + *
                    • CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
                      • + *
                    • DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
                      • + *
                    • FORCED_LINKED_ACCOUNT_RESYNC - FORCED_LINKED_ACCOUNT_RESYNC
                      • + *
                    • MUTED_ISSUE - MUTED_ISSUE
                      • + *
                    • GENERATED_MAGIC_LINK - GENERATED_MAGIC_LINK
                      • + *
                    • ENABLED_MERGE_WEBHOOK - ENABLED_MERGE_WEBHOOK
                      • + *
                    • DISABLED_MERGE_WEBHOOK - DISABLED_MERGE_WEBHOOK
                      • + *
                    • MERGE_WEBHOOK_TARGET_CHANGED - MERGE_WEBHOOK_TARGET_CHANGED
                      • + *
                    • END_USER_CREDENTIALS_ACCESSED - END_USER_CREDENTIALS_ACCESSED
                      • + *
                    + *

                    Designates the type of event that occurred.

                    *
                      *
                    • CREATED_REMOTE_PRODUCTION_API_KEY - CREATED_REMOTE_PRODUCTION_API_KEY
                      • *
                    • DELETED_REMOTE_PRODUCTION_API_KEY - DELETED_REMOTE_PRODUCTION_API_KEY
                      • diff --git a/src/main/java/com/merge/api/filestorage/types/AuditLogEventEventType.java b/src/main/java/com/merge/api/filestorage/types/AuditLogEventEventType.java index 297857295..009254533 100644 --- a/src/main/java/com/merge/api/filestorage/types/AuditLogEventEventType.java +++ b/src/main/java/com/merge/api/filestorage/types/AuditLogEventEventType.java @@ -83,11 +83,11 @@ public AuditLogEventEventType deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, EventTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/AuditLogEventRole.java b/src/main/java/com/merge/api/filestorage/types/AuditLogEventRole.java index 1e3d49da9..c26a7f8eb 100644 --- a/src/main/java/com/merge/api/filestorage/types/AuditLogEventRole.java +++ b/src/main/java/com/merge/api/filestorage/types/AuditLogEventRole.java @@ -83,11 +83,11 @@ public AuditLogEventRole deserialize(JsonParser p, DeserializationContext contex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RoleEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/CommonModelScopeApi.java b/src/main/java/com/merge/api/filestorage/types/CommonModelScopeApi.java index 9e492d942..a836ab738 100644 --- a/src/main/java/com/merge/api/filestorage/types/CommonModelScopeApi.java +++ b/src/main/java/com/merge/api/filestorage/types/CommonModelScopeApi.java @@ -98,7 +98,9 @@ public Builder addCommonModels(IndividualCommonModelScopeDeserializer commonMode } public Builder addAllCommonModels(List commonModels) { - this.commonModels.addAll(commonModels); + if (commonModels != null) { + this.commonModels.addAll(commonModels); + } return this; } diff --git a/src/main/java/com/merge/api/filestorage/types/CommonModelScopesBodyRequest.java b/src/main/java/com/merge/api/filestorage/types/CommonModelScopesBodyRequest.java index 1891c1262..46d76db0f 100644 --- a/src/main/java/com/merge/api/filestorage/types/CommonModelScopesBodyRequest.java +++ b/src/main/java/com/merge/api/filestorage/types/CommonModelScopesBodyRequest.java @@ -139,7 +139,9 @@ public _FinalStage modelId(@NotNull String modelId) { @java.lang.Override public _FinalStage addAllDisabledFields(List disabledFields) { - this.disabledFields.addAll(disabledFields); + if (disabledFields != null) { + this.disabledFields.addAll(disabledFields); + } return this; } @@ -159,7 +161,9 @@ public _FinalStage disabledFields(List disabledFields) { @java.lang.Override public _FinalStage addAllEnabledActions(List enabledActions) { - this.enabledActions.addAll(enabledActions); + if (enabledActions != null) { + this.enabledActions.addAll(enabledActions); + } return this; } diff --git a/src/main/java/com/merge/api/filestorage/types/CreateFieldMappingRequest.java b/src/main/java/com/merge/api/filestorage/types/CreateFieldMappingRequest.java index 026b32730..763248d87 100644 --- a/src/main/java/com/merge/api/filestorage/types/CreateFieldMappingRequest.java +++ b/src/main/java/com/merge/api/filestorage/types/CreateFieldMappingRequest.java @@ -159,7 +159,7 @@ public static TargetFieldNameStage builder() { public interface TargetFieldNameStage { /** - * The name of the target field you want this remote field to map to. + *

                      The name of the target field you want this remote field to map to.

                      */ TargetFieldDescriptionStage targetFieldName(@NotNull String targetFieldName); @@ -168,28 +168,28 @@ public interface TargetFieldNameStage { public interface TargetFieldDescriptionStage { /** - * The description of the target field you want this remote field to map to. + *

                      The description of the target field you want this remote field to map to.

                      */ RemoteMethodStage targetFieldDescription(@NotNull String targetFieldDescription); } public interface RemoteMethodStage { /** - * The method of the remote endpoint where the remote field is coming from. + *

                      The method of the remote endpoint where the remote field is coming from.

                      */ RemoteUrlPathStage remoteMethod(@NotNull String remoteMethod); } public interface RemoteUrlPathStage { /** - * The path of the remote endpoint where the remote field is coming from. + *

                      The path of the remote endpoint where the remote field is coming from.

                      */ CommonModelNameStage remoteUrlPath(@NotNull String remoteUrlPath); } public interface CommonModelNameStage { /** - * The name of the Common Model that the remote field corresponds to in a given category. + *

                      The name of the Common Model that the remote field corresponds to in a given category.

                      */ _FinalStage commonModelName(@NotNull String commonModelName); } @@ -254,7 +254,8 @@ public Builder from(CreateFieldMappingRequest other) { } /** - * The name of the target field you want this remote field to map to.

                      The name of the target field you want this remote field to map to.

                      + *

                      The name of the target field you want this remote field to map to.

                      + *

                      The name of the target field you want this remote field to map to.

                      * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -265,7 +266,8 @@ public TargetFieldDescriptionStage targetFieldName(@NotNull String targetFieldNa } /** - * The description of the target field you want this remote field to map to.

                      The description of the target field you want this remote field to map to.

                      + *

                      The description of the target field you want this remote field to map to.

                      + *

                      The description of the target field you want this remote field to map to.

                      * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -276,7 +278,8 @@ public RemoteMethodStage targetFieldDescription(@NotNull String targetFieldDescr } /** - * The method of the remote endpoint where the remote field is coming from.

                      The method of the remote endpoint where the remote field is coming from.

                      + *

                      The method of the remote endpoint where the remote field is coming from.

                      + *

                      The method of the remote endpoint where the remote field is coming from.

                      * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -287,7 +290,8 @@ public RemoteUrlPathStage remoteMethod(@NotNull String remoteMethod) { } /** - * The path of the remote endpoint where the remote field is coming from.

                      The path of the remote endpoint where the remote field is coming from.

                      + *

                      The path of the remote endpoint where the remote field is coming from.

                      + *

                      The path of the remote endpoint where the remote field is coming from.

                      * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -298,7 +302,8 @@ public CommonModelNameStage remoteUrlPath(@NotNull String remoteUrlPath) { } /** - * The name of the Common Model that the remote field corresponds to in a given category.

                      The name of the Common Model that the remote field corresponds to in a given category.

                      + *

                      The name of the Common Model that the remote field corresponds to in a given category.

                      + *

                      The name of the Common Model that the remote field corresponds to in a given category.

                      * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -314,7 +319,9 @@ public _FinalStage commonModelName(@NotNull String commonModelName) { */ @java.lang.Override public _FinalStage addAllRemoteFieldTraversalPath(List remoteFieldTraversalPath) { - this.remoteFieldTraversalPath.addAll(remoteFieldTraversalPath); + if (remoteFieldTraversalPath != null) { + this.remoteFieldTraversalPath.addAll(remoteFieldTraversalPath); + } return this; } diff --git a/src/main/java/com/merge/api/filestorage/types/DataPassthroughRequest.java b/src/main/java/com/merge/api/filestorage/types/DataPassthroughRequest.java index 09377c8d4..53f2f58ff 100644 --- a/src/main/java/com/merge/api/filestorage/types/DataPassthroughRequest.java +++ b/src/main/java/com/merge/api/filestorage/types/DataPassthroughRequest.java @@ -172,7 +172,7 @@ public interface MethodStage { public interface PathStage { /** - * The path of the request in the third party's platform. + *

                      The path of the request in the third party's platform.

                      */ _FinalStage path(@NotNull String path); } @@ -264,7 +264,8 @@ public PathStage method(@NotNull MethodEnum method) { } /** - * The path of the request in the third party's platform.

                      The path of the request in the third party's platform.

                      + *

                      The path of the request in the third party's platform.

                      + *

                      The path of the request in the third party's platform.

                      * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/filestorage/types/DownloadRequestMeta.java b/src/main/java/com/merge/api/filestorage/types/DownloadRequestMeta.java index c9d153574..0f046d258 100644 --- a/src/main/java/com/merge/api/filestorage/types/DownloadRequestMeta.java +++ b/src/main/java/com/merge/api/filestorage/types/DownloadRequestMeta.java @@ -174,7 +174,9 @@ public _FinalStage headers(String key, JsonNode value) { @java.lang.Override public _FinalStage putAllHeaders(Map headers) { - this.headers.putAll(headers); + if (headers != null) { + this.headers.putAll(headers); + } return this; } diff --git a/src/main/java/com/merge/api/filestorage/types/EndUserDetailsRequest.java b/src/main/java/com/merge/api/filestorage/types/EndUserDetailsRequest.java index d18452c63..169e1a578 100644 --- a/src/main/java/com/merge/api/filestorage/types/EndUserDetailsRequest.java +++ b/src/main/java/com/merge/api/filestorage/types/EndUserDetailsRequest.java @@ -250,7 +250,7 @@ public static EndUserEmailAddressStage builder() { public interface EndUserEmailAddressStage { /** - * Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent. + *

                      Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.

                      */ EndUserOrganizationNameStage endUserEmailAddress(@NotNull String endUserEmailAddress); @@ -259,14 +259,14 @@ public interface EndUserEmailAddressStage { public interface EndUserOrganizationNameStage { /** - * Your end user's organization. + *

                      Your end user's organization.

                      */ EndUserOriginIdStage endUserOrganizationName(@NotNull String endUserOrganizationName); } public interface EndUserOriginIdStage { /** - * This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers. + *

                      This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.

                      */ _FinalStage endUserOriginId(@NotNull String endUserOriginId); } @@ -408,7 +408,8 @@ public Builder from(EndUserDetailsRequest other) { } /** - * Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.

                      Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.

                      + *

                      Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.

                      + *

                      Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.

                      * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -419,7 +420,8 @@ public EndUserOrganizationNameStage endUserEmailAddress(@NotNull String endUserE } /** - * Your end user's organization.

                      Your end user's organization.

                      + *

                      Your end user's organization.

                      + *

                      Your end user's organization.

                      * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -430,7 +432,8 @@ public EndUserOriginIdStage endUserOrganizationName(@NotNull String endUserOrgan } /** - * This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.

                      This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.

                      + *

                      This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.

                      + *

                      This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.

                      * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -637,7 +640,9 @@ public _FinalStage integration(Optional integration) { */ @java.lang.Override public _FinalStage addAllCategories(List categories) { - this.categories.addAll(categories); + if (categories != null) { + this.categories.addAll(categories); + } return this; } diff --git a/src/main/java/com/merge/api/filestorage/types/EndUserDetailsRequestLanguage.java b/src/main/java/com/merge/api/filestorage/types/EndUserDetailsRequestLanguage.java index 27bc13b2c..f86019e91 100644 --- a/src/main/java/com/merge/api/filestorage/types/EndUserDetailsRequestLanguage.java +++ b/src/main/java/com/merge/api/filestorage/types/EndUserDetailsRequestLanguage.java @@ -84,11 +84,11 @@ public EndUserDetailsRequestLanguage deserialize(JsonParser p, DeserializationCo Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, LanguageEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/FieldMappingInstanceResponse.java b/src/main/java/com/merge/api/filestorage/types/FieldMappingInstanceResponse.java index e3f6f8e32..fdce30e9b 100644 --- a/src/main/java/com/merge/api/filestorage/types/FieldMappingInstanceResponse.java +++ b/src/main/java/com/merge/api/filestorage/types/FieldMappingInstanceResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/filestorage/types/FileDrive.java b/src/main/java/com/merge/api/filestorage/types/FileDrive.java index 3ba627aab..5908e7f64 100644 --- a/src/main/java/com/merge/api/filestorage/types/FileDrive.java +++ b/src/main/java/com/merge/api/filestorage/types/FileDrive.java @@ -83,11 +83,11 @@ public FileDrive deserialize(JsonParser p, DeserializationContext context) throw Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Drive.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/FileFolder.java b/src/main/java/com/merge/api/filestorage/types/FileFolder.java index d4a673fb3..33e094bdc 100644 --- a/src/main/java/com/merge/api/filestorage/types/FileFolder.java +++ b/src/main/java/com/merge/api/filestorage/types/FileFolder.java @@ -83,11 +83,11 @@ public FileFolder deserialize(JsonParser p, DeserializationContext context) thro Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Folder.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/FilePermissions.java b/src/main/java/com/merge/api/filestorage/types/FilePermissions.java index 4dea58508..ca41ddfbb 100644 --- a/src/main/java/com/merge/api/filestorage/types/FilePermissions.java +++ b/src/main/java/com/merge/api/filestorage/types/FilePermissions.java @@ -93,16 +93,16 @@ public FilePermissions deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Permission.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue( value, new TypeReference>() {})); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/FilePermissionsItem.java b/src/main/java/com/merge/api/filestorage/types/FilePermissionsItem.java index 5fcceda4f..e376c613f 100644 --- a/src/main/java/com/merge/api/filestorage/types/FilePermissionsItem.java +++ b/src/main/java/com/merge/api/filestorage/types/FilePermissionsItem.java @@ -83,11 +83,11 @@ public FilePermissionsItem deserialize(JsonParser p, DeserializationContext cont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Permission.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/FileRequestDrive.java b/src/main/java/com/merge/api/filestorage/types/FileRequestDrive.java index 105eec4f3..f16b3c16f 100644 --- a/src/main/java/com/merge/api/filestorage/types/FileRequestDrive.java +++ b/src/main/java/com/merge/api/filestorage/types/FileRequestDrive.java @@ -83,11 +83,11 @@ public FileRequestDrive deserialize(JsonParser p, DeserializationContext context Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Drive.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/FileRequestFolder.java b/src/main/java/com/merge/api/filestorage/types/FileRequestFolder.java index f239bb8e4..44038fff4 100644 --- a/src/main/java/com/merge/api/filestorage/types/FileRequestFolder.java +++ b/src/main/java/com/merge/api/filestorage/types/FileRequestFolder.java @@ -83,11 +83,11 @@ public FileRequestFolder deserialize(JsonParser p, DeserializationContext contex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Folder.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/FileRequestPermissions.java b/src/main/java/com/merge/api/filestorage/types/FileRequestPermissions.java index 7ed5384e1..9b44fda56 100644 --- a/src/main/java/com/merge/api/filestorage/types/FileRequestPermissions.java +++ b/src/main/java/com/merge/api/filestorage/types/FileRequestPermissions.java @@ -93,16 +93,16 @@ public FileRequestPermissions deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PermissionRequest.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue( value, new TypeReference>() {})); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/FileRequestPermissionsItem.java b/src/main/java/com/merge/api/filestorage/types/FileRequestPermissionsItem.java index eef669d92..514191977 100644 --- a/src/main/java/com/merge/api/filestorage/types/FileRequestPermissionsItem.java +++ b/src/main/java/com/merge/api/filestorage/types/FileRequestPermissionsItem.java @@ -83,11 +83,11 @@ public FileRequestPermissionsItem deserialize(JsonParser p, DeserializationConte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PermissionRequest.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/FileStorageFileResponse.java b/src/main/java/com/merge/api/filestorage/types/FileStorageFileResponse.java index 41163f63e..4d30de5f8 100644 --- a/src/main/java/com/merge/api/filestorage/types/FileStorageFileResponse.java +++ b/src/main/java/com/merge/api/filestorage/types/FileStorageFileResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/filestorage/types/FileStorageFolderResponse.java b/src/main/java/com/merge/api/filestorage/types/FileStorageFolderResponse.java index f7f3e5c91..21e77c2b0 100644 --- a/src/main/java/com/merge/api/filestorage/types/FileStorageFolderResponse.java +++ b/src/main/java/com/merge/api/filestorage/types/FileStorageFolderResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/filestorage/types/FolderDrive.java b/src/main/java/com/merge/api/filestorage/types/FolderDrive.java index 2aa0402d8..8366970d6 100644 --- a/src/main/java/com/merge/api/filestorage/types/FolderDrive.java +++ b/src/main/java/com/merge/api/filestorage/types/FolderDrive.java @@ -83,11 +83,11 @@ public FolderDrive deserialize(JsonParser p, DeserializationContext context) thr Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Drive.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/FolderParentFolder.java b/src/main/java/com/merge/api/filestorage/types/FolderParentFolder.java index 8d0c4c065..7020ef36d 100644 --- a/src/main/java/com/merge/api/filestorage/types/FolderParentFolder.java +++ b/src/main/java/com/merge/api/filestorage/types/FolderParentFolder.java @@ -83,11 +83,11 @@ public FolderParentFolder deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Folder.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/FolderPermissions.java b/src/main/java/com/merge/api/filestorage/types/FolderPermissions.java index c6204e594..2e27b0204 100644 --- a/src/main/java/com/merge/api/filestorage/types/FolderPermissions.java +++ b/src/main/java/com/merge/api/filestorage/types/FolderPermissions.java @@ -93,16 +93,16 @@ public FolderPermissions deserialize(JsonParser p, DeserializationContext contex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Permission.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue( value, new TypeReference>() {})); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/FolderPermissionsItem.java b/src/main/java/com/merge/api/filestorage/types/FolderPermissionsItem.java index 4d8ada40f..ad291a316 100644 --- a/src/main/java/com/merge/api/filestorage/types/FolderPermissionsItem.java +++ b/src/main/java/com/merge/api/filestorage/types/FolderPermissionsItem.java @@ -83,11 +83,11 @@ public FolderPermissionsItem deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Permission.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/FolderRequestDrive.java b/src/main/java/com/merge/api/filestorage/types/FolderRequestDrive.java index 29f440ac9..753436744 100644 --- a/src/main/java/com/merge/api/filestorage/types/FolderRequestDrive.java +++ b/src/main/java/com/merge/api/filestorage/types/FolderRequestDrive.java @@ -83,11 +83,11 @@ public FolderRequestDrive deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Drive.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/FolderRequestParentFolder.java b/src/main/java/com/merge/api/filestorage/types/FolderRequestParentFolder.java index da4748460..08a0e22c8 100644 --- a/src/main/java/com/merge/api/filestorage/types/FolderRequestParentFolder.java +++ b/src/main/java/com/merge/api/filestorage/types/FolderRequestParentFolder.java @@ -83,11 +83,11 @@ public FolderRequestParentFolder deserialize(JsonParser p, DeserializationContex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Folder.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/FolderRequestPermissions.java b/src/main/java/com/merge/api/filestorage/types/FolderRequestPermissions.java index a79431ff8..cacd48077 100644 --- a/src/main/java/com/merge/api/filestorage/types/FolderRequestPermissions.java +++ b/src/main/java/com/merge/api/filestorage/types/FolderRequestPermissions.java @@ -93,16 +93,16 @@ public FolderRequestPermissions deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PermissionRequest.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue( value, new TypeReference>() {})); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/FolderRequestPermissionsItem.java b/src/main/java/com/merge/api/filestorage/types/FolderRequestPermissionsItem.java index 11ab9ce5f..8a29ab59c 100644 --- a/src/main/java/com/merge/api/filestorage/types/FolderRequestPermissionsItem.java +++ b/src/main/java/com/merge/api/filestorage/types/FolderRequestPermissionsItem.java @@ -84,11 +84,11 @@ public FolderRequestPermissionsItem deserialize(JsonParser p, DeserializationCon Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PermissionRequest.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/GenerateRemoteKeyRequest.java b/src/main/java/com/merge/api/filestorage/types/GenerateRemoteKeyRequest.java index 20f1e6d22..4698c8ca7 100644 --- a/src/main/java/com/merge/api/filestorage/types/GenerateRemoteKeyRequest.java +++ b/src/main/java/com/merge/api/filestorage/types/GenerateRemoteKeyRequest.java @@ -67,7 +67,7 @@ public static NameStage builder() { public interface NameStage { /** - * The name of the remote key + *

                      The name of the remote key

                      */ _FinalStage name(@NotNull String name); @@ -94,7 +94,8 @@ public Builder from(GenerateRemoteKeyRequest other) { } /** - * The name of the remote key

                      The name of the remote key

                      + *

                      The name of the remote key

                      + *

                      The name of the remote key

                      * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/filestorage/types/Group.java b/src/main/java/com/merge/api/filestorage/types/Group.java index 4a0a93c8d..7b262387c 100644 --- a/src/main/java/com/merge/api/filestorage/types/Group.java +++ b/src/main/java/com/merge/api/filestorage/types/Group.java @@ -314,7 +314,9 @@ public Builder addUsers(String users) { } public Builder addAllUsers(List users) { - this.users.addAll(users); + if (users != null) { + this.users.addAll(users); + } return this; } diff --git a/src/main/java/com/merge/api/filestorage/types/GroupChildGroupsItem.java b/src/main/java/com/merge/api/filestorage/types/GroupChildGroupsItem.java index 43238fc44..f841671e7 100644 --- a/src/main/java/com/merge/api/filestorage/types/GroupChildGroupsItem.java +++ b/src/main/java/com/merge/api/filestorage/types/GroupChildGroupsItem.java @@ -83,11 +83,11 @@ public GroupChildGroupsItem deserialize(JsonParser p, DeserializationContext con Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Group.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/IssueStatus.java b/src/main/java/com/merge/api/filestorage/types/IssueStatus.java index 293fb53eb..f4b92184f 100644 --- a/src/main/java/com/merge/api/filestorage/types/IssueStatus.java +++ b/src/main/java/com/merge/api/filestorage/types/IssueStatus.java @@ -83,11 +83,11 @@ public IssueStatus deserialize(JsonParser p, DeserializationContext context) thr Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, IssueStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/LinkedAccountCommonModelScopeDeserializerRequest.java b/src/main/java/com/merge/api/filestorage/types/LinkedAccountCommonModelScopeDeserializerRequest.java index 66aeace14..1020d718f 100644 --- a/src/main/java/com/merge/api/filestorage/types/LinkedAccountCommonModelScopeDeserializerRequest.java +++ b/src/main/java/com/merge/api/filestorage/types/LinkedAccountCommonModelScopeDeserializerRequest.java @@ -100,7 +100,9 @@ public Builder addCommonModels(IndividualCommonModelScopeDeserializerRequest com } public Builder addAllCommonModels(List commonModels) { - this.commonModels.addAll(commonModels); + if (commonModels != null) { + this.commonModels.addAll(commonModels); + } return this; } diff --git a/src/main/java/com/merge/api/filestorage/types/MetaResponse.java b/src/main/java/com/merge/api/filestorage/types/MetaResponse.java index 73e1e3f5a..d108f3b7b 100644 --- a/src/main/java/com/merge/api/filestorage/types/MetaResponse.java +++ b/src/main/java/com/merge/api/filestorage/types/MetaResponse.java @@ -216,7 +216,9 @@ public _FinalStage requestSchema(String key, JsonNode value) { @java.lang.Override public _FinalStage putAllRequestSchema(Map requestSchema) { - this.requestSchema.putAll(requestSchema); + if (requestSchema != null) { + this.requestSchema.putAll(requestSchema); + } return this; } diff --git a/src/main/java/com/merge/api/filestorage/types/ModelOperation.java b/src/main/java/com/merge/api/filestorage/types/ModelOperation.java index 4576c5235..5168287d9 100644 --- a/src/main/java/com/merge/api/filestorage/types/ModelOperation.java +++ b/src/main/java/com/merge/api/filestorage/types/ModelOperation.java @@ -159,7 +159,9 @@ public _FinalStage modelName(@NotNull String modelName) { @java.lang.Override public _FinalStage addAllSupportedFields(List supportedFields) { - this.supportedFields.addAll(supportedFields); + if (supportedFields != null) { + this.supportedFields.addAll(supportedFields); + } return this; } @@ -179,7 +181,9 @@ public _FinalStage supportedFields(List supportedFields) { @java.lang.Override public _FinalStage addAllRequiredPostParameters(List requiredPostParameters) { - this.requiredPostParameters.addAll(requiredPostParameters); + if (requiredPostParameters != null) { + this.requiredPostParameters.addAll(requiredPostParameters); + } return this; } @@ -199,7 +203,9 @@ public _FinalStage requiredPostParameters(List requiredPostParameters) { @java.lang.Override public _FinalStage addAllAvailableOperations(List availableOperations) { - this.availableOperations.addAll(availableOperations); + if (availableOperations != null) { + this.availableOperations.addAll(availableOperations); + } return this; } diff --git a/src/main/java/com/merge/api/filestorage/types/MultipartFormFieldRequest.java b/src/main/java/com/merge/api/filestorage/types/MultipartFormFieldRequest.java index d3b685c14..7807ea96c 100644 --- a/src/main/java/com/merge/api/filestorage/types/MultipartFormFieldRequest.java +++ b/src/main/java/com/merge/api/filestorage/types/MultipartFormFieldRequest.java @@ -128,7 +128,7 @@ public static NameStage builder() { public interface NameStage { /** - * The name of the form field + *

                      The name of the form field

                      */ DataStage name(@NotNull String name); @@ -137,7 +137,7 @@ public interface NameStage { public interface DataStage { /** - * The data for the form field. + *

                      The data for the form field.

                      */ _FinalStage data(@NotNull String data); } @@ -200,7 +200,8 @@ public Builder from(MultipartFormFieldRequest other) { } /** - * The name of the form field

                      The name of the form field

                      + *

                      The name of the form field

                      + *

                      The name of the form field

                      * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -211,7 +212,8 @@ public DataStage name(@NotNull String name) { } /** - * The data for the form field.

                      The data for the form field.

                      + *

                      The data for the form field.

                      + *

                      The data for the form field.

                      * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/filestorage/types/MultipartFormFieldRequestEncoding.java b/src/main/java/com/merge/api/filestorage/types/MultipartFormFieldRequestEncoding.java index dfe57a152..42fa8c9ce 100644 --- a/src/main/java/com/merge/api/filestorage/types/MultipartFormFieldRequestEncoding.java +++ b/src/main/java/com/merge/api/filestorage/types/MultipartFormFieldRequestEncoding.java @@ -84,11 +84,11 @@ public MultipartFormFieldRequestEncoding deserialize(JsonParser p, Deserializati Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, EncodingEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/PermissionGroup.java b/src/main/java/com/merge/api/filestorage/types/PermissionGroup.java index f49ca9073..6dd26e8ad 100644 --- a/src/main/java/com/merge/api/filestorage/types/PermissionGroup.java +++ b/src/main/java/com/merge/api/filestorage/types/PermissionGroup.java @@ -83,11 +83,11 @@ public PermissionGroup deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Group.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/PermissionRequestGroup.java b/src/main/java/com/merge/api/filestorage/types/PermissionRequestGroup.java index b0fd481a3..8f7e3c2db 100644 --- a/src/main/java/com/merge/api/filestorage/types/PermissionRequestGroup.java +++ b/src/main/java/com/merge/api/filestorage/types/PermissionRequestGroup.java @@ -83,11 +83,11 @@ public PermissionRequestGroup deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Group.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/PermissionRequestRolesItem.java b/src/main/java/com/merge/api/filestorage/types/PermissionRequestRolesItem.java index cf2f1f42a..7436cdae8 100644 --- a/src/main/java/com/merge/api/filestorage/types/PermissionRequestRolesItem.java +++ b/src/main/java/com/merge/api/filestorage/types/PermissionRequestRolesItem.java @@ -83,11 +83,11 @@ public PermissionRequestRolesItem deserialize(JsonParser p, DeserializationConte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RolesEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/PermissionRequestType.java b/src/main/java/com/merge/api/filestorage/types/PermissionRequestType.java index eae03fb60..1640f1508 100644 --- a/src/main/java/com/merge/api/filestorage/types/PermissionRequestType.java +++ b/src/main/java/com/merge/api/filestorage/types/PermissionRequestType.java @@ -83,11 +83,11 @@ public PermissionRequestType deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/PermissionRequestUser.java b/src/main/java/com/merge/api/filestorage/types/PermissionRequestUser.java index 048ea1c46..1f6857e42 100644 --- a/src/main/java/com/merge/api/filestorage/types/PermissionRequestUser.java +++ b/src/main/java/com/merge/api/filestorage/types/PermissionRequestUser.java @@ -83,11 +83,11 @@ public PermissionRequestUser deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, User.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/PermissionRolesItem.java b/src/main/java/com/merge/api/filestorage/types/PermissionRolesItem.java index aae57775e..a1a20f564 100644 --- a/src/main/java/com/merge/api/filestorage/types/PermissionRolesItem.java +++ b/src/main/java/com/merge/api/filestorage/types/PermissionRolesItem.java @@ -83,11 +83,11 @@ public PermissionRolesItem deserialize(JsonParser p, DeserializationContext cont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RolesEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/PermissionType.java b/src/main/java/com/merge/api/filestorage/types/PermissionType.java index d30cd1da5..9b797d96f 100644 --- a/src/main/java/com/merge/api/filestorage/types/PermissionType.java +++ b/src/main/java/com/merge/api/filestorage/types/PermissionType.java @@ -83,11 +83,11 @@ public PermissionType deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/PermissionUser.java b/src/main/java/com/merge/api/filestorage/types/PermissionUser.java index 3253b3642..21db64db1 100644 --- a/src/main/java/com/merge/api/filestorage/types/PermissionUser.java +++ b/src/main/java/com/merge/api/filestorage/types/PermissionUser.java @@ -83,11 +83,11 @@ public PermissionUser deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, User.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/RemoteData.java b/src/main/java/com/merge/api/filestorage/types/RemoteData.java index b390ac160..e96a73416 100644 --- a/src/main/java/com/merge/api/filestorage/types/RemoteData.java +++ b/src/main/java/com/merge/api/filestorage/types/RemoteData.java @@ -78,7 +78,7 @@ public static PathStage builder() { public interface PathStage { /** - * The third-party API path that is being called. + *

                      The third-party API path that is being called.

                      */ _FinalStage path(@NotNull String path); @@ -112,7 +112,8 @@ public Builder from(RemoteData other) { } /** - * The third-party API path that is being called.

                      The third-party API path that is being called.

                      + *

                      The third-party API path that is being called.

                      + *

                      The third-party API path that is being called.

                      * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/filestorage/types/RemoteEndpointInfo.java b/src/main/java/com/merge/api/filestorage/types/RemoteEndpointInfo.java index 3a362acfd..07ac8f64b 100644 --- a/src/main/java/com/merge/api/filestorage/types/RemoteEndpointInfo.java +++ b/src/main/java/com/merge/api/filestorage/types/RemoteEndpointInfo.java @@ -145,7 +145,9 @@ public _FinalStage urlPath(@NotNull String urlPath) { @java.lang.Override public _FinalStage addAllFieldTraversalPath(List fieldTraversalPath) { - this.fieldTraversalPath.addAll(fieldTraversalPath); + if (fieldTraversalPath != null) { + this.fieldTraversalPath.addAll(fieldTraversalPath); + } return this; } diff --git a/src/main/java/com/merge/api/filestorage/types/RemoteFieldApi.java b/src/main/java/com/merge/api/filestorage/types/RemoteFieldApi.java index 935ac11dd..35f157f5c 100644 --- a/src/main/java/com/merge/api/filestorage/types/RemoteFieldApi.java +++ b/src/main/java/com/merge/api/filestorage/types/RemoteFieldApi.java @@ -248,7 +248,9 @@ public _FinalStage schema(String key, JsonNode value) { @java.lang.Override public _FinalStage putAllSchema(Map schema) { - this.schema.putAll(schema); + if (schema != null) { + this.schema.putAll(schema); + } return this; } diff --git a/src/main/java/com/merge/api/filestorage/types/RemoteKeyForRegenerationRequest.java b/src/main/java/com/merge/api/filestorage/types/RemoteKeyForRegenerationRequest.java index 786df6dcf..08b16b8b2 100644 --- a/src/main/java/com/merge/api/filestorage/types/RemoteKeyForRegenerationRequest.java +++ b/src/main/java/com/merge/api/filestorage/types/RemoteKeyForRegenerationRequest.java @@ -67,7 +67,7 @@ public static NameStage builder() { public interface NameStage { /** - * The name of the remote key + *

                      The name of the remote key

                      */ _FinalStage name(@NotNull String name); @@ -94,7 +94,8 @@ public Builder from(RemoteKeyForRegenerationRequest other) { } /** - * The name of the remote key

                      The name of the remote key

                      + *

                      The name of the remote key

                      + *

                      The name of the remote key

                      * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/filestorage/types/RemoteResponseResponseType.java b/src/main/java/com/merge/api/filestorage/types/RemoteResponseResponseType.java index 52e10fd5b..ecccebb86 100644 --- a/src/main/java/com/merge/api/filestorage/types/RemoteResponseResponseType.java +++ b/src/main/java/com/merge/api/filestorage/types/RemoteResponseResponseType.java @@ -83,11 +83,11 @@ public RemoteResponseResponseType deserialize(JsonParser p, DeserializationConte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, ResponseTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/SyncStatusLastSyncResult.java b/src/main/java/com/merge/api/filestorage/types/SyncStatusLastSyncResult.java index f06b75bb8..aed847f8d 100644 --- a/src/main/java/com/merge/api/filestorage/types/SyncStatusLastSyncResult.java +++ b/src/main/java/com/merge/api/filestorage/types/SyncStatusLastSyncResult.java @@ -83,11 +83,11 @@ public SyncStatusLastSyncResult deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, LastSyncResultEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/filestorage/types/SyncStatusStatus.java b/src/main/java/com/merge/api/filestorage/types/SyncStatusStatus.java index 344fb7fe1..7962ed126 100644 --- a/src/main/java/com/merge/api/filestorage/types/SyncStatusStatus.java +++ b/src/main/java/com/merge/api/filestorage/types/SyncStatusStatus.java @@ -83,11 +83,11 @@ public SyncStatusStatus deserialize(JsonParser p, DeserializationContext context Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, StatusFd5Enum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/AsyncRawAccountDetailsClient.java b/src/main/java/com/merge/api/hris/AsyncRawAccountDetailsClient.java index fbed9550f..275807e28 100644 --- a/src/main/java/com/merge/api/hris/AsyncRawAccountDetailsClient.java +++ b/src/main/java/com/merge/api/hris/AsyncRawAccountDetailsClient.java @@ -48,7 +48,6 @@ public CompletableFuture> retrieve(RequestO .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/AsyncRawAccountTokenClient.java b/src/main/java/com/merge/api/hris/AsyncRawAccountTokenClient.java index 21ec55f91..ddf3e2769 100644 --- a/src/main/java/com/merge/api/hris/AsyncRawAccountTokenClient.java +++ b/src/main/java/com/merge/api/hris/AsyncRawAccountTokenClient.java @@ -50,7 +50,6 @@ public CompletableFuture> retrieve( .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/AsyncRawAsyncPassthroughClient.java b/src/main/java/com/merge/api/hris/AsyncRawAsyncPassthroughClient.java index f1eee8062..8ad1c8352 100644 --- a/src/main/java/com/merge/api/hris/AsyncRawAsyncPassthroughClient.java +++ b/src/main/java/com/merge/api/hris/AsyncRawAsyncPassthroughClient.java @@ -122,7 +122,6 @@ public CompletableFuture> .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/AsyncRawAuditTrailClient.java b/src/main/java/com/merge/api/hris/AsyncRawAuditTrailClient.java index ac5dd3130..16d171e9d 100644 --- a/src/main/java/com/merge/api/hris/AsyncRawAuditTrailClient.java +++ b/src/main/java/com/merge/api/hris/AsyncRawAuditTrailClient.java @@ -74,7 +74,7 @@ public CompletableFuture> } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getStartDate().isPresent()) { QueryStringMapper.addQueryParameter( @@ -88,7 +88,6 @@ public CompletableFuture> .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/AsyncRawAvailableActionsClient.java b/src/main/java/com/merge/api/hris/AsyncRawAvailableActionsClient.java index 2fa1ead72..53f1c86bf 100644 --- a/src/main/java/com/merge/api/hris/AsyncRawAvailableActionsClient.java +++ b/src/main/java/com/merge/api/hris/AsyncRawAvailableActionsClient.java @@ -48,7 +48,6 @@ public CompletableFuture> retrieve(Reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/AsyncRawBankInfoClient.java b/src/main/java/com/merge/api/hris/AsyncRawBankInfoClient.java index 96a066d70..831eea568 100644 --- a/src/main/java/com/merge/api/hris/AsyncRawBankInfoClient.java +++ b/src/main/java/com/merge/api/hris/AsyncRawBankInfoClient.java @@ -62,7 +62,7 @@ public CompletableFuture>> lis .addPathSegments("hris/v1/bank-info"); if (request.getAccountType().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "account_type", request.getAccountType().get().toString(), false); + httpUrl, "account_type", request.getAccountType().get(), false); } if (request.getBankName().isPresent()) { QueryStringMapper.addQueryParameter( @@ -70,11 +70,11 @@ public CompletableFuture>> lis } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -88,41 +88,35 @@ public CompletableFuture>> lis QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getOrderBy().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "order_by", request.getOrderBy().get().toString(), false); + httpUrl, "order_by", request.getOrderBy().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -138,13 +132,12 @@ public CompletableFuture>> lis } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -225,15 +218,12 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -245,13 +235,12 @@ public CompletableFuture> retrieve( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/AsyncRawBenefitsClient.java b/src/main/java/com/merge/api/hris/AsyncRawBenefitsClient.java index dceacb934..c532ec94c 100644 --- a/src/main/java/com/merge/api/hris/AsyncRawBenefitsClient.java +++ b/src/main/java/com/merge/api/hris/AsyncRawBenefitsClient.java @@ -62,11 +62,11 @@ public CompletableFuture>> list .addPathSegments("hris/v1/benefits"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -80,37 +80,31 @@ public CompletableFuture>> list QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -118,13 +112,12 @@ public CompletableFuture>> list } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -205,25 +198,21 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/AsyncRawCompaniesClient.java b/src/main/java/com/merge/api/hris/AsyncRawCompaniesClient.java index e5b5d1422..a22c37f03 100644 --- a/src/main/java/com/merge/api/hris/AsyncRawCompaniesClient.java +++ b/src/main/java/com/merge/api/hris/AsyncRawCompaniesClient.java @@ -62,11 +62,11 @@ public CompletableFuture>> list .addPathSegments("hris/v1/companies"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -76,37 +76,31 @@ public CompletableFuture>> list QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -116,7 +110,6 @@ public CompletableFuture>> list .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -197,21 +190,17 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/AsyncRawDependentsClient.java b/src/main/java/com/merge/api/hris/AsyncRawDependentsClient.java index 885a1e6bd..d6f7223bc 100644 --- a/src/main/java/com/merge/api/hris/AsyncRawDependentsClient.java +++ b/src/main/java/com/merge/api/hris/AsyncRawDependentsClient.java @@ -62,11 +62,11 @@ public CompletableFuture>> li .addPathSegments("hris/v1/dependents"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -76,44 +76,38 @@ public CompletableFuture>> li QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeSensitiveFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_sensitive_fields", - request.getIncludeSensitiveFields().get().toString(), + request.getIncludeSensitiveFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -123,7 +117,6 @@ public CompletableFuture>> li .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -204,28 +197,24 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeSensitiveFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_sensitive_fields", - request.getIncludeSensitiveFields().get().toString(), + request.getIncludeSensitiveFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/AsyncRawEmployeePayrollRunsClient.java b/src/main/java/com/merge/api/hris/AsyncRawEmployeePayrollRunsClient.java index e47c1e88d..56975c987 100644 --- a/src/main/java/com/merge/api/hris/AsyncRawEmployeePayrollRunsClient.java +++ b/src/main/java/com/merge/api/hris/AsyncRawEmployeePayrollRunsClient.java @@ -63,11 +63,11 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/AsyncRawEmployeesClient.java b/src/main/java/com/merge/api/hris/AsyncRawEmployeesClient.java index 8ef84a2c9..35617e9bf 100644 --- a/src/main/java/com/merge/api/hris/AsyncRawEmployeesClient.java +++ b/src/main/java/com/merge/api/hris/AsyncRawEmployeesClient.java @@ -75,11 +75,11 @@ public CompletableFuture>> lis } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -91,10 +91,7 @@ public CompletableFuture>> lis } if (request.getEmploymentStatus().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "employment_status", - request.getEmploymentStatus().get().toString(), - false); + httpUrl, "employment_status", request.getEmploymentStatus().get(), false); } if (request.getEmploymentType().isPresent()) { QueryStringMapper.addQueryParameter( @@ -116,29 +113,26 @@ public CompletableFuture>> lis QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeSensitiveFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_sensitive_fields", - request.getIncludeSensitiveFields().get().toString(), + request.getIncludeSensitiveFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getJobTitle().isPresent()) { QueryStringMapper.addQueryParameter( @@ -154,18 +148,15 @@ public CompletableFuture>> lis } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getPayGroupId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -177,7 +168,7 @@ public CompletableFuture>> lis } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -185,18 +176,15 @@ public CompletableFuture>> lis } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getStartedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "started_after", request.getStartedAfter().get().toString(), false); + httpUrl, "started_after", request.getStartedAfter().get(), false); } if (request.getStartedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "started_before", request.getStartedBefore().get().toString(), false); + httpUrl, "started_before", request.getStartedBefore().get(), false); } if (request.getTeamId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -204,17 +192,11 @@ public CompletableFuture>> lis } if (request.getTerminatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "terminated_after", - request.getTerminatedAfter().get().toString(), - false); + httpUrl, "terminated_after", request.getTerminatedAfter().get(), false); } if (request.getTerminatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "terminated_before", - request.getTerminatedBefore().get().toString(), - false); + httpUrl, "terminated_before", request.getTerminatedBefore().get(), false); } if (request.getWorkEmail().isPresent()) { QueryStringMapper.addQueryParameter( @@ -226,13 +208,12 @@ public CompletableFuture>> lis } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -303,11 +284,11 @@ public CompletableFuture> create( .addPathSegments("hris/v1/employees"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -387,43 +368,36 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeSensitiveFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_sensitive_fields", - request.getIncludeSensitiveFields().get().toString(), + request.getIncludeSensitiveFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -543,7 +517,6 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/AsyncRawEmployerBenefitsClient.java b/src/main/java/com/merge/api/hris/AsyncRawEmployerBenefitsClient.java index 246c26ebf..7d951e2ee 100644 --- a/src/main/java/com/merge/api/hris/AsyncRawEmployerBenefitsClient.java +++ b/src/main/java/com/merge/api/hris/AsyncRawEmployerBenefitsClient.java @@ -63,11 +63,11 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/AsyncRawEmploymentsClient.java b/src/main/java/com/merge/api/hris/AsyncRawEmploymentsClient.java index 3da704ddc..83fadeb1d 100644 --- a/src/main/java/com/merge/api/hris/AsyncRawEmploymentsClient.java +++ b/src/main/java/com/merge/api/hris/AsyncRawEmploymentsClient.java @@ -63,11 +63,11 @@ public CompletableFuture>> l .addPathSegments("hris/v1/employments"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -81,45 +81,39 @@ public CompletableFuture>> l QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getOrderBy().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "order_by", request.getOrderBy().get().toString(), false); + httpUrl, "order_by", request.getOrderBy().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -127,20 +121,16 @@ public CompletableFuture>> l } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -221,36 +211,29 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/AsyncRawFieldMappingClient.java b/src/main/java/com/merge/api/hris/AsyncRawFieldMappingClient.java index ef00de387..5d6f6c9ea 100644 --- a/src/main/java/com/merge/api/hris/AsyncRawFieldMappingClient.java +++ b/src/main/java/com/merge/api/hris/AsyncRawFieldMappingClient.java @@ -69,14 +69,13 @@ public CompletableFuture> QueryStringMapper.addQueryParameter( httpUrl, "exclude_remote_field_metadata", - request.getExcludeRemoteFieldMetadata().get().toString(), + request.getExcludeRemoteFieldMetadata().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -135,7 +134,7 @@ public CompletableFuture> fie QueryStringMapper.addQueryParameter( httpUrl, "exclude_remote_field_metadata", - request.getExcludeRemoteFieldMetadata().get().toString(), + request.getExcludeRemoteFieldMetadata().get(), false); } Map properties = new HashMap<>(); @@ -217,7 +216,6 @@ public CompletableFuture> fie .url(httpUrl) .method("DELETE", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -371,7 +369,6 @@ public CompletableFuture> remoteFie .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -430,7 +427,6 @@ public CompletableFuture> t .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/AsyncRawForceResyncClient.java b/src/main/java/com/merge/api/hris/AsyncRawForceResyncClient.java index 2c18cf670..bd854af36 100644 --- a/src/main/java/com/merge/api/hris/AsyncRawForceResyncClient.java +++ b/src/main/java/com/merge/api/hris/AsyncRawForceResyncClient.java @@ -52,7 +52,6 @@ public CompletableFuture>> syncStatusResyn .url(httpUrl) .method("POST", RequestBody.create("", null)) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/AsyncRawGroupsClient.java b/src/main/java/com/merge/api/hris/AsyncRawGroupsClient.java index 77b6c1b2f..0ecae3cca 100644 --- a/src/main/java/com/merge/api/hris/AsyncRawGroupsClient.java +++ b/src/main/java/com/merge/api/hris/AsyncRawGroupsClient.java @@ -62,11 +62,11 @@ public CompletableFuture>> list( .addPathSegments("hris/v1/groups"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -76,22 +76,19 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsCommonlyUsedAsTeam().isPresent()) { QueryStringMapper.addQueryParameter( @@ -102,14 +99,11 @@ public CompletableFuture>> list( } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getNames().isPresent()) { QueryStringMapper.addQueryParameter( @@ -117,7 +111,7 @@ public CompletableFuture>> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -139,7 +133,6 @@ public CompletableFuture>> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -220,15 +213,12 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -242,7 +232,6 @@ public CompletableFuture> retrieve( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/AsyncRawIssuesClient.java b/src/main/java/com/merge/api/hris/AsyncRawIssuesClient.java index bc22ad1a4..f9bab6fe8 100644 --- a/src/main/java/com/merge/api/hris/AsyncRawIssuesClient.java +++ b/src/main/java/com/merge/api/hris/AsyncRawIssuesClient.java @@ -82,14 +82,14 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "first_incident_time_after", - request.getFirstIncidentTimeAfter().get().toString(), + request.getFirstIncidentTimeAfter().get(), false); } if (request.getFirstIncidentTimeBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "first_incident_time_before", - request.getFirstIncidentTimeBefore().get().toString(), + request.getFirstIncidentTimeBefore().get(), false); } if (request.getIncludeMuted().isPresent()) { @@ -104,14 +104,14 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "last_incident_time_after", - request.getLastIncidentTimeAfter().get().toString(), + request.getLastIncidentTimeAfter().get(), false); } if (request.getLastIncidentTimeBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "last_incident_time_before", - request.getLastIncidentTimeBefore().get().toString(), + request.getLastIncidentTimeBefore().get(), false); } if (request.getLinkedAccountId().isPresent()) { @@ -120,7 +120,7 @@ public CompletableFuture>> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getStartDate().isPresent()) { QueryStringMapper.addQueryParameter( @@ -128,13 +128,12 @@ public CompletableFuture>> list( } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "status", request.getStatus().get().toString(), false); + httpUrl, "status", request.getStatus().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -208,7 +207,6 @@ public CompletableFuture> retrieve(String id, Reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/AsyncRawLinkedAccountsClient.java b/src/main/java/com/merge/api/hris/AsyncRawLinkedAccountsClient.java index ab34ff213..bf43871c6 100644 --- a/src/main/java/com/merge/api/hris/AsyncRawLinkedAccountsClient.java +++ b/src/main/java/com/merge/api/hris/AsyncRawLinkedAccountsClient.java @@ -62,7 +62,7 @@ public CompletableFuture>> lis .addPathSegments("hris/v1/locations"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -76,45 +76,39 @@ public CompletableFuture>> lis QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getLocationType().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "location_type", request.getLocationType().get().toString(), false); + httpUrl, "location_type", request.getLocationType().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -122,16 +116,12 @@ public CompletableFuture>> lis } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -212,32 +202,25 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/AsyncRawPayGroupsClient.java b/src/main/java/com/merge/api/hris/AsyncRawPayGroupsClient.java index 6305a886e..472c3b98e 100644 --- a/src/main/java/com/merge/api/hris/AsyncRawPayGroupsClient.java +++ b/src/main/java/com/merge/api/hris/AsyncRawPayGroupsClient.java @@ -62,11 +62,11 @@ public CompletableFuture>> lis .addPathSegments("hris/v1/pay-groups"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -76,37 +76,31 @@ public CompletableFuture>> lis QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -116,7 +110,6 @@ public CompletableFuture>> lis .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -197,21 +190,17 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/AsyncRawPayrollRunsClient.java b/src/main/java/com/merge/api/hris/AsyncRawPayrollRunsClient.java index b3544e8c0..3bb3608e8 100644 --- a/src/main/java/com/merge/api/hris/AsyncRawPayrollRunsClient.java +++ b/src/main/java/com/merge/api/hris/AsyncRawPayrollRunsClient.java @@ -63,11 +63,11 @@ public CompletableFuture>> l .addPathSegments("hris/v1/payroll-runs"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -75,51 +75,45 @@ public CompletableFuture>> l } if (request.getEndedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "ended_after", request.getEndedAfter().get().toString(), false); + httpUrl, "ended_after", request.getEndedAfter().get(), false); } if (request.getEndedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "ended_before", request.getEndedBefore().get().toString(), false); + httpUrl, "ended_before", request.getEndedBefore().get(), false); } if (request.getIncludeDeletedData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -127,28 +121,24 @@ public CompletableFuture>> l } if (request.getRunType().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_type", request.getRunType().get().toString(), false); + httpUrl, "run_type", request.getRunType().get(), false); } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getStartedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "started_after", request.getStartedAfter().get().toString(), false); + httpUrl, "started_after", request.getStartedAfter().get(), false); } if (request.getStartedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "started_before", request.getStartedBefore().get().toString(), false); + httpUrl, "started_before", request.getStartedBefore().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -229,32 +219,25 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/AsyncRawScopesClient.java b/src/main/java/com/merge/api/hris/AsyncRawScopesClient.java index f8ea6f711..cd6fe31e5 100644 --- a/src/main/java/com/merge/api/hris/AsyncRawScopesClient.java +++ b/src/main/java/com/merge/api/hris/AsyncRawScopesClient.java @@ -53,7 +53,6 @@ public CompletableFuture> defaultScope .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -111,7 +110,6 @@ public CompletableFuture> linkedAccoun .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/AsyncRawSyncStatusClient.java b/src/main/java/com/merge/api/hris/AsyncRawSyncStatusClient.java index 06545e1ac..831788905 100644 --- a/src/main/java/com/merge/api/hris/AsyncRawSyncStatusClient.java +++ b/src/main/java/com/merge/api/hris/AsyncRawSyncStatusClient.java @@ -65,13 +65,12 @@ public CompletableFuture>> l } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/AsyncRawTeamsClient.java b/src/main/java/com/merge/api/hris/AsyncRawTeamsClient.java index cf97daafa..e31bde60f 100644 --- a/src/main/java/com/merge/api/hris/AsyncRawTeamsClient.java +++ b/src/main/java/com/merge/api/hris/AsyncRawTeamsClient.java @@ -62,11 +62,11 @@ public CompletableFuture>> list( .addPathSegments("hris/v1/teams"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -76,37 +76,31 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getParentTeamId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -118,13 +112,12 @@ public CompletableFuture>> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -205,25 +198,21 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/AsyncRawTimeOffBalancesClient.java b/src/main/java/com/merge/api/hris/AsyncRawTimeOffBalancesClient.java index 8225fdc1d..f9b51e49b 100644 --- a/src/main/java/com/merge/api/hris/AsyncRawTimeOffBalancesClient.java +++ b/src/main/java/com/merge/api/hris/AsyncRawTimeOffBalancesClient.java @@ -63,11 +63,11 @@ public CompletableFuture .addPathSegments("hris/v1/time-off-balances"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -81,41 +81,35 @@ public CompletableFuture QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getPolicyType().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "policy_type", request.getPolicyType().get().toString(), false); + httpUrl, "policy_type", request.getPolicyType().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -131,13 +125,12 @@ public CompletableFuture } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -220,15 +213,12 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -240,13 +230,12 @@ public CompletableFuture> retrieve( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/AsyncRawTimeOffClient.java b/src/main/java/com/merge/api/hris/AsyncRawTimeOffClient.java index b9d606c62..0d682280a 100644 --- a/src/main/java/com/merge/api/hris/AsyncRawTimeOffClient.java +++ b/src/main/java/com/merge/api/hris/AsyncRawTimeOffClient.java @@ -73,11 +73,11 @@ public CompletableFuture>> list } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -89,51 +89,45 @@ public CompletableFuture>> list } if (request.getEndedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "ended_after", request.getEndedAfter().get().toString(), false); + httpUrl, "ended_after", request.getEndedAfter().get(), false); } if (request.getEndedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "ended_before", request.getEndedBefore().get().toString(), false); + httpUrl, "ended_before", request.getEndedBefore().get(), false); } if (request.getIncludeDeletedData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -141,36 +135,32 @@ public CompletableFuture>> list } if (request.getRequestType().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "request_type", request.getRequestType().get().toString(), false); + httpUrl, "request_type", request.getRequestType().get(), false); } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getStartedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "started_after", request.getStartedAfter().get().toString(), false); + httpUrl, "started_after", request.getStartedAfter().get(), false); } if (request.getStartedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "started_before", request.getStartedBefore().get().toString(), false); + httpUrl, "started_before", request.getStartedBefore().get(), false); } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "status", request.getStatus().get().toString(), false); + httpUrl, "status", request.getStatus().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -241,11 +231,11 @@ public CompletableFuture> create( .addPathSegments("hris/v1/time-off"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -325,36 +315,29 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -410,7 +393,6 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/AsyncRawTimesheetEntriesClient.java b/src/main/java/com/merge/api/hris/AsyncRawTimesheetEntriesClient.java index 169322dc0..a1f0dab39 100644 --- a/src/main/java/com/merge/api/hris/AsyncRawTimesheetEntriesClient.java +++ b/src/main/java/com/merge/api/hris/AsyncRawTimesheetEntriesClient.java @@ -70,11 +70,11 @@ public CompletableFuture .addPathSegments("hris/v1/timesheet-entries"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -86,51 +86,45 @@ public CompletableFuture } if (request.getEndedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "ended_after", request.getEndedAfter().get().toString(), false); + httpUrl, "ended_after", request.getEndedAfter().get(), false); } if (request.getEndedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "ended_before", request.getEndedBefore().get().toString(), false); + httpUrl, "ended_before", request.getEndedBefore().get(), false); } if (request.getIncludeDeletedData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getOrderBy().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "order_by", request.getOrderBy().get().toString(), false); + httpUrl, "order_by", request.getOrderBy().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -138,21 +132,20 @@ public CompletableFuture } if (request.getStartedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "started_after", request.getStartedAfter().get().toString(), false); + httpUrl, "started_after", request.getStartedAfter().get(), false); } if (request.getStartedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "started_before", request.getStartedBefore().get().toString(), false); + httpUrl, "started_before", request.getStartedBefore().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -225,11 +218,11 @@ public CompletableFuture> create( .addPathSegments("hris/v1/timesheet-entries"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -311,25 +304,21 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -386,7 +375,6 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/AsyncRawWebhookReceiversClient.java b/src/main/java/com/merge/api/hris/AsyncRawWebhookReceiversClient.java index 66d9370d6..27c07d12d 100644 --- a/src/main/java/com/merge/api/hris/AsyncRawWebhookReceiversClient.java +++ b/src/main/java/com/merge/api/hris/AsyncRawWebhookReceiversClient.java @@ -54,7 +54,6 @@ public CompletableFuture>> list(Reque .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/RawAccountDetailsClient.java b/src/main/java/com/merge/api/hris/RawAccountDetailsClient.java index 8fd8945c8..9ddafde1d 100644 --- a/src/main/java/com/merge/api/hris/RawAccountDetailsClient.java +++ b/src/main/java/com/merge/api/hris/RawAccountDetailsClient.java @@ -44,7 +44,6 @@ public MergeApiHttpResponse retrieve(RequestOptions requestOptio .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/RawAccountTokenClient.java b/src/main/java/com/merge/api/hris/RawAccountTokenClient.java index 203e753fd..0e16fac96 100644 --- a/src/main/java/com/merge/api/hris/RawAccountTokenClient.java +++ b/src/main/java/com/merge/api/hris/RawAccountTokenClient.java @@ -45,7 +45,6 @@ public MergeApiHttpResponse retrieve(String publicToken, RequestOp .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/RawAsyncPassthroughClient.java b/src/main/java/com/merge/api/hris/RawAsyncPassthroughClient.java index 34456c593..3c05abaec 100644 --- a/src/main/java/com/merge/api/hris/RawAsyncPassthroughClient.java +++ b/src/main/java/com/merge/api/hris/RawAsyncPassthroughClient.java @@ -103,7 +103,6 @@ public MergeApiHttpResponse retrieve( .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/RawAuditTrailClient.java b/src/main/java/com/merge/api/hris/RawAuditTrailClient.java index c6ff09299..9a608b38c 100644 --- a/src/main/java/com/merge/api/hris/RawAuditTrailClient.java +++ b/src/main/java/com/merge/api/hris/RawAuditTrailClient.java @@ -68,7 +68,7 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getStartDate().isPresent()) { QueryStringMapper.addQueryParameter( @@ -82,7 +82,6 @@ public MergeApiHttpResponse> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/RawAvailableActionsClient.java b/src/main/java/com/merge/api/hris/RawAvailableActionsClient.java index 6953fe137..43bd22aed 100644 --- a/src/main/java/com/merge/api/hris/RawAvailableActionsClient.java +++ b/src/main/java/com/merge/api/hris/RawAvailableActionsClient.java @@ -44,7 +44,6 @@ public MergeApiHttpResponse retrieve(RequestOptions requestOpt .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/RawBankInfoClient.java b/src/main/java/com/merge/api/hris/RawBankInfoClient.java index 709211a07..7483ca370 100644 --- a/src/main/java/com/merge/api/hris/RawBankInfoClient.java +++ b/src/main/java/com/merge/api/hris/RawBankInfoClient.java @@ -57,7 +57,7 @@ public MergeApiHttpResponse> list( .addPathSegments("hris/v1/bank-info"); if (request.getAccountType().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "account_type", request.getAccountType().get().toString(), false); + httpUrl, "account_type", request.getAccountType().get(), false); } if (request.getBankName().isPresent()) { QueryStringMapper.addQueryParameter( @@ -65,11 +65,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -83,41 +83,35 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getOrderBy().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "order_by", request.getOrderBy().get().toString(), false); + httpUrl, "order_by", request.getOrderBy().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -133,13 +127,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -201,15 +194,12 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -221,13 +211,12 @@ public MergeApiHttpResponse retrieve( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/RawBenefitsClient.java b/src/main/java/com/merge/api/hris/RawBenefitsClient.java index 4f9b2199e..e38206a63 100644 --- a/src/main/java/com/merge/api/hris/RawBenefitsClient.java +++ b/src/main/java/com/merge/api/hris/RawBenefitsClient.java @@ -57,11 +57,11 @@ public MergeApiHttpResponse> list( .addPathSegments("hris/v1/benefits"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -75,37 +75,31 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -113,13 +107,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -181,25 +174,21 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/RawCompaniesClient.java b/src/main/java/com/merge/api/hris/RawCompaniesClient.java index 2f1ed0542..0592e8591 100644 --- a/src/main/java/com/merge/api/hris/RawCompaniesClient.java +++ b/src/main/java/com/merge/api/hris/RawCompaniesClient.java @@ -57,11 +57,11 @@ public MergeApiHttpResponse> list( .addPathSegments("hris/v1/companies"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -71,37 +71,31 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -111,7 +105,6 @@ public MergeApiHttpResponse> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -173,21 +166,17 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/RawDependentsClient.java b/src/main/java/com/merge/api/hris/RawDependentsClient.java index 8614be3b0..7c802495c 100644 --- a/src/main/java/com/merge/api/hris/RawDependentsClient.java +++ b/src/main/java/com/merge/api/hris/RawDependentsClient.java @@ -57,11 +57,11 @@ public MergeApiHttpResponse> list( .addPathSegments("hris/v1/dependents"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -71,44 +71,38 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeSensitiveFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_sensitive_fields", - request.getIncludeSensitiveFields().get().toString(), + request.getIncludeSensitiveFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -118,7 +112,6 @@ public MergeApiHttpResponse> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -180,28 +173,24 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeSensitiveFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_sensitive_fields", - request.getIncludeSensitiveFields().get().toString(), + request.getIncludeSensitiveFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/RawEmployeePayrollRunsClient.java b/src/main/java/com/merge/api/hris/RawEmployeePayrollRunsClient.java index 0930b35ce..152a9c634 100644 --- a/src/main/java/com/merge/api/hris/RawEmployeePayrollRunsClient.java +++ b/src/main/java/com/merge/api/hris/RawEmployeePayrollRunsClient.java @@ -57,11 +57,11 @@ public MergeApiHttpResponse> list( .addPathSegments("hris/v1/employee-payroll-runs"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -73,47 +73,41 @@ public MergeApiHttpResponse> list( } if (request.getEndedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "ended_after", request.getEndedAfter().get().toString(), false); + httpUrl, "ended_after", request.getEndedAfter().get(), false); } if (request.getEndedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "ended_before", request.getEndedBefore().get().toString(), false); + httpUrl, "ended_before", request.getEndedBefore().get(), false); } if (request.getIncludeDeletedData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getPayrollRunId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -125,21 +119,20 @@ public MergeApiHttpResponse> list( } if (request.getStartedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "started_after", request.getStartedAfter().get().toString(), false); + httpUrl, "started_after", request.getStartedAfter().get(), false); } if (request.getStartedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "started_before", request.getStartedBefore().get().toString(), false); + httpUrl, "started_before", request.getStartedBefore().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -201,25 +194,21 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/RawEmployeesClient.java b/src/main/java/com/merge/api/hris/RawEmployeesClient.java index 5e0cb4466..c29ff08b6 100644 --- a/src/main/java/com/merge/api/hris/RawEmployeesClient.java +++ b/src/main/java/com/merge/api/hris/RawEmployeesClient.java @@ -70,11 +70,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -86,10 +86,7 @@ public MergeApiHttpResponse> list( } if (request.getEmploymentStatus().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "employment_status", - request.getEmploymentStatus().get().toString(), - false); + httpUrl, "employment_status", request.getEmploymentStatus().get(), false); } if (request.getEmploymentType().isPresent()) { QueryStringMapper.addQueryParameter( @@ -111,29 +108,26 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeSensitiveFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_sensitive_fields", - request.getIncludeSensitiveFields().get().toString(), + request.getIncludeSensitiveFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getJobTitle().isPresent()) { QueryStringMapper.addQueryParameter( @@ -149,18 +143,15 @@ public MergeApiHttpResponse> list( } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getPayGroupId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -172,7 +163,7 @@ public MergeApiHttpResponse> list( } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -180,18 +171,15 @@ public MergeApiHttpResponse> list( } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getStartedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "started_after", request.getStartedAfter().get().toString(), false); + httpUrl, "started_after", request.getStartedAfter().get(), false); } if (request.getStartedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "started_before", request.getStartedBefore().get().toString(), false); + httpUrl, "started_before", request.getStartedBefore().get(), false); } if (request.getTeamId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -199,17 +187,11 @@ public MergeApiHttpResponse> list( } if (request.getTerminatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "terminated_after", - request.getTerminatedAfter().get().toString(), - false); + httpUrl, "terminated_after", request.getTerminatedAfter().get(), false); } if (request.getTerminatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "terminated_before", - request.getTerminatedBefore().get().toString(), - false); + httpUrl, "terminated_before", request.getTerminatedBefore().get(), false); } if (request.getWorkEmail().isPresent()) { QueryStringMapper.addQueryParameter( @@ -221,13 +203,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -279,11 +260,11 @@ public MergeApiHttpResponse create( .addPathSegments("hris/v1/employees"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -349,43 +330,36 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeSensitiveFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_sensitive_fields", - request.getIncludeSensitiveFields().get().toString(), + request.getIncludeSensitiveFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -478,7 +452,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/RawEmployerBenefitsClient.java b/src/main/java/com/merge/api/hris/RawEmployerBenefitsClient.java index 48a70c32b..e01e2d550 100644 --- a/src/main/java/com/merge/api/hris/RawEmployerBenefitsClient.java +++ b/src/main/java/com/merge/api/hris/RawEmployerBenefitsClient.java @@ -57,11 +57,11 @@ public MergeApiHttpResponse> list( .addPathSegments("hris/v1/employer-benefits"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -71,37 +71,31 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -111,7 +105,6 @@ public MergeApiHttpResponse> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -173,21 +166,17 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/RawEmploymentsClient.java b/src/main/java/com/merge/api/hris/RawEmploymentsClient.java index e617aec09..7a2530b14 100644 --- a/src/main/java/com/merge/api/hris/RawEmploymentsClient.java +++ b/src/main/java/com/merge/api/hris/RawEmploymentsClient.java @@ -57,11 +57,11 @@ public MergeApiHttpResponse> list( .addPathSegments("hris/v1/employments"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -75,45 +75,39 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getOrderBy().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "order_by", request.getOrderBy().get().toString(), false); + httpUrl, "order_by", request.getOrderBy().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -121,20 +115,16 @@ public MergeApiHttpResponse> list( } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -196,36 +186,29 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/RawFieldMappingClient.java b/src/main/java/com/merge/api/hris/RawFieldMappingClient.java index 54347b371..a018105b7 100644 --- a/src/main/java/com/merge/api/hris/RawFieldMappingClient.java +++ b/src/main/java/com/merge/api/hris/RawFieldMappingClient.java @@ -65,14 +65,13 @@ public MergeApiHttpResponse fieldMappingsRetrie QueryStringMapper.addQueryParameter( httpUrl, "exclude_remote_field_metadata", - request.getExcludeRemoteFieldMetadata().get().toString(), + request.getExcludeRemoteFieldMetadata().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -117,7 +116,7 @@ public MergeApiHttpResponse fieldMappingsCreate( QueryStringMapper.addQueryParameter( httpUrl, "exclude_remote_field_metadata", - request.getExcludeRemoteFieldMetadata().get().toString(), + request.getExcludeRemoteFieldMetadata().get(), false); } Map properties = new HashMap<>(); @@ -184,7 +183,6 @@ public MergeApiHttpResponse fieldMappingsDestroy( .url(httpUrl) .method("DELETE", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -308,7 +306,6 @@ public MergeApiHttpResponse remoteFieldsRetrieve( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -352,7 +349,6 @@ public MergeApiHttpResponse targetFieldsRetrieve .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/RawForceResyncClient.java b/src/main/java/com/merge/api/hris/RawForceResyncClient.java index 3d3f2d5b3..9ab174d8e 100644 --- a/src/main/java/com/merge/api/hris/RawForceResyncClient.java +++ b/src/main/java/com/merge/api/hris/RawForceResyncClient.java @@ -47,7 +47,6 @@ public MergeApiHttpResponse> syncStatusResyncCreate(RequestOpti .url(httpUrl) .method("POST", RequestBody.create("", null)) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/RawGroupsClient.java b/src/main/java/com/merge/api/hris/RawGroupsClient.java index 3d9bfdbec..367a92a3d 100644 --- a/src/main/java/com/merge/api/hris/RawGroupsClient.java +++ b/src/main/java/com/merge/api/hris/RawGroupsClient.java @@ -57,11 +57,11 @@ public MergeApiHttpResponse> list( .addPathSegments("hris/v1/groups"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -71,22 +71,19 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsCommonlyUsedAsTeam().isPresent()) { QueryStringMapper.addQueryParameter( @@ -97,14 +94,11 @@ public MergeApiHttpResponse> list( } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getNames().isPresent()) { QueryStringMapper.addQueryParameter( @@ -112,7 +106,7 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -134,7 +128,6 @@ public MergeApiHttpResponse> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -196,15 +189,12 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -218,7 +208,6 @@ public MergeApiHttpResponse retrieve( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/RawIssuesClient.java b/src/main/java/com/merge/api/hris/RawIssuesClient.java index c0e8a9fa8..22e8ae3cb 100644 --- a/src/main/java/com/merge/api/hris/RawIssuesClient.java +++ b/src/main/java/com/merge/api/hris/RawIssuesClient.java @@ -77,14 +77,14 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "first_incident_time_after", - request.getFirstIncidentTimeAfter().get().toString(), + request.getFirstIncidentTimeAfter().get(), false); } if (request.getFirstIncidentTimeBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "first_incident_time_before", - request.getFirstIncidentTimeBefore().get().toString(), + request.getFirstIncidentTimeBefore().get(), false); } if (request.getIncludeMuted().isPresent()) { @@ -99,14 +99,14 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "last_incident_time_after", - request.getLastIncidentTimeAfter().get().toString(), + request.getLastIncidentTimeAfter().get(), false); } if (request.getLastIncidentTimeBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "last_incident_time_before", - request.getLastIncidentTimeBefore().get().toString(), + request.getLastIncidentTimeBefore().get(), false); } if (request.getLinkedAccountId().isPresent()) { @@ -115,7 +115,7 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getStartDate().isPresent()) { QueryStringMapper.addQueryParameter( @@ -123,13 +123,12 @@ public MergeApiHttpResponse> list( } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "status", request.getStatus().get().toString(), false); + httpUrl, "status", request.getStatus().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -184,7 +183,6 @@ public MergeApiHttpResponse retrieve(String id, RequestOptions requestOpt .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/RawLinkedAccountsClient.java b/src/main/java/com/merge/api/hris/RawLinkedAccountsClient.java index 1b7e8115e..49e1172ba 100644 --- a/src/main/java/com/merge/api/hris/RawLinkedAccountsClient.java +++ b/src/main/java/com/merge/api/hris/RawLinkedAccountsClient.java @@ -56,7 +56,7 @@ public MergeApiHttpResponse> list( .addPathSegments("hris/v1/linked-accounts"); if (request.getCategory().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "category", request.getCategory().get().toString(), false); + httpUrl, "category", request.getCategory().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -97,7 +97,7 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_duplicates", - request.getIncludeDuplicates().get().toString(), + request.getIncludeDuplicates().get(), false); } if (request.getIntegrationName().isPresent()) { @@ -110,7 +110,7 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( @@ -120,7 +120,6 @@ public MergeApiHttpResponse> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/RawLocationsClient.java b/src/main/java/com/merge/api/hris/RawLocationsClient.java index 2f696a7ea..10d63fe5b 100644 --- a/src/main/java/com/merge/api/hris/RawLocationsClient.java +++ b/src/main/java/com/merge/api/hris/RawLocationsClient.java @@ -57,11 +57,11 @@ public MergeApiHttpResponse> list( .addPathSegments("hris/v1/locations"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -71,45 +71,39 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getLocationType().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "location_type", request.getLocationType().get().toString(), false); + httpUrl, "location_type", request.getLocationType().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -117,16 +111,12 @@ public MergeApiHttpResponse> list( } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -188,32 +178,25 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/RawPayGroupsClient.java b/src/main/java/com/merge/api/hris/RawPayGroupsClient.java index ece11ff2c..254018e72 100644 --- a/src/main/java/com/merge/api/hris/RawPayGroupsClient.java +++ b/src/main/java/com/merge/api/hris/RawPayGroupsClient.java @@ -57,11 +57,11 @@ public MergeApiHttpResponse> list( .addPathSegments("hris/v1/pay-groups"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -71,37 +71,31 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -111,7 +105,6 @@ public MergeApiHttpResponse> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -173,21 +166,17 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/RawPayrollRunsClient.java b/src/main/java/com/merge/api/hris/RawPayrollRunsClient.java index ac1604251..27f8f3466 100644 --- a/src/main/java/com/merge/api/hris/RawPayrollRunsClient.java +++ b/src/main/java/com/merge/api/hris/RawPayrollRunsClient.java @@ -57,11 +57,11 @@ public MergeApiHttpResponse> list( .addPathSegments("hris/v1/payroll-runs"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -69,51 +69,45 @@ public MergeApiHttpResponse> list( } if (request.getEndedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "ended_after", request.getEndedAfter().get().toString(), false); + httpUrl, "ended_after", request.getEndedAfter().get(), false); } if (request.getEndedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "ended_before", request.getEndedBefore().get().toString(), false); + httpUrl, "ended_before", request.getEndedBefore().get(), false); } if (request.getIncludeDeletedData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -121,28 +115,24 @@ public MergeApiHttpResponse> list( } if (request.getRunType().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_type", request.getRunType().get().toString(), false); + httpUrl, "run_type", request.getRunType().get(), false); } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getStartedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "started_after", request.getStartedAfter().get().toString(), false); + httpUrl, "started_after", request.getStartedAfter().get(), false); } if (request.getStartedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "started_before", request.getStartedBefore().get().toString(), false); + httpUrl, "started_before", request.getStartedBefore().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -204,32 +194,25 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/RawScopesClient.java b/src/main/java/com/merge/api/hris/RawScopesClient.java index 0c49c4474..ac4d9c26a 100644 --- a/src/main/java/com/merge/api/hris/RawScopesClient.java +++ b/src/main/java/com/merge/api/hris/RawScopesClient.java @@ -48,7 +48,6 @@ public MergeApiHttpResponse defaultScopesRetrieve(RequestOp .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -92,7 +91,6 @@ public MergeApiHttpResponse linkedAccountScopesRetrieve(Req .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/RawSyncStatusClient.java b/src/main/java/com/merge/api/hris/RawSyncStatusClient.java index ea949ac15..ee92a0130 100644 --- a/src/main/java/com/merge/api/hris/RawSyncStatusClient.java +++ b/src/main/java/com/merge/api/hris/RawSyncStatusClient.java @@ -60,13 +60,12 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/RawTeamsClient.java b/src/main/java/com/merge/api/hris/RawTeamsClient.java index ee1876df6..7f5b5ca1c 100644 --- a/src/main/java/com/merge/api/hris/RawTeamsClient.java +++ b/src/main/java/com/merge/api/hris/RawTeamsClient.java @@ -57,11 +57,11 @@ public MergeApiHttpResponse> list( .addPathSegments("hris/v1/teams"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -71,37 +71,31 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getParentTeamId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -113,13 +107,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -180,25 +173,21 @@ public MergeApiHttpResponse retrieve(String id, TeamsRetrieveRequest reque QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/RawTimeOffBalancesClient.java b/src/main/java/com/merge/api/hris/RawTimeOffBalancesClient.java index 252f48224..b6164bcac 100644 --- a/src/main/java/com/merge/api/hris/RawTimeOffBalancesClient.java +++ b/src/main/java/com/merge/api/hris/RawTimeOffBalancesClient.java @@ -57,11 +57,11 @@ public MergeApiHttpResponse> list( .addPathSegments("hris/v1/time-off-balances"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -75,41 +75,35 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getPolicyType().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "policy_type", request.getPolicyType().get().toString(), false); + httpUrl, "policy_type", request.getPolicyType().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -125,13 +119,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -193,15 +186,12 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -213,13 +203,12 @@ public MergeApiHttpResponse retrieve( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/RawTimeOffClient.java b/src/main/java/com/merge/api/hris/RawTimeOffClient.java index 33a586b3c..a46c801e6 100644 --- a/src/main/java/com/merge/api/hris/RawTimeOffClient.java +++ b/src/main/java/com/merge/api/hris/RawTimeOffClient.java @@ -68,11 +68,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -84,51 +84,45 @@ public MergeApiHttpResponse> list( } if (request.getEndedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "ended_after", request.getEndedAfter().get().toString(), false); + httpUrl, "ended_after", request.getEndedAfter().get(), false); } if (request.getEndedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "ended_before", request.getEndedBefore().get().toString(), false); + httpUrl, "ended_before", request.getEndedBefore().get(), false); } if (request.getIncludeDeletedData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -136,36 +130,32 @@ public MergeApiHttpResponse> list( } if (request.getRequestType().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "request_type", request.getRequestType().get().toString(), false); + httpUrl, "request_type", request.getRequestType().get(), false); } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getStartedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "started_after", request.getStartedAfter().get().toString(), false); + httpUrl, "started_after", request.getStartedAfter().get(), false); } if (request.getStartedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "started_before", request.getStartedBefore().get().toString(), false); + httpUrl, "started_before", request.getStartedBefore().get(), false); } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "status", request.getStatus().get().toString(), false); + httpUrl, "status", request.getStatus().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -216,11 +206,11 @@ public MergeApiHttpResponse create(TimeOffEndpointRequest reque .addPathSegments("hris/v1/time-off"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -286,36 +276,29 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -358,7 +341,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/RawTimesheetEntriesClient.java b/src/main/java/com/merge/api/hris/RawTimesheetEntriesClient.java index 2b3a0562a..874cc81bc 100644 --- a/src/main/java/com/merge/api/hris/RawTimesheetEntriesClient.java +++ b/src/main/java/com/merge/api/hris/RawTimesheetEntriesClient.java @@ -64,11 +64,11 @@ public MergeApiHttpResponse> list( .addPathSegments("hris/v1/timesheet-entries"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -80,51 +80,45 @@ public MergeApiHttpResponse> list( } if (request.getEndedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "ended_after", request.getEndedAfter().get().toString(), false); + httpUrl, "ended_after", request.getEndedAfter().get(), false); } if (request.getEndedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "ended_before", request.getEndedBefore().get().toString(), false); + httpUrl, "ended_before", request.getEndedBefore().get(), false); } if (request.getIncludeDeletedData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getOrderBy().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "order_by", request.getOrderBy().get().toString(), false); + httpUrl, "order_by", request.getOrderBy().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -132,21 +126,20 @@ public MergeApiHttpResponse> list( } if (request.getStartedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "started_after", request.getStartedAfter().get().toString(), false); + httpUrl, "started_after", request.getStartedAfter().get(), false); } if (request.getStartedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "started_before", request.getStartedBefore().get().toString(), false); + httpUrl, "started_before", request.getStartedBefore().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -198,11 +191,11 @@ public MergeApiHttpResponse create( .addPathSegments("hris/v1/timesheet-entries"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -269,25 +262,21 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -330,7 +319,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/RawWebhookReceiversClient.java b/src/main/java/com/merge/api/hris/RawWebhookReceiversClient.java index b7b509bca..f1ea223f2 100644 --- a/src/main/java/com/merge/api/hris/RawWebhookReceiversClient.java +++ b/src/main/java/com/merge/api/hris/RawWebhookReceiversClient.java @@ -50,7 +50,6 @@ public MergeApiHttpResponse> list(RequestOptions requestOp .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/hris/types/AccountDetailsAndActionsCategory.java b/src/main/java/com/merge/api/hris/types/AccountDetailsAndActionsCategory.java index 85a170e78..b65c9d4be 100644 --- a/src/main/java/com/merge/api/hris/types/AccountDetailsAndActionsCategory.java +++ b/src/main/java/com/merge/api/hris/types/AccountDetailsAndActionsCategory.java @@ -84,11 +84,11 @@ public AccountDetailsAndActionsCategory deserialize(JsonParser p, Deserializatio Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CategoryEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/AccountDetailsAndActionsIntegration.java b/src/main/java/com/merge/api/hris/types/AccountDetailsAndActionsIntegration.java index 0cd9cdfcb..daf190eb4 100644 --- a/src/main/java/com/merge/api/hris/types/AccountDetailsAndActionsIntegration.java +++ b/src/main/java/com/merge/api/hris/types/AccountDetailsAndActionsIntegration.java @@ -293,7 +293,9 @@ public _FinalStage image(Optional image) { @java.lang.Override public _FinalStage addAllCategories(List categories) { - this.categories.addAll(categories); + if (categories != null) { + this.categories.addAll(categories); + } return this; } diff --git a/src/main/java/com/merge/api/hris/types/AccountDetailsAndActionsStatus.java b/src/main/java/com/merge/api/hris/types/AccountDetailsAndActionsStatus.java index 7146f6fd8..a92ba27bb 100644 --- a/src/main/java/com/merge/api/hris/types/AccountDetailsAndActionsStatus.java +++ b/src/main/java/com/merge/api/hris/types/AccountDetailsAndActionsStatus.java @@ -84,11 +84,11 @@ public AccountDetailsAndActionsStatus deserialize(JsonParser p, DeserializationC Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AccountDetailsAndActionsStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/AccountDetailsCategory.java b/src/main/java/com/merge/api/hris/types/AccountDetailsCategory.java index 8e79a9ee4..e85ff18c9 100644 --- a/src/main/java/com/merge/api/hris/types/AccountDetailsCategory.java +++ b/src/main/java/com/merge/api/hris/types/AccountDetailsCategory.java @@ -83,11 +83,11 @@ public AccountDetailsCategory deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CategoryEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/AccountIntegration.java b/src/main/java/com/merge/api/hris/types/AccountIntegration.java index 939812d8b..85449794d 100644 --- a/src/main/java/com/merge/api/hris/types/AccountIntegration.java +++ b/src/main/java/com/merge/api/hris/types/AccountIntegration.java @@ -197,7 +197,7 @@ public static NameStage builder() { public interface NameStage { /** - * Company name. + *

                      Company name.

                      */ _FinalStage name(@NotNull String name); @@ -311,7 +311,8 @@ public Builder from(AccountIntegration other) { } /** - * Company name.

                      Company name.

                      + *

                      Company name.

                      + *

                      Company name.

                      * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/hris/types/AsyncPassthroughRetrieveResponse.java b/src/main/java/com/merge/api/hris/types/AsyncPassthroughRetrieveResponse.java index 29cd64695..57849df66 100644 --- a/src/main/java/com/merge/api/hris/types/AsyncPassthroughRetrieveResponse.java +++ b/src/main/java/com/merge/api/hris/types/AsyncPassthroughRetrieveResponse.java @@ -84,11 +84,11 @@ public AsyncPassthroughRetrieveResponse deserialize(JsonParser p, Deserializatio Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RemoteResponse.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/AuditLogEvent.java b/src/main/java/com/merge/api/hris/types/AuditLogEvent.java index 5bf6a05ac..72bb37dbb 100644 --- a/src/main/java/com/merge/api/hris/types/AuditLogEvent.java +++ b/src/main/java/com/merge/api/hris/types/AuditLogEvent.java @@ -212,14 +212,15 @@ public static RoleStage builder() { public interface RoleStage { /** - * Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring. - * - * * `ADMIN` - ADMIN - * * `DEVELOPER` - DEVELOPER - * * `MEMBER` - MEMBER - * * `API` - API - * * `SYSTEM` - SYSTEM - * * `MERGE_TEAM` - MERGE_TEAM + *

                      Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring.

                      + *
                        + *
                      • ADMIN - ADMIN
                        • + *
                      • DEVELOPER - DEVELOPER
                        • + *
                      • MEMBER - MEMBER
                        • + *
                      • API - API
                        • + *
                      • SYSTEM - SYSTEM
                        • + *
                      • MERGE_TEAM - MERGE_TEAM
                        • + *
                      */ IpAddressStage role(@NotNull AuditLogEventRole role); @@ -232,51 +233,52 @@ public interface IpAddressStage { public interface EventTypeStage { /** - * Designates the type of event that occurred. - * - * * `CREATED_REMOTE_PRODUCTION_API_KEY` - CREATED_REMOTE_PRODUCTION_API_KEY - * * `DELETED_REMOTE_PRODUCTION_API_KEY` - DELETED_REMOTE_PRODUCTION_API_KEY - * * `CREATED_TEST_API_KEY` - CREATED_TEST_API_KEY - * * `DELETED_TEST_API_KEY` - DELETED_TEST_API_KEY - * * `REGENERATED_PRODUCTION_API_KEY` - REGENERATED_PRODUCTION_API_KEY - * * `REGENERATED_WEBHOOK_SIGNATURE` - REGENERATED_WEBHOOK_SIGNATURE - * * `INVITED_USER` - INVITED_USER - * * `TWO_FACTOR_AUTH_ENABLED` - TWO_FACTOR_AUTH_ENABLED - * * `TWO_FACTOR_AUTH_DISABLED` - TWO_FACTOR_AUTH_DISABLED - * * `DELETED_LINKED_ACCOUNT` - DELETED_LINKED_ACCOUNT - * * `DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT` - DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT - * * `CREATED_DESTINATION` - CREATED_DESTINATION - * * `DELETED_DESTINATION` - DELETED_DESTINATION - * * `CHANGED_DESTINATION` - CHANGED_DESTINATION - * * `CHANGED_SCOPES` - CHANGED_SCOPES - * * `CHANGED_PERSONAL_INFORMATION` - CHANGED_PERSONAL_INFORMATION - * * `CHANGED_ORGANIZATION_SETTINGS` - CHANGED_ORGANIZATION_SETTINGS - * * `ENABLED_INTEGRATION` - ENABLED_INTEGRATION - * * `DISABLED_INTEGRATION` - DISABLED_INTEGRATION - * * `ENABLED_CATEGORY` - ENABLED_CATEGORY - * * `DISABLED_CATEGORY` - DISABLED_CATEGORY - * * `CHANGED_PASSWORD` - CHANGED_PASSWORD - * * `RESET_PASSWORD` - RESET_PASSWORD - * * `ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION` - ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - * * `ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT` - ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - * * `DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION` - DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - * * `DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT` - DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - * * `CREATED_INTEGRATION_WIDE_FIELD_MAPPING` - CREATED_INTEGRATION_WIDE_FIELD_MAPPING - * * `CREATED_LINKED_ACCOUNT_FIELD_MAPPING` - CREATED_LINKED_ACCOUNT_FIELD_MAPPING - * * `CHANGED_INTEGRATION_WIDE_FIELD_MAPPING` - CHANGED_INTEGRATION_WIDE_FIELD_MAPPING - * * `CHANGED_LINKED_ACCOUNT_FIELD_MAPPING` - CHANGED_LINKED_ACCOUNT_FIELD_MAPPING - * * `DELETED_INTEGRATION_WIDE_FIELD_MAPPING` - DELETED_INTEGRATION_WIDE_FIELD_MAPPING - * * `DELETED_LINKED_ACCOUNT_FIELD_MAPPING` - DELETED_LINKED_ACCOUNT_FIELD_MAPPING - * * `CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `FORCED_LINKED_ACCOUNT_RESYNC` - FORCED_LINKED_ACCOUNT_RESYNC - * * `MUTED_ISSUE` - MUTED_ISSUE - * * `GENERATED_MAGIC_LINK` - GENERATED_MAGIC_LINK - * * `ENABLED_MERGE_WEBHOOK` - ENABLED_MERGE_WEBHOOK - * * `DISABLED_MERGE_WEBHOOK` - DISABLED_MERGE_WEBHOOK - * * `MERGE_WEBHOOK_TARGET_CHANGED` - MERGE_WEBHOOK_TARGET_CHANGED - * * `END_USER_CREDENTIALS_ACCESSED` - END_USER_CREDENTIALS_ACCESSED + *

                      Designates the type of event that occurred.

                      + *
                        + *
                      • CREATED_REMOTE_PRODUCTION_API_KEY - CREATED_REMOTE_PRODUCTION_API_KEY
                        • + *
                      • DELETED_REMOTE_PRODUCTION_API_KEY - DELETED_REMOTE_PRODUCTION_API_KEY
                        • + *
                      • CREATED_TEST_API_KEY - CREATED_TEST_API_KEY
                        • + *
                      • DELETED_TEST_API_KEY - DELETED_TEST_API_KEY
                        • + *
                      • REGENERATED_PRODUCTION_API_KEY - REGENERATED_PRODUCTION_API_KEY
                        • + *
                      • REGENERATED_WEBHOOK_SIGNATURE - REGENERATED_WEBHOOK_SIGNATURE
                        • + *
                      • INVITED_USER - INVITED_USER
                        • + *
                      • TWO_FACTOR_AUTH_ENABLED - TWO_FACTOR_AUTH_ENABLED
                        • + *
                      • TWO_FACTOR_AUTH_DISABLED - TWO_FACTOR_AUTH_DISABLED
                        • + *
                      • DELETED_LINKED_ACCOUNT - DELETED_LINKED_ACCOUNT
                        • + *
                      • DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT - DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT
                        • + *
                      • CREATED_DESTINATION - CREATED_DESTINATION
                        • + *
                      • DELETED_DESTINATION - DELETED_DESTINATION
                        • + *
                      • CHANGED_DESTINATION - CHANGED_DESTINATION
                        • + *
                      • CHANGED_SCOPES - CHANGED_SCOPES
                        • + *
                      • CHANGED_PERSONAL_INFORMATION - CHANGED_PERSONAL_INFORMATION
                        • + *
                      • CHANGED_ORGANIZATION_SETTINGS - CHANGED_ORGANIZATION_SETTINGS
                        • + *
                      • ENABLED_INTEGRATION - ENABLED_INTEGRATION
                        • + *
                      • DISABLED_INTEGRATION - DISABLED_INTEGRATION
                        • + *
                      • ENABLED_CATEGORY - ENABLED_CATEGORY
                        • + *
                      • DISABLED_CATEGORY - DISABLED_CATEGORY
                        • + *
                      • CHANGED_PASSWORD - CHANGED_PASSWORD
                        • + *
                      • RESET_PASSWORD - RESET_PASSWORD
                        • + *
                      • ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION
                        • + *
                      • ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT
                        • + *
                      • DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION
                        • + *
                      • DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT
                        • + *
                      • CREATED_INTEGRATION_WIDE_FIELD_MAPPING - CREATED_INTEGRATION_WIDE_FIELD_MAPPING
                        • + *
                      • CREATED_LINKED_ACCOUNT_FIELD_MAPPING - CREATED_LINKED_ACCOUNT_FIELD_MAPPING
                        • + *
                      • CHANGED_INTEGRATION_WIDE_FIELD_MAPPING - CHANGED_INTEGRATION_WIDE_FIELD_MAPPING
                        • + *
                      • CHANGED_LINKED_ACCOUNT_FIELD_MAPPING - CHANGED_LINKED_ACCOUNT_FIELD_MAPPING
                        • + *
                      • DELETED_INTEGRATION_WIDE_FIELD_MAPPING - DELETED_INTEGRATION_WIDE_FIELD_MAPPING
                        • + *
                      • DELETED_LINKED_ACCOUNT_FIELD_MAPPING - DELETED_LINKED_ACCOUNT_FIELD_MAPPING
                        • + *
                      • CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
                        • + *
                      • CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
                        • + *
                      • DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
                        • + *
                      • FORCED_LINKED_ACCOUNT_RESYNC - FORCED_LINKED_ACCOUNT_RESYNC
                        • + *
                      • MUTED_ISSUE - MUTED_ISSUE
                        • + *
                      • GENERATED_MAGIC_LINK - GENERATED_MAGIC_LINK
                        • + *
                      • ENABLED_MERGE_WEBHOOK - ENABLED_MERGE_WEBHOOK
                        • + *
                      • DISABLED_MERGE_WEBHOOK - DISABLED_MERGE_WEBHOOK
                        • + *
                      • MERGE_WEBHOOK_TARGET_CHANGED - MERGE_WEBHOOK_TARGET_CHANGED
                        • + *
                      • END_USER_CREDENTIALS_ACCESSED - END_USER_CREDENTIALS_ACCESSED
                        • + *
                      */ EventDescriptionStage eventType(@NotNull AuditLogEventEventType eventType); } @@ -349,14 +351,16 @@ public Builder from(AuditLogEvent other) { } /** - * Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring. - * - * * `ADMIN` - ADMIN - * * `DEVELOPER` - DEVELOPER - * * `MEMBER` - MEMBER - * * `API` - API - * * `SYSTEM` - SYSTEM - * * `MERGE_TEAM` - MERGE_TEAM

                      Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring.

                      + *

                      Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring.

                      + *
                        + *
                      • ADMIN - ADMIN
                        • + *
                      • DEVELOPER - DEVELOPER
                        • + *
                      • MEMBER - MEMBER
                        • + *
                      • API - API
                        • + *
                      • SYSTEM - SYSTEM
                        • + *
                      • MERGE_TEAM - MERGE_TEAM
                        • + *
                      + *

                      Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring.

                      *
                        *
                      • ADMIN - ADMIN
                        • *
                      • DEVELOPER - DEVELOPER
                        • @@ -382,51 +386,53 @@ public EventTypeStage ipAddress(@NotNull String ipAddress) { } /** - * Designates the type of event that occurred. - * - * * `CREATED_REMOTE_PRODUCTION_API_KEY` - CREATED_REMOTE_PRODUCTION_API_KEY - * * `DELETED_REMOTE_PRODUCTION_API_KEY` - DELETED_REMOTE_PRODUCTION_API_KEY - * * `CREATED_TEST_API_KEY` - CREATED_TEST_API_KEY - * * `DELETED_TEST_API_KEY` - DELETED_TEST_API_KEY - * * `REGENERATED_PRODUCTION_API_KEY` - REGENERATED_PRODUCTION_API_KEY - * * `REGENERATED_WEBHOOK_SIGNATURE` - REGENERATED_WEBHOOK_SIGNATURE - * * `INVITED_USER` - INVITED_USER - * * `TWO_FACTOR_AUTH_ENABLED` - TWO_FACTOR_AUTH_ENABLED - * * `TWO_FACTOR_AUTH_DISABLED` - TWO_FACTOR_AUTH_DISABLED - * * `DELETED_LINKED_ACCOUNT` - DELETED_LINKED_ACCOUNT - * * `DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT` - DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT - * * `CREATED_DESTINATION` - CREATED_DESTINATION - * * `DELETED_DESTINATION` - DELETED_DESTINATION - * * `CHANGED_DESTINATION` - CHANGED_DESTINATION - * * `CHANGED_SCOPES` - CHANGED_SCOPES - * * `CHANGED_PERSONAL_INFORMATION` - CHANGED_PERSONAL_INFORMATION - * * `CHANGED_ORGANIZATION_SETTINGS` - CHANGED_ORGANIZATION_SETTINGS - * * `ENABLED_INTEGRATION` - ENABLED_INTEGRATION - * * `DISABLED_INTEGRATION` - DISABLED_INTEGRATION - * * `ENABLED_CATEGORY` - ENABLED_CATEGORY - * * `DISABLED_CATEGORY` - DISABLED_CATEGORY - * * `CHANGED_PASSWORD` - CHANGED_PASSWORD - * * `RESET_PASSWORD` - RESET_PASSWORD - * * `ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION` - ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - * * `ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT` - ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - * * `DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION` - DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - * * `DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT` - DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - * * `CREATED_INTEGRATION_WIDE_FIELD_MAPPING` - CREATED_INTEGRATION_WIDE_FIELD_MAPPING - * * `CREATED_LINKED_ACCOUNT_FIELD_MAPPING` - CREATED_LINKED_ACCOUNT_FIELD_MAPPING - * * `CHANGED_INTEGRATION_WIDE_FIELD_MAPPING` - CHANGED_INTEGRATION_WIDE_FIELD_MAPPING - * * `CHANGED_LINKED_ACCOUNT_FIELD_MAPPING` - CHANGED_LINKED_ACCOUNT_FIELD_MAPPING - * * `DELETED_INTEGRATION_WIDE_FIELD_MAPPING` - DELETED_INTEGRATION_WIDE_FIELD_MAPPING - * * `DELETED_LINKED_ACCOUNT_FIELD_MAPPING` - DELETED_LINKED_ACCOUNT_FIELD_MAPPING - * * `CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `FORCED_LINKED_ACCOUNT_RESYNC` - FORCED_LINKED_ACCOUNT_RESYNC - * * `MUTED_ISSUE` - MUTED_ISSUE - * * `GENERATED_MAGIC_LINK` - GENERATED_MAGIC_LINK - * * `ENABLED_MERGE_WEBHOOK` - ENABLED_MERGE_WEBHOOK - * * `DISABLED_MERGE_WEBHOOK` - DISABLED_MERGE_WEBHOOK - * * `MERGE_WEBHOOK_TARGET_CHANGED` - MERGE_WEBHOOK_TARGET_CHANGED - * * `END_USER_CREDENTIALS_ACCESSED` - END_USER_CREDENTIALS_ACCESSED

                        Designates the type of event that occurred.

                        + *

                        Designates the type of event that occurred.

                        + *
                          + *
                        • CREATED_REMOTE_PRODUCTION_API_KEY - CREATED_REMOTE_PRODUCTION_API_KEY
                          • + *
                        • DELETED_REMOTE_PRODUCTION_API_KEY - DELETED_REMOTE_PRODUCTION_API_KEY
                          • + *
                        • CREATED_TEST_API_KEY - CREATED_TEST_API_KEY
                          • + *
                        • DELETED_TEST_API_KEY - DELETED_TEST_API_KEY
                          • + *
                        • REGENERATED_PRODUCTION_API_KEY - REGENERATED_PRODUCTION_API_KEY
                          • + *
                        • REGENERATED_WEBHOOK_SIGNATURE - REGENERATED_WEBHOOK_SIGNATURE
                          • + *
                        • INVITED_USER - INVITED_USER
                          • + *
                        • TWO_FACTOR_AUTH_ENABLED - TWO_FACTOR_AUTH_ENABLED
                          • + *
                        • TWO_FACTOR_AUTH_DISABLED - TWO_FACTOR_AUTH_DISABLED
                          • + *
                        • DELETED_LINKED_ACCOUNT - DELETED_LINKED_ACCOUNT
                          • + *
                        • DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT - DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT
                          • + *
                        • CREATED_DESTINATION - CREATED_DESTINATION
                          • + *
                        • DELETED_DESTINATION - DELETED_DESTINATION
                          • + *
                        • CHANGED_DESTINATION - CHANGED_DESTINATION
                          • + *
                        • CHANGED_SCOPES - CHANGED_SCOPES
                          • + *
                        • CHANGED_PERSONAL_INFORMATION - CHANGED_PERSONAL_INFORMATION
                          • + *
                        • CHANGED_ORGANIZATION_SETTINGS - CHANGED_ORGANIZATION_SETTINGS
                          • + *
                        • ENABLED_INTEGRATION - ENABLED_INTEGRATION
                          • + *
                        • DISABLED_INTEGRATION - DISABLED_INTEGRATION
                          • + *
                        • ENABLED_CATEGORY - ENABLED_CATEGORY
                          • + *
                        • DISABLED_CATEGORY - DISABLED_CATEGORY
                          • + *
                        • CHANGED_PASSWORD - CHANGED_PASSWORD
                          • + *
                        • RESET_PASSWORD - RESET_PASSWORD
                          • + *
                        • ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION
                          • + *
                        • ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT
                          • + *
                        • DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION
                          • + *
                        • DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT
                          • + *
                        • CREATED_INTEGRATION_WIDE_FIELD_MAPPING - CREATED_INTEGRATION_WIDE_FIELD_MAPPING
                          • + *
                        • CREATED_LINKED_ACCOUNT_FIELD_MAPPING - CREATED_LINKED_ACCOUNT_FIELD_MAPPING
                          • + *
                        • CHANGED_INTEGRATION_WIDE_FIELD_MAPPING - CHANGED_INTEGRATION_WIDE_FIELD_MAPPING
                          • + *
                        • CHANGED_LINKED_ACCOUNT_FIELD_MAPPING - CHANGED_LINKED_ACCOUNT_FIELD_MAPPING
                          • + *
                        • DELETED_INTEGRATION_WIDE_FIELD_MAPPING - DELETED_INTEGRATION_WIDE_FIELD_MAPPING
                          • + *
                        • DELETED_LINKED_ACCOUNT_FIELD_MAPPING - DELETED_LINKED_ACCOUNT_FIELD_MAPPING
                          • + *
                        • CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
                          • + *
                        • CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
                          • + *
                        • DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
                          • + *
                        • FORCED_LINKED_ACCOUNT_RESYNC - FORCED_LINKED_ACCOUNT_RESYNC
                          • + *
                        • MUTED_ISSUE - MUTED_ISSUE
                          • + *
                        • GENERATED_MAGIC_LINK - GENERATED_MAGIC_LINK
                          • + *
                        • ENABLED_MERGE_WEBHOOK - ENABLED_MERGE_WEBHOOK
                          • + *
                        • DISABLED_MERGE_WEBHOOK - DISABLED_MERGE_WEBHOOK
                          • + *
                        • MERGE_WEBHOOK_TARGET_CHANGED - MERGE_WEBHOOK_TARGET_CHANGED
                          • + *
                        • END_USER_CREDENTIALS_ACCESSED - END_USER_CREDENTIALS_ACCESSED
                          • + *
                        + *

                        Designates the type of event that occurred.

                        *
                          *
                        • CREATED_REMOTE_PRODUCTION_API_KEY - CREATED_REMOTE_PRODUCTION_API_KEY
                          • *
                        • DELETED_REMOTE_PRODUCTION_API_KEY - DELETED_REMOTE_PRODUCTION_API_KEY
                          • diff --git a/src/main/java/com/merge/api/hris/types/AuditLogEventEventType.java b/src/main/java/com/merge/api/hris/types/AuditLogEventEventType.java index 6005bb129..3b70b8db8 100644 --- a/src/main/java/com/merge/api/hris/types/AuditLogEventEventType.java +++ b/src/main/java/com/merge/api/hris/types/AuditLogEventEventType.java @@ -83,11 +83,11 @@ public AuditLogEventEventType deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, EventTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/AuditLogEventRole.java b/src/main/java/com/merge/api/hris/types/AuditLogEventRole.java index b7e2cf425..b95ab7abf 100644 --- a/src/main/java/com/merge/api/hris/types/AuditLogEventRole.java +++ b/src/main/java/com/merge/api/hris/types/AuditLogEventRole.java @@ -83,11 +83,11 @@ public AuditLogEventRole deserialize(JsonParser p, DeserializationContext contex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RoleEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/BankInfoAccountType.java b/src/main/java/com/merge/api/hris/types/BankInfoAccountType.java index 5a2593e40..74bd44d52 100644 --- a/src/main/java/com/merge/api/hris/types/BankInfoAccountType.java +++ b/src/main/java/com/merge/api/hris/types/BankInfoAccountType.java @@ -83,11 +83,11 @@ public BankInfoAccountType deserialize(JsonParser p, DeserializationContext cont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AccountTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/BankInfoEmployee.java b/src/main/java/com/merge/api/hris/types/BankInfoEmployee.java index 105cf99c4..0d3408143 100644 --- a/src/main/java/com/merge/api/hris/types/BankInfoEmployee.java +++ b/src/main/java/com/merge/api/hris/types/BankInfoEmployee.java @@ -83,11 +83,11 @@ public BankInfoEmployee deserialize(JsonParser p, DeserializationContext context Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Employee.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/BenefitEmployee.java b/src/main/java/com/merge/api/hris/types/BenefitEmployee.java index 896e9bf1b..499e42756 100644 --- a/src/main/java/com/merge/api/hris/types/BenefitEmployee.java +++ b/src/main/java/com/merge/api/hris/types/BenefitEmployee.java @@ -83,11 +83,11 @@ public BenefitEmployee deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Employee.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/CommonModelScopeApi.java b/src/main/java/com/merge/api/hris/types/CommonModelScopeApi.java index 337af5780..e9c9ad658 100644 --- a/src/main/java/com/merge/api/hris/types/CommonModelScopeApi.java +++ b/src/main/java/com/merge/api/hris/types/CommonModelScopeApi.java @@ -98,7 +98,9 @@ public Builder addCommonModels(IndividualCommonModelScopeDeserializer commonMode } public Builder addAllCommonModels(List commonModels) { - this.commonModels.addAll(commonModels); + if (commonModels != null) { + this.commonModels.addAll(commonModels); + } return this; } diff --git a/src/main/java/com/merge/api/hris/types/CommonModelScopesBodyRequest.java b/src/main/java/com/merge/api/hris/types/CommonModelScopesBodyRequest.java index 5f6c42d19..bc9fa9a09 100644 --- a/src/main/java/com/merge/api/hris/types/CommonModelScopesBodyRequest.java +++ b/src/main/java/com/merge/api/hris/types/CommonModelScopesBodyRequest.java @@ -139,7 +139,9 @@ public _FinalStage modelId(@NotNull String modelId) { @java.lang.Override public _FinalStage addAllDisabledFields(List disabledFields) { - this.disabledFields.addAll(disabledFields); + if (disabledFields != null) { + this.disabledFields.addAll(disabledFields); + } return this; } @@ -159,7 +161,9 @@ public _FinalStage disabledFields(List disabledFields) { @java.lang.Override public _FinalStage addAllEnabledActions(List enabledActions) { - this.enabledActions.addAll(enabledActions); + if (enabledActions != null) { + this.enabledActions.addAll(enabledActions); + } return this; } diff --git a/src/main/java/com/merge/api/hris/types/CreateFieldMappingRequest.java b/src/main/java/com/merge/api/hris/types/CreateFieldMappingRequest.java index 15ee96e96..9fe799e27 100644 --- a/src/main/java/com/merge/api/hris/types/CreateFieldMappingRequest.java +++ b/src/main/java/com/merge/api/hris/types/CreateFieldMappingRequest.java @@ -159,7 +159,7 @@ public static TargetFieldNameStage builder() { public interface TargetFieldNameStage { /** - * The name of the target field you want this remote field to map to. + *

                          The name of the target field you want this remote field to map to.

                          */ TargetFieldDescriptionStage targetFieldName(@NotNull String targetFieldName); @@ -168,28 +168,28 @@ public interface TargetFieldNameStage { public interface TargetFieldDescriptionStage { /** - * The description of the target field you want this remote field to map to. + *

                          The description of the target field you want this remote field to map to.

                          */ RemoteMethodStage targetFieldDescription(@NotNull String targetFieldDescription); } public interface RemoteMethodStage { /** - * The method of the remote endpoint where the remote field is coming from. + *

                          The method of the remote endpoint where the remote field is coming from.

                          */ RemoteUrlPathStage remoteMethod(@NotNull String remoteMethod); } public interface RemoteUrlPathStage { /** - * The path of the remote endpoint where the remote field is coming from. + *

                          The path of the remote endpoint where the remote field is coming from.

                          */ CommonModelNameStage remoteUrlPath(@NotNull String remoteUrlPath); } public interface CommonModelNameStage { /** - * The name of the Common Model that the remote field corresponds to in a given category. + *

                          The name of the Common Model that the remote field corresponds to in a given category.

                          */ _FinalStage commonModelName(@NotNull String commonModelName); } @@ -254,7 +254,8 @@ public Builder from(CreateFieldMappingRequest other) { } /** - * The name of the target field you want this remote field to map to.

                          The name of the target field you want this remote field to map to.

                          + *

                          The name of the target field you want this remote field to map to.

                          + *

                          The name of the target field you want this remote field to map to.

                          * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -265,7 +266,8 @@ public TargetFieldDescriptionStage targetFieldName(@NotNull String targetFieldNa } /** - * The description of the target field you want this remote field to map to.

                          The description of the target field you want this remote field to map to.

                          + *

                          The description of the target field you want this remote field to map to.

                          + *

                          The description of the target field you want this remote field to map to.

                          * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -276,7 +278,8 @@ public RemoteMethodStage targetFieldDescription(@NotNull String targetFieldDescr } /** - * The method of the remote endpoint where the remote field is coming from.

                          The method of the remote endpoint where the remote field is coming from.

                          + *

                          The method of the remote endpoint where the remote field is coming from.

                          + *

                          The method of the remote endpoint where the remote field is coming from.

                          * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -287,7 +290,8 @@ public RemoteUrlPathStage remoteMethod(@NotNull String remoteMethod) { } /** - * The path of the remote endpoint where the remote field is coming from.

                          The path of the remote endpoint where the remote field is coming from.

                          + *

                          The path of the remote endpoint where the remote field is coming from.

                          + *

                          The path of the remote endpoint where the remote field is coming from.

                          * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -298,7 +302,8 @@ public CommonModelNameStage remoteUrlPath(@NotNull String remoteUrlPath) { } /** - * The name of the Common Model that the remote field corresponds to in a given category.

                          The name of the Common Model that the remote field corresponds to in a given category.

                          + *

                          The name of the Common Model that the remote field corresponds to in a given category.

                          + *

                          The name of the Common Model that the remote field corresponds to in a given category.

                          * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -314,7 +319,9 @@ public _FinalStage commonModelName(@NotNull String commonModelName) { */ @java.lang.Override public _FinalStage addAllRemoteFieldTraversalPath(List remoteFieldTraversalPath) { - this.remoteFieldTraversalPath.addAll(remoteFieldTraversalPath); + if (remoteFieldTraversalPath != null) { + this.remoteFieldTraversalPath.addAll(remoteFieldTraversalPath); + } return this; } diff --git a/src/main/java/com/merge/api/hris/types/DataPassthroughRequest.java b/src/main/java/com/merge/api/hris/types/DataPassthroughRequest.java index 2c7733ed8..d5fcd0da5 100644 --- a/src/main/java/com/merge/api/hris/types/DataPassthroughRequest.java +++ b/src/main/java/com/merge/api/hris/types/DataPassthroughRequest.java @@ -172,7 +172,7 @@ public interface MethodStage { public interface PathStage { /** - * The path of the request in the third party's platform. + *

                          The path of the request in the third party's platform.

                          */ _FinalStage path(@NotNull String path); } @@ -264,7 +264,8 @@ public PathStage method(@NotNull MethodEnum method) { } /** - * The path of the request in the third party's platform.

                          The path of the request in the third party's platform.

                          + *

                          The path of the request in the third party's platform.

                          + *

                          The path of the request in the third party's platform.

                          * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/hris/types/DependentGender.java b/src/main/java/com/merge/api/hris/types/DependentGender.java index 4c11b2461..3985e3ff5 100644 --- a/src/main/java/com/merge/api/hris/types/DependentGender.java +++ b/src/main/java/com/merge/api/hris/types/DependentGender.java @@ -83,11 +83,11 @@ public DependentGender deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, GenderEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/DependentRelationship.java b/src/main/java/com/merge/api/hris/types/DependentRelationship.java index ed429ea5f..fe3e7c316 100644 --- a/src/main/java/com/merge/api/hris/types/DependentRelationship.java +++ b/src/main/java/com/merge/api/hris/types/DependentRelationship.java @@ -83,11 +83,11 @@ public DependentRelationship deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RelationshipEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EarningType.java b/src/main/java/com/merge/api/hris/types/EarningType.java index 49dbc5750..960e5cda7 100644 --- a/src/main/java/com/merge/api/hris/types/EarningType.java +++ b/src/main/java/com/merge/api/hris/types/EarningType.java @@ -83,11 +83,11 @@ public EarningType deserialize(JsonParser p, DeserializationContext context) thr Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, EarningTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmployeeCompany.java b/src/main/java/com/merge/api/hris/types/EmployeeCompany.java index 2b5ecc60d..be4965999 100644 --- a/src/main/java/com/merge/api/hris/types/EmployeeCompany.java +++ b/src/main/java/com/merge/api/hris/types/EmployeeCompany.java @@ -83,11 +83,11 @@ public EmployeeCompany deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Company.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmployeeEmploymentStatus.java b/src/main/java/com/merge/api/hris/types/EmployeeEmploymentStatus.java index 16d9a6bd2..1e7ea1151 100644 --- a/src/main/java/com/merge/api/hris/types/EmployeeEmploymentStatus.java +++ b/src/main/java/com/merge/api/hris/types/EmployeeEmploymentStatus.java @@ -83,11 +83,11 @@ public EmployeeEmploymentStatus deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, EmploymentStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmployeeEmploymentsItem.java b/src/main/java/com/merge/api/hris/types/EmployeeEmploymentsItem.java index ceb438789..d9a5f6198 100644 --- a/src/main/java/com/merge/api/hris/types/EmployeeEmploymentsItem.java +++ b/src/main/java/com/merge/api/hris/types/EmployeeEmploymentsItem.java @@ -83,11 +83,11 @@ public EmployeeEmploymentsItem deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Employment.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmployeeEthnicity.java b/src/main/java/com/merge/api/hris/types/EmployeeEthnicity.java index 8e3643f98..ddd9d6d65 100644 --- a/src/main/java/com/merge/api/hris/types/EmployeeEthnicity.java +++ b/src/main/java/com/merge/api/hris/types/EmployeeEthnicity.java @@ -83,11 +83,11 @@ public EmployeeEthnicity deserialize(JsonParser p, DeserializationContext contex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, EthnicityEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmployeeGender.java b/src/main/java/com/merge/api/hris/types/EmployeeGender.java index cca6d4449..8d9488b9e 100644 --- a/src/main/java/com/merge/api/hris/types/EmployeeGender.java +++ b/src/main/java/com/merge/api/hris/types/EmployeeGender.java @@ -83,11 +83,11 @@ public EmployeeGender deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, GenderEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmployeeGroupsItem.java b/src/main/java/com/merge/api/hris/types/EmployeeGroupsItem.java index 3d6ed8f2c..d921b337e 100644 --- a/src/main/java/com/merge/api/hris/types/EmployeeGroupsItem.java +++ b/src/main/java/com/merge/api/hris/types/EmployeeGroupsItem.java @@ -83,11 +83,11 @@ public EmployeeGroupsItem deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Group.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmployeeHomeLocation.java b/src/main/java/com/merge/api/hris/types/EmployeeHomeLocation.java index a9175b685..922ec205f 100644 --- a/src/main/java/com/merge/api/hris/types/EmployeeHomeLocation.java +++ b/src/main/java/com/merge/api/hris/types/EmployeeHomeLocation.java @@ -83,11 +83,11 @@ public EmployeeHomeLocation deserialize(JsonParser p, DeserializationContext con Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Location.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmployeeManager.java b/src/main/java/com/merge/api/hris/types/EmployeeManager.java index 2e4bad6b0..4e534fa40 100644 --- a/src/main/java/com/merge/api/hris/types/EmployeeManager.java +++ b/src/main/java/com/merge/api/hris/types/EmployeeManager.java @@ -83,11 +83,11 @@ public EmployeeManager deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Employee.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmployeeMaritalStatus.java b/src/main/java/com/merge/api/hris/types/EmployeeMaritalStatus.java index 738def2af..30aa8683b 100644 --- a/src/main/java/com/merge/api/hris/types/EmployeeMaritalStatus.java +++ b/src/main/java/com/merge/api/hris/types/EmployeeMaritalStatus.java @@ -83,11 +83,11 @@ public EmployeeMaritalStatus deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, MaritalStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmployeePayGroup.java b/src/main/java/com/merge/api/hris/types/EmployeePayGroup.java index e4016be8d..b07191917 100644 --- a/src/main/java/com/merge/api/hris/types/EmployeePayGroup.java +++ b/src/main/java/com/merge/api/hris/types/EmployeePayGroup.java @@ -83,11 +83,11 @@ public EmployeePayGroup deserialize(JsonParser p, DeserializationContext context Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PayGroup.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmployeePayrollRunEmployee.java b/src/main/java/com/merge/api/hris/types/EmployeePayrollRunEmployee.java index 51b2d9c7a..b75bd56cc 100644 --- a/src/main/java/com/merge/api/hris/types/EmployeePayrollRunEmployee.java +++ b/src/main/java/com/merge/api/hris/types/EmployeePayrollRunEmployee.java @@ -83,11 +83,11 @@ public EmployeePayrollRunEmployee deserialize(JsonParser p, DeserializationConte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Employee.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmployeePayrollRunPayrollRun.java b/src/main/java/com/merge/api/hris/types/EmployeePayrollRunPayrollRun.java index d106ee508..8df315787 100644 --- a/src/main/java/com/merge/api/hris/types/EmployeePayrollRunPayrollRun.java +++ b/src/main/java/com/merge/api/hris/types/EmployeePayrollRunPayrollRun.java @@ -84,11 +84,11 @@ public EmployeePayrollRunPayrollRun deserialize(JsonParser p, DeserializationCon Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PayrollRun.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmployeeRequestCompany.java b/src/main/java/com/merge/api/hris/types/EmployeeRequestCompany.java index 64ddf4a6c..ac955da46 100644 --- a/src/main/java/com/merge/api/hris/types/EmployeeRequestCompany.java +++ b/src/main/java/com/merge/api/hris/types/EmployeeRequestCompany.java @@ -83,11 +83,11 @@ public EmployeeRequestCompany deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Company.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmployeeRequestEmploymentStatus.java b/src/main/java/com/merge/api/hris/types/EmployeeRequestEmploymentStatus.java index 81c869b10..51fa734d8 100644 --- a/src/main/java/com/merge/api/hris/types/EmployeeRequestEmploymentStatus.java +++ b/src/main/java/com/merge/api/hris/types/EmployeeRequestEmploymentStatus.java @@ -84,11 +84,11 @@ public EmployeeRequestEmploymentStatus deserialize(JsonParser p, Deserialization Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, EmploymentStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmployeeRequestEmploymentsItem.java b/src/main/java/com/merge/api/hris/types/EmployeeRequestEmploymentsItem.java index f16e6fcf2..fb6c55f0d 100644 --- a/src/main/java/com/merge/api/hris/types/EmployeeRequestEmploymentsItem.java +++ b/src/main/java/com/merge/api/hris/types/EmployeeRequestEmploymentsItem.java @@ -84,11 +84,11 @@ public EmployeeRequestEmploymentsItem deserialize(JsonParser p, DeserializationC Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Employment.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmployeeRequestEthnicity.java b/src/main/java/com/merge/api/hris/types/EmployeeRequestEthnicity.java index 671c2d2d0..67272df00 100644 --- a/src/main/java/com/merge/api/hris/types/EmployeeRequestEthnicity.java +++ b/src/main/java/com/merge/api/hris/types/EmployeeRequestEthnicity.java @@ -83,11 +83,11 @@ public EmployeeRequestEthnicity deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, EthnicityEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmployeeRequestGender.java b/src/main/java/com/merge/api/hris/types/EmployeeRequestGender.java index 091b2de41..682217f41 100644 --- a/src/main/java/com/merge/api/hris/types/EmployeeRequestGender.java +++ b/src/main/java/com/merge/api/hris/types/EmployeeRequestGender.java @@ -83,11 +83,11 @@ public EmployeeRequestGender deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, GenderEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmployeeRequestGroupsItem.java b/src/main/java/com/merge/api/hris/types/EmployeeRequestGroupsItem.java index dfb8e59dd..42f108700 100644 --- a/src/main/java/com/merge/api/hris/types/EmployeeRequestGroupsItem.java +++ b/src/main/java/com/merge/api/hris/types/EmployeeRequestGroupsItem.java @@ -83,11 +83,11 @@ public EmployeeRequestGroupsItem deserialize(JsonParser p, DeserializationContex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Group.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmployeeRequestHomeLocation.java b/src/main/java/com/merge/api/hris/types/EmployeeRequestHomeLocation.java index ac31d6ea6..dc5617ea9 100644 --- a/src/main/java/com/merge/api/hris/types/EmployeeRequestHomeLocation.java +++ b/src/main/java/com/merge/api/hris/types/EmployeeRequestHomeLocation.java @@ -84,11 +84,11 @@ public EmployeeRequestHomeLocation deserialize(JsonParser p, DeserializationCont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Location.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmployeeRequestManager.java b/src/main/java/com/merge/api/hris/types/EmployeeRequestManager.java index b52a7e850..5ff0cddbc 100644 --- a/src/main/java/com/merge/api/hris/types/EmployeeRequestManager.java +++ b/src/main/java/com/merge/api/hris/types/EmployeeRequestManager.java @@ -83,11 +83,11 @@ public EmployeeRequestManager deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Employee.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmployeeRequestMaritalStatus.java b/src/main/java/com/merge/api/hris/types/EmployeeRequestMaritalStatus.java index 08f60240c..4f1e56fe9 100644 --- a/src/main/java/com/merge/api/hris/types/EmployeeRequestMaritalStatus.java +++ b/src/main/java/com/merge/api/hris/types/EmployeeRequestMaritalStatus.java @@ -84,11 +84,11 @@ public EmployeeRequestMaritalStatus deserialize(JsonParser p, DeserializationCon Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, MaritalStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmployeeRequestPayGroup.java b/src/main/java/com/merge/api/hris/types/EmployeeRequestPayGroup.java index 1cb816218..4f9c27d2c 100644 --- a/src/main/java/com/merge/api/hris/types/EmployeeRequestPayGroup.java +++ b/src/main/java/com/merge/api/hris/types/EmployeeRequestPayGroup.java @@ -83,11 +83,11 @@ public EmployeeRequestPayGroup deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PayGroup.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmployeeRequestTeam.java b/src/main/java/com/merge/api/hris/types/EmployeeRequestTeam.java index 9b4b4556d..f08c74a6c 100644 --- a/src/main/java/com/merge/api/hris/types/EmployeeRequestTeam.java +++ b/src/main/java/com/merge/api/hris/types/EmployeeRequestTeam.java @@ -83,11 +83,11 @@ public EmployeeRequestTeam deserialize(JsonParser p, DeserializationContext cont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Team.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmployeeRequestWorkLocation.java b/src/main/java/com/merge/api/hris/types/EmployeeRequestWorkLocation.java index 1ebb4ec6c..4c79c4ed1 100644 --- a/src/main/java/com/merge/api/hris/types/EmployeeRequestWorkLocation.java +++ b/src/main/java/com/merge/api/hris/types/EmployeeRequestWorkLocation.java @@ -84,11 +84,11 @@ public EmployeeRequestWorkLocation deserialize(JsonParser p, DeserializationCont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Location.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmployeeResponse.java b/src/main/java/com/merge/api/hris/types/EmployeeResponse.java index 89860e889..c48d0b047 100644 --- a/src/main/java/com/merge/api/hris/types/EmployeeResponse.java +++ b/src/main/java/com/merge/api/hris/types/EmployeeResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/hris/types/EmployeeTeam.java b/src/main/java/com/merge/api/hris/types/EmployeeTeam.java index afc079e65..22003e583 100644 --- a/src/main/java/com/merge/api/hris/types/EmployeeTeam.java +++ b/src/main/java/com/merge/api/hris/types/EmployeeTeam.java @@ -83,11 +83,11 @@ public EmployeeTeam deserialize(JsonParser p, DeserializationContext context) th Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Team.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmployeeWorkLocation.java b/src/main/java/com/merge/api/hris/types/EmployeeWorkLocation.java index 0054ec927..95f404e91 100644 --- a/src/main/java/com/merge/api/hris/types/EmployeeWorkLocation.java +++ b/src/main/java/com/merge/api/hris/types/EmployeeWorkLocation.java @@ -83,11 +83,11 @@ public EmployeeWorkLocation deserialize(JsonParser p, DeserializationContext con Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Location.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmployerBenefitBenefitPlanType.java b/src/main/java/com/merge/api/hris/types/EmployerBenefitBenefitPlanType.java index ef2543878..48e341c0c 100644 --- a/src/main/java/com/merge/api/hris/types/EmployerBenefitBenefitPlanType.java +++ b/src/main/java/com/merge/api/hris/types/EmployerBenefitBenefitPlanType.java @@ -84,11 +84,11 @@ public EmployerBenefitBenefitPlanType deserialize(JsonParser p, DeserializationC Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, BenefitPlanTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmploymentEmployee.java b/src/main/java/com/merge/api/hris/types/EmploymentEmployee.java index 07bbecc9f..4eef1e075 100644 --- a/src/main/java/com/merge/api/hris/types/EmploymentEmployee.java +++ b/src/main/java/com/merge/api/hris/types/EmploymentEmployee.java @@ -83,11 +83,11 @@ public EmploymentEmployee deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Employee.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmploymentEmploymentType.java b/src/main/java/com/merge/api/hris/types/EmploymentEmploymentType.java index 130fb4410..4dc7a1eea 100644 --- a/src/main/java/com/merge/api/hris/types/EmploymentEmploymentType.java +++ b/src/main/java/com/merge/api/hris/types/EmploymentEmploymentType.java @@ -83,11 +83,11 @@ public EmploymentEmploymentType deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, EmploymentTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmploymentFlsaStatus.java b/src/main/java/com/merge/api/hris/types/EmploymentFlsaStatus.java index 6b4066dce..bbeb8b67d 100644 --- a/src/main/java/com/merge/api/hris/types/EmploymentFlsaStatus.java +++ b/src/main/java/com/merge/api/hris/types/EmploymentFlsaStatus.java @@ -83,11 +83,11 @@ public EmploymentFlsaStatus deserialize(JsonParser p, DeserializationContext con Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, FlsaStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmploymentPayCurrency.java b/src/main/java/com/merge/api/hris/types/EmploymentPayCurrency.java index 10ced6599..a1c8ebebe 100644 --- a/src/main/java/com/merge/api/hris/types/EmploymentPayCurrency.java +++ b/src/main/java/com/merge/api/hris/types/EmploymentPayCurrency.java @@ -83,11 +83,11 @@ public EmploymentPayCurrency deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PayCurrencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmploymentPayFrequency.java b/src/main/java/com/merge/api/hris/types/EmploymentPayFrequency.java index a95ed2e74..8f3460bb6 100644 --- a/src/main/java/com/merge/api/hris/types/EmploymentPayFrequency.java +++ b/src/main/java/com/merge/api/hris/types/EmploymentPayFrequency.java @@ -83,11 +83,11 @@ public EmploymentPayFrequency deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PayFrequencyEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmploymentPayGroup.java b/src/main/java/com/merge/api/hris/types/EmploymentPayGroup.java index 0a536ed65..93d1cb186 100644 --- a/src/main/java/com/merge/api/hris/types/EmploymentPayGroup.java +++ b/src/main/java/com/merge/api/hris/types/EmploymentPayGroup.java @@ -83,11 +83,11 @@ public EmploymentPayGroup deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PayGroup.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EmploymentPayPeriod.java b/src/main/java/com/merge/api/hris/types/EmploymentPayPeriod.java index 86556c44b..5d8da2cd1 100644 --- a/src/main/java/com/merge/api/hris/types/EmploymentPayPeriod.java +++ b/src/main/java/com/merge/api/hris/types/EmploymentPayPeriod.java @@ -83,11 +83,11 @@ public EmploymentPayPeriod deserialize(JsonParser p, DeserializationContext cont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PayPeriodEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/EndUserDetailsRequest.java b/src/main/java/com/merge/api/hris/types/EndUserDetailsRequest.java index 005697a02..59530ba67 100644 --- a/src/main/java/com/merge/api/hris/types/EndUserDetailsRequest.java +++ b/src/main/java/com/merge/api/hris/types/EndUserDetailsRequest.java @@ -250,7 +250,7 @@ public static EndUserEmailAddressStage builder() { public interface EndUserEmailAddressStage { /** - * Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent. + *

                          Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.

                          */ EndUserOrganizationNameStage endUserEmailAddress(@NotNull String endUserEmailAddress); @@ -259,14 +259,14 @@ public interface EndUserEmailAddressStage { public interface EndUserOrganizationNameStage { /** - * Your end user's organization. + *

                          Your end user's organization.

                          */ EndUserOriginIdStage endUserOrganizationName(@NotNull String endUserOrganizationName); } public interface EndUserOriginIdStage { /** - * This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers. + *

                          This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.

                          */ _FinalStage endUserOriginId(@NotNull String endUserOriginId); } @@ -408,7 +408,8 @@ public Builder from(EndUserDetailsRequest other) { } /** - * Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.

                          Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.

                          + *

                          Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.

                          + *

                          Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.

                          * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -419,7 +420,8 @@ public EndUserOrganizationNameStage endUserEmailAddress(@NotNull String endUserE } /** - * Your end user's organization.

                          Your end user's organization.

                          + *

                          Your end user's organization.

                          + *

                          Your end user's organization.

                          * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -430,7 +432,8 @@ public EndUserOriginIdStage endUserOrganizationName(@NotNull String endUserOrgan } /** - * This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.

                          This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.

                          + *

                          This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.

                          + *

                          This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.

                          * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -637,7 +640,9 @@ public _FinalStage integration(Optional integration) { */ @java.lang.Override public _FinalStage addAllCategories(List categories) { - this.categories.addAll(categories); + if (categories != null) { + this.categories.addAll(categories); + } return this; } diff --git a/src/main/java/com/merge/api/hris/types/EndUserDetailsRequestLanguage.java b/src/main/java/com/merge/api/hris/types/EndUserDetailsRequestLanguage.java index cff05d8a3..5cfa3ce3b 100644 --- a/src/main/java/com/merge/api/hris/types/EndUserDetailsRequestLanguage.java +++ b/src/main/java/com/merge/api/hris/types/EndUserDetailsRequestLanguage.java @@ -84,11 +84,11 @@ public EndUserDetailsRequestLanguage deserialize(JsonParser p, DeserializationCo Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, LanguageEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/FieldMappingInstanceResponse.java b/src/main/java/com/merge/api/hris/types/FieldMappingInstanceResponse.java index ffa8663af..d61c87522 100644 --- a/src/main/java/com/merge/api/hris/types/FieldMappingInstanceResponse.java +++ b/src/main/java/com/merge/api/hris/types/FieldMappingInstanceResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/hris/types/GenerateRemoteKeyRequest.java b/src/main/java/com/merge/api/hris/types/GenerateRemoteKeyRequest.java index 5be2a89b2..54c7d74c0 100644 --- a/src/main/java/com/merge/api/hris/types/GenerateRemoteKeyRequest.java +++ b/src/main/java/com/merge/api/hris/types/GenerateRemoteKeyRequest.java @@ -67,7 +67,7 @@ public static NameStage builder() { public interface NameStage { /** - * The name of the remote key + *

                          The name of the remote key

                          */ _FinalStage name(@NotNull String name); @@ -94,7 +94,8 @@ public Builder from(GenerateRemoteKeyRequest other) { } /** - * The name of the remote key

                          The name of the remote key

                          + *

                          The name of the remote key

                          + *

                          The name of the remote key

                          * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/hris/types/GroupType.java b/src/main/java/com/merge/api/hris/types/GroupType.java index 2880c6e18..a2c72428a 100644 --- a/src/main/java/com/merge/api/hris/types/GroupType.java +++ b/src/main/java/com/merge/api/hris/types/GroupType.java @@ -83,11 +83,11 @@ public GroupType deserialize(JsonParser p, DeserializationContext context) throw Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, GroupTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/IgnoreCommonModelRequestReason.java b/src/main/java/com/merge/api/hris/types/IgnoreCommonModelRequestReason.java index cd7bda0ac..be835a4d9 100644 --- a/src/main/java/com/merge/api/hris/types/IgnoreCommonModelRequestReason.java +++ b/src/main/java/com/merge/api/hris/types/IgnoreCommonModelRequestReason.java @@ -84,11 +84,11 @@ public IgnoreCommonModelRequestReason deserialize(JsonParser p, DeserializationC Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, ReasonEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/IssueStatus.java b/src/main/java/com/merge/api/hris/types/IssueStatus.java index 9871aa7d8..90a84f366 100644 --- a/src/main/java/com/merge/api/hris/types/IssueStatus.java +++ b/src/main/java/com/merge/api/hris/types/IssueStatus.java @@ -83,11 +83,11 @@ public IssueStatus deserialize(JsonParser p, DeserializationContext context) thr Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, IssueStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/LinkedAccountCommonModelScopeDeserializerRequest.java b/src/main/java/com/merge/api/hris/types/LinkedAccountCommonModelScopeDeserializerRequest.java index dec1445b6..f8d7a2c0c 100644 --- a/src/main/java/com/merge/api/hris/types/LinkedAccountCommonModelScopeDeserializerRequest.java +++ b/src/main/java/com/merge/api/hris/types/LinkedAccountCommonModelScopeDeserializerRequest.java @@ -100,7 +100,9 @@ public Builder addCommonModels(IndividualCommonModelScopeDeserializerRequest com } public Builder addAllCommonModels(List commonModels) { - this.commonModels.addAll(commonModels); + if (commonModels != null) { + this.commonModels.addAll(commonModels); + } return this; } diff --git a/src/main/java/com/merge/api/hris/types/LocationCountry.java b/src/main/java/com/merge/api/hris/types/LocationCountry.java index d2855b512..4234f639d 100644 --- a/src/main/java/com/merge/api/hris/types/LocationCountry.java +++ b/src/main/java/com/merge/api/hris/types/LocationCountry.java @@ -83,11 +83,11 @@ public LocationCountry deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CountryEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/LocationLocationType.java b/src/main/java/com/merge/api/hris/types/LocationLocationType.java index 84f067aa7..81ee1a4b3 100644 --- a/src/main/java/com/merge/api/hris/types/LocationLocationType.java +++ b/src/main/java/com/merge/api/hris/types/LocationLocationType.java @@ -83,11 +83,11 @@ public LocationLocationType deserialize(JsonParser p, DeserializationContext con Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, LocationTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/MetaResponse.java b/src/main/java/com/merge/api/hris/types/MetaResponse.java index 009bfe283..4b090c2b2 100644 --- a/src/main/java/com/merge/api/hris/types/MetaResponse.java +++ b/src/main/java/com/merge/api/hris/types/MetaResponse.java @@ -216,7 +216,9 @@ public _FinalStage requestSchema(String key, JsonNode value) { @java.lang.Override public _FinalStage putAllRequestSchema(Map requestSchema) { - this.requestSchema.putAll(requestSchema); + if (requestSchema != null) { + this.requestSchema.putAll(requestSchema); + } return this; } diff --git a/src/main/java/com/merge/api/hris/types/ModelOperation.java b/src/main/java/com/merge/api/hris/types/ModelOperation.java index 33665b056..e93f6a1ea 100644 --- a/src/main/java/com/merge/api/hris/types/ModelOperation.java +++ b/src/main/java/com/merge/api/hris/types/ModelOperation.java @@ -159,7 +159,9 @@ public _FinalStage modelName(@NotNull String modelName) { @java.lang.Override public _FinalStage addAllSupportedFields(List supportedFields) { - this.supportedFields.addAll(supportedFields); + if (supportedFields != null) { + this.supportedFields.addAll(supportedFields); + } return this; } @@ -179,7 +181,9 @@ public _FinalStage supportedFields(List supportedFields) { @java.lang.Override public _FinalStage addAllRequiredPostParameters(List requiredPostParameters) { - this.requiredPostParameters.addAll(requiredPostParameters); + if (requiredPostParameters != null) { + this.requiredPostParameters.addAll(requiredPostParameters); + } return this; } @@ -199,7 +203,9 @@ public _FinalStage requiredPostParameters(List requiredPostParameters) { @java.lang.Override public _FinalStage addAllAvailableOperations(List availableOperations) { - this.availableOperations.addAll(availableOperations); + if (availableOperations != null) { + this.availableOperations.addAll(availableOperations); + } return this; } diff --git a/src/main/java/com/merge/api/hris/types/MultipartFormFieldRequest.java b/src/main/java/com/merge/api/hris/types/MultipartFormFieldRequest.java index cadc8a410..0018dd580 100644 --- a/src/main/java/com/merge/api/hris/types/MultipartFormFieldRequest.java +++ b/src/main/java/com/merge/api/hris/types/MultipartFormFieldRequest.java @@ -128,7 +128,7 @@ public static NameStage builder() { public interface NameStage { /** - * The name of the form field + *

                          The name of the form field

                          */ DataStage name(@NotNull String name); @@ -137,7 +137,7 @@ public interface NameStage { public interface DataStage { /** - * The data for the form field. + *

                          The data for the form field.

                          */ _FinalStage data(@NotNull String data); } @@ -200,7 +200,8 @@ public Builder from(MultipartFormFieldRequest other) { } /** - * The name of the form field

                          The name of the form field

                          + *

                          The name of the form field

                          + *

                          The name of the form field

                          * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -211,7 +212,8 @@ public DataStage name(@NotNull String name) { } /** - * The data for the form field.

                          The data for the form field.

                          + *

                          The data for the form field.

                          + *

                          The data for the form field.

                          * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/hris/types/PayrollRunRunState.java b/src/main/java/com/merge/api/hris/types/PayrollRunRunState.java index e77a24cd9..e7fd65253 100644 --- a/src/main/java/com/merge/api/hris/types/PayrollRunRunState.java +++ b/src/main/java/com/merge/api/hris/types/PayrollRunRunState.java @@ -83,11 +83,11 @@ public PayrollRunRunState deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RunStateEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/PayrollRunRunType.java b/src/main/java/com/merge/api/hris/types/PayrollRunRunType.java index 1941992c3..2a0454d95 100644 --- a/src/main/java/com/merge/api/hris/types/PayrollRunRunType.java +++ b/src/main/java/com/merge/api/hris/types/PayrollRunRunType.java @@ -83,11 +83,11 @@ public PayrollRunRunType deserialize(JsonParser p, DeserializationContext contex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RunTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/RemoteData.java b/src/main/java/com/merge/api/hris/types/RemoteData.java index e9d82f2e0..7ab1bdbfa 100644 --- a/src/main/java/com/merge/api/hris/types/RemoteData.java +++ b/src/main/java/com/merge/api/hris/types/RemoteData.java @@ -78,7 +78,7 @@ public static PathStage builder() { public interface PathStage { /** - * The third-party API path that is being called. + *

                          The third-party API path that is being called.

                          */ _FinalStage path(@NotNull String path); @@ -112,7 +112,8 @@ public Builder from(RemoteData other) { } /** - * The third-party API path that is being called.

                          The third-party API path that is being called.

                          + *

                          The third-party API path that is being called.

                          + *

                          The third-party API path that is being called.

                          * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/hris/types/RemoteEndpointInfo.java b/src/main/java/com/merge/api/hris/types/RemoteEndpointInfo.java index 3c1e0101a..46e44fefd 100644 --- a/src/main/java/com/merge/api/hris/types/RemoteEndpointInfo.java +++ b/src/main/java/com/merge/api/hris/types/RemoteEndpointInfo.java @@ -145,7 +145,9 @@ public _FinalStage urlPath(@NotNull String urlPath) { @java.lang.Override public _FinalStage addAllFieldTraversalPath(List fieldTraversalPath) { - this.fieldTraversalPath.addAll(fieldTraversalPath); + if (fieldTraversalPath != null) { + this.fieldTraversalPath.addAll(fieldTraversalPath); + } return this; } diff --git a/src/main/java/com/merge/api/hris/types/RemoteFieldApi.java b/src/main/java/com/merge/api/hris/types/RemoteFieldApi.java index 1d8e99c0b..3df9d64c2 100644 --- a/src/main/java/com/merge/api/hris/types/RemoteFieldApi.java +++ b/src/main/java/com/merge/api/hris/types/RemoteFieldApi.java @@ -248,7 +248,9 @@ public _FinalStage schema(String key, JsonNode value) { @java.lang.Override public _FinalStage putAllSchema(Map schema) { - this.schema.putAll(schema); + if (schema != null) { + this.schema.putAll(schema); + } return this; } diff --git a/src/main/java/com/merge/api/hris/types/RemoteKeyForRegenerationRequest.java b/src/main/java/com/merge/api/hris/types/RemoteKeyForRegenerationRequest.java index cd2206459..14452589e 100644 --- a/src/main/java/com/merge/api/hris/types/RemoteKeyForRegenerationRequest.java +++ b/src/main/java/com/merge/api/hris/types/RemoteKeyForRegenerationRequest.java @@ -67,7 +67,7 @@ public static NameStage builder() { public interface NameStage { /** - * The name of the remote key + *

                          The name of the remote key

                          */ _FinalStage name(@NotNull String name); @@ -94,7 +94,8 @@ public Builder from(RemoteKeyForRegenerationRequest other) { } /** - * The name of the remote key

                          The name of the remote key

                          + *

                          The name of the remote key

                          + *

                          The name of the remote key

                          * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/hris/types/RemoteResponseResponseType.java b/src/main/java/com/merge/api/hris/types/RemoteResponseResponseType.java index f6bf8b1ac..20fea7d2e 100644 --- a/src/main/java/com/merge/api/hris/types/RemoteResponseResponseType.java +++ b/src/main/java/com/merge/api/hris/types/RemoteResponseResponseType.java @@ -83,11 +83,11 @@ public RemoteResponseResponseType deserialize(JsonParser p, DeserializationConte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, ResponseTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/SyncStatusLastSyncResult.java b/src/main/java/com/merge/api/hris/types/SyncStatusLastSyncResult.java index 4fd37b503..58a4a7b0a 100644 --- a/src/main/java/com/merge/api/hris/types/SyncStatusLastSyncResult.java +++ b/src/main/java/com/merge/api/hris/types/SyncStatusLastSyncResult.java @@ -83,11 +83,11 @@ public SyncStatusLastSyncResult deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, LastSyncResultEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/SyncStatusStatus.java b/src/main/java/com/merge/api/hris/types/SyncStatusStatus.java index 32894b7f9..cdebd8b3e 100644 --- a/src/main/java/com/merge/api/hris/types/SyncStatusStatus.java +++ b/src/main/java/com/merge/api/hris/types/SyncStatusStatus.java @@ -83,11 +83,11 @@ public SyncStatusStatus deserialize(JsonParser p, DeserializationContext context Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, StatusFd5Enum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/TeamParentTeam.java b/src/main/java/com/merge/api/hris/types/TeamParentTeam.java index ca57f448b..2427a6ed1 100644 --- a/src/main/java/com/merge/api/hris/types/TeamParentTeam.java +++ b/src/main/java/com/merge/api/hris/types/TeamParentTeam.java @@ -83,11 +83,11 @@ public TeamParentTeam deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Team.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/TimeOffApprover.java b/src/main/java/com/merge/api/hris/types/TimeOffApprover.java index a1e9a9854..ece15276e 100644 --- a/src/main/java/com/merge/api/hris/types/TimeOffApprover.java +++ b/src/main/java/com/merge/api/hris/types/TimeOffApprover.java @@ -83,11 +83,11 @@ public TimeOffApprover deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Employee.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/TimeOffBalanceEmployee.java b/src/main/java/com/merge/api/hris/types/TimeOffBalanceEmployee.java index 82478718a..52a01075b 100644 --- a/src/main/java/com/merge/api/hris/types/TimeOffBalanceEmployee.java +++ b/src/main/java/com/merge/api/hris/types/TimeOffBalanceEmployee.java @@ -83,11 +83,11 @@ public TimeOffBalanceEmployee deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Employee.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/TimeOffBalancePolicyType.java b/src/main/java/com/merge/api/hris/types/TimeOffBalancePolicyType.java index 08b4d8168..0113bbbe1 100644 --- a/src/main/java/com/merge/api/hris/types/TimeOffBalancePolicyType.java +++ b/src/main/java/com/merge/api/hris/types/TimeOffBalancePolicyType.java @@ -83,11 +83,11 @@ public TimeOffBalancePolicyType deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PolicyTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/TimeOffEmployee.java b/src/main/java/com/merge/api/hris/types/TimeOffEmployee.java index 5b9753528..99d955368 100644 --- a/src/main/java/com/merge/api/hris/types/TimeOffEmployee.java +++ b/src/main/java/com/merge/api/hris/types/TimeOffEmployee.java @@ -83,11 +83,11 @@ public TimeOffEmployee deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Employee.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/TimeOffRequestApprover.java b/src/main/java/com/merge/api/hris/types/TimeOffRequestApprover.java index 8a7eae8f9..2f48a96d3 100644 --- a/src/main/java/com/merge/api/hris/types/TimeOffRequestApprover.java +++ b/src/main/java/com/merge/api/hris/types/TimeOffRequestApprover.java @@ -83,11 +83,11 @@ public TimeOffRequestApprover deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Employee.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/TimeOffRequestEmployee.java b/src/main/java/com/merge/api/hris/types/TimeOffRequestEmployee.java index a897c8363..647e65738 100644 --- a/src/main/java/com/merge/api/hris/types/TimeOffRequestEmployee.java +++ b/src/main/java/com/merge/api/hris/types/TimeOffRequestEmployee.java @@ -83,11 +83,11 @@ public TimeOffRequestEmployee deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Employee.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/TimeOffRequestRequestType.java b/src/main/java/com/merge/api/hris/types/TimeOffRequestRequestType.java index f66661993..c7e492ded 100644 --- a/src/main/java/com/merge/api/hris/types/TimeOffRequestRequestType.java +++ b/src/main/java/com/merge/api/hris/types/TimeOffRequestRequestType.java @@ -83,11 +83,11 @@ public TimeOffRequestRequestType deserialize(JsonParser p, DeserializationContex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RequestTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/TimeOffRequestStatus.java b/src/main/java/com/merge/api/hris/types/TimeOffRequestStatus.java index 5b0d62091..3efd3170e 100644 --- a/src/main/java/com/merge/api/hris/types/TimeOffRequestStatus.java +++ b/src/main/java/com/merge/api/hris/types/TimeOffRequestStatus.java @@ -83,11 +83,11 @@ public TimeOffRequestStatus deserialize(JsonParser p, DeserializationContext con Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TimeOffStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/TimeOffRequestType.java b/src/main/java/com/merge/api/hris/types/TimeOffRequestType.java index b8fe94c97..fec8faeaa 100644 --- a/src/main/java/com/merge/api/hris/types/TimeOffRequestType.java +++ b/src/main/java/com/merge/api/hris/types/TimeOffRequestType.java @@ -83,11 +83,11 @@ public TimeOffRequestType deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RequestTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/TimeOffRequestUnits.java b/src/main/java/com/merge/api/hris/types/TimeOffRequestUnits.java index 3eaab9bb1..c64b8d5a5 100644 --- a/src/main/java/com/merge/api/hris/types/TimeOffRequestUnits.java +++ b/src/main/java/com/merge/api/hris/types/TimeOffRequestUnits.java @@ -83,11 +83,11 @@ public TimeOffRequestUnits deserialize(JsonParser p, DeserializationContext cont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, UnitsEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/TimeOffResponse.java b/src/main/java/com/merge/api/hris/types/TimeOffResponse.java index 0b395b890..d5d69ba4b 100644 --- a/src/main/java/com/merge/api/hris/types/TimeOffResponse.java +++ b/src/main/java/com/merge/api/hris/types/TimeOffResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/hris/types/TimeOffStatus.java b/src/main/java/com/merge/api/hris/types/TimeOffStatus.java index 01bd18ad1..e2145612a 100644 --- a/src/main/java/com/merge/api/hris/types/TimeOffStatus.java +++ b/src/main/java/com/merge/api/hris/types/TimeOffStatus.java @@ -83,11 +83,11 @@ public TimeOffStatus deserialize(JsonParser p, DeserializationContext context) t Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TimeOffStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/TimeOffUnits.java b/src/main/java/com/merge/api/hris/types/TimeOffUnits.java index 4cd7c3937..f86557d6a 100644 --- a/src/main/java/com/merge/api/hris/types/TimeOffUnits.java +++ b/src/main/java/com/merge/api/hris/types/TimeOffUnits.java @@ -83,11 +83,11 @@ public TimeOffUnits deserialize(JsonParser p, DeserializationContext context) th Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, UnitsEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/TimesheetEntryEmployee.java b/src/main/java/com/merge/api/hris/types/TimesheetEntryEmployee.java index 44be4338a..59279ed34 100644 --- a/src/main/java/com/merge/api/hris/types/TimesheetEntryEmployee.java +++ b/src/main/java/com/merge/api/hris/types/TimesheetEntryEmployee.java @@ -83,11 +83,11 @@ public TimesheetEntryEmployee deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Employee.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/TimesheetEntryRequestEmployee.java b/src/main/java/com/merge/api/hris/types/TimesheetEntryRequestEmployee.java index e139c525c..5254bd990 100644 --- a/src/main/java/com/merge/api/hris/types/TimesheetEntryRequestEmployee.java +++ b/src/main/java/com/merge/api/hris/types/TimesheetEntryRequestEmployee.java @@ -84,11 +84,11 @@ public TimesheetEntryRequestEmployee deserialize(JsonParser p, DeserializationCo Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Employee.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/hris/types/TimesheetEntryResponse.java b/src/main/java/com/merge/api/hris/types/TimesheetEntryResponse.java index 26ffbd0de..01d220898 100644 --- a/src/main/java/com/merge/api/hris/types/TimesheetEntryResponse.java +++ b/src/main/java/com/merge/api/hris/types/TimesheetEntryResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/ticketing/AsyncRawAccountDetailsClient.java b/src/main/java/com/merge/api/ticketing/AsyncRawAccountDetailsClient.java index 62c5f95b0..4a87072e7 100644 --- a/src/main/java/com/merge/api/ticketing/AsyncRawAccountDetailsClient.java +++ b/src/main/java/com/merge/api/ticketing/AsyncRawAccountDetailsClient.java @@ -48,7 +48,6 @@ public CompletableFuture> retrieve(RequestO .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/AsyncRawAccountTokenClient.java b/src/main/java/com/merge/api/ticketing/AsyncRawAccountTokenClient.java index ece832412..d90edf025 100644 --- a/src/main/java/com/merge/api/ticketing/AsyncRawAccountTokenClient.java +++ b/src/main/java/com/merge/api/ticketing/AsyncRawAccountTokenClient.java @@ -50,7 +50,6 @@ public CompletableFuture> retrieve( .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/AsyncRawAccountsClient.java b/src/main/java/com/merge/api/ticketing/AsyncRawAccountsClient.java index dba3cde8d..aca3b47be 100644 --- a/src/main/java/com/merge/api/ticketing/AsyncRawAccountsClient.java +++ b/src/main/java/com/merge/api/ticketing/AsyncRawAccountsClient.java @@ -62,11 +62,11 @@ public CompletableFuture>> list .addPathSegments("ticketing/v1/accounts"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -76,37 +76,31 @@ public CompletableFuture>> list QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -116,7 +110,6 @@ public CompletableFuture>> list .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -197,21 +190,17 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/AsyncRawAsyncPassthroughClient.java b/src/main/java/com/merge/api/ticketing/AsyncRawAsyncPassthroughClient.java index 94124c0f3..9365dede5 100644 --- a/src/main/java/com/merge/api/ticketing/AsyncRawAsyncPassthroughClient.java +++ b/src/main/java/com/merge/api/ticketing/AsyncRawAsyncPassthroughClient.java @@ -122,7 +122,6 @@ public CompletableFuture> .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/AsyncRawAttachmentsClient.java b/src/main/java/com/merge/api/ticketing/AsyncRawAttachmentsClient.java index f392f131f..290af6c8e 100644 --- a/src/main/java/com/merge/api/ticketing/AsyncRawAttachmentsClient.java +++ b/src/main/java/com/merge/api/ticketing/AsyncRawAttachmentsClient.java @@ -73,11 +73,11 @@ public CompletableFuture>> l .addPathSegments("ticketing/v1/attachments"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -87,43 +87,37 @@ public CompletableFuture>> l QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "remote_created_after", - request.getRemoteCreatedAfter().get().toString(), + request.getRemoteCreatedAfter().get(), false); } if (request.getRemoteId().isPresent()) { @@ -136,13 +130,12 @@ public CompletableFuture>> l } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -214,11 +207,11 @@ public CompletableFuture> crea .addPathSegments("ticketing/v1/attachments"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -299,25 +292,21 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -382,10 +371,7 @@ public CompletableFuture> downloadRetrieve( .addPathSegments("download"); if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getMimeType().isPresent()) { QueryStringMapper.addQueryParameter( @@ -394,8 +380,7 @@ public CompletableFuture> downloadRetrieve( Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) - .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json"); + .headers(Headers.of(clientOptions.headers(requestOptions))); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); if (requestOptions != null && requestOptions.getTimeout().isPresent()) { @@ -450,7 +435,6 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/AsyncRawAuditTrailClient.java b/src/main/java/com/merge/api/ticketing/AsyncRawAuditTrailClient.java index c03956609..c625a679b 100644 --- a/src/main/java/com/merge/api/ticketing/AsyncRawAuditTrailClient.java +++ b/src/main/java/com/merge/api/ticketing/AsyncRawAuditTrailClient.java @@ -74,7 +74,7 @@ public CompletableFuture> } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getStartDate().isPresent()) { QueryStringMapper.addQueryParameter( @@ -88,7 +88,6 @@ public CompletableFuture> .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/AsyncRawAvailableActionsClient.java b/src/main/java/com/merge/api/ticketing/AsyncRawAvailableActionsClient.java index 49e5e1b20..ff2864a31 100644 --- a/src/main/java/com/merge/api/ticketing/AsyncRawAvailableActionsClient.java +++ b/src/main/java/com/merge/api/ticketing/AsyncRawAvailableActionsClient.java @@ -48,7 +48,6 @@ public CompletableFuture> retrieve(Reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/AsyncRawCollectionsClient.java b/src/main/java/com/merge/api/ticketing/AsyncRawCollectionsClient.java index 8cabbc63b..30a585b09 100644 --- a/src/main/java/com/merge/api/ticketing/AsyncRawCollectionsClient.java +++ b/src/main/java/com/merge/api/ticketing/AsyncRawCollectionsClient.java @@ -70,11 +70,11 @@ public CompletableFuture>> l } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -84,37 +84,31 @@ public CompletableFuture>> l QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getParentCollectionId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -137,13 +131,12 @@ public CompletableFuture>> l } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -230,36 +223,32 @@ public CompletableFuture>> viewe QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -340,15 +329,12 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -360,13 +346,12 @@ public CompletableFuture> retrieve( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/AsyncRawCommentsClient.java b/src/main/java/com/merge/api/ticketing/AsyncRawCommentsClient.java index 1bad52f96..66a94957d 100644 --- a/src/main/java/com/merge/api/ticketing/AsyncRawCommentsClient.java +++ b/src/main/java/com/merge/api/ticketing/AsyncRawCommentsClient.java @@ -69,11 +69,11 @@ public CompletableFuture>> list .addPathSegments("ticketing/v1/comments"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -83,43 +83,37 @@ public CompletableFuture>> list QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "remote_created_after", - request.getRemoteCreatedAfter().get().toString(), + request.getRemoteCreatedAfter().get(), false); } if (request.getRemoteId().isPresent()) { @@ -132,13 +126,12 @@ public CompletableFuture>> list } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -209,11 +202,11 @@ public CompletableFuture> create( .addPathSegments("ticketing/v1/comments"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -293,25 +286,21 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -367,7 +356,6 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/AsyncRawContactsClient.java b/src/main/java/com/merge/api/ticketing/AsyncRawContactsClient.java index 797e1dfd3..06c94465a 100644 --- a/src/main/java/com/merge/api/ticketing/AsyncRawContactsClient.java +++ b/src/main/java/com/merge/api/ticketing/AsyncRawContactsClient.java @@ -69,11 +69,11 @@ public CompletableFuture>> list .addPathSegments("ticketing/v1/contacts"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -83,37 +83,31 @@ public CompletableFuture>> list QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -121,13 +115,12 @@ public CompletableFuture>> list } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -199,11 +192,11 @@ public CompletableFuture> create( .addPathSegments("ticketing/v1/contacts"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -284,25 +277,21 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -358,7 +347,6 @@ public CompletableFuture> metaPostRetrieve(Re .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/AsyncRawFieldMappingClient.java b/src/main/java/com/merge/api/ticketing/AsyncRawFieldMappingClient.java index a9566ad3a..9648e816d 100644 --- a/src/main/java/com/merge/api/ticketing/AsyncRawFieldMappingClient.java +++ b/src/main/java/com/merge/api/ticketing/AsyncRawFieldMappingClient.java @@ -69,14 +69,13 @@ public CompletableFuture> QueryStringMapper.addQueryParameter( httpUrl, "exclude_remote_field_metadata", - request.getExcludeRemoteFieldMetadata().get().toString(), + request.getExcludeRemoteFieldMetadata().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -135,7 +134,7 @@ public CompletableFuture> fie QueryStringMapper.addQueryParameter( httpUrl, "exclude_remote_field_metadata", - request.getExcludeRemoteFieldMetadata().get().toString(), + request.getExcludeRemoteFieldMetadata().get(), false); } Map properties = new HashMap<>(); @@ -217,7 +216,6 @@ public CompletableFuture> fie .url(httpUrl) .method("DELETE", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -371,7 +369,6 @@ public CompletableFuture> remoteFie .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -430,7 +427,6 @@ public CompletableFuture> t .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/AsyncRawForceResyncClient.java b/src/main/java/com/merge/api/ticketing/AsyncRawForceResyncClient.java index 9668abb67..dd87696eb 100644 --- a/src/main/java/com/merge/api/ticketing/AsyncRawForceResyncClient.java +++ b/src/main/java/com/merge/api/ticketing/AsyncRawForceResyncClient.java @@ -52,7 +52,6 @@ public CompletableFuture>> syncStatusResyn .url(httpUrl) .method("POST", RequestBody.create("", null)) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/AsyncRawIssuesClient.java b/src/main/java/com/merge/api/ticketing/AsyncRawIssuesClient.java index 46dc3e4f4..ed347c588 100644 --- a/src/main/java/com/merge/api/ticketing/AsyncRawIssuesClient.java +++ b/src/main/java/com/merge/api/ticketing/AsyncRawIssuesClient.java @@ -82,14 +82,14 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "first_incident_time_after", - request.getFirstIncidentTimeAfter().get().toString(), + request.getFirstIncidentTimeAfter().get(), false); } if (request.getFirstIncidentTimeBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "first_incident_time_before", - request.getFirstIncidentTimeBefore().get().toString(), + request.getFirstIncidentTimeBefore().get(), false); } if (request.getIncludeMuted().isPresent()) { @@ -104,14 +104,14 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "last_incident_time_after", - request.getLastIncidentTimeAfter().get().toString(), + request.getLastIncidentTimeAfter().get(), false); } if (request.getLastIncidentTimeBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "last_incident_time_before", - request.getLastIncidentTimeBefore().get().toString(), + request.getLastIncidentTimeBefore().get(), false); } if (request.getLinkedAccountId().isPresent()) { @@ -120,7 +120,7 @@ public CompletableFuture>> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getStartDate().isPresent()) { QueryStringMapper.addQueryParameter( @@ -128,13 +128,12 @@ public CompletableFuture>> list( } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "status", request.getStatus().get().toString(), false); + httpUrl, "status", request.getStatus().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -208,7 +207,6 @@ public CompletableFuture> retrieve(String id, Reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/AsyncRawLinkedAccountsClient.java b/src/main/java/com/merge/api/ticketing/AsyncRawLinkedAccountsClient.java index a7f20926b..038d7a332 100644 --- a/src/main/java/com/merge/api/ticketing/AsyncRawLinkedAccountsClient.java +++ b/src/main/java/com/merge/api/ticketing/AsyncRawLinkedAccountsClient.java @@ -62,7 +62,7 @@ public CompletableFuture>> list .addPathSegments("ticketing/v1/projects"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -79,37 +79,31 @@ public CompletableFuture>> list QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -119,7 +113,6 @@ public CompletableFuture>> list .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -200,21 +193,17 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -284,36 +273,32 @@ public CompletableFuture>> usersLi QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/AsyncRawRolesClient.java b/src/main/java/com/merge/api/ticketing/AsyncRawRolesClient.java index 086eafd21..7e552c363 100644 --- a/src/main/java/com/merge/api/ticketing/AsyncRawRolesClient.java +++ b/src/main/java/com/merge/api/ticketing/AsyncRawRolesClient.java @@ -62,11 +62,11 @@ public CompletableFuture>> list( .addPathSegments("ticketing/v1/roles"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -76,37 +76,31 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -116,7 +110,6 @@ public CompletableFuture>> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -197,21 +190,17 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/AsyncRawScopesClient.java b/src/main/java/com/merge/api/ticketing/AsyncRawScopesClient.java index c6098baa8..677b22cfa 100644 --- a/src/main/java/com/merge/api/ticketing/AsyncRawScopesClient.java +++ b/src/main/java/com/merge/api/ticketing/AsyncRawScopesClient.java @@ -53,7 +53,6 @@ public CompletableFuture> defaultScope .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -111,7 +110,6 @@ public CompletableFuture> linkedAccoun .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/AsyncRawSyncStatusClient.java b/src/main/java/com/merge/api/ticketing/AsyncRawSyncStatusClient.java index 24d6a92f5..edfd8b20f 100644 --- a/src/main/java/com/merge/api/ticketing/AsyncRawSyncStatusClient.java +++ b/src/main/java/com/merge/api/ticketing/AsyncRawSyncStatusClient.java @@ -65,13 +65,12 @@ public CompletableFuture>> l } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/AsyncRawTagsClient.java b/src/main/java/com/merge/api/ticketing/AsyncRawTagsClient.java index 265f5c697..70932e986 100644 --- a/src/main/java/com/merge/api/ticketing/AsyncRawTagsClient.java +++ b/src/main/java/com/merge/api/ticketing/AsyncRawTagsClient.java @@ -62,11 +62,11 @@ public CompletableFuture>> list( .addPathSegments("ticketing/v1/tags"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -76,37 +76,31 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -116,7 +110,6 @@ public CompletableFuture>> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -197,21 +190,17 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/AsyncRawTeamsClient.java b/src/main/java/com/merge/api/ticketing/AsyncRawTeamsClient.java index 05663725d..d3eb8187b 100644 --- a/src/main/java/com/merge/api/ticketing/AsyncRawTeamsClient.java +++ b/src/main/java/com/merge/api/ticketing/AsyncRawTeamsClient.java @@ -62,11 +62,11 @@ public CompletableFuture>> list( .addPathSegments("ticketing/v1/teams"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -76,37 +76,31 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -116,7 +110,6 @@ public CompletableFuture>> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -197,21 +190,17 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/AsyncRawTicketsClient.java b/src/main/java/com/merge/api/ticketing/AsyncRawTicketsClient.java index 350a20480..9512a1c8d 100644 --- a/src/main/java/com/merge/api/ticketing/AsyncRawTicketsClient.java +++ b/src/main/java/com/merge/api/ticketing/AsyncRawTicketsClient.java @@ -89,17 +89,11 @@ public CompletableFuture>> list( } if (request.getCompletedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "completed_after", - request.getCompletedAfter().get().toString(), - false); + httpUrl, "completed_after", request.getCompletedAfter().get(), false); } if (request.getCompletedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "completed_before", - request.getCompletedBefore().get().toString(), - false); + httpUrl, "completed_before", request.getCompletedBefore().get(), false); } if (request.getContactId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -107,11 +101,11 @@ public CompletableFuture>> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCreatorId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -123,54 +117,48 @@ public CompletableFuture>> list( } if (request.getDueAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "due_after", request.getDueAfter().get().toString(), false); + httpUrl, "due_after", request.getDueAfter().get(), false); } if (request.getDueBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "due_before", request.getDueBefore().get().toString(), false); + httpUrl, "due_before", request.getDueBefore().get(), false); } if (request.getIncludeDeletedData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getParentTicketId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -178,25 +166,25 @@ public CompletableFuture>> list( } if (request.getPriority().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "priority", request.getPriority().get().toString(), false); + httpUrl, "priority", request.getPriority().get(), false); } if (request.getRemoteCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "remote_created_after", - request.getRemoteCreatedAfter().get().toString(), + request.getRemoteCreatedAfter().get(), false); } if (request.getRemoteCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "remote_created_before", - request.getRemoteCreatedBefore().get().toString(), + request.getRemoteCreatedBefore().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -206,22 +194,19 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "remote_updated_after", - request.getRemoteUpdatedAfter().get().toString(), + request.getRemoteUpdatedAfter().get(), false); } if (request.getRemoteUpdatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "remote_updated_before", - request.getRemoteUpdatedBefore().get().toString(), + request.getRemoteUpdatedBefore().get(), false); } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( @@ -241,13 +226,12 @@ public CompletableFuture>> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -318,11 +302,11 @@ public CompletableFuture> create( .addPathSegments("ticketing/v1/tickets"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -402,43 +386,36 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -494,11 +471,11 @@ public CompletableFuture> partialUpdate( .addPathSegment(id); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -584,36 +561,32 @@ public CompletableFuture>> viewe QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -688,7 +661,6 @@ public CompletableFuture> metaPatchRetrieve( .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -761,7 +733,6 @@ public CompletableFuture> metaPostRetrieve( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -834,43 +805,39 @@ public CompletableFuture>> list( .addPathSegments("ticketing/v1/users"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -80,37 +80,31 @@ public CompletableFuture>> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -122,13 +116,12 @@ public CompletableFuture>> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -209,25 +202,21 @@ public CompletableFuture> retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/AsyncRawWebhookReceiversClient.java b/src/main/java/com/merge/api/ticketing/AsyncRawWebhookReceiversClient.java index 88aa4ed92..b7d70910e 100644 --- a/src/main/java/com/merge/api/ticketing/AsyncRawWebhookReceiversClient.java +++ b/src/main/java/com/merge/api/ticketing/AsyncRawWebhookReceiversClient.java @@ -54,7 +54,6 @@ public CompletableFuture>> list(Reque .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/RawAccountDetailsClient.java b/src/main/java/com/merge/api/ticketing/RawAccountDetailsClient.java index 1008b20ad..f793a8cb5 100644 --- a/src/main/java/com/merge/api/ticketing/RawAccountDetailsClient.java +++ b/src/main/java/com/merge/api/ticketing/RawAccountDetailsClient.java @@ -44,7 +44,6 @@ public MergeApiHttpResponse retrieve(RequestOptions requestOptio .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/RawAccountTokenClient.java b/src/main/java/com/merge/api/ticketing/RawAccountTokenClient.java index 744b6d313..e8d4587f9 100644 --- a/src/main/java/com/merge/api/ticketing/RawAccountTokenClient.java +++ b/src/main/java/com/merge/api/ticketing/RawAccountTokenClient.java @@ -45,7 +45,6 @@ public MergeApiHttpResponse retrieve(String publicToken, RequestOp .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/RawAccountsClient.java b/src/main/java/com/merge/api/ticketing/RawAccountsClient.java index dba1cf258..bf14a5ac5 100644 --- a/src/main/java/com/merge/api/ticketing/RawAccountsClient.java +++ b/src/main/java/com/merge/api/ticketing/RawAccountsClient.java @@ -57,11 +57,11 @@ public MergeApiHttpResponse> list( .addPathSegments("ticketing/v1/accounts"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -71,37 +71,31 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -111,7 +105,6 @@ public MergeApiHttpResponse> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -173,21 +166,17 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/RawAsyncPassthroughClient.java b/src/main/java/com/merge/api/ticketing/RawAsyncPassthroughClient.java index 2bbabfaf5..421ecaa11 100644 --- a/src/main/java/com/merge/api/ticketing/RawAsyncPassthroughClient.java +++ b/src/main/java/com/merge/api/ticketing/RawAsyncPassthroughClient.java @@ -103,7 +103,6 @@ public MergeApiHttpResponse retrieve( .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/RawAttachmentsClient.java b/src/main/java/com/merge/api/ticketing/RawAttachmentsClient.java index daf955db5..44bca0daa 100644 --- a/src/main/java/com/merge/api/ticketing/RawAttachmentsClient.java +++ b/src/main/java/com/merge/api/ticketing/RawAttachmentsClient.java @@ -67,11 +67,11 @@ public MergeApiHttpResponse> list( .addPathSegments("ticketing/v1/attachments"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -81,43 +81,37 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "remote_created_after", - request.getRemoteCreatedAfter().get().toString(), + request.getRemoteCreatedAfter().get(), false); } if (request.getRemoteId().isPresent()) { @@ -130,13 +124,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -188,11 +181,11 @@ public MergeApiHttpResponse create( .addPathSegments("ticketing/v1/attachments"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -259,25 +252,21 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -327,10 +316,7 @@ public MergeApiHttpResponse downloadRetrieve( .addPathSegments("download"); if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getMimeType().isPresent()) { QueryStringMapper.addQueryParameter( @@ -339,8 +325,7 @@ public MergeApiHttpResponse downloadRetrieve( Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) - .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json"); + .headers(Headers.of(clientOptions.headers(requestOptions))); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); if (requestOptions != null && requestOptions.getTimeout().isPresent()) { @@ -382,7 +367,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/RawAuditTrailClient.java b/src/main/java/com/merge/api/ticketing/RawAuditTrailClient.java index 0fea3502f..3eb360502 100644 --- a/src/main/java/com/merge/api/ticketing/RawAuditTrailClient.java +++ b/src/main/java/com/merge/api/ticketing/RawAuditTrailClient.java @@ -68,7 +68,7 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getStartDate().isPresent()) { QueryStringMapper.addQueryParameter( @@ -82,7 +82,6 @@ public MergeApiHttpResponse> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/RawAvailableActionsClient.java b/src/main/java/com/merge/api/ticketing/RawAvailableActionsClient.java index b4c7a67bd..32a17d37f 100644 --- a/src/main/java/com/merge/api/ticketing/RawAvailableActionsClient.java +++ b/src/main/java/com/merge/api/ticketing/RawAvailableActionsClient.java @@ -44,7 +44,6 @@ public MergeApiHttpResponse retrieve(RequestOptions requestOpt .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/RawCollectionsClient.java b/src/main/java/com/merge/api/ticketing/RawCollectionsClient.java index 1de52db6d..5f14e8d44 100644 --- a/src/main/java/com/merge/api/ticketing/RawCollectionsClient.java +++ b/src/main/java/com/merge/api/ticketing/RawCollectionsClient.java @@ -64,11 +64,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -78,37 +78,31 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getParentCollectionId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -131,13 +125,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -205,36 +198,32 @@ public MergeApiHttpResponse> viewersList( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -296,15 +285,12 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( @@ -316,13 +302,12 @@ public MergeApiHttpResponse retrieve( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/RawCommentsClient.java b/src/main/java/com/merge/api/ticketing/RawCommentsClient.java index 2acc5c40e..83573aefc 100644 --- a/src/main/java/com/merge/api/ticketing/RawCommentsClient.java +++ b/src/main/java/com/merge/api/ticketing/RawCommentsClient.java @@ -64,11 +64,11 @@ public MergeApiHttpResponse> list( .addPathSegments("ticketing/v1/comments"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -78,43 +78,37 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "remote_created_after", - request.getRemoteCreatedAfter().get().toString(), + request.getRemoteCreatedAfter().get(), false); } if (request.getRemoteId().isPresent()) { @@ -127,13 +121,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -184,11 +177,11 @@ public MergeApiHttpResponse create(CommentEndpointRequest reque .addPathSegments("ticketing/v1/comments"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -254,25 +247,21 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -315,7 +304,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/RawContactsClient.java b/src/main/java/com/merge/api/ticketing/RawContactsClient.java index f8c22973b..5b632b368 100644 --- a/src/main/java/com/merge/api/ticketing/RawContactsClient.java +++ b/src/main/java/com/merge/api/ticketing/RawContactsClient.java @@ -64,11 +64,11 @@ public MergeApiHttpResponse> list( .addPathSegments("ticketing/v1/contacts"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -78,37 +78,31 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -116,13 +110,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -174,11 +167,11 @@ public MergeApiHttpResponse create( .addPathSegments("ticketing/v1/contacts"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -245,25 +238,21 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -306,7 +295,6 @@ public MergeApiHttpResponse metaPostRetrieve(RequestOptions reques .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/RawFieldMappingClient.java b/src/main/java/com/merge/api/ticketing/RawFieldMappingClient.java index 40aa261af..cfcc99a98 100644 --- a/src/main/java/com/merge/api/ticketing/RawFieldMappingClient.java +++ b/src/main/java/com/merge/api/ticketing/RawFieldMappingClient.java @@ -65,14 +65,13 @@ public MergeApiHttpResponse fieldMappingsRetrie QueryStringMapper.addQueryParameter( httpUrl, "exclude_remote_field_metadata", - request.getExcludeRemoteFieldMetadata().get().toString(), + request.getExcludeRemoteFieldMetadata().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -117,7 +116,7 @@ public MergeApiHttpResponse fieldMappingsCreate( QueryStringMapper.addQueryParameter( httpUrl, "exclude_remote_field_metadata", - request.getExcludeRemoteFieldMetadata().get().toString(), + request.getExcludeRemoteFieldMetadata().get(), false); } Map properties = new HashMap<>(); @@ -184,7 +183,6 @@ public MergeApiHttpResponse fieldMappingsDestroy( .url(httpUrl) .method("DELETE", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -308,7 +306,6 @@ public MergeApiHttpResponse remoteFieldsRetrieve( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -352,7 +349,6 @@ public MergeApiHttpResponse targetFieldsRetrieve .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/RawForceResyncClient.java b/src/main/java/com/merge/api/ticketing/RawForceResyncClient.java index 04a19e1cb..f1a9e59f7 100644 --- a/src/main/java/com/merge/api/ticketing/RawForceResyncClient.java +++ b/src/main/java/com/merge/api/ticketing/RawForceResyncClient.java @@ -47,7 +47,6 @@ public MergeApiHttpResponse> syncStatusResyncCreate(RequestOpti .url(httpUrl) .method("POST", RequestBody.create("", null)) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/RawIssuesClient.java b/src/main/java/com/merge/api/ticketing/RawIssuesClient.java index 69c2c2907..e8120d912 100644 --- a/src/main/java/com/merge/api/ticketing/RawIssuesClient.java +++ b/src/main/java/com/merge/api/ticketing/RawIssuesClient.java @@ -77,14 +77,14 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "first_incident_time_after", - request.getFirstIncidentTimeAfter().get().toString(), + request.getFirstIncidentTimeAfter().get(), false); } if (request.getFirstIncidentTimeBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "first_incident_time_before", - request.getFirstIncidentTimeBefore().get().toString(), + request.getFirstIncidentTimeBefore().get(), false); } if (request.getIncludeMuted().isPresent()) { @@ -99,14 +99,14 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "last_incident_time_after", - request.getLastIncidentTimeAfter().get().toString(), + request.getLastIncidentTimeAfter().get(), false); } if (request.getLastIncidentTimeBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "last_incident_time_before", - request.getLastIncidentTimeBefore().get().toString(), + request.getLastIncidentTimeBefore().get(), false); } if (request.getLinkedAccountId().isPresent()) { @@ -115,7 +115,7 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getStartDate().isPresent()) { QueryStringMapper.addQueryParameter( @@ -123,13 +123,12 @@ public MergeApiHttpResponse> list( } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "status", request.getStatus().get().toString(), false); + httpUrl, "status", request.getStatus().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -184,7 +183,6 @@ public MergeApiHttpResponse retrieve(String id, RequestOptions requestOpt .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/RawLinkedAccountsClient.java b/src/main/java/com/merge/api/ticketing/RawLinkedAccountsClient.java index 1ed2cb47d..bbf64e490 100644 --- a/src/main/java/com/merge/api/ticketing/RawLinkedAccountsClient.java +++ b/src/main/java/com/merge/api/ticketing/RawLinkedAccountsClient.java @@ -56,7 +56,7 @@ public MergeApiHttpResponse> list( .addPathSegments("ticketing/v1/linked-accounts"); if (request.getCategory().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "category", request.getCategory().get().toString(), false); + httpUrl, "category", request.getCategory().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -97,7 +97,7 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_duplicates", - request.getIncludeDuplicates().get().toString(), + request.getIncludeDuplicates().get(), false); } if (request.getIntegrationName().isPresent()) { @@ -110,7 +110,7 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( @@ -120,7 +120,6 @@ public MergeApiHttpResponse> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/RawProjectsClient.java b/src/main/java/com/merge/api/ticketing/RawProjectsClient.java index 886d065ae..45e899902 100644 --- a/src/main/java/com/merge/api/ticketing/RawProjectsClient.java +++ b/src/main/java/com/merge/api/ticketing/RawProjectsClient.java @@ -60,11 +60,11 @@ public MergeApiHttpResponse> list( .addPathSegments("ticketing/v1/projects"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -74,37 +74,31 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -114,7 +108,6 @@ public MergeApiHttpResponse> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -176,21 +169,17 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -246,36 +235,32 @@ public MergeApiHttpResponse> usersList( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/RawRolesClient.java b/src/main/java/com/merge/api/ticketing/RawRolesClient.java index 4612c1956..98126902f 100644 --- a/src/main/java/com/merge/api/ticketing/RawRolesClient.java +++ b/src/main/java/com/merge/api/ticketing/RawRolesClient.java @@ -57,11 +57,11 @@ public MergeApiHttpResponse> list( .addPathSegments("ticketing/v1/roles"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -71,37 +71,31 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -111,7 +105,6 @@ public MergeApiHttpResponse> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -172,21 +165,17 @@ public MergeApiHttpResponse retrieve(String id, RolesRetrieveRequest reque QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/RawScopesClient.java b/src/main/java/com/merge/api/ticketing/RawScopesClient.java index 431aa0dcd..79fcb031d 100644 --- a/src/main/java/com/merge/api/ticketing/RawScopesClient.java +++ b/src/main/java/com/merge/api/ticketing/RawScopesClient.java @@ -48,7 +48,6 @@ public MergeApiHttpResponse defaultScopesRetrieve(RequestOp .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -92,7 +91,6 @@ public MergeApiHttpResponse linkedAccountScopesRetrieve(Req .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/RawSyncStatusClient.java b/src/main/java/com/merge/api/ticketing/RawSyncStatusClient.java index ed07c4438..f25e4e5ee 100644 --- a/src/main/java/com/merge/api/ticketing/RawSyncStatusClient.java +++ b/src/main/java/com/merge/api/ticketing/RawSyncStatusClient.java @@ -60,13 +60,12 @@ public MergeApiHttpResponse> list( } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/RawTagsClient.java b/src/main/java/com/merge/api/ticketing/RawTagsClient.java index b8799eaf7..8fbb88044 100644 --- a/src/main/java/com/merge/api/ticketing/RawTagsClient.java +++ b/src/main/java/com/merge/api/ticketing/RawTagsClient.java @@ -56,11 +56,11 @@ public MergeApiHttpResponse> list(TagsListRequest reques .addPathSegments("ticketing/v1/tags"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -70,37 +70,31 @@ public MergeApiHttpResponse> list(TagsListRequest reques QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -110,7 +104,6 @@ public MergeApiHttpResponse> list(TagsListRequest reques .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -171,21 +164,17 @@ public MergeApiHttpResponse retrieve(String id, TagsRetrieveRequest request QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/RawTeamsClient.java b/src/main/java/com/merge/api/ticketing/RawTeamsClient.java index 75354e33a..f87b88aa9 100644 --- a/src/main/java/com/merge/api/ticketing/RawTeamsClient.java +++ b/src/main/java/com/merge/api/ticketing/RawTeamsClient.java @@ -57,11 +57,11 @@ public MergeApiHttpResponse> list( .addPathSegments("ticketing/v1/teams"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -71,37 +71,31 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -111,7 +105,6 @@ public MergeApiHttpResponse> list( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -172,21 +165,17 @@ public MergeApiHttpResponse retrieve(String id, TeamsRetrieveRequest reque QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/RawTicketsClient.java b/src/main/java/com/merge/api/ticketing/RawTicketsClient.java index b08a8fc4d..9756b09ff 100644 --- a/src/main/java/com/merge/api/ticketing/RawTicketsClient.java +++ b/src/main/java/com/merge/api/ticketing/RawTicketsClient.java @@ -84,17 +84,11 @@ public MergeApiHttpResponse> list( } if (request.getCompletedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "completed_after", - request.getCompletedAfter().get().toString(), - false); + httpUrl, "completed_after", request.getCompletedAfter().get(), false); } if (request.getCompletedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "completed_before", - request.getCompletedBefore().get().toString(), - false); + httpUrl, "completed_before", request.getCompletedBefore().get(), false); } if (request.getContactId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -102,11 +96,11 @@ public MergeApiHttpResponse> list( } if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCreatorId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -118,54 +112,48 @@ public MergeApiHttpResponse> list( } if (request.getDueAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "due_after", request.getDueAfter().get().toString(), false); + httpUrl, "due_after", request.getDueAfter().get(), false); } if (request.getDueBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "due_before", request.getDueBefore().get().toString(), false); + httpUrl, "due_before", request.getDueBefore().get(), false); } if (request.getIncludeDeletedData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getParentTicketId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -173,25 +161,25 @@ public MergeApiHttpResponse> list( } if (request.getPriority().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "priority", request.getPriority().get().toString(), false); + httpUrl, "priority", request.getPriority().get(), false); } if (request.getRemoteCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "remote_created_after", - request.getRemoteCreatedAfter().get().toString(), + request.getRemoteCreatedAfter().get(), false); } if (request.getRemoteCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "remote_created_before", - request.getRemoteCreatedBefore().get().toString(), + request.getRemoteCreatedBefore().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -201,22 +189,19 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "remote_updated_after", - request.getRemoteUpdatedAfter().get().toString(), + request.getRemoteUpdatedAfter().get(), false); } if (request.getRemoteUpdatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "remote_updated_before", - request.getRemoteUpdatedBefore().get().toString(), + request.getRemoteUpdatedBefore().get(), false); } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getStatus().isPresent()) { QueryStringMapper.addQueryParameter( @@ -236,13 +221,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -293,11 +277,11 @@ public MergeApiHttpResponse create(TicketEndpointRequest request .addPathSegments("ticketing/v1/tickets"); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -363,43 +347,36 @@ public MergeApiHttpResponse retrieve( QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_fields", - request.getIncludeRemoteFields().get().toString(), + request.getIncludeRemoteFields().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getRemoteFields().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "remote_fields", request.getRemoteFields().get().toString(), false); + httpUrl, "remote_fields", request.getRemoteFields().get(), false); } if (request.getShowEnumOrigins().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "show_enum_origins", - request.getShowEnumOrigins().get().toString(), - false); + httpUrl, "show_enum_origins", request.getShowEnumOrigins().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -441,11 +418,11 @@ public MergeApiHttpResponse partialUpdate( .addPathSegment(id); if (request.getIsDebugMode().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_debug_mode", request.getIsDebugMode().get().toString(), false); + httpUrl, "is_debug_mode", request.getIsDebugMode().get(), false); } if (request.getRunAsync().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "run_async", request.getRunAsync().get().toString(), false); + httpUrl, "run_async", request.getRunAsync().get(), false); } Map properties = new HashMap<>(); properties.put("model", request.getModel()); @@ -517,36 +494,32 @@ public MergeApiHttpResponse> viewersList( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -601,7 +574,6 @@ public MergeApiHttpResponse metaPatchRetrieve(String id, RequestOp .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); @@ -659,7 +631,6 @@ public MergeApiHttpResponse metaPostRetrieve( .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -718,43 +689,39 @@ public MergeApiHttpResponse> remoteFieldCla QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getIsCommonModelField().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "is_common_model_field", - request.getIsCommonModelField().get().toString(), + request.getIsCommonModelField().get(), false); } if (request.getIsCustom().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "is_custom", request.getIsCustom().get().toString(), false); + httpUrl, "is_custom", request.getIsCustom().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/RawUsersClient.java b/src/main/java/com/merge/api/ticketing/RawUsersClient.java index 5c0c7ab64..92108c967 100644 --- a/src/main/java/com/merge/api/ticketing/RawUsersClient.java +++ b/src/main/java/com/merge/api/ticketing/RawUsersClient.java @@ -57,11 +57,11 @@ public MergeApiHttpResponse> list( .addPathSegments("ticketing/v1/users"); if (request.getCreatedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_after", request.getCreatedAfter().get().toString(), false); + httpUrl, "created_after", request.getCreatedAfter().get(), false); } if (request.getCreatedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "created_before", request.getCreatedBefore().get().toString(), false); + httpUrl, "created_before", request.getCreatedBefore().get(), false); } if (request.getCursor().isPresent()) { QueryStringMapper.addQueryParameter( @@ -75,37 +75,31 @@ public MergeApiHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "include_deleted_data", - request.getIncludeDeletedData().get().toString(), + request.getIncludeDeletedData().get(), false); } if (request.getIncludeRemoteData().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getModifiedAfter().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "modified_after", request.getModifiedAfter().get().toString(), false); + httpUrl, "modified_after", request.getModifiedAfter().get(), false); } if (request.getModifiedBefore().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "modified_before", - request.getModifiedBefore().get().toString(), - false); + httpUrl, "modified_before", request.getModifiedBefore().get(), false); } if (request.getPageSize().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "page_size", request.getPageSize().get().toString(), false); + httpUrl, "page_size", request.getPageSize().get(), false); } if (request.getRemoteId().isPresent()) { QueryStringMapper.addQueryParameter( @@ -117,13 +111,12 @@ public MergeApiHttpResponse> list( } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); @@ -184,25 +177,21 @@ public MergeApiHttpResponse retrieve(String id, UsersRetrieveRequest reque QueryStringMapper.addQueryParameter( httpUrl, "include_remote_data", - request.getIncludeRemoteData().get().toString(), + request.getIncludeRemoteData().get(), false); } if (request.getIncludeShellData().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, - "include_shell_data", - request.getIncludeShellData().get().toString(), - false); + httpUrl, "include_shell_data", request.getIncludeShellData().get(), false); } if (request.getExpand().isPresent()) { QueryStringMapper.addQueryParameter( - httpUrl, "expand", request.getExpand().get().toString(), false); + httpUrl, "expand", request.getExpand().get(), true); } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json"); Request okhttpRequest = _requestBuilder.build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/RawWebhookReceiversClient.java b/src/main/java/com/merge/api/ticketing/RawWebhookReceiversClient.java index 17edcf2df..77b889e74 100644 --- a/src/main/java/com/merge/api/ticketing/RawWebhookReceiversClient.java +++ b/src/main/java/com/merge/api/ticketing/RawWebhookReceiversClient.java @@ -50,7 +50,6 @@ public MergeApiHttpResponse> list(RequestOptions requestOp .url(httpUrl) .method("GET", null) .headers(Headers.of(clientOptions.headers(requestOptions))) - .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .build(); OkHttpClient client = clientOptions.httpClient(); diff --git a/src/main/java/com/merge/api/ticketing/types/AccountDetailsAndActionsCategory.java b/src/main/java/com/merge/api/ticketing/types/AccountDetailsAndActionsCategory.java index 1900d1ed3..60fce51ac 100644 --- a/src/main/java/com/merge/api/ticketing/types/AccountDetailsAndActionsCategory.java +++ b/src/main/java/com/merge/api/ticketing/types/AccountDetailsAndActionsCategory.java @@ -84,11 +84,11 @@ public AccountDetailsAndActionsCategory deserialize(JsonParser p, Deserializatio Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CategoryEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/AccountDetailsAndActionsIntegration.java b/src/main/java/com/merge/api/ticketing/types/AccountDetailsAndActionsIntegration.java index 6082cfd2a..98683b2ce 100644 --- a/src/main/java/com/merge/api/ticketing/types/AccountDetailsAndActionsIntegration.java +++ b/src/main/java/com/merge/api/ticketing/types/AccountDetailsAndActionsIntegration.java @@ -293,7 +293,9 @@ public _FinalStage image(Optional image) { @java.lang.Override public _FinalStage addAllCategories(List categories) { - this.categories.addAll(categories); + if (categories != null) { + this.categories.addAll(categories); + } return this; } diff --git a/src/main/java/com/merge/api/ticketing/types/AccountDetailsAndActionsStatus.java b/src/main/java/com/merge/api/ticketing/types/AccountDetailsAndActionsStatus.java index 852c08af3..15c432dd7 100644 --- a/src/main/java/com/merge/api/ticketing/types/AccountDetailsAndActionsStatus.java +++ b/src/main/java/com/merge/api/ticketing/types/AccountDetailsAndActionsStatus.java @@ -84,11 +84,11 @@ public AccountDetailsAndActionsStatus deserialize(JsonParser p, DeserializationC Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, AccountDetailsAndActionsStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/AccountDetailsCategory.java b/src/main/java/com/merge/api/ticketing/types/AccountDetailsCategory.java index a70a8e086..4714d8822 100644 --- a/src/main/java/com/merge/api/ticketing/types/AccountDetailsCategory.java +++ b/src/main/java/com/merge/api/ticketing/types/AccountDetailsCategory.java @@ -83,11 +83,11 @@ public AccountDetailsCategory deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CategoryEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/AccountIntegration.java b/src/main/java/com/merge/api/ticketing/types/AccountIntegration.java index 101d1f76a..787eabe89 100644 --- a/src/main/java/com/merge/api/ticketing/types/AccountIntegration.java +++ b/src/main/java/com/merge/api/ticketing/types/AccountIntegration.java @@ -197,7 +197,7 @@ public static NameStage builder() { public interface NameStage { /** - * Company name. + *

                          Company name.

                          */ _FinalStage name(@NotNull String name); @@ -311,7 +311,8 @@ public Builder from(AccountIntegration other) { } /** - * Company name.

                          Company name.

                          + *

                          Company name.

                          + *

                          Company name.

                          * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/ticketing/types/AsyncPassthroughRetrieveResponse.java b/src/main/java/com/merge/api/ticketing/types/AsyncPassthroughRetrieveResponse.java index 310f7b1c2..7c1d6acee 100644 --- a/src/main/java/com/merge/api/ticketing/types/AsyncPassthroughRetrieveResponse.java +++ b/src/main/java/com/merge/api/ticketing/types/AsyncPassthroughRetrieveResponse.java @@ -84,11 +84,11 @@ public AsyncPassthroughRetrieveResponse deserialize(JsonParser p, Deserializatio Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RemoteResponse.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/AttachmentRequestTicket.java b/src/main/java/com/merge/api/ticketing/types/AttachmentRequestTicket.java index def62074c..dc70e4c0e 100644 --- a/src/main/java/com/merge/api/ticketing/types/AttachmentRequestTicket.java +++ b/src/main/java/com/merge/api/ticketing/types/AttachmentRequestTicket.java @@ -83,11 +83,11 @@ public AttachmentRequestTicket deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Ticket.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/AttachmentTicket.java b/src/main/java/com/merge/api/ticketing/types/AttachmentTicket.java index c36a7aa71..c1e190791 100644 --- a/src/main/java/com/merge/api/ticketing/types/AttachmentTicket.java +++ b/src/main/java/com/merge/api/ticketing/types/AttachmentTicket.java @@ -83,11 +83,11 @@ public AttachmentTicket deserialize(JsonParser p, DeserializationContext context Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Ticket.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/AuditLogEvent.java b/src/main/java/com/merge/api/ticketing/types/AuditLogEvent.java index bb4b137b8..1a7b4358b 100644 --- a/src/main/java/com/merge/api/ticketing/types/AuditLogEvent.java +++ b/src/main/java/com/merge/api/ticketing/types/AuditLogEvent.java @@ -212,14 +212,15 @@ public static RoleStage builder() { public interface RoleStage { /** - * Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring. - * - * * `ADMIN` - ADMIN - * * `DEVELOPER` - DEVELOPER - * * `MEMBER` - MEMBER - * * `API` - API - * * `SYSTEM` - SYSTEM - * * `MERGE_TEAM` - MERGE_TEAM + *

                          Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring.

                          + *
                            + *
                          • ADMIN - ADMIN
                            • + *
                          • DEVELOPER - DEVELOPER
                            • + *
                          • MEMBER - MEMBER
                            • + *
                          • API - API
                            • + *
                          • SYSTEM - SYSTEM
                            • + *
                          • MERGE_TEAM - MERGE_TEAM
                            • + *
                          */ IpAddressStage role(@NotNull AuditLogEventRole role); @@ -232,51 +233,52 @@ public interface IpAddressStage { public interface EventTypeStage { /** - * Designates the type of event that occurred. - * - * * `CREATED_REMOTE_PRODUCTION_API_KEY` - CREATED_REMOTE_PRODUCTION_API_KEY - * * `DELETED_REMOTE_PRODUCTION_API_KEY` - DELETED_REMOTE_PRODUCTION_API_KEY - * * `CREATED_TEST_API_KEY` - CREATED_TEST_API_KEY - * * `DELETED_TEST_API_KEY` - DELETED_TEST_API_KEY - * * `REGENERATED_PRODUCTION_API_KEY` - REGENERATED_PRODUCTION_API_KEY - * * `REGENERATED_WEBHOOK_SIGNATURE` - REGENERATED_WEBHOOK_SIGNATURE - * * `INVITED_USER` - INVITED_USER - * * `TWO_FACTOR_AUTH_ENABLED` - TWO_FACTOR_AUTH_ENABLED - * * `TWO_FACTOR_AUTH_DISABLED` - TWO_FACTOR_AUTH_DISABLED - * * `DELETED_LINKED_ACCOUNT` - DELETED_LINKED_ACCOUNT - * * `DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT` - DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT - * * `CREATED_DESTINATION` - CREATED_DESTINATION - * * `DELETED_DESTINATION` - DELETED_DESTINATION - * * `CHANGED_DESTINATION` - CHANGED_DESTINATION - * * `CHANGED_SCOPES` - CHANGED_SCOPES - * * `CHANGED_PERSONAL_INFORMATION` - CHANGED_PERSONAL_INFORMATION - * * `CHANGED_ORGANIZATION_SETTINGS` - CHANGED_ORGANIZATION_SETTINGS - * * `ENABLED_INTEGRATION` - ENABLED_INTEGRATION - * * `DISABLED_INTEGRATION` - DISABLED_INTEGRATION - * * `ENABLED_CATEGORY` - ENABLED_CATEGORY - * * `DISABLED_CATEGORY` - DISABLED_CATEGORY - * * `CHANGED_PASSWORD` - CHANGED_PASSWORD - * * `RESET_PASSWORD` - RESET_PASSWORD - * * `ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION` - ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - * * `ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT` - ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - * * `DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION` - DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - * * `DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT` - DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - * * `CREATED_INTEGRATION_WIDE_FIELD_MAPPING` - CREATED_INTEGRATION_WIDE_FIELD_MAPPING - * * `CREATED_LINKED_ACCOUNT_FIELD_MAPPING` - CREATED_LINKED_ACCOUNT_FIELD_MAPPING - * * `CHANGED_INTEGRATION_WIDE_FIELD_MAPPING` - CHANGED_INTEGRATION_WIDE_FIELD_MAPPING - * * `CHANGED_LINKED_ACCOUNT_FIELD_MAPPING` - CHANGED_LINKED_ACCOUNT_FIELD_MAPPING - * * `DELETED_INTEGRATION_WIDE_FIELD_MAPPING` - DELETED_INTEGRATION_WIDE_FIELD_MAPPING - * * `DELETED_LINKED_ACCOUNT_FIELD_MAPPING` - DELETED_LINKED_ACCOUNT_FIELD_MAPPING - * * `CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `FORCED_LINKED_ACCOUNT_RESYNC` - FORCED_LINKED_ACCOUNT_RESYNC - * * `MUTED_ISSUE` - MUTED_ISSUE - * * `GENERATED_MAGIC_LINK` - GENERATED_MAGIC_LINK - * * `ENABLED_MERGE_WEBHOOK` - ENABLED_MERGE_WEBHOOK - * * `DISABLED_MERGE_WEBHOOK` - DISABLED_MERGE_WEBHOOK - * * `MERGE_WEBHOOK_TARGET_CHANGED` - MERGE_WEBHOOK_TARGET_CHANGED - * * `END_USER_CREDENTIALS_ACCESSED` - END_USER_CREDENTIALS_ACCESSED + *

                          Designates the type of event that occurred.

                          + *
                            + *
                          • CREATED_REMOTE_PRODUCTION_API_KEY - CREATED_REMOTE_PRODUCTION_API_KEY
                            • + *
                          • DELETED_REMOTE_PRODUCTION_API_KEY - DELETED_REMOTE_PRODUCTION_API_KEY
                            • + *
                          • CREATED_TEST_API_KEY - CREATED_TEST_API_KEY
                            • + *
                          • DELETED_TEST_API_KEY - DELETED_TEST_API_KEY
                            • + *
                          • REGENERATED_PRODUCTION_API_KEY - REGENERATED_PRODUCTION_API_KEY
                            • + *
                          • REGENERATED_WEBHOOK_SIGNATURE - REGENERATED_WEBHOOK_SIGNATURE
                            • + *
                          • INVITED_USER - INVITED_USER
                            • + *
                          • TWO_FACTOR_AUTH_ENABLED - TWO_FACTOR_AUTH_ENABLED
                            • + *
                          • TWO_FACTOR_AUTH_DISABLED - TWO_FACTOR_AUTH_DISABLED
                            • + *
                          • DELETED_LINKED_ACCOUNT - DELETED_LINKED_ACCOUNT
                            • + *
                          • DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT - DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT
                            • + *
                          • CREATED_DESTINATION - CREATED_DESTINATION
                            • + *
                          • DELETED_DESTINATION - DELETED_DESTINATION
                            • + *
                          • CHANGED_DESTINATION - CHANGED_DESTINATION
                            • + *
                          • CHANGED_SCOPES - CHANGED_SCOPES
                            • + *
                          • CHANGED_PERSONAL_INFORMATION - CHANGED_PERSONAL_INFORMATION
                            • + *
                          • CHANGED_ORGANIZATION_SETTINGS - CHANGED_ORGANIZATION_SETTINGS
                            • + *
                          • ENABLED_INTEGRATION - ENABLED_INTEGRATION
                            • + *
                          • DISABLED_INTEGRATION - DISABLED_INTEGRATION
                            • + *
                          • ENABLED_CATEGORY - ENABLED_CATEGORY
                            • + *
                          • DISABLED_CATEGORY - DISABLED_CATEGORY
                            • + *
                          • CHANGED_PASSWORD - CHANGED_PASSWORD
                            • + *
                          • RESET_PASSWORD - RESET_PASSWORD
                            • + *
                          • ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION
                            • + *
                          • ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT
                            • + *
                          • DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION
                            • + *
                          • DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT
                            • + *
                          • CREATED_INTEGRATION_WIDE_FIELD_MAPPING - CREATED_INTEGRATION_WIDE_FIELD_MAPPING
                            • + *
                          • CREATED_LINKED_ACCOUNT_FIELD_MAPPING - CREATED_LINKED_ACCOUNT_FIELD_MAPPING
                            • + *
                          • CHANGED_INTEGRATION_WIDE_FIELD_MAPPING - CHANGED_INTEGRATION_WIDE_FIELD_MAPPING
                            • + *
                          • CHANGED_LINKED_ACCOUNT_FIELD_MAPPING - CHANGED_LINKED_ACCOUNT_FIELD_MAPPING
                            • + *
                          • DELETED_INTEGRATION_WIDE_FIELD_MAPPING - DELETED_INTEGRATION_WIDE_FIELD_MAPPING
                            • + *
                          • DELETED_LINKED_ACCOUNT_FIELD_MAPPING - DELETED_LINKED_ACCOUNT_FIELD_MAPPING
                            • + *
                          • CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
                            • + *
                          • CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
                            • + *
                          • DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
                            • + *
                          • FORCED_LINKED_ACCOUNT_RESYNC - FORCED_LINKED_ACCOUNT_RESYNC
                            • + *
                          • MUTED_ISSUE - MUTED_ISSUE
                            • + *
                          • GENERATED_MAGIC_LINK - GENERATED_MAGIC_LINK
                            • + *
                          • ENABLED_MERGE_WEBHOOK - ENABLED_MERGE_WEBHOOK
                            • + *
                          • DISABLED_MERGE_WEBHOOK - DISABLED_MERGE_WEBHOOK
                            • + *
                          • MERGE_WEBHOOK_TARGET_CHANGED - MERGE_WEBHOOK_TARGET_CHANGED
                            • + *
                          • END_USER_CREDENTIALS_ACCESSED - END_USER_CREDENTIALS_ACCESSED
                            • + *
                          */ EventDescriptionStage eventType(@NotNull AuditLogEventEventType eventType); } @@ -349,14 +351,16 @@ public Builder from(AuditLogEvent other) { } /** - * Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring. - * - * * `ADMIN` - ADMIN - * * `DEVELOPER` - DEVELOPER - * * `MEMBER` - MEMBER - * * `API` - API - * * `SYSTEM` - SYSTEM - * * `MERGE_TEAM` - MERGE_TEAM

                          Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring.

                          + *

                          Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring.

                          + *
                            + *
                          • ADMIN - ADMIN
                            • + *
                          • DEVELOPER - DEVELOPER
                            • + *
                          • MEMBER - MEMBER
                            • + *
                          • API - API
                            • + *
                          • SYSTEM - SYSTEM
                            • + *
                          • MERGE_TEAM - MERGE_TEAM
                            • + *
                          + *

                          Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring.

                          *
                            *
                          • ADMIN - ADMIN
                            • *
                          • DEVELOPER - DEVELOPER
                            • @@ -382,51 +386,53 @@ public EventTypeStage ipAddress(@NotNull String ipAddress) { } /** - * Designates the type of event that occurred. - * - * * `CREATED_REMOTE_PRODUCTION_API_KEY` - CREATED_REMOTE_PRODUCTION_API_KEY - * * `DELETED_REMOTE_PRODUCTION_API_KEY` - DELETED_REMOTE_PRODUCTION_API_KEY - * * `CREATED_TEST_API_KEY` - CREATED_TEST_API_KEY - * * `DELETED_TEST_API_KEY` - DELETED_TEST_API_KEY - * * `REGENERATED_PRODUCTION_API_KEY` - REGENERATED_PRODUCTION_API_KEY - * * `REGENERATED_WEBHOOK_SIGNATURE` - REGENERATED_WEBHOOK_SIGNATURE - * * `INVITED_USER` - INVITED_USER - * * `TWO_FACTOR_AUTH_ENABLED` - TWO_FACTOR_AUTH_ENABLED - * * `TWO_FACTOR_AUTH_DISABLED` - TWO_FACTOR_AUTH_DISABLED - * * `DELETED_LINKED_ACCOUNT` - DELETED_LINKED_ACCOUNT - * * `DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT` - DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT - * * `CREATED_DESTINATION` - CREATED_DESTINATION - * * `DELETED_DESTINATION` - DELETED_DESTINATION - * * `CHANGED_DESTINATION` - CHANGED_DESTINATION - * * `CHANGED_SCOPES` - CHANGED_SCOPES - * * `CHANGED_PERSONAL_INFORMATION` - CHANGED_PERSONAL_INFORMATION - * * `CHANGED_ORGANIZATION_SETTINGS` - CHANGED_ORGANIZATION_SETTINGS - * * `ENABLED_INTEGRATION` - ENABLED_INTEGRATION - * * `DISABLED_INTEGRATION` - DISABLED_INTEGRATION - * * `ENABLED_CATEGORY` - ENABLED_CATEGORY - * * `DISABLED_CATEGORY` - DISABLED_CATEGORY - * * `CHANGED_PASSWORD` - CHANGED_PASSWORD - * * `RESET_PASSWORD` - RESET_PASSWORD - * * `ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION` - ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - * * `ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT` - ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - * * `DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION` - DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - * * `DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT` - DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - * * `CREATED_INTEGRATION_WIDE_FIELD_MAPPING` - CREATED_INTEGRATION_WIDE_FIELD_MAPPING - * * `CREATED_LINKED_ACCOUNT_FIELD_MAPPING` - CREATED_LINKED_ACCOUNT_FIELD_MAPPING - * * `CHANGED_INTEGRATION_WIDE_FIELD_MAPPING` - CHANGED_INTEGRATION_WIDE_FIELD_MAPPING - * * `CHANGED_LINKED_ACCOUNT_FIELD_MAPPING` - CHANGED_LINKED_ACCOUNT_FIELD_MAPPING - * * `DELETED_INTEGRATION_WIDE_FIELD_MAPPING` - DELETED_INTEGRATION_WIDE_FIELD_MAPPING - * * `DELETED_LINKED_ACCOUNT_FIELD_MAPPING` - DELETED_LINKED_ACCOUNT_FIELD_MAPPING - * * `CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` - DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - * * `FORCED_LINKED_ACCOUNT_RESYNC` - FORCED_LINKED_ACCOUNT_RESYNC - * * `MUTED_ISSUE` - MUTED_ISSUE - * * `GENERATED_MAGIC_LINK` - GENERATED_MAGIC_LINK - * * `ENABLED_MERGE_WEBHOOK` - ENABLED_MERGE_WEBHOOK - * * `DISABLED_MERGE_WEBHOOK` - DISABLED_MERGE_WEBHOOK - * * `MERGE_WEBHOOK_TARGET_CHANGED` - MERGE_WEBHOOK_TARGET_CHANGED - * * `END_USER_CREDENTIALS_ACCESSED` - END_USER_CREDENTIALS_ACCESSED

                            Designates the type of event that occurred.

                            + *

                            Designates the type of event that occurred.

                            + *
                              + *
                            • CREATED_REMOTE_PRODUCTION_API_KEY - CREATED_REMOTE_PRODUCTION_API_KEY
                              • + *
                            • DELETED_REMOTE_PRODUCTION_API_KEY - DELETED_REMOTE_PRODUCTION_API_KEY
                              • + *
                            • CREATED_TEST_API_KEY - CREATED_TEST_API_KEY
                              • + *
                            • DELETED_TEST_API_KEY - DELETED_TEST_API_KEY
                              • + *
                            • REGENERATED_PRODUCTION_API_KEY - REGENERATED_PRODUCTION_API_KEY
                              • + *
                            • REGENERATED_WEBHOOK_SIGNATURE - REGENERATED_WEBHOOK_SIGNATURE
                              • + *
                            • INVITED_USER - INVITED_USER
                              • + *
                            • TWO_FACTOR_AUTH_ENABLED - TWO_FACTOR_AUTH_ENABLED
                              • + *
                            • TWO_FACTOR_AUTH_DISABLED - TWO_FACTOR_AUTH_DISABLED
                              • + *
                            • DELETED_LINKED_ACCOUNT - DELETED_LINKED_ACCOUNT
                              • + *
                            • DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT - DELETED_ALL_COMMON_MODELS_FOR_LINKED_ACCOUNT
                              • + *
                            • CREATED_DESTINATION - CREATED_DESTINATION
                              • + *
                            • DELETED_DESTINATION - DELETED_DESTINATION
                              • + *
                            • CHANGED_DESTINATION - CHANGED_DESTINATION
                              • + *
                            • CHANGED_SCOPES - CHANGED_SCOPES
                              • + *
                            • CHANGED_PERSONAL_INFORMATION - CHANGED_PERSONAL_INFORMATION
                              • + *
                            • CHANGED_ORGANIZATION_SETTINGS - CHANGED_ORGANIZATION_SETTINGS
                              • + *
                            • ENABLED_INTEGRATION - ENABLED_INTEGRATION
                              • + *
                            • DISABLED_INTEGRATION - DISABLED_INTEGRATION
                              • + *
                            • ENABLED_CATEGORY - ENABLED_CATEGORY
                              • + *
                            • DISABLED_CATEGORY - DISABLED_CATEGORY
                              • + *
                            • CHANGED_PASSWORD - CHANGED_PASSWORD
                              • + *
                            • RESET_PASSWORD - RESET_PASSWORD
                              • + *
                            • ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION
                              • + *
                            • ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT
                              • + *
                            • DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION - DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION
                              • + *
                            • DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT - DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT
                              • + *
                            • CREATED_INTEGRATION_WIDE_FIELD_MAPPING - CREATED_INTEGRATION_WIDE_FIELD_MAPPING
                              • + *
                            • CREATED_LINKED_ACCOUNT_FIELD_MAPPING - CREATED_LINKED_ACCOUNT_FIELD_MAPPING
                              • + *
                            • CHANGED_INTEGRATION_WIDE_FIELD_MAPPING - CHANGED_INTEGRATION_WIDE_FIELD_MAPPING
                              • + *
                            • CHANGED_LINKED_ACCOUNT_FIELD_MAPPING - CHANGED_LINKED_ACCOUNT_FIELD_MAPPING
                              • + *
                            • DELETED_INTEGRATION_WIDE_FIELD_MAPPING - DELETED_INTEGRATION_WIDE_FIELD_MAPPING
                              • + *
                            • DELETED_LINKED_ACCOUNT_FIELD_MAPPING - DELETED_LINKED_ACCOUNT_FIELD_MAPPING
                              • + *
                            • CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
                              • + *
                            • CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
                              • + *
                            • DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE - DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
                              • + *
                            • FORCED_LINKED_ACCOUNT_RESYNC - FORCED_LINKED_ACCOUNT_RESYNC
                              • + *
                            • MUTED_ISSUE - MUTED_ISSUE
                              • + *
                            • GENERATED_MAGIC_LINK - GENERATED_MAGIC_LINK
                              • + *
                            • ENABLED_MERGE_WEBHOOK - ENABLED_MERGE_WEBHOOK
                              • + *
                            • DISABLED_MERGE_WEBHOOK - DISABLED_MERGE_WEBHOOK
                              • + *
                            • MERGE_WEBHOOK_TARGET_CHANGED - MERGE_WEBHOOK_TARGET_CHANGED
                              • + *
                            • END_USER_CREDENTIALS_ACCESSED - END_USER_CREDENTIALS_ACCESSED
                              • + *
                            + *

                            Designates the type of event that occurred.

                            *
                              *
                            • CREATED_REMOTE_PRODUCTION_API_KEY - CREATED_REMOTE_PRODUCTION_API_KEY
                              • *
                            • DELETED_REMOTE_PRODUCTION_API_KEY - DELETED_REMOTE_PRODUCTION_API_KEY
                              • diff --git a/src/main/java/com/merge/api/ticketing/types/AuditLogEventEventType.java b/src/main/java/com/merge/api/ticketing/types/AuditLogEventEventType.java index 3fdbe0b00..2a8f117fc 100644 --- a/src/main/java/com/merge/api/ticketing/types/AuditLogEventEventType.java +++ b/src/main/java/com/merge/api/ticketing/types/AuditLogEventEventType.java @@ -83,11 +83,11 @@ public AuditLogEventEventType deserialize(JsonParser p, DeserializationContext c Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, EventTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/AuditLogEventRole.java b/src/main/java/com/merge/api/ticketing/types/AuditLogEventRole.java index 5f535a0d7..2ab1ec6b6 100644 --- a/src/main/java/com/merge/api/ticketing/types/AuditLogEventRole.java +++ b/src/main/java/com/merge/api/ticketing/types/AuditLogEventRole.java @@ -83,11 +83,11 @@ public AuditLogEventRole deserialize(JsonParser p, DeserializationContext contex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RoleEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/CollectionAccessLevel.java b/src/main/java/com/merge/api/ticketing/types/CollectionAccessLevel.java index 39d741158..9e62b058a 100644 --- a/src/main/java/com/merge/api/ticketing/types/CollectionAccessLevel.java +++ b/src/main/java/com/merge/api/ticketing/types/CollectionAccessLevel.java @@ -83,11 +83,11 @@ public CollectionAccessLevel deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, CollectionAccessLevelEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/CollectionParentCollection.java b/src/main/java/com/merge/api/ticketing/types/CollectionParentCollection.java index 955daefa1..52a0097bb 100644 --- a/src/main/java/com/merge/api/ticketing/types/CollectionParentCollection.java +++ b/src/main/java/com/merge/api/ticketing/types/CollectionParentCollection.java @@ -83,11 +83,11 @@ public CollectionParentCollection deserialize(JsonParser p, DeserializationConte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Collection.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/CommentContact.java b/src/main/java/com/merge/api/ticketing/types/CommentContact.java index e90ea1090..3ab77ead1 100644 --- a/src/main/java/com/merge/api/ticketing/types/CommentContact.java +++ b/src/main/java/com/merge/api/ticketing/types/CommentContact.java @@ -83,11 +83,11 @@ public CommentContact deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/CommentRequestContact.java b/src/main/java/com/merge/api/ticketing/types/CommentRequestContact.java index 3664fccaa..b37e76b2b 100644 --- a/src/main/java/com/merge/api/ticketing/types/CommentRequestContact.java +++ b/src/main/java/com/merge/api/ticketing/types/CommentRequestContact.java @@ -83,11 +83,11 @@ public CommentRequestContact deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/CommentRequestTicket.java b/src/main/java/com/merge/api/ticketing/types/CommentRequestTicket.java index fa361d4db..d874ee6d7 100644 --- a/src/main/java/com/merge/api/ticketing/types/CommentRequestTicket.java +++ b/src/main/java/com/merge/api/ticketing/types/CommentRequestTicket.java @@ -83,11 +83,11 @@ public CommentRequestTicket deserialize(JsonParser p, DeserializationContext con Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Ticket.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/CommentRequestUser.java b/src/main/java/com/merge/api/ticketing/types/CommentRequestUser.java index 51760f51d..9b15ba346 100644 --- a/src/main/java/com/merge/api/ticketing/types/CommentRequestUser.java +++ b/src/main/java/com/merge/api/ticketing/types/CommentRequestUser.java @@ -83,11 +83,11 @@ public CommentRequestUser deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, User.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/CommentResponse.java b/src/main/java/com/merge/api/ticketing/types/CommentResponse.java index 3d31603c5..18b400823 100644 --- a/src/main/java/com/merge/api/ticketing/types/CommentResponse.java +++ b/src/main/java/com/merge/api/ticketing/types/CommentResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/ticketing/types/CommentTicket.java b/src/main/java/com/merge/api/ticketing/types/CommentTicket.java index ae6809b33..3d49aae7b 100644 --- a/src/main/java/com/merge/api/ticketing/types/CommentTicket.java +++ b/src/main/java/com/merge/api/ticketing/types/CommentTicket.java @@ -83,11 +83,11 @@ public CommentTicket deserialize(JsonParser p, DeserializationContext context) t Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Ticket.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/CommentUser.java b/src/main/java/com/merge/api/ticketing/types/CommentUser.java index a61c197e8..a4779b721 100644 --- a/src/main/java/com/merge/api/ticketing/types/CommentUser.java +++ b/src/main/java/com/merge/api/ticketing/types/CommentUser.java @@ -83,11 +83,11 @@ public CommentUser deserialize(JsonParser p, DeserializationContext context) thr Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, User.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/CommonModelScopeApi.java b/src/main/java/com/merge/api/ticketing/types/CommonModelScopeApi.java index c071f997d..76b06a340 100644 --- a/src/main/java/com/merge/api/ticketing/types/CommonModelScopeApi.java +++ b/src/main/java/com/merge/api/ticketing/types/CommonModelScopeApi.java @@ -98,7 +98,9 @@ public Builder addCommonModels(IndividualCommonModelScopeDeserializer commonMode } public Builder addAllCommonModels(List commonModels) { - this.commonModels.addAll(commonModels); + if (commonModels != null) { + this.commonModels.addAll(commonModels); + } return this; } diff --git a/src/main/java/com/merge/api/ticketing/types/CommonModelScopesBodyRequest.java b/src/main/java/com/merge/api/ticketing/types/CommonModelScopesBodyRequest.java index 6e99b2bf9..20cc9faad 100644 --- a/src/main/java/com/merge/api/ticketing/types/CommonModelScopesBodyRequest.java +++ b/src/main/java/com/merge/api/ticketing/types/CommonModelScopesBodyRequest.java @@ -139,7 +139,9 @@ public _FinalStage modelId(@NotNull String modelId) { @java.lang.Override public _FinalStage addAllDisabledFields(List disabledFields) { - this.disabledFields.addAll(disabledFields); + if (disabledFields != null) { + this.disabledFields.addAll(disabledFields); + } return this; } @@ -159,7 +161,9 @@ public _FinalStage disabledFields(List disabledFields) { @java.lang.Override public _FinalStage addAllEnabledActions(List enabledActions) { - this.enabledActions.addAll(enabledActions); + if (enabledActions != null) { + this.enabledActions.addAll(enabledActions); + } return this; } diff --git a/src/main/java/com/merge/api/ticketing/types/ContactAccount.java b/src/main/java/com/merge/api/ticketing/types/ContactAccount.java index d7a2c500d..ca9c99d0b 100644 --- a/src/main/java/com/merge/api/ticketing/types/ContactAccount.java +++ b/src/main/java/com/merge/api/ticketing/types/ContactAccount.java @@ -83,11 +83,11 @@ public ContactAccount deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/ContactRequestAccount.java b/src/main/java/com/merge/api/ticketing/types/ContactRequestAccount.java index 743344fd1..e5c7eaba1 100644 --- a/src/main/java/com/merge/api/ticketing/types/ContactRequestAccount.java +++ b/src/main/java/com/merge/api/ticketing/types/ContactRequestAccount.java @@ -83,11 +83,11 @@ public ContactRequestAccount deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/CreateFieldMappingRequest.java b/src/main/java/com/merge/api/ticketing/types/CreateFieldMappingRequest.java index 948415eb6..52d4cdad0 100644 --- a/src/main/java/com/merge/api/ticketing/types/CreateFieldMappingRequest.java +++ b/src/main/java/com/merge/api/ticketing/types/CreateFieldMappingRequest.java @@ -159,7 +159,7 @@ public static TargetFieldNameStage builder() { public interface TargetFieldNameStage { /** - * The name of the target field you want this remote field to map to. + *

                              The name of the target field you want this remote field to map to.

                              */ TargetFieldDescriptionStage targetFieldName(@NotNull String targetFieldName); @@ -168,28 +168,28 @@ public interface TargetFieldNameStage { public interface TargetFieldDescriptionStage { /** - * The description of the target field you want this remote field to map to. + *

                              The description of the target field you want this remote field to map to.

                              */ RemoteMethodStage targetFieldDescription(@NotNull String targetFieldDescription); } public interface RemoteMethodStage { /** - * The method of the remote endpoint where the remote field is coming from. + *

                              The method of the remote endpoint where the remote field is coming from.

                              */ RemoteUrlPathStage remoteMethod(@NotNull String remoteMethod); } public interface RemoteUrlPathStage { /** - * The path of the remote endpoint where the remote field is coming from. + *

                              The path of the remote endpoint where the remote field is coming from.

                              */ CommonModelNameStage remoteUrlPath(@NotNull String remoteUrlPath); } public interface CommonModelNameStage { /** - * The name of the Common Model that the remote field corresponds to in a given category. + *

                              The name of the Common Model that the remote field corresponds to in a given category.

                              */ _FinalStage commonModelName(@NotNull String commonModelName); } @@ -254,7 +254,8 @@ public Builder from(CreateFieldMappingRequest other) { } /** - * The name of the target field you want this remote field to map to.

                              The name of the target field you want this remote field to map to.

                              + *

                              The name of the target field you want this remote field to map to.

                              + *

                              The name of the target field you want this remote field to map to.

                              * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -265,7 +266,8 @@ public TargetFieldDescriptionStage targetFieldName(@NotNull String targetFieldNa } /** - * The description of the target field you want this remote field to map to.

                              The description of the target field you want this remote field to map to.

                              + *

                              The description of the target field you want this remote field to map to.

                              + *

                              The description of the target field you want this remote field to map to.

                              * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -276,7 +278,8 @@ public RemoteMethodStage targetFieldDescription(@NotNull String targetFieldDescr } /** - * The method of the remote endpoint where the remote field is coming from.

                              The method of the remote endpoint where the remote field is coming from.

                              + *

                              The method of the remote endpoint where the remote field is coming from.

                              + *

                              The method of the remote endpoint where the remote field is coming from.

                              * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -287,7 +290,8 @@ public RemoteUrlPathStage remoteMethod(@NotNull String remoteMethod) { } /** - * The path of the remote endpoint where the remote field is coming from.

                              The path of the remote endpoint where the remote field is coming from.

                              + *

                              The path of the remote endpoint where the remote field is coming from.

                              + *

                              The path of the remote endpoint where the remote field is coming from.

                              * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -298,7 +302,8 @@ public CommonModelNameStage remoteUrlPath(@NotNull String remoteUrlPath) { } /** - * The name of the Common Model that the remote field corresponds to in a given category.

                              The name of the Common Model that the remote field corresponds to in a given category.

                              + *

                              The name of the Common Model that the remote field corresponds to in a given category.

                              + *

                              The name of the Common Model that the remote field corresponds to in a given category.

                              * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -314,7 +319,9 @@ public _FinalStage commonModelName(@NotNull String commonModelName) { */ @java.lang.Override public _FinalStage addAllRemoteFieldTraversalPath(List remoteFieldTraversalPath) { - this.remoteFieldTraversalPath.addAll(remoteFieldTraversalPath); + if (remoteFieldTraversalPath != null) { + this.remoteFieldTraversalPath.addAll(remoteFieldTraversalPath); + } return this; } diff --git a/src/main/java/com/merge/api/ticketing/types/DataPassthroughRequest.java b/src/main/java/com/merge/api/ticketing/types/DataPassthroughRequest.java index c10fbb23d..8bede8661 100644 --- a/src/main/java/com/merge/api/ticketing/types/DataPassthroughRequest.java +++ b/src/main/java/com/merge/api/ticketing/types/DataPassthroughRequest.java @@ -172,7 +172,7 @@ public interface MethodStage { public interface PathStage { /** - * The path of the request in the third party's platform. + *

                              The path of the request in the third party's platform.

                              */ _FinalStage path(@NotNull String path); } @@ -264,7 +264,8 @@ public PathStage method(@NotNull MethodEnum method) { } /** - * The path of the request in the third party's platform.

                              The path of the request in the third party's platform.

                              + *

                              The path of the request in the third party's platform.

                              + *

                              The path of the request in the third party's platform.

                              * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/ticketing/types/EndUserDetailsRequest.java b/src/main/java/com/merge/api/ticketing/types/EndUserDetailsRequest.java index aedc8a2b3..fa5a5dc0e 100644 --- a/src/main/java/com/merge/api/ticketing/types/EndUserDetailsRequest.java +++ b/src/main/java/com/merge/api/ticketing/types/EndUserDetailsRequest.java @@ -250,7 +250,7 @@ public static EndUserEmailAddressStage builder() { public interface EndUserEmailAddressStage { /** - * Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent. + *

                              Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.

                              */ EndUserOrganizationNameStage endUserEmailAddress(@NotNull String endUserEmailAddress); @@ -259,14 +259,14 @@ public interface EndUserEmailAddressStage { public interface EndUserOrganizationNameStage { /** - * Your end user's organization. + *

                              Your end user's organization.

                              */ EndUserOriginIdStage endUserOrganizationName(@NotNull String endUserOrganizationName); } public interface EndUserOriginIdStage { /** - * This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers. + *

                              This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.

                              */ _FinalStage endUserOriginId(@NotNull String endUserOriginId); } @@ -408,7 +408,8 @@ public Builder from(EndUserDetailsRequest other) { } /** - * Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.

                              Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.

                              + *

                              Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.

                              + *

                              Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.

                              * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -419,7 +420,8 @@ public EndUserOrganizationNameStage endUserEmailAddress(@NotNull String endUserE } /** - * Your end user's organization.

                              Your end user's organization.

                              + *

                              Your end user's organization.

                              + *

                              Your end user's organization.

                              * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -430,7 +432,8 @@ public EndUserOriginIdStage endUserOrganizationName(@NotNull String endUserOrgan } /** - * This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.

                              This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.

                              + *

                              This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.

                              + *

                              This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.

                              * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -637,7 +640,9 @@ public _FinalStage integration(Optional integration) { */ @java.lang.Override public _FinalStage addAllCategories(List categories) { - this.categories.addAll(categories); + if (categories != null) { + this.categories.addAll(categories); + } return this; } diff --git a/src/main/java/com/merge/api/ticketing/types/EndUserDetailsRequestLanguage.java b/src/main/java/com/merge/api/ticketing/types/EndUserDetailsRequestLanguage.java index 601df80ad..1b6b90a1a 100644 --- a/src/main/java/com/merge/api/ticketing/types/EndUserDetailsRequestLanguage.java +++ b/src/main/java/com/merge/api/ticketing/types/EndUserDetailsRequestLanguage.java @@ -84,11 +84,11 @@ public EndUserDetailsRequestLanguage deserialize(JsonParser p, DeserializationCo Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, LanguageEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/FieldMappingInstanceResponse.java b/src/main/java/com/merge/api/ticketing/types/FieldMappingInstanceResponse.java index e0a3d2cd7..523547e66 100644 --- a/src/main/java/com/merge/api/ticketing/types/FieldMappingInstanceResponse.java +++ b/src/main/java/com/merge/api/ticketing/types/FieldMappingInstanceResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/ticketing/types/GenerateRemoteKeyRequest.java b/src/main/java/com/merge/api/ticketing/types/GenerateRemoteKeyRequest.java index 8efc5da05..7ec01672f 100644 --- a/src/main/java/com/merge/api/ticketing/types/GenerateRemoteKeyRequest.java +++ b/src/main/java/com/merge/api/ticketing/types/GenerateRemoteKeyRequest.java @@ -67,7 +67,7 @@ public static NameStage builder() { public interface NameStage { /** - * The name of the remote key + *

                              The name of the remote key

                              */ _FinalStage name(@NotNull String name); @@ -94,7 +94,8 @@ public Builder from(GenerateRemoteKeyRequest other) { } /** - * The name of the remote key

                              The name of the remote key

                              + *

                              The name of the remote key

                              + *

                              The name of the remote key

                              * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/ticketing/types/IssueStatus.java b/src/main/java/com/merge/api/ticketing/types/IssueStatus.java index 874cc892c..401387208 100644 --- a/src/main/java/com/merge/api/ticketing/types/IssueStatus.java +++ b/src/main/java/com/merge/api/ticketing/types/IssueStatus.java @@ -83,11 +83,11 @@ public IssueStatus deserialize(JsonParser p, DeserializationContext context) thr Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, IssueStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/LinkedAccountCommonModelScopeDeserializerRequest.java b/src/main/java/com/merge/api/ticketing/types/LinkedAccountCommonModelScopeDeserializerRequest.java index c4d88e9e7..8b0392a09 100644 --- a/src/main/java/com/merge/api/ticketing/types/LinkedAccountCommonModelScopeDeserializerRequest.java +++ b/src/main/java/com/merge/api/ticketing/types/LinkedAccountCommonModelScopeDeserializerRequest.java @@ -100,7 +100,9 @@ public Builder addCommonModels(IndividualCommonModelScopeDeserializerRequest com } public Builder addAllCommonModels(List commonModels) { - this.commonModels.addAll(commonModels); + if (commonModels != null) { + this.commonModels.addAll(commonModels); + } return this; } diff --git a/src/main/java/com/merge/api/ticketing/types/MetaResponse.java b/src/main/java/com/merge/api/ticketing/types/MetaResponse.java index 70da0ec5e..aaf163668 100644 --- a/src/main/java/com/merge/api/ticketing/types/MetaResponse.java +++ b/src/main/java/com/merge/api/ticketing/types/MetaResponse.java @@ -216,7 +216,9 @@ public _FinalStage requestSchema(String key, JsonNode value) { @java.lang.Override public _FinalStage putAllRequestSchema(Map requestSchema) { - this.requestSchema.putAll(requestSchema); + if (requestSchema != null) { + this.requestSchema.putAll(requestSchema); + } return this; } diff --git a/src/main/java/com/merge/api/ticketing/types/ModelOperation.java b/src/main/java/com/merge/api/ticketing/types/ModelOperation.java index b7ec6f42e..d8a2320c4 100644 --- a/src/main/java/com/merge/api/ticketing/types/ModelOperation.java +++ b/src/main/java/com/merge/api/ticketing/types/ModelOperation.java @@ -159,7 +159,9 @@ public _FinalStage modelName(@NotNull String modelName) { @java.lang.Override public _FinalStage addAllSupportedFields(List supportedFields) { - this.supportedFields.addAll(supportedFields); + if (supportedFields != null) { + this.supportedFields.addAll(supportedFields); + } return this; } @@ -179,7 +181,9 @@ public _FinalStage supportedFields(List supportedFields) { @java.lang.Override public _FinalStage addAllRequiredPostParameters(List requiredPostParameters) { - this.requiredPostParameters.addAll(requiredPostParameters); + if (requiredPostParameters != null) { + this.requiredPostParameters.addAll(requiredPostParameters); + } return this; } @@ -199,7 +203,9 @@ public _FinalStage requiredPostParameters(List requiredPostParameters) { @java.lang.Override public _FinalStage addAllAvailableOperations(List availableOperations) { - this.availableOperations.addAll(availableOperations); + if (availableOperations != null) { + this.availableOperations.addAll(availableOperations); + } return this; } diff --git a/src/main/java/com/merge/api/ticketing/types/MultipartFormFieldRequest.java b/src/main/java/com/merge/api/ticketing/types/MultipartFormFieldRequest.java index 20d19608d..713754edd 100644 --- a/src/main/java/com/merge/api/ticketing/types/MultipartFormFieldRequest.java +++ b/src/main/java/com/merge/api/ticketing/types/MultipartFormFieldRequest.java @@ -128,7 +128,7 @@ public static NameStage builder() { public interface NameStage { /** - * The name of the form field + *

                              The name of the form field

                              */ DataStage name(@NotNull String name); @@ -137,7 +137,7 @@ public interface NameStage { public interface DataStage { /** - * The data for the form field. + *

                              The data for the form field.

                              */ _FinalStage data(@NotNull String data); } @@ -200,7 +200,8 @@ public Builder from(MultipartFormFieldRequest other) { } /** - * The name of the form field

                              The name of the form field

                              + *

                              The name of the form field

                              + *

                              The name of the form field

                              * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override @@ -211,7 +212,8 @@ public DataStage name(@NotNull String name) { } /** - * The data for the form field.

                              The data for the form field.

                              + *

                              The data for the form field.

                              + *

                              The data for the form field.

                              * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/ticketing/types/MultipartFormFieldRequestEncoding.java b/src/main/java/com/merge/api/ticketing/types/MultipartFormFieldRequestEncoding.java index 9bac556bc..26eab7ff1 100644 --- a/src/main/java/com/merge/api/ticketing/types/MultipartFormFieldRequestEncoding.java +++ b/src/main/java/com/merge/api/ticketing/types/MultipartFormFieldRequestEncoding.java @@ -84,11 +84,11 @@ public MultipartFormFieldRequestEncoding deserialize(JsonParser p, Deserializati Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, EncodingEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/PatchedTicketRequestAccessLevel.java b/src/main/java/com/merge/api/ticketing/types/PatchedTicketRequestAccessLevel.java index 133eb7098..a70248b83 100644 --- a/src/main/java/com/merge/api/ticketing/types/PatchedTicketRequestAccessLevel.java +++ b/src/main/java/com/merge/api/ticketing/types/PatchedTicketRequestAccessLevel.java @@ -84,11 +84,11 @@ public PatchedTicketRequestAccessLevel deserialize(JsonParser p, Deserialization Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TicketAccessLevelEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/PatchedTicketRequestStatus.java b/src/main/java/com/merge/api/ticketing/types/PatchedTicketRequestStatus.java index c88cb8ce5..b44356c13 100644 --- a/src/main/java/com/merge/api/ticketing/types/PatchedTicketRequestStatus.java +++ b/src/main/java/com/merge/api/ticketing/types/PatchedTicketRequestStatus.java @@ -83,11 +83,11 @@ public PatchedTicketRequestStatus deserialize(JsonParser p, DeserializationConte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TicketStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/RemoteData.java b/src/main/java/com/merge/api/ticketing/types/RemoteData.java index e955df50b..5534766b0 100644 --- a/src/main/java/com/merge/api/ticketing/types/RemoteData.java +++ b/src/main/java/com/merge/api/ticketing/types/RemoteData.java @@ -78,7 +78,7 @@ public static PathStage builder() { public interface PathStage { /** - * The third-party API path that is being called. + *

                              The third-party API path that is being called.

                              */ _FinalStage path(@NotNull String path); @@ -112,7 +112,8 @@ public Builder from(RemoteData other) { } /** - * The third-party API path that is being called.

                              The third-party API path that is being called.

                              + *

                              The third-party API path that is being called.

                              + *

                              The third-party API path that is being called.

                              * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/ticketing/types/RemoteEndpointInfo.java b/src/main/java/com/merge/api/ticketing/types/RemoteEndpointInfo.java index 86c36e6f4..fdbad212b 100644 --- a/src/main/java/com/merge/api/ticketing/types/RemoteEndpointInfo.java +++ b/src/main/java/com/merge/api/ticketing/types/RemoteEndpointInfo.java @@ -145,7 +145,9 @@ public _FinalStage urlPath(@NotNull String urlPath) { @java.lang.Override public _FinalStage addAllFieldTraversalPath(List fieldTraversalPath) { - this.fieldTraversalPath.addAll(fieldTraversalPath); + if (fieldTraversalPath != null) { + this.fieldTraversalPath.addAll(fieldTraversalPath); + } return this; } diff --git a/src/main/java/com/merge/api/ticketing/types/RemoteFieldApi.java b/src/main/java/com/merge/api/ticketing/types/RemoteFieldApi.java index d2cbe6b71..664587494 100644 --- a/src/main/java/com/merge/api/ticketing/types/RemoteFieldApi.java +++ b/src/main/java/com/merge/api/ticketing/types/RemoteFieldApi.java @@ -248,7 +248,9 @@ public _FinalStage schema(String key, JsonNode value) { @java.lang.Override public _FinalStage putAllSchema(Map schema) { - this.schema.putAll(schema); + if (schema != null) { + this.schema.putAll(schema); + } return this; } diff --git a/src/main/java/com/merge/api/ticketing/types/RemoteFieldRemoteFieldClass.java b/src/main/java/com/merge/api/ticketing/types/RemoteFieldRemoteFieldClass.java index d1a9d487d..ff98c47eb 100644 --- a/src/main/java/com/merge/api/ticketing/types/RemoteFieldRemoteFieldClass.java +++ b/src/main/java/com/merge/api/ticketing/types/RemoteFieldRemoteFieldClass.java @@ -84,11 +84,11 @@ public RemoteFieldRemoteFieldClass deserialize(JsonParser p, DeserializationCont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RemoteFieldClass.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/RemoteFieldRequestRemoteFieldClass.java b/src/main/java/com/merge/api/ticketing/types/RemoteFieldRequestRemoteFieldClass.java index a98e45d65..bd3d4af9d 100644 --- a/src/main/java/com/merge/api/ticketing/types/RemoteFieldRequestRemoteFieldClass.java +++ b/src/main/java/com/merge/api/ticketing/types/RemoteFieldRequestRemoteFieldClass.java @@ -85,11 +85,11 @@ public RemoteFieldRequestRemoteFieldClass deserialize(JsonParser p, Deserializat Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, RemoteFieldClass.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/RemoteKeyForRegenerationRequest.java b/src/main/java/com/merge/api/ticketing/types/RemoteKeyForRegenerationRequest.java index 749fcab0c..82ca1dcf4 100644 --- a/src/main/java/com/merge/api/ticketing/types/RemoteKeyForRegenerationRequest.java +++ b/src/main/java/com/merge/api/ticketing/types/RemoteKeyForRegenerationRequest.java @@ -67,7 +67,7 @@ public static NameStage builder() { public interface NameStage { /** - * The name of the remote key + *

                              The name of the remote key

                              */ _FinalStage name(@NotNull String name); @@ -94,7 +94,8 @@ public Builder from(RemoteKeyForRegenerationRequest other) { } /** - * The name of the remote key

                              The name of the remote key

                              + *

                              The name of the remote key

                              + *

                              The name of the remote key

                              * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override diff --git a/src/main/java/com/merge/api/ticketing/types/RemoteResponseResponseType.java b/src/main/java/com/merge/api/ticketing/types/RemoteResponseResponseType.java index 73d97130d..8054c2669 100644 --- a/src/main/java/com/merge/api/ticketing/types/RemoteResponseResponseType.java +++ b/src/main/java/com/merge/api/ticketing/types/RemoteResponseResponseType.java @@ -83,11 +83,11 @@ public RemoteResponseResponseType deserialize(JsonParser p, DeserializationConte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, ResponseTypeEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/RoleTicketAccess.java b/src/main/java/com/merge/api/ticketing/types/RoleTicketAccess.java index ed7d02e75..ac5e33a4d 100644 --- a/src/main/java/com/merge/api/ticketing/types/RoleTicketAccess.java +++ b/src/main/java/com/merge/api/ticketing/types/RoleTicketAccess.java @@ -83,11 +83,11 @@ public RoleTicketAccess deserialize(JsonParser p, DeserializationContext context Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TicketAccessEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/RoleTicketActionsItem.java b/src/main/java/com/merge/api/ticketing/types/RoleTicketActionsItem.java index 71e3a1a7b..100029126 100644 --- a/src/main/java/com/merge/api/ticketing/types/RoleTicketActionsItem.java +++ b/src/main/java/com/merge/api/ticketing/types/RoleTicketActionsItem.java @@ -83,11 +83,11 @@ public RoleTicketActionsItem deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TicketActionsEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/SyncStatusLastSyncResult.java b/src/main/java/com/merge/api/ticketing/types/SyncStatusLastSyncResult.java index 70ce30a3b..61f424bc4 100644 --- a/src/main/java/com/merge/api/ticketing/types/SyncStatusLastSyncResult.java +++ b/src/main/java/com/merge/api/ticketing/types/SyncStatusLastSyncResult.java @@ -83,11 +83,11 @@ public SyncStatusLastSyncResult deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, LastSyncResultEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/SyncStatusStatus.java b/src/main/java/com/merge/api/ticketing/types/SyncStatusStatus.java index 1495b3e5d..270d3a483 100644 --- a/src/main/java/com/merge/api/ticketing/types/SyncStatusStatus.java +++ b/src/main/java/com/merge/api/ticketing/types/SyncStatusStatus.java @@ -83,11 +83,11 @@ public SyncStatusStatus deserialize(JsonParser p, DeserializationContext context Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, StatusFd5Enum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/TicketAccessLevel.java b/src/main/java/com/merge/api/ticketing/types/TicketAccessLevel.java index b588382a8..191841790 100644 --- a/src/main/java/com/merge/api/ticketing/types/TicketAccessLevel.java +++ b/src/main/java/com/merge/api/ticketing/types/TicketAccessLevel.java @@ -83,11 +83,11 @@ public TicketAccessLevel deserialize(JsonParser p, DeserializationContext contex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TicketAccessLevelEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/TicketAccount.java b/src/main/java/com/merge/api/ticketing/types/TicketAccount.java index e2be7798e..b9527ab4f 100644 --- a/src/main/java/com/merge/api/ticketing/types/TicketAccount.java +++ b/src/main/java/com/merge/api/ticketing/types/TicketAccount.java @@ -83,11 +83,11 @@ public TicketAccount deserialize(JsonParser p, DeserializationContext context) t Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/TicketAssignedTeamsItem.java b/src/main/java/com/merge/api/ticketing/types/TicketAssignedTeamsItem.java index 4f2bbcd06..97dd08ba7 100644 --- a/src/main/java/com/merge/api/ticketing/types/TicketAssignedTeamsItem.java +++ b/src/main/java/com/merge/api/ticketing/types/TicketAssignedTeamsItem.java @@ -83,11 +83,11 @@ public TicketAssignedTeamsItem deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Team.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/TicketAssigneesItem.java b/src/main/java/com/merge/api/ticketing/types/TicketAssigneesItem.java index dac1343cb..fd4e464ec 100644 --- a/src/main/java/com/merge/api/ticketing/types/TicketAssigneesItem.java +++ b/src/main/java/com/merge/api/ticketing/types/TicketAssigneesItem.java @@ -83,11 +83,11 @@ public TicketAssigneesItem deserialize(JsonParser p, DeserializationContext cont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, User.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/TicketAttachmentsItem.java b/src/main/java/com/merge/api/ticketing/types/TicketAttachmentsItem.java index 58352a927..5360f3413 100644 --- a/src/main/java/com/merge/api/ticketing/types/TicketAttachmentsItem.java +++ b/src/main/java/com/merge/api/ticketing/types/TicketAttachmentsItem.java @@ -83,11 +83,11 @@ public TicketAttachmentsItem deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Attachment.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/TicketCollectionsItem.java b/src/main/java/com/merge/api/ticketing/types/TicketCollectionsItem.java index 1194ff7eb..ae56965ee 100644 --- a/src/main/java/com/merge/api/ticketing/types/TicketCollectionsItem.java +++ b/src/main/java/com/merge/api/ticketing/types/TicketCollectionsItem.java @@ -83,11 +83,11 @@ public TicketCollectionsItem deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Collection.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/TicketContact.java b/src/main/java/com/merge/api/ticketing/types/TicketContact.java index 6d19e5aac..b29c96df6 100644 --- a/src/main/java/com/merge/api/ticketing/types/TicketContact.java +++ b/src/main/java/com/merge/api/ticketing/types/TicketContact.java @@ -83,11 +83,11 @@ public TicketContact deserialize(JsonParser p, DeserializationContext context) t Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/TicketCreator.java b/src/main/java/com/merge/api/ticketing/types/TicketCreator.java index c31ca7c36..38761b78e 100644 --- a/src/main/java/com/merge/api/ticketing/types/TicketCreator.java +++ b/src/main/java/com/merge/api/ticketing/types/TicketCreator.java @@ -83,11 +83,11 @@ public TicketCreator deserialize(JsonParser p, DeserializationContext context) t Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, User.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/TicketParentTicket.java b/src/main/java/com/merge/api/ticketing/types/TicketParentTicket.java index bd299759d..cb8c3c7bd 100644 --- a/src/main/java/com/merge/api/ticketing/types/TicketParentTicket.java +++ b/src/main/java/com/merge/api/ticketing/types/TicketParentTicket.java @@ -83,11 +83,11 @@ public TicketParentTicket deserialize(JsonParser p, DeserializationContext conte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Ticket.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/TicketPriority.java b/src/main/java/com/merge/api/ticketing/types/TicketPriority.java index 77f208d57..83597edd7 100644 --- a/src/main/java/com/merge/api/ticketing/types/TicketPriority.java +++ b/src/main/java/com/merge/api/ticketing/types/TicketPriority.java @@ -83,11 +83,11 @@ public TicketPriority deserialize(JsonParser p, DeserializationContext context) Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PriorityEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/TicketRequestAccessLevel.java b/src/main/java/com/merge/api/ticketing/types/TicketRequestAccessLevel.java index 0d60e85fa..963aef617 100644 --- a/src/main/java/com/merge/api/ticketing/types/TicketRequestAccessLevel.java +++ b/src/main/java/com/merge/api/ticketing/types/TicketRequestAccessLevel.java @@ -83,11 +83,11 @@ public TicketRequestAccessLevel deserialize(JsonParser p, DeserializationContext Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TicketAccessLevelEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/TicketRequestAccount.java b/src/main/java/com/merge/api/ticketing/types/TicketRequestAccount.java index 2aa4512aa..0be2b7cba 100644 --- a/src/main/java/com/merge/api/ticketing/types/TicketRequestAccount.java +++ b/src/main/java/com/merge/api/ticketing/types/TicketRequestAccount.java @@ -83,11 +83,11 @@ public TicketRequestAccount deserialize(JsonParser p, DeserializationContext con Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Account.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/TicketRequestAssignedTeamsItem.java b/src/main/java/com/merge/api/ticketing/types/TicketRequestAssignedTeamsItem.java index ca95ac3fd..14158f1ea 100644 --- a/src/main/java/com/merge/api/ticketing/types/TicketRequestAssignedTeamsItem.java +++ b/src/main/java/com/merge/api/ticketing/types/TicketRequestAssignedTeamsItem.java @@ -84,11 +84,11 @@ public TicketRequestAssignedTeamsItem deserialize(JsonParser p, DeserializationC Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Team.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/TicketRequestAssigneesItem.java b/src/main/java/com/merge/api/ticketing/types/TicketRequestAssigneesItem.java index 58c4543e0..8d61838d5 100644 --- a/src/main/java/com/merge/api/ticketing/types/TicketRequestAssigneesItem.java +++ b/src/main/java/com/merge/api/ticketing/types/TicketRequestAssigneesItem.java @@ -83,11 +83,11 @@ public TicketRequestAssigneesItem deserialize(JsonParser p, DeserializationConte Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, User.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/TicketRequestAttachmentsItem.java b/src/main/java/com/merge/api/ticketing/types/TicketRequestAttachmentsItem.java index 71a371494..829706e82 100644 --- a/src/main/java/com/merge/api/ticketing/types/TicketRequestAttachmentsItem.java +++ b/src/main/java/com/merge/api/ticketing/types/TicketRequestAttachmentsItem.java @@ -84,11 +84,11 @@ public TicketRequestAttachmentsItem deserialize(JsonParser p, DeserializationCon Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Attachment.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/TicketRequestCollectionsItem.java b/src/main/java/com/merge/api/ticketing/types/TicketRequestCollectionsItem.java index 60a27f24d..a07221597 100644 --- a/src/main/java/com/merge/api/ticketing/types/TicketRequestCollectionsItem.java +++ b/src/main/java/com/merge/api/ticketing/types/TicketRequestCollectionsItem.java @@ -84,11 +84,11 @@ public TicketRequestCollectionsItem deserialize(JsonParser p, DeserializationCon Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Collection.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/TicketRequestContact.java b/src/main/java/com/merge/api/ticketing/types/TicketRequestContact.java index e79a7283a..7359e2fb6 100644 --- a/src/main/java/com/merge/api/ticketing/types/TicketRequestContact.java +++ b/src/main/java/com/merge/api/ticketing/types/TicketRequestContact.java @@ -83,11 +83,11 @@ public TicketRequestContact deserialize(JsonParser p, DeserializationContext con Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Contact.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/TicketRequestCreator.java b/src/main/java/com/merge/api/ticketing/types/TicketRequestCreator.java index e5ee0698c..2427db20a 100644 --- a/src/main/java/com/merge/api/ticketing/types/TicketRequestCreator.java +++ b/src/main/java/com/merge/api/ticketing/types/TicketRequestCreator.java @@ -83,11 +83,11 @@ public TicketRequestCreator deserialize(JsonParser p, DeserializationContext con Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, User.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/TicketRequestParentTicket.java b/src/main/java/com/merge/api/ticketing/types/TicketRequestParentTicket.java index 753672806..f4e7cb36f 100644 --- a/src/main/java/com/merge/api/ticketing/types/TicketRequestParentTicket.java +++ b/src/main/java/com/merge/api/ticketing/types/TicketRequestParentTicket.java @@ -83,11 +83,11 @@ public TicketRequestParentTicket deserialize(JsonParser p, DeserializationContex Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Ticket.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/TicketRequestPriority.java b/src/main/java/com/merge/api/ticketing/types/TicketRequestPriority.java index 10f3fbd55..2377f8e8f 100644 --- a/src/main/java/com/merge/api/ticketing/types/TicketRequestPriority.java +++ b/src/main/java/com/merge/api/ticketing/types/TicketRequestPriority.java @@ -83,11 +83,11 @@ public TicketRequestPriority deserialize(JsonParser p, DeserializationContext co Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, PriorityEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/TicketRequestStatus.java b/src/main/java/com/merge/api/ticketing/types/TicketRequestStatus.java index e6af24ae2..4b369fa60 100644 --- a/src/main/java/com/merge/api/ticketing/types/TicketRequestStatus.java +++ b/src/main/java/com/merge/api/ticketing/types/TicketRequestStatus.java @@ -83,11 +83,11 @@ public TicketRequestStatus deserialize(JsonParser p, DeserializationContext cont Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TicketStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/TicketResponse.java b/src/main/java/com/merge/api/ticketing/types/TicketResponse.java index 3f9e3a9a5..4617b03c8 100644 --- a/src/main/java/com/merge/api/ticketing/types/TicketResponse.java +++ b/src/main/java/com/merge/api/ticketing/types/TicketResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/ticketing/types/TicketStatus.java b/src/main/java/com/merge/api/ticketing/types/TicketStatus.java index 549dc4070..6a48875dc 100644 --- a/src/main/java/com/merge/api/ticketing/types/TicketStatus.java +++ b/src/main/java/com/merge/api/ticketing/types/TicketStatus.java @@ -83,11 +83,11 @@ public TicketStatus deserialize(JsonParser p, DeserializationContext context) th Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, TicketStatusEnum.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/TicketingAttachmentResponse.java b/src/main/java/com/merge/api/ticketing/types/TicketingAttachmentResponse.java index 926f0ee81..687ca802a 100644 --- a/src/main/java/com/merge/api/ticketing/types/TicketingAttachmentResponse.java +++ b/src/main/java/com/merge/api/ticketing/types/TicketingAttachmentResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/ticketing/types/TicketingContactResponse.java b/src/main/java/com/merge/api/ticketing/types/TicketingContactResponse.java index 0cc9903a5..9a29a73a8 100644 --- a/src/main/java/com/merge/api/ticketing/types/TicketingContactResponse.java +++ b/src/main/java/com/merge/api/ticketing/types/TicketingContactResponse.java @@ -170,7 +170,9 @@ public _FinalStage logs(Optional> logs) { @java.lang.Override public _FinalStage addAllErrors(List errors) { - this.errors.addAll(errors); + if (errors != null) { + this.errors.addAll(errors); + } return this; } @@ -190,7 +192,9 @@ public _FinalStage errors(List errors) { @java.lang.Override public _FinalStage addAllWarnings(List warnings) { - this.warnings.addAll(warnings); + if (warnings != null) { + this.warnings.addAll(warnings); + } return this; } diff --git a/src/main/java/com/merge/api/ticketing/types/UserRolesItem.java b/src/main/java/com/merge/api/ticketing/types/UserRolesItem.java index af138cd63..9f6440423 100644 --- a/src/main/java/com/merge/api/ticketing/types/UserRolesItem.java +++ b/src/main/java/com/merge/api/ticketing/types/UserRolesItem.java @@ -83,11 +83,11 @@ public UserRolesItem deserialize(JsonParser p, DeserializationContext context) t Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Role.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/UserTeamsItem.java b/src/main/java/com/merge/api/ticketing/types/UserTeamsItem.java index bf81ba061..78789c607 100644 --- a/src/main/java/com/merge/api/ticketing/types/UserTeamsItem.java +++ b/src/main/java/com/merge/api/ticketing/types/UserTeamsItem.java @@ -83,11 +83,11 @@ public UserTeamsItem deserialize(JsonParser p, DeserializationContext context) t Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Team.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/ViewerTeam.java b/src/main/java/com/merge/api/ticketing/types/ViewerTeam.java index 7cec00039..ce58d2338 100644 --- a/src/main/java/com/merge/api/ticketing/types/ViewerTeam.java +++ b/src/main/java/com/merge/api/ticketing/types/ViewerTeam.java @@ -83,11 +83,11 @@ public ViewerTeam deserialize(JsonParser p, DeserializationContext context) thro Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, Team.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/main/java/com/merge/api/ticketing/types/ViewerUser.java b/src/main/java/com/merge/api/ticketing/types/ViewerUser.java index 42de0d927..6e18f21c2 100644 --- a/src/main/java/com/merge/api/ticketing/types/ViewerUser.java +++ b/src/main/java/com/merge/api/ticketing/types/ViewerUser.java @@ -83,11 +83,11 @@ public ViewerUser deserialize(JsonParser p, DeserializationContext context) thro Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, User.class)); - } catch (IllegalArgumentException e) { + } catch (RuntimeException e) { } throw new JsonParseException(p, "Failed to deserialize"); } diff --git a/src/test/java/com/merge/api/StreamTest.java b/src/test/java/com/merge/api/StreamTest.java new file mode 100644 index 000000000..4872aa373 --- /dev/null +++ b/src/test/java/com/merge/api/StreamTest.java @@ -0,0 +1,86 @@ +/** + * This file was auto-generated by Fern from our API Definition. + */ +package com.merge.api; + +import static org.junit.jupiter.api.Assertions.*; + +import com.merge.api.core.ObjectMappers; +import com.merge.api.core.Stream; +import java.io.IOException; +import java.io.StringReader; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import org.junit.jupiter.api.Test; + +public final class StreamTest { + @Test + public void testJsonStream() { + List messages = List.of(Map.of("message", "hello"), Map.of("message", "world")); + List jsonStrings = messages.stream().map(StreamTest::mapToJson).collect(Collectors.toList()); + String input = String.join("\n", jsonStrings); + StringReader jsonInput = new StringReader(input); + Stream jsonStream = Stream.fromJson(Map.class, jsonInput); + int expectedMessages = 2; + int actualMessages = 0; + for (Map jsonObject : jsonStream) { + actualMessages++; + assertTrue(jsonObject.containsKey("message")); + } + assertEquals(expectedMessages, actualMessages); + } + + @Test + public void testSseStream() { + List events = List.of(Map.of("event", "start"), Map.of("event", "end")); + List sseStrings = events.stream().map(StreamTest::mapToSse).collect(Collectors.toList()); + String input = String.join("\n" + "\n", sseStrings); + StringReader sseInput = new StringReader(input); + Stream sseStream = Stream.fromSse(Map.class, sseInput); + int expectedEvents = 2; + int actualEvents = 0; + for (Map eventData : sseStream) { + actualEvents++; + assertTrue(eventData.containsKey("event")); + } + assertEquals(expectedEvents, actualEvents); + } + + @Test + public void testSseStreamWithTerminator() { + List events = List.of(Map.of("message", "first"), Map.of("message", "second")); + List sseStrings = events.stream().map(StreamTest::mapToSse).collect(Collectors.toList()); + sseStrings.add("data: [DONE]"); + String input = String.join("\n" + "\n", sseStrings); + StringReader sseInput = new StringReader(input); + Stream sseStream = Stream.fromSse(Map.class, sseInput, "[DONE]"); + int expectedEvents = 2; + int actualEvents = 0; + for (Map eventData : sseStream) { + actualEvents++; + assertTrue(eventData.containsKey("message")); + } + assertEquals(expectedEvents, actualEvents); + } + + @Test + public void testStreamResourceManagement() throws IOException { + StringReader testInput = new StringReader("{\"test\":\"data\"}"); + Stream testStream = Stream.fromJson(Map.class, testInput); + testStream.close(); + assertFalse(testStream.iterator().hasNext()); + } + + private static String mapToJson(Map map) { + try { + return ObjectMappers.JSON_MAPPER.writeValueAsString(map); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + private static String mapToSse(Map map) { + return "data: " + mapToJson(map); + } +}