From ae8c1ebff14621a706e1c8989111717926fdc01b Mon Sep 17 00:00:00 2001 From: Brian Date: Tue, 21 May 2024 09:46:01 -0400 Subject: [PATCH] Regenerated with 7.6.0 --- .openapi-generator/FILES | 6 - .openapi-generator/VERSION | 2 +- README.md | 1 + api/openapi.yaml | 390 +++++++++++------- build.gradle | 16 +- build.sbt | 8 +- gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 43453 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 189 +++++---- gradlew.bat | 37 +- openapitools.json | 2 +- pom.xml | 2 +- .../java/com/bandwidth/sdk/ApiClient.java | 14 + .../java/com/bandwidth/sdk/ApiException.java | 4 +- .../java/com/bandwidth/sdk/Configuration.java | 2 +- src/main/java/com/bandwidth/sdk/JSON.java | 21 +- src/main/java/com/bandwidth/sdk/Pair.java | 2 +- .../bandwidth/sdk/ServerConfiguration.java | 1 + .../com/bandwidth/sdk/ServerVariable.java | 1 + .../java/com/bandwidth/sdk/StringUtil.java | 2 +- .../java/com/bandwidth/sdk/api/MediaApi.java | 2 +- .../com/bandwidth/sdk/auth/ApiKeyAuth.java | 2 +- .../bandwidth/sdk/auth/HttpBearerAuth.java | 22 +- .../sdk/model/AbstractOpenApiSchema.java | 4 +- .../sdk/model/AccountStatistics.java | 14 +- .../bandwidth/sdk/model/AnswerCallback.java | 42 +- .../sdk/model/BridgeCompleteCallback.java | 46 +-- .../model/BridgeTargetCompleteCallback.java | 40 +- .../sdk/model/CallDirectionEnum.java | 6 + .../sdk/model/CallRecordingMetadata.java | 54 +-- .../com/bandwidth/sdk/model/CallState.java | 50 +-- .../bandwidth/sdk/model/CallStateEnum.java | 6 + .../sdk/model/CallTranscription.java | 36 +- .../sdk/model/CallTranscriptionMetadata.java | 14 +- .../sdk/model/CallTranscriptionResponse.java | 20 +- .../sdk/model/CallbackMethodEnum.java | 6 + .../com/bandwidth/sdk/model/CodeRequest.java | 22 +- .../com/bandwidth/sdk/model/Conference.java | 30 +- .../model/ConferenceCompletedCallback.java | 20 +- .../sdk/model/ConferenceCreatedCallback.java | 20 +- .../bandwidth/sdk/model/ConferenceMember.java | 22 +- .../model/ConferenceMemberExitCallback.java | 26 +- .../model/ConferenceMemberJoinCallback.java | 26 +- .../ConferenceRecordingAvailableCallback.java | 42 +- .../model/ConferenceRecordingMetadata.java | 36 +- .../sdk/model/ConferenceRedirectCallback.java | 20 +- .../sdk/model/ConferenceStateEnum.java | 6 + .../com/bandwidth/sdk/model/CreateCall.java | 62 +-- .../sdk/model/CreateCallResponse.java | 60 +-- .../sdk/model/CreateLookupResponse.java | 18 +- .../sdk/model/CreateMessageRequestError.java | 18 +- .../bandwidth/sdk/model/DeferredResult.java | 14 +- .../sdk/model/DisconnectCallback.java | 48 +-- .../com/bandwidth/sdk/model/Diversion.java | 24 +- .../com/bandwidth/sdk/model/DtmfCallback.java | 48 +-- .../com/bandwidth/sdk/model/FieldError.java | 14 +- .../bandwidth/sdk/model/FileFormatEnum.java | 6 + .../bandwidth/sdk/model/GatherCallback.java | 50 +-- .../sdk/model/InboundMessageCallback.java | 20 +- .../model/InboundMessageCallbackMessage.java | 42 +- .../bandwidth/sdk/model/InitiateCallback.java | 38 +- .../sdk/model/ListMessageDirectionEnum.java | 6 + .../bandwidth/sdk/model/ListMessageItem.java | 56 +-- .../bandwidth/sdk/model/LookupRequest.java | 12 +- .../com/bandwidth/sdk/model/LookupResult.java | 28 +- .../com/bandwidth/sdk/model/LookupStatus.java | 26 +- .../bandwidth/sdk/model/LookupStatusEnum.java | 6 + .../MachineDetectionCompleteCallback.java | 42 +- .../model/MachineDetectionConfiguration.java | 52 +-- .../sdk/model/MachineDetectionModeEnum.java | 6 + .../sdk/model/MachineDetectionResult.java | 14 +- .../java/com/bandwidth/sdk/model/Media.java | 16 +- .../java/com/bandwidth/sdk/model/Message.java | 48 +-- .../sdk/model/MessageDeliveredCallback.java | 20 +- .../MessageDeliveredCallbackMessage.java | 42 +- .../sdk/model/MessageDirectionEnum.java | 6 + .../sdk/model/MessageFailedCallback.java | 22 +- .../model/MessageFailedCallbackMessage.java | 40 +- .../bandwidth/sdk/model/MessageRequest.java | 32 +- .../sdk/model/MessageSendingCallback.java | 20 +- .../model/MessageSendingCallbackMessage.java | 38 +- .../sdk/model/MessageStatusEnum.java | 6 + .../bandwidth/sdk/model/MessageTypeEnum.java | 6 + .../com/bandwidth/sdk/model/MessagesList.java | 18 +- .../sdk/model/MessagingCodeResponse.java | 12 +- .../sdk/model/MessagingRequestError.java | 14 +- .../sdk/model/MfaForbiddenRequestError.java | 12 +- .../bandwidth/sdk/model/MfaRequestError.java | 14 +- .../model/MfaUnauthorizedRequestError.java | 12 +- .../com/bandwidth/sdk/model/PageInfo.java | 18 +- .../com/bandwidth/sdk/model/PriorityEnum.java | 6 + .../sdk/model/RecordingAvailableCallback.java | 62 +-- .../sdk/model/RecordingCompleteCallback.java | 62 +-- .../sdk/model/RecordingStateEnum.java | 6 + .../model/RecordingTranscriptionMetadata.java | 18 +- .../sdk/model/RecordingTranscriptions.java | 14 +- .../bandwidth/sdk/model/RedirectCallback.java | 46 +-- .../sdk/model/RedirectMethodEnum.java | 6 + .../com/bandwidth/sdk/model/StirShaken.java | 16 +- .../java/com/bandwidth/sdk/model/Tag.java | 14 +- .../sdk/model/TnLookupRequestError.java | 12 +- .../sdk/model/TranscribeRecording.java | 28 +- .../bandwidth/sdk/model/Transcription.java | 14 +- .../model/TranscriptionAvailableCallback.java | 60 +-- .../sdk/model/TransferAnswerCallback.java | 44 +- .../sdk/model/TransferCompleteCallback.java | 50 +-- .../sdk/model/TransferDisconnectCallback.java | 54 +-- .../com/bandwidth/sdk/model/UpdateCall.java | 42 +- .../sdk/model/UpdateCallRecording.java | 14 +- .../bandwidth/sdk/model/UpdateConference.java | 40 +- .../sdk/model/UpdateConferenceMember.java | 16 +- .../sdk/model/VerifyCodeRequest.java | 18 +- .../sdk/model/VerifyCodeResponse.java | 12 +- .../bandwidth/sdk/model/VoiceApiError.java | 16 +- .../sdk/model/VoiceCodeResponse.java | 12 +- .../sdk/api/TranscriptionsApiTest.java | 5 +- 116 files changed, 1295 insertions(+), 1836 deletions(-) diff --git a/.openapi-generator/FILES b/.openapi-generator/FILES index c33cafac..9eba548e 100644 --- a/.openapi-generator/FILES +++ b/.openapi-generator/FILES @@ -229,9 +229,3 @@ src/main/java/com/bandwidth/sdk/model/VerifyCodeRequest.java src/main/java/com/bandwidth/sdk/model/VerifyCodeResponse.java src/main/java/com/bandwidth/sdk/model/VoiceApiError.java src/main/java/com/bandwidth/sdk/model/VoiceCodeResponse.java -src/test/java/com/bandwidth/sdk/api/TranscriptionsApiTest.java -src/test/java/com/bandwidth/sdk/model/CallTranscriptionMetadataTest.java -src/test/java/com/bandwidth/sdk/model/CallTranscriptionResponseTest.java -src/test/java/com/bandwidth/sdk/model/CallTranscriptionTest.java -src/test/java/com/bandwidth/sdk/model/RecordingTranscriptionMetadataTest.java -src/test/java/com/bandwidth/sdk/model/RecordingTranscriptionsTest.java diff --git a/.openapi-generator/VERSION b/.openapi-generator/VERSION index 41225218..93c8ddab 100644 --- a/.openapi-generator/VERSION +++ b/.openapi-generator/VERSION @@ -1 +1 @@ -7.0.0 \ No newline at end of file +7.6.0 diff --git a/README.md b/README.md index 924ab72a..85de3774 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ Bandwidth - API version: 1.0.0 + - Generator version: 7.6.0 Bandwidth's Communication APIs diff --git a/api/openapi.yaml b/api/openapi.yaml index 862c08fc..85cfd74d 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -112,7 +112,8 @@ paths: summary: List Media tags: - Media - x-accepts: application/json + x-accepts: + - application/json servers: - description: Production url: https://messaging.bandwidth.com/api/v2 @@ -198,7 +199,8 @@ paths: summary: Delete Media tags: - Media - x-accepts: application/json + x-accepts: + - application/json get: description: Downloads a media file you previously uploaded. operationId: getMedia @@ -281,7 +283,9 @@ paths: summary: Get Media tags: - Media - x-accepts: application/json + x-accepts: + - application/json + - application/octet-stream put: description: |- Upload a file. You may add headers to the request in order to provide some control to your media file. @@ -385,7 +389,8 @@ paths: tags: - Media x-content-type: application/json - x-accepts: application/json + x-accepts: + - application/json servers: - description: Production url: https://messaging.bandwidth.com/api/v2 @@ -608,7 +613,8 @@ paths: summary: List Messages tags: - Messages - x-accepts: application/json + x-accepts: + - application/json post: callbacks: inboundCallback: @@ -689,7 +695,8 @@ paths: tags: - Messages x-content-type: application/json - x-accepts: application/json + x-accepts: + - application/json servers: - description: Production url: https://messaging.bandwidth.com/api/v2 @@ -872,7 +879,8 @@ paths: summary: Get Calls tags: - Calls - x-accepts: application/json + x-accepts: + - application/json post: description: |- Creates an outbound phone call. @@ -993,7 +1001,8 @@ paths: tags: - Calls x-content-type: application/json - x-accepts: application/json + x-accepts: + - application/json servers: - description: Production url: https://voice.bandwidth.com/api/v2 @@ -1112,7 +1121,8 @@ paths: summary: Get Call State Information tags: - Calls - x-accepts: application/json + x-accepts: + - application/json post: description: Interrupts and redirects a call to a different URL that should return a BXML document. @@ -1233,7 +1243,8 @@ paths: tags: - Calls x-content-type: application/json - x-accepts: application/json + x-accepts: + - application/json servers: - description: Production url: https://voice.bandwidth.com/api/v2 @@ -1357,7 +1368,8 @@ paths: tags: - Calls x-content-type: application/xml - x-accepts: application/json + x-accepts: + - application/json servers: - description: Production url: https://voice.bandwidth.com/api/v2 @@ -1524,7 +1536,8 @@ paths: summary: Get Conferences tags: - Conferences - x-accepts: application/json + x-accepts: + - application/json servers: - description: Production url: https://voice.bandwidth.com/api/v2 @@ -1640,7 +1653,8 @@ paths: summary: Get Conference Information tags: - Conferences - x-accepts: application/json + x-accepts: + - application/json post: description: Update the conference state. operationId: updateConference @@ -1751,7 +1765,8 @@ paths: tags: - Conferences x-content-type: application/json - x-accepts: application/json + x-accepts: + - application/json servers: - description: Production url: https://voice.bandwidth.com/api/v2 @@ -1866,7 +1881,8 @@ paths: tags: - Conferences x-content-type: application/xml - x-accepts: application/json + x-accepts: + - application/json servers: - description: Production url: https://voice.bandwidth.com/api/v2 @@ -1991,7 +2007,8 @@ paths: summary: Get Conference Member tags: - Conferences - x-accepts: application/json + x-accepts: + - application/json put: description: Updates settings for a particular conference member. operationId: updateConferenceMember @@ -2111,7 +2128,8 @@ paths: tags: - Conferences x-content-type: application/json - x-accepts: application/json + x-accepts: + - application/json servers: - description: Production url: https://voice.bandwidth.com/api/v2 @@ -2230,7 +2248,8 @@ paths: summary: Get Conference Recordings tags: - Conferences - x-accepts: application/json + x-accepts: + - application/json servers: - description: Production url: https://voice.bandwidth.com/api/v2 @@ -2355,7 +2374,8 @@ paths: summary: Get Conference Recording Information tags: - Conferences - x-accepts: application/json + x-accepts: + - application/json servers: - description: Production url: https://voice.bandwidth.com/api/v2 @@ -2485,7 +2505,10 @@ paths: summary: Download Conference Recording tags: - Conferences - x-accepts: application/json + x-accepts: + - application/json + - audio/mpeg + - audio/vnd.wave servers: - description: Production url: https://voice.bandwidth.com/api/v2 @@ -2636,7 +2659,8 @@ paths: summary: Get Call Recordings tags: - Recordings - x-accepts: application/json + x-accepts: + - application/json servers: - description: Production url: https://voice.bandwidth.com/api/v2 @@ -2751,7 +2775,8 @@ paths: tags: - Recordings x-content-type: application/json - x-accepts: application/json + x-accepts: + - application/json servers: - description: Production url: https://voice.bandwidth.com/api/v2 @@ -2871,7 +2896,8 @@ paths: summary: List Call Recordings tags: - Recordings - x-accepts: application/json + x-accepts: + - application/json servers: - description: Production url: https://voice.bandwidth.com/api/v2 @@ -2995,7 +3021,8 @@ paths: summary: Delete Recording tags: - Recordings - x-accepts: application/json + x-accepts: + - application/json get: description: Returns metadata for the specified recording. operationId: getCallRecording @@ -3116,7 +3143,8 @@ paths: summary: Get Call Recording tags: - Recordings - x-accepts: application/json + x-accepts: + - application/json servers: - description: Production url: https://voice.bandwidth.com/api/v2 @@ -3237,7 +3265,8 @@ paths: summary: Delete Recording Media tags: - Recordings - x-accepts: application/json + x-accepts: + - application/json get: description: Downloads the specified recording. operationId: downloadCallRecording @@ -3363,7 +3392,10 @@ paths: summary: Download Recording tags: - Recordings - x-accepts: application/json + x-accepts: + - application/json + - audio/mpeg + - audio/vnd.wave servers: - description: Production url: https://voice.bandwidth.com/api/v2 @@ -3487,7 +3519,8 @@ paths: summary: Delete Transcription tags: - Recordings - x-accepts: application/json + x-accepts: + - application/json get: description: |- Downloads the specified transcription. @@ -3612,7 +3645,8 @@ paths: summary: Get Transcription tags: - Recordings - x-accepts: application/json + x-accepts: + - application/json post: description: |- Generate the transcription for a specific recording. Transcription @@ -3735,7 +3769,8 @@ paths: tags: - Recordings x-content-type: application/json - x-accepts: application/json + x-accepts: + - application/json servers: - description: Production url: https://voice.bandwidth.com/api/v2 @@ -3842,7 +3877,8 @@ paths: summary: Get Account Statistics tags: - Statistics - x-accepts: application/json + x-accepts: + - application/json servers: - description: Production url: https://voice.bandwidth.com/api/v2 @@ -3958,7 +3994,8 @@ paths: summary: Enumerate transcriptions made with StartTranscription tags: - Transcriptions - x-accepts: application/json + x-accepts: + - application/json servers: - description: Production url: https://voice.bandwidth.com/api/v2 @@ -4082,7 +4119,8 @@ paths: summary: Delete a specific transcription tags: - Transcriptions - x-accepts: application/json + x-accepts: + - application/json get: description: "Retrieve the specified transcription that was created on this\ \ call via [startTranscription](/docs/voice/bxml/startTranscription)." @@ -4204,7 +4242,8 @@ paths: summary: Retrieve a specific transcription tags: - Transcriptions - x-accepts: application/json + x-accepts: + - application/json servers: - description: Production url: https://voice.bandwidth.com/api/v2 @@ -4259,7 +4298,8 @@ paths: tags: - MFA x-content-type: application/json - x-accepts: application/json + x-accepts: + - application/json servers: - description: Production url: https://mfa.bandwidth.com/api/v1 @@ -4314,7 +4354,8 @@ paths: tags: - MFA x-content-type: application/json - x-accepts: application/json + x-accepts: + - application/json servers: - description: Production url: https://mfa.bandwidth.com/api/v1 @@ -4375,7 +4416,8 @@ paths: tags: - MFA x-content-type: application/json - x-accepts: application/json + x-accepts: + - application/json servers: - description: Production url: https://mfa.bandwidth.com/api/v1 @@ -4479,7 +4521,8 @@ paths: tags: - Phone Number Lookup x-content-type: application/json - x-accepts: application/json + x-accepts: + - application/json servers: - description: Production url: https://numbers.bandwidth.com/api/v1 @@ -4590,7 +4633,8 @@ paths: summary: Get Lookup Request Status tags: - Phone Number Lookup - x-accepts: application/json + x-accepts: + - application/json servers: - description: Production url: https://numbers.bandwidth.com/api/v1 @@ -4633,8 +4677,8 @@ components: applicationId: 04e88489-df02-4e34-a0ee-27a91849555f accountId: "9900000" callId: c-15ac29a2-1331029c-2cb0-4a07-b215-b22865662d85 - to: +19195551234 - from: +19195554312 + to: "+19195551234" + from: "+19195554312" enqueuedTime: 2022-06-16T13:15:07.160Z callUrl: https://voice.bandwidth.com/api/v2/accounts/9900000/calls/c-15ac29a2-1331029c-2cb0-4a07-b215-b22865662d85 callTimeout: 30 @@ -4709,13 +4753,13 @@ components: summary: Example Number Lookup Request for One Number value: tns: - - +19195551234 + - "+19195551234" multipleNumberRequestExample: summary: Example Number Lookup Request for Multiple Numbers value: tns: - - +19195551234 - - +19195554321 + - "+19195551234" + - "+19195554321" lookupInProgressExample: summary: Example Lookup In Progress Response value: @@ -4727,7 +4771,7 @@ components: requestId: 004223a0-8b17-41b1-bf81-20732adf5590 status: FAILED failedTelephoneNumbers: - - +191955512345 + - "+191955512345" lookupSingleNumberCompleteExample: summary: Example Single Number Lookup Complete Response value: @@ -4736,7 +4780,7 @@ components: result: - Response Code: 0 Message: NOERROR - E.164 Format: +19195551234 + E.164 Format: "+19195551234" Formatted: (919) 555-1234 Country: US Line Type: Mobile @@ -4751,7 +4795,7 @@ components: result: - Response Code: 0 Message: NOERROR - E.164 Format: +19195551234 + E.164 Format: "+19195551234" Formatted: (919) 555-1234 Country: US Line Type: Mobile @@ -4760,7 +4804,7 @@ components: Mobile Network Code: "010" - Response Code: 0 Message: NOERROR - E.164 Format: +19195554321 + E.164 Format: "+19195554321" Formatted: (919) 555-4321 Country: US Line Type: Mobile @@ -4775,7 +4819,7 @@ components: result: - Response Code: 0 Message: NOERROR - E.164 Format: +19195551234 + E.164 Format: "+19195551234" Formatted: (919) 555-1234 Country: US Line Type: Mobile @@ -4783,7 +4827,7 @@ components: Mobile Country Code: "310" Mobile Network Code: "010" failedTelephoneNumbers: - - +191955512345 + - "+191955512345" lookupSingleNumberCompleteNoInfoExample: summary: Example Single Number Lookup Complete with No Information Response value: @@ -4792,7 +4836,7 @@ components: result: - Response Code: 3 Message: NXDOMAIN - E.164 Format: +19195550000 + E.164 Format: "+19195550000" Formatted: (919) 555-0000 Country: US parameters: @@ -5993,6 +6037,10 @@ components: example: sms type: string fieldError: + example: + fieldName: from + description: '''+invalid'' must be replaced with a valid E164 formatted telephone + number' properties: fieldName: description: The name of the field that contains the error @@ -6012,34 +6060,34 @@ components: nextPageToken: GL83PD3C prevPage: https://messaging.bandwidth.com/api/v2/users/accountId/messages?messageStatus=DLR_EXPIRED&nextPage=DLAPE902 messages: - - sourceTn: +15554443333 + - sourceTn: "+15554443333" messageLength: 18 campaignId: CJEUMDK messageId: 1589228074636lm4k2je7j7jklbn2 errorCode: 9902 - destinationTn: +15554442222 + destinationTn: "+15554442222" segmentCount: 1 messageStatus: RECEIVED receiveTime: 2020-04-07T14:03:07Z accountId: "9900000" - messageDirection: null + messageDirection: INBOUND messageType: sms carrierName: other recipientCount: 1 campaignClass: T attachmentCount: 1 messageSize: 27 - - sourceTn: +15554443333 + - sourceTn: "+15554443333" messageLength: 18 campaignId: CJEUMDK messageId: 1589228074636lm4k2je7j7jklbn2 errorCode: 9902 - destinationTn: +15554442222 + destinationTn: "+15554442222" segmentCount: 1 messageStatus: RECEIVED receiveTime: 2020-04-07T14:03:07Z accountId: "9900000" - messageDirection: null + messageDirection: INBOUND messageType: sms carrierName: other recipientCount: 1 @@ -6063,17 +6111,17 @@ components: type: object listMessageItem: example: - sourceTn: +15554443333 + sourceTn: "+15554443333" messageLength: 18 campaignId: CJEUMDK messageId: 1589228074636lm4k2je7j7jklbn2 errorCode: 9902 - destinationTn: +15554442222 + destinationTn: "+15554442222" segmentCount: 1 messageStatus: RECEIVED receiveTime: 2020-04-07T14:03:07Z accountId: "9900000" - messageDirection: null + messageDirection: INBOUND messageType: sms carrierName: other recipientCount: 1 @@ -6091,11 +6139,11 @@ components: type: string sourceTn: description: The source phone number of the message. - example: +15554443333 + example: "+15554443333" type: string destinationTn: description: The recipient phone number of the message. - example: +15554442222 + example: "+15554442222" type: string messageStatus: $ref: '#/components/schemas/messageStatusEnum' @@ -6179,6 +6227,9 @@ components: title: PageInfo type: object messagingRequestError: + example: + description: description + type: type properties: type: type: string @@ -6190,6 +6241,16 @@ components: title: MessagingRequestError type: object createMessageRequestError: + example: + fieldErrors: + - fieldName: from + description: '''+invalid'' must be replaced with a valid E164 formatted + telephone number' + - fieldName: from + description: '''+invalid'' must be replaced with a valid E164 formatted + telephone number' + description: description + type: type properties: type: type: string @@ -6236,21 +6297,21 @@ components: type: object message: example: - owner: +15554443333 + owner: "+15554443333" media: - https://dev.bandwidth.com/images/bandwidth-logo.png priority: default segmentCount: 2 - from: +15553332222 + from: "+15553332222" expiration: 2021-02-01T11:29:18-05:00 id: 1589228074636lm4k2je7j7jklbn2 time: 2022-09-14T18:20:16Z to: - - +15552223333 + - "+15552223333" text: Hello world tag: custom tag applicationId: 93de2206-9669-4e07-948d-329f4b722ee2 - direction: null + direction: in properties: id: description: The id of the message. @@ -6258,7 +6319,7 @@ components: type: string owner: description: The Bandwidth phone number associated with the message. - example: +15554443333 + example: "+15554443333" type: string applicationId: description: The application ID associated with the message. @@ -6279,14 +6340,14 @@ components: to: description: The phone number recipients of the message. example: - - +15552223333 + - "+15552223333" items: type: string type: array uniqueItems: true from: description: The phone number the message was sent from. - example: +15553332222 + example: "+15553332222" type: string media: description: The list of media URLs sent in the message. Including a `filename` @@ -6326,8 +6387,8 @@ components: to: description: The phone number(s) the message should be sent to in E164 format. example: - - +15554443333 - - +15552223333 + - "+15554443333" + - "+15552223333" items: type: string type: array @@ -6340,7 +6401,7 @@ components: \ lower-case letters a-z, numbers 0-9, space, hyphen -, plus +, underscore\ \ _ and ampersand &. Alphanumeric Sender IDs must contain at least one\ \ letter." - example: +15551113333 + example: "+15551113333" type: string text: description: The contents of the text message. Must be 2048 characters or @@ -6391,7 +6452,7 @@ components: example: message-received type: string to: - example: +15552223333 + example: "+15552223333" type: string description: example: Incoming message received @@ -6412,7 +6473,7 @@ components: example: 1661365814859loidf7mcwd4qacn7 type: string owner: - example: +15553332222 + example: "+15553332222" type: string applicationId: example: 93de2206-9669-4e07-948d-329f4b722ee2 @@ -6428,13 +6489,13 @@ components: $ref: '#/components/schemas/messageDirectionEnum' to: example: - - +15552223333 + - "+15552223333" items: type: string type: array uniqueItems: true from: - example: +15553332222 + example: "+15553332222" type: string text: example: Hello world @@ -6474,7 +6535,7 @@ components: example: message-sending type: string to: - example: +15552223333 + example: "+15552223333" type: string description: example: Message is sending to carrier @@ -6495,7 +6556,7 @@ components: example: 1661365814859loidf7mcwd4qacn7 type: string owner: - example: +15553332222 + example: "+15553332222" type: string applicationId: example: 93de2206-9669-4e07-948d-329f4b722ee2 @@ -6511,13 +6572,13 @@ components: $ref: '#/components/schemas/messageDirectionEnum' to: example: - - +15552223333 + - "+15552223333" items: type: string type: array uniqueItems: true from: - example: +15553332222 + example: "+15553332222" type: string text: example: Hello world @@ -6559,7 +6620,7 @@ components: example: message-delivered type: string to: - example: +15552223333 + example: "+15552223333" type: string description: example: Message delivered to carrier. @@ -6580,7 +6641,7 @@ components: example: 1661365814859loidf7mcwd4qacn7 type: string owner: - example: +15553332222 + example: "+15553332222" type: string applicationId: example: 93de2206-9669-4e07-948d-329f4b722ee2 @@ -6596,13 +6657,13 @@ components: $ref: '#/components/schemas/messageDirectionEnum' to: example: - - +15552223333 + - "+15552223333" items: type: string type: array uniqueItems: true from: - example: +15553332222 + example: "+15553332222" type: string text: example: Hello world @@ -6643,7 +6704,7 @@ components: example: message-failed type: string to: - example: +15552223333 + example: "+15552223333" type: string description: example: rejected-unallocated-from-number @@ -6668,7 +6729,7 @@ components: example: 1661365814859loidf7mcwd4qacn7 type: string owner: - example: +15553332222 + example: "+15553332222" type: string applicationId: example: 93de2206-9669-4e07-948d-329f4b722ee2 @@ -6684,13 +6745,13 @@ components: $ref: '#/components/schemas/messageDirectionEnum' to: example: - - +15552223333 + - "+15552223333" items: type: string type: array uniqueItems: true from: - example: +15553332222 + example: "+15553332222" type: string text: example: Hello world @@ -6809,14 +6870,14 @@ components: description: |- The destination to call (must be an E.164 formatted number (e.g. `+15555551212`) or a SIP URI (e.g. `sip:user@server.example`)). - example: +19195551234 + example: "+19195551234" type: string from: description: |- A Bandwidth phone number on your account the call should come from (must be in E.164 format, like `+15555551212`, or be one of the following strings: `Restricted`, `Anonymous`, `Private`, or `Unavailable`). - example: +19195554321 + example: "+19195554321" type: string displayName: description: "The caller display name to use when the call is created. \n\ @@ -6977,9 +7038,9 @@ components: answerMethod: POST enqueuedTime: 2022-06-16T13:15:07.16Z disconnectUrl: https://myServer.example/bandwidth/webhooks/disconnect - from: +19195554321 + from: "+19195554321" fallbackPassword: mySecretPassword1! - to: +19195551234 + to: "+19195551234" tag: My custom tag value applicationId: 04e88489-df02-4e34-a0ee-27a91849555f username: mySecretUsername @@ -6999,11 +7060,11 @@ components: type: string to: description: Recipient of the outgoing call. - example: +19195551234 + example: "+19195551234" type: string from: description: Phone number that created the outbound call. - example: +19195554321 + example: "+19195554321" type: string enqueuedTime: description: The time at which the call was accepted into the queue. @@ -7113,7 +7174,7 @@ components: originatingId: abc123 from: "19195554321" startTime: 2022-06-16T13:15:07.16Z - to: +19195551234 + to: "+19195551234" state: disconnected endTime: 2022-06-16T13:15:18.314Z errorId: errorId @@ -7141,7 +7202,7 @@ components: to: description: "The phone number that received the call, in E.164 format (e.g.\ \ +15555555555), or if the call was to a SIP URI, the SIP URI." - example: +19195551234 + example: "+19195551234" type: string from: description: "The phone number that made the call, in E.164 format (e.g.\ @@ -7353,14 +7414,14 @@ components: url: https://voice.bandwidth.com/api/v2/accounts/9900000/calls/c-15ac29a2-1331029c-2cb0-4a07-b215-b22865662d85/recordings/r-15ac29a2-1331029c-2cb0-4a07-b215-b22865662d85/transcription status: completed parentCallId: c-95ac8d6e-1a31c52e-b38f-4198-93c1-51633ec68f8d - transferCallerId: +15555555555 + transferCallerId: "+15555555555" transferTo: +15555555555) duration: PT13.67S accountId: "920012" channels: 1 - from: +15555555555 + from: "+15555555555" startTime: 2022-06-17T22:19:40.375Z - to: +15555555555 + to: "+15555555555" endTime: 2022-06-17T22:20:00Z applicationId: 04e88489-df02-4e34-a0ee-27a91849555f recordingId: r-fbe05094-9fd2afe9-bf5b-4c68-820a-41a01c1c5833 @@ -7393,19 +7454,19 @@ components: to: description: "The phone number that received the call, in E.164 format (e.g.\ \ +15555555555)." - example: +15555555555 + example: "+15555555555" type: string from: description: "The provided identifier of the caller: can be a phone number\ \ in E.164 format (e.g. +15555555555) or one of Private, Restricted, Unavailable,\ \ or Anonymous." - example: +15555555555 + example: "+15555555555" type: string transferCallerId: description: "The phone number used as the from field of the B-leg call,\ \ in E.164 format (e.g. +15555555555) or one of Restricted, Anonymous,\ \ Private, or Unavailable." - example: +15555555555 + example: "+15555555555" type: string transferTo: description: "The phone number used as the to field of the B-leg call, in\ @@ -8020,6 +8081,10 @@ components: type: string type: object voiceApiError: + example: + description: description + id: id + type: type properties: type: type: string @@ -8061,12 +8126,12 @@ components: description: "The provided identifier of the caller: can be a phone number\ \ in E.164 format (e.g. +15555555555) or one of Private, Restricted, Unavailable,\ \ or Anonymous." - example: +15555555555 + example: "+15555555555" type: string to: description: "The phone number that received the call, in E.164 format (e.g.\ \ +15555555555)." - example: +15555555555 + example: "+15555555555" type: string direction: $ref: '#/components/schemas/callDirectionEnum' @@ -8140,12 +8205,12 @@ components: description: "The provided identifier of the caller: can be a phone number\ \ in E.164 format (e.g. +15555555555) or one of Private, Restricted, Unavailable,\ \ or Anonymous." - example: +15555555555 + example: "+15555555555" type: string to: description: "The phone number that received the call, in E.164 format (e.g.\ \ +15555555555)." - example: +15555555555 + example: "+15555555555" type: string direction: $ref: '#/components/schemas/callDirectionEnum' @@ -8234,12 +8299,12 @@ components: description: "The provided identifier of the caller: can be a phone number\ \ in E.164 format (e.g. +15555555555) or one of Private, Restricted, Unavailable,\ \ or Anonymous." - example: +15555555555 + example: "+15555555555" type: string to: description: "The phone number that received the call, in E.164 format (e.g.\ \ +15555555555)." - example: +15555555555 + example: "+15555555555" type: string direction: $ref: '#/components/schemas/callDirectionEnum' @@ -8397,12 +8462,12 @@ components: description: "The provided identifier of the caller: can be a phone number\ \ in E.164 format (e.g. +15555555555) or one of Private, Restricted, Unavailable,\ \ or Anonymous." - example: +15555555555 + example: "+15555555555" type: string to: description: "The phone number that received the call, in E.164 format (e.g.\ \ +15555555555)." - example: +15555555555 + example: "+15555555555" type: string callId: description: The call id associated with the event. @@ -8453,12 +8518,12 @@ components: description: "The provided identifier of the caller: can be a phone number\ \ in E.164 format (e.g. +15555555555) or one of Private, Restricted, Unavailable,\ \ or Anonymous." - example: +15555555555 + example: "+15555555555" type: string to: description: "The phone number that received the call, in E.164 format (e.g.\ \ +15555555555)." - example: +15555555555 + example: "+15555555555" type: string callId: description: The call id associated with the event. @@ -8621,12 +8686,12 @@ components: description: "The provided identifier of the caller: can be a phone number\ \ in E.164 format (e.g. +15555555555) or one of Private, Restricted, Unavailable,\ \ or Anonymous." - example: +15555555555 + example: "+15555555555" type: string to: description: "The phone number that received the call, in E.164 format (e.g.\ \ +15555555555)." - example: +15555555555 + example: "+15555555555" type: string callId: description: The call id associated with the event. @@ -8718,12 +8783,12 @@ components: description: "The provided identifier of the caller: can be a phone number\ \ in E.164 format (e.g. +15555555555) or one of Private, Restricted, Unavailable,\ \ or Anonymous." - example: +15555555555 + example: "+15555555555" type: string to: description: "The phone number that received the call, in E.164 format (e.g.\ \ +15555555555)." - example: +15555555555 + example: "+15555555555" type: string callId: description: The call id associated with the event. @@ -8767,7 +8832,7 @@ components: description: "The phone number used as the from field of the B-leg call,\ \ in E.164 format (e.g. +15555555555) or one of Restricted, Anonymous,\ \ Private, or Unavailable." - example: +15555555555 + example: "+15555555555" type: string transferTo: description: "The phone number used as the to field of the B-leg call, in\ @@ -8813,12 +8878,12 @@ components: description: "The provided identifier of the caller: can be a phone number\ \ in E.164 format (e.g. +15555555555) or one of Private, Restricted, Unavailable,\ \ or Anonymous." - example: +15555555555 + example: "+15555555555" type: string to: description: "The phone number that received the call, in E.164 format (e.g.\ \ +15555555555)." - example: +15555555555 + example: "+15555555555" type: string direction: $ref: '#/components/schemas/callDirectionEnum' @@ -8869,7 +8934,7 @@ components: description: "The phone number used as the from field of the B-leg call,\ \ in E.164 format (e.g. +15555555555) or one of Restricted, Anonymous,\ \ Private, or Unavailable." - example: +15555555555 + example: "+15555555555" type: string transferTo: description: "The phone number used as the to field of the B-leg call, in\ @@ -8917,12 +8982,12 @@ components: description: "The provided identifier of the caller: can be a phone number\ \ in E.164 format (e.g. +15555555555) or one of Private, Restricted, Unavailable,\ \ or Anonymous." - example: +15555555555 + example: "+15555555555" type: string to: description: "The phone number that received the call, in E.164 format (e.g.\ \ +15555555555)." - example: +15555555555 + example: "+15555555555" type: string direction: $ref: '#/components/schemas/callDirectionEnum' @@ -8978,12 +9043,12 @@ components: description: "The provided identifier of the caller: can be a phone number\ \ in E.164 format (e.g. +15555555555) or one of Private, Restricted, Unavailable,\ \ or Anonymous." - example: +15555555555 + example: "+15555555555" type: string to: description: "The phone number that received the call, in E.164 format (e.g.\ \ +15555555555)." - example: +15555555555 + example: "+15555555555" type: string direction: $ref: '#/components/schemas/callDirectionEnum' @@ -9056,12 +9121,12 @@ components: description: "The provided identifier of the caller: can be a phone number\ \ in E.164 format (e.g. +15555555555) or one of Private, Restricted, Unavailable,\ \ or Anonymous." - example: +15555555555 + example: "+15555555555" type: string to: description: "The phone number that received the call, in E.164 format (e.g.\ \ +15555555555)." - example: +15555555555 + example: "+15555555555" type: string direction: $ref: '#/components/schemas/callDirectionEnum' @@ -9135,7 +9200,7 @@ components: description: "The phone number used as the from field of the B-leg call,\ \ in E.164 format (e.g. +15555555555) or one of Restricted, Anonymous,\ \ Private, or Unavailable." - example: +15555555555 + example: "+15555555555" type: string transferTo: description: "The phone number used as the to field of the B-leg call, in\ @@ -9175,12 +9240,12 @@ components: description: "The provided identifier of the caller: can be a phone number\ \ in E.164 format (e.g. +15555555555) or one of Private, Restricted, Unavailable,\ \ or Anonymous." - example: +15555555555 + example: "+15555555555" type: string to: description: "The phone number that received the call, in E.164 format (e.g.\ \ +15555555555)." - example: +15555555555 + example: "+15555555555" type: string direction: $ref: '#/components/schemas/callDirectionEnum' @@ -9257,7 +9322,7 @@ components: description: "The phone number used as the from field of the B-leg call,\ \ in E.164 format (e.g. +15555555555) or one of Restricted, Anonymous,\ \ Private, or Unavailable." - example: +15555555555 + example: "+15555555555" type: string transferTo: description: "The phone number used as the to field of the B-leg call, in\ @@ -9297,12 +9362,12 @@ components: description: "The provided identifier of the caller: can be a phone number\ \ in E.164 format (e.g. +15555555555) or one of Private, Restricted, Unavailable,\ \ or Anonymous." - example: +15555555555 + example: "+15555555555" type: string to: description: "The phone number that received the call, in E.164 format (e.g.\ \ +15555555555)." - example: +15555555555 + example: "+15555555555" type: string direction: $ref: '#/components/schemas/callDirectionEnum' @@ -9348,7 +9413,7 @@ components: description: "The phone number used as the from field of the B-leg call,\ \ in E.164 format (e.g. +15555555555) or one of Restricted, Anonymous,\ \ Private, or Unavailable." - example: +15555555555 + example: "+15555555555" type: string transferTo: description: "The phone number used as the to field of the B-leg call, in\ @@ -9388,12 +9453,12 @@ components: description: "The provided identifier of the caller: can be a phone number\ \ in E.164 format (e.g. +15555555555) or one of Private, Restricted, Unavailable,\ \ or Anonymous." - example: +15555555555 + example: "+15555555555" type: string to: description: "The phone number that received the call, in E.164 format (e.g.\ \ +15555555555)." - example: +15555555555 + example: "+15555555555" type: string direction: $ref: '#/components/schemas/callDirectionEnum' @@ -9457,7 +9522,7 @@ components: description: "The phone number used as the from field of the B-leg call,\ \ in E.164 format (e.g. +15555555555) or one of Restricted, Anonymous,\ \ Private, or Unavailable." - example: +15555555555 + example: "+15555555555" type: string transferTo: description: "The phone number used as the to field of the B-leg call, in\ @@ -9502,12 +9567,12 @@ components: description: "The provided identifier of the caller: can be a phone number\ \ in E.164 format (e.g. +15555555555) or one of Private, Restricted, Unavailable,\ \ or Anonymous." - example: +15555555555 + example: "+15555555555" type: string to: description: "The phone number that received the call, in E.164 format (e.g.\ \ +15555555555)." - example: +15555555555 + example: "+15555555555" type: string direction: $ref: '#/components/schemas/callDirectionEnum' @@ -9547,7 +9612,7 @@ components: description: "The phone number used as the from field of the B-leg call,\ \ in E.164 format (e.g. +15555555555) or one of Restricted, Anonymous,\ \ Private, or Unavailable." - example: +15555555555 + example: "+15555555555" type: string transferTo: description: "The phone number used as the to field of the B-leg call, in\ @@ -9590,12 +9655,12 @@ components: description: "The provided identifier of the caller: can be a phone number\ \ in E.164 format (e.g. +15555555555) or one of Private, Restricted, Unavailable,\ \ or Anonymous." - example: +15555555555 + example: "+15555555555" type: string to: description: "The phone number that received the call, in E.164 format (e.g.\ \ +15555555555)." - example: +15555555555 + example: "+15555555555" type: string direction: $ref: '#/components/schemas/callDirectionEnum' @@ -9635,7 +9700,7 @@ components: description: "The phone number used as the from field of the B-leg call,\ \ in E.164 format (e.g. +15555555555) or one of Restricted, Anonymous,\ \ Private, or Unavailable." - example: +15555555555 + example: "+15555555555" type: string transferTo: description: "The phone number used as the to field of the B-leg call, in\ @@ -9697,12 +9762,12 @@ components: description: "The provided identifier of the caller: can be a phone number\ \ in E.164 format (e.g. +15555555555) or one of Private, Restricted, Unavailable,\ \ or Anonymous." - example: +15555555555 + example: "+15555555555" type: string to: description: "The phone number that received the call, in E.164 format (e.g.\ \ +15555555555)." - example: +15555555555 + example: "+15555555555" type: string direction: $ref: '#/components/schemas/callDirectionEnum' @@ -9753,7 +9818,7 @@ components: description: "The phone number used as the from field of the B-leg call,\ \ in E.164 format (e.g. +15555555555) or one of Restricted, Anonymous,\ \ Private, or Unavailable." - example: +15555555555 + example: "+15555555555" type: string transferTo: description: "The phone number used as the to field of the B-leg call, in\ @@ -9806,13 +9871,13 @@ components: to: description: "The phone number that received the call, in E.164 format (e.g.\ \ +15555555555)." - example: +15555555555 + example: "+15555555555" type: string from: description: "The provided identifier of the caller: can be a phone number in\ \ E.164 format (e.g. +15555555555) or one of Private, Restricted, Unavailable,\ \ or Anonymous." - example: +15555555555 + example: "+15555555555" type: string conferenceId: description: "The unique, Bandwidth-generated ID of the conference that was\ @@ -9888,7 +9953,7 @@ components: description: "The phone number used as the from field of the B-leg call, in\ \ E.164 format (e.g. +15555555555) or one of Restricted, Anonymous, Private,\ \ or Unavailable." - example: +15555555555 + example: "+15555555555" type: string transferTo: description: "The phone number used as the to field of the B-leg call, in E.164\ @@ -9989,7 +10054,7 @@ components: origTo: description: Always present. Indicates the last telephone number that the call was diverted from. - example: +15558884444 + example: "+15558884444" type: string type: object transcription: @@ -10030,12 +10095,12 @@ components: properties: to: description: The phone number to send the mfa code to. - example: +19195551234 + example: "+19195551234" pattern: "^\\+[1-9]\\d{1,14}$" type: string from: description: "The application phone number, the sender of the mfa code." - example: +19195554321 + example: "+19195554321" maxLength: 32 pattern: "^\\+[1-9]\\d{1,14}$" type: string @@ -10097,7 +10162,7 @@ components: properties: to: description: The phone number to send the mfa code to. - example: +19195551234 + example: "+19195551234" pattern: "^\\+[1-9]\\d{1,14}$" type: string scope: @@ -10135,6 +10200,9 @@ components: type: boolean type: object mfaRequestError: + example: + requestId: 354cc8a3-6701-461e-8fa7-8671703dd898 + error: 400 Request is malformed or invalid properties: error: description: A message describing the error with your request. @@ -10146,6 +10214,8 @@ components: type: string type: object mfaUnauthorizedRequestError: + example: + message: Unauthorized properties: message: description: Unauthorized @@ -10153,6 +10223,8 @@ components: type: string type: object mfaForbiddenRequestError: + example: + message: Missing Authentication Token properties: message: description: The message containing the reason behind the request being @@ -10201,7 +10273,7 @@ components: \ was available for the TN." example: result: - - E.164 Format: +19195551234 + - E.164 Format: "+19195551234" Formatted: (919) 555-1234 Line Provider: Verizon Wireless Message: NOERROR @@ -10210,7 +10282,7 @@ components: Mobile Country Code: "310" Mobile Network Code: "010" Response Code: 0 - - E.164 Format: +19195551234 + - E.164 Format: "+19195551234" Formatted: (919) 555-1234 Line Provider: Verizon Wireless Message: NOERROR @@ -10221,7 +10293,7 @@ components: Response Code: 0 requestId: 004223a0-8b17-41b1-bf81-20732adf5590 failedTelephoneNumbers: - - +191955512345 + - "+191955512345" status: COMPLETE properties: requestId: @@ -10239,7 +10311,7 @@ components: failedTelephoneNumbers: description: The telephone numbers whose lookup failed. example: - - +191955512345 + - "+191955512345" items: type: string type: array @@ -10247,7 +10319,7 @@ components: lookupResult: description: Carrier information results for the specified telephone number. example: - E.164 Format: +19195551234 + E.164 Format: "+19195551234" Formatted: (919) 555-1234 Line Provider: Verizon Wireless Message: NOERROR @@ -10267,7 +10339,7 @@ components: type: string E.164 Format: description: The telephone number in E.164 format. - example: +19195551234 + example: "+19195551234" type: string Formatted: description: The formatted version of the telephone number. @@ -10295,6 +10367,8 @@ components: type: string type: object tnLookupRequestError: + example: + message: example error message properties: message: description: A description of what validation error occurred. diff --git a/build.gradle b/build.gradle index efd99809..a805f53b 100644 --- a/build.gradle +++ b/build.gradle @@ -62,9 +62,9 @@ if(hasProperty('target') && target == 'android') { def task = project.tasks.create "jar${variant.name.capitalize()}", Jar task.description = "Create jar artifact for ${variant.name}" task.dependsOn variant.javaCompile - task.from variant.javaCompile.destinationDir - task.destinationDir = project.file("${project.buildDir}/outputs/jar") - task.archiveName = "${project.name}-${variant.baseName}-${version}.jar" + task.from variant.javaCompile.destinationDirectory + task.destinationDirectory = project.file("${project.buildDir}/outputs/jar") + task.archiveFileName = "${project.name}-${variant.baseName}-${version}.jar" artifacts.add('archives', task) } } @@ -108,18 +108,18 @@ ext { dependencies { implementation 'io.swagger:swagger-annotations:1.6.8' implementation "com.google.code.findbugs:jsr305:3.0.2" - implementation 'com.squareup.okhttp3:okhttp:4.10.0' - implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0' + implementation 'com.squareup.okhttp3:okhttp:4.12.0' + implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0' implementation 'com.google.code.gson:gson:2.9.1' - implementation 'io.gsonfire:gson-fire:1.8.5' + implementation 'io.gsonfire:gson-fire:1.9.0' implementation 'javax.ws.rs:jsr311-api:1.1.1' implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1' implementation 'org.openapitools:jackson-databind-nullable:0.2.6' implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0' implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2' testImplementation 'org.mockito:mockito-core:3.12.4' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2' } javadoc { diff --git a/build.sbt b/build.sbt index 22544979..c1271347 100644 --- a/build.sbt +++ b/build.sbt @@ -10,18 +10,18 @@ lazy val root = (project in file(".")). resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( "io.swagger" % "swagger-annotations" % "1.6.5", - "com.squareup.okhttp3" % "okhttp" % "4.10.0", - "com.squareup.okhttp3" % "logging-interceptor" % "4.10.0", + "com.squareup.okhttp3" % "okhttp" % "4.12.0", + "com.squareup.okhttp3" % "logging-interceptor" % "4.12.0", "com.google.code.gson" % "gson" % "2.9.1", "org.apache.commons" % "commons-lang3" % "3.12.0", "javax.ws.rs" % "jsr311-api" % "1.1.1", "javax.ws.rs" % "javax.ws.rs-api" % "2.1.1", "org.openapitools" % "jackson-databind-nullable" % "0.2.6", - "io.gsonfire" % "gson-fire" % "1.8.5" % "compile", + "io.gsonfire" % "gson-fire" % "1.9.0" % "compile", "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile", "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", - "org.junit.jupiter" % "junit-jupiter-api" % "5.9.1" % "test", + "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test", "com.novocode" % "junit-interface" % "0.10" % "test", "org.mockito" % "mockito-core" % "3.12.4" % "test" ) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..e6441136f3d4ba8a0da8d277868979cfbc8ad796 100644 GIT binary patch literal 43453 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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
NnX)EH+Nua)3Y(c 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 QuEJmfE|#`Dqx|px0L@K;Y5)KL diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ffed3a25..b82aa23a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 005bcde0..9d0ce634 100644 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -69,37 +69,35 @@ app_path=$0 # Need this for daisy-chained symlinks. while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] +APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path +[ -h "$app_path" ] do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac +ls=$( ls -ld "$app_path" ) +link=${ls#*' -> '} +case $link in #( +/*) app_path=$link ;; #( +*) app_path=$APP_HOME$link ;; +esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum warn () { - echo "$*" +echo "$*" } >&2 die () { - echo - echo "$*" - echo - exit 1 +echo +echo "$*" +echo +exit 1 } >&2 # OS specific support (must be 'true' or 'false'). @@ -108,10 +106,10 @@ msys=false darwin=false nonstop=false case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; +CYGWIN* ) cygwin=true ;; #( +Darwin* ) darwin=true ;; #( +MSYS* | MINGW* ) msys=true ;; #( +NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -119,39 +117,46 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME +if [ -x "$JAVA_HOME/jre/sh/java" ] ; then +# IBM's JDK on AIX uses strange locations for the executables +JAVACMD=$JAVA_HOME/jre/sh/java +else +JAVACMD=$JAVA_HOME/bin/java +fi +if [ ! -x "$JAVACMD" ] ; then +die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME Please set the JAVA_HOME variable in your environment to match the location of your Java installation." - fi +fi else - JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +JAVACMD=java +if ! command -v java >/dev/null 2>&1 +then +die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi +fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac +case $MAX_FD in #( +max*) +# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. +# shellcheck disable=SC2039,SC3045 +MAX_FD=$( ulimit -H -n ) || +warn "Could not query maximum file descriptor limit" +esac +case $MAX_FD in #( +'' | soft) :;; #( +*) +# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. +# shellcheck disable=SC2039,SC3045 +ulimit -n "$MAX_FD" || +warn "Could not set maximum file descriptor limit to $MAX_FD" +esac fi # Collect all arguments for the java command, stacking in reverse order: @@ -164,46 +169,56 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done +APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) +CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + +JAVACMD=$( cygpath --unix "$JAVACMD" ) + +# Now convert the arguments - kludge to limit ourselves to /bin/sh +for arg do +if +case $arg in #( +-*) false ;; # don't mess with options #( +/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath +[ -e "$t" ] ;; #( +*) false ;; +esac +then +arg=$( cygpath --path --ignore --mixed "$arg" ) +fi +# Roll the args list around exactly as many times as the number of +# args, so each arg winds up back in the position where it started, but +# possibly modified. +# +# NB: a `for` loop captures its iteration list before it begins, so +# changing the positional parameters here affects neither the number of +# iterations, nor the values presented in `arg`. +shift # remove old arg +set -- "$@" "$arg" # push replacement arg +done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" +"-Dorg.gradle.appname=$APP_BASE_NAME" \ +-classpath "$CLASSPATH" \ +org.gradle.wrapper.GradleWrapperMain \ +"$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then +die "xargs is not available" +fi # Use "xargs" to parse quoted args. # @@ -225,10 +240,10 @@ set -- \ # eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' +printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | +xargs -n1 | +sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | +tr '\n' ' ' +)" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 6a68175e..25da30db 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -33,20 +34,20 @@ set APP_HOME=%DIRNAME% for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS=-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m" +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/openapitools.json b/openapitools.json index 3015568c..5c50d6a2 100644 --- a/openapitools.json +++ b/openapitools.json @@ -2,6 +2,6 @@ "$schema": "./node_modules/@openapitools/openapi-generator-cli/config.schema.json", "spaces": 2, "generator-cli": { - "version": "7.0.0" + "version": "7.6.0" } } diff --git a/pom.xml b/pom.xml index bc68b39c..bfbd01ec 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.2.5 + 2.22.2 diff --git a/src/main/java/com/bandwidth/sdk/ApiClient.java b/src/main/java/com/bandwidth/sdk/ApiClient.java index 07cf490f..1338dddb 100644 --- a/src/main/java/com/bandwidth/sdk/ApiClient.java +++ b/src/main/java/com/bandwidth/sdk/ApiClient.java @@ -47,6 +47,7 @@ import java.util.*; import java.util.Map.Entry; import java.util.concurrent.TimeUnit; +import java.util.function.Supplier; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -466,6 +467,19 @@ public void setAWS4Configuration(String accessKey, String secretKey, String regi throw new RuntimeException("No AWS4 authentication configured!"); } + /** + * Helper method to set credentials for AWSV4 Signature + * + * @param accessKey Access Key + * @param secretKey Secret Key + * @param sessionToken Session Token + * @param region Region + * @param service Service to access to + */ + public void setAWS4Configuration(String accessKey, String secretKey, String sessionToken, String region, String service) { + throw new RuntimeException("No AWS4 authentication configured!"); + } + /** * Set the User-Agent header's value (by adding to the default header map). * diff --git a/src/main/java/com/bandwidth/sdk/ApiException.java b/src/main/java/com/bandwidth/sdk/ApiException.java index 55fe2953..a1c6b060 100644 --- a/src/main/java/com/bandwidth/sdk/ApiException.java +++ b/src/main/java/com/bandwidth/sdk/ApiException.java @@ -21,8 +21,10 @@ *

ApiException class.

*/ @SuppressWarnings("serial") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class ApiException extends Exception { + private static final long serialVersionUID = 1L; + private int code = 0; private Map> responseHeaders = null; private String responseBody = null; diff --git a/src/main/java/com/bandwidth/sdk/Configuration.java b/src/main/java/com/bandwidth/sdk/Configuration.java index a76f451b..285c19a9 100644 --- a/src/main/java/com/bandwidth/sdk/Configuration.java +++ b/src/main/java/com/bandwidth/sdk/Configuration.java @@ -13,7 +13,7 @@ package com.bandwidth.sdk; -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class Configuration { public static final String VERSION = "10.0.0"; diff --git a/src/main/java/com/bandwidth/sdk/JSON.java b/src/main/java/com/bandwidth/sdk/JSON.java index 4e1175f7..0659d01f 100644 --- a/src/main/java/com/bandwidth/sdk/JSON.java +++ b/src/main/java/com/bandwidth/sdk/JSON.java @@ -13,11 +13,11 @@ package com.bandwidth.sdk; +import com.fasterxml.jackson.databind.util.StdDateFormat; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonParseException; import com.google.gson.TypeAdapter; -import com.google.gson.internal.bind.util.ISO8601Utils; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import com.google.gson.JsonElement; @@ -31,14 +31,16 @@ import java.lang.reflect.Type; import java.text.DateFormat; import java.text.ParseException; -import java.text.ParsePosition; import java.time.LocalDate; import java.time.OffsetDateTime; +import java.time.ZoneId; +import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; import java.util.Date; import java.util.Locale; import java.util.Map; import java.util.HashMap; +import java.util.TimeZone; /* * A JSON utility class @@ -55,6 +57,11 @@ public class JSON { private static LocalDateTypeAdapter localDateTypeAdapter = new LocalDateTypeAdapter(); private static ByteArrayAdapter byteArrayAdapter = new ByteArrayAdapter(); + private static final StdDateFormat sdf = new StdDateFormat() + .withTimeZone(TimeZone.getTimeZone(ZoneId.systemDefault())) + .withColonInTimeZone(true); + private static final DateTimeFormatter dtf = DateTimeFormatter.ISO_OFFSET_DATE_TIME; + @SuppressWarnings("unchecked") public static GsonBuilder createGson() { GsonFireBuilder fireBuilder = new GsonFireBuilder() @@ -86,7 +93,7 @@ private static Class getClassByDiscriminator(Map classByDiscriminatorValue, Stri return clazz; } - { + static { GsonBuilder gsonBuilder = createGson(); gsonBuilder.registerTypeAdapter(Date.class, dateTypeAdapter); gsonBuilder.registerTypeAdapter(java.sql.Date.class, sqlDateTypeAdapter); @@ -402,7 +409,7 @@ public java.sql.Date read(JsonReader in) throws IOException { if (dateFormat != null) { return new java.sql.Date(dateFormat.parse(date).getTime()); } - return new java.sql.Date(ISO8601Utils.parse(date, new ParsePosition(0)).getTime()); + return new java.sql.Date(sdf.parse(date).getTime()); } catch (ParseException e) { throw new JsonParseException(e); } @@ -412,7 +419,7 @@ public java.sql.Date read(JsonReader in) throws IOException { /** * Gson TypeAdapter for java.util.Date type - * If the dateFormat is null, ISO8601Utils will be used. + * If the dateFormat is null, DateTimeFormatter will be used. */ public static class DateTypeAdapter extends TypeAdapter { @@ -437,7 +444,7 @@ public void write(JsonWriter out, Date date) throws IOException { if (dateFormat != null) { value = dateFormat.format(date); } else { - value = ISO8601Utils.format(date, true); + value = date.toInstant().atOffset(ZoneOffset.UTC).format(dtf); } out.value(value); } @@ -456,7 +463,7 @@ public Date read(JsonReader in) throws IOException { if (dateFormat != null) { return dateFormat.parse(date); } - return ISO8601Utils.parse(date, new ParsePosition(0)); + return sdf.parse(date); } catch (ParseException e) { throw new JsonParseException(e); } diff --git a/src/main/java/com/bandwidth/sdk/Pair.java b/src/main/java/com/bandwidth/sdk/Pair.java index 93fad347..bb9a088b 100644 --- a/src/main/java/com/bandwidth/sdk/Pair.java +++ b/src/main/java/com/bandwidth/sdk/Pair.java @@ -13,7 +13,7 @@ package com.bandwidth.sdk; -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class Pair { private String name = ""; private String value = ""; diff --git a/src/main/java/com/bandwidth/sdk/ServerConfiguration.java b/src/main/java/com/bandwidth/sdk/ServerConfiguration.java index df9dc784..b02050dc 100644 --- a/src/main/java/com/bandwidth/sdk/ServerConfiguration.java +++ b/src/main/java/com/bandwidth/sdk/ServerConfiguration.java @@ -5,6 +5,7 @@ /** * Representing a Server configuration. */ +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class ServerConfiguration { public String URL; public String description; diff --git a/src/main/java/com/bandwidth/sdk/ServerVariable.java b/src/main/java/com/bandwidth/sdk/ServerVariable.java index 675f9e28..bc89b1ba 100644 --- a/src/main/java/com/bandwidth/sdk/ServerVariable.java +++ b/src/main/java/com/bandwidth/sdk/ServerVariable.java @@ -5,6 +5,7 @@ /** * Representing a Server Variable for server URL template substitution. */ +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class ServerVariable { public String description; public String defaultValue; diff --git a/src/main/java/com/bandwidth/sdk/StringUtil.java b/src/main/java/com/bandwidth/sdk/StringUtil.java index 29277114..6b85f153 100644 --- a/src/main/java/com/bandwidth/sdk/StringUtil.java +++ b/src/main/java/com/bandwidth/sdk/StringUtil.java @@ -16,7 +16,7 @@ import java.util.Collection; import java.util.Iterator; -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class StringUtil { /** * Check if the given array contains the given value (with case-insensitive comparison). diff --git a/src/main/java/com/bandwidth/sdk/api/MediaApi.java b/src/main/java/com/bandwidth/sdk/api/MediaApi.java index a2cd799d..d31a0e7e 100644 --- a/src/main/java/com/bandwidth/sdk/api/MediaApi.java +++ b/src/main/java/com/bandwidth/sdk/api/MediaApi.java @@ -678,6 +678,7 @@ public okhttp3.Call uploadMediaCall(String accountId, String mediaId, File body, "video/x-ms-wmv" }; + if (contentType == null) { final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes); if (localVarContentType != null) { @@ -685,7 +686,6 @@ public okhttp3.Call uploadMediaCall(String accountId, String mediaId, File body, } }; - String[] localVarAuthNames = new String[] { "Basic" }; return localVarApiClient.buildCall(basePath, localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback); } diff --git a/src/main/java/com/bandwidth/sdk/auth/ApiKeyAuth.java b/src/main/java/com/bandwidth/sdk/auth/ApiKeyAuth.java index 6cf0d0c8..a091f358 100644 --- a/src/main/java/com/bandwidth/sdk/auth/ApiKeyAuth.java +++ b/src/main/java/com/bandwidth/sdk/auth/ApiKeyAuth.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.List; -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class ApiKeyAuth implements Authentication { private final String location; private final String paramName; diff --git a/src/main/java/com/bandwidth/sdk/auth/HttpBearerAuth.java b/src/main/java/com/bandwidth/sdk/auth/HttpBearerAuth.java index 8773cf97..4d95d13c 100644 --- a/src/main/java/com/bandwidth/sdk/auth/HttpBearerAuth.java +++ b/src/main/java/com/bandwidth/sdk/auth/HttpBearerAuth.java @@ -17,13 +17,15 @@ import com.bandwidth.sdk.Pair; import java.net.URI; -import java.util.Map; import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.function.Supplier; -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class HttpBearerAuth implements Authentication { private final String scheme; - private String bearerToken; + private Supplier tokenSupplier; public HttpBearerAuth(String scheme) { this.scheme = scheme; @@ -35,7 +37,7 @@ public HttpBearerAuth(String scheme) { * @return The bearer token */ public String getBearerToken() { - return bearerToken; + return tokenSupplier.get(); } /** @@ -44,12 +46,22 @@ public String getBearerToken() { * @param bearerToken The bearer token to send in the Authorization header */ public void setBearerToken(String bearerToken) { - this.bearerToken = bearerToken; + this.tokenSupplier = () -> bearerToken; + } + + /** + * Sets the supplier of tokens, which together with the scheme, will be sent as the value of the Authorization header. + * + * @param tokenSupplier The supplier of bearer tokens to send in the Authorization header + */ + public void setBearerToken(Supplier tokenSupplier) { + this.tokenSupplier = tokenSupplier; } @Override public void applyToParams(List queryParams, Map headerParams, Map cookieParams, String payload, String method, URI uri) throws ApiException { + String bearerToken = Optional.ofNullable(tokenSupplier).map(Supplier::get).orElse(null); if (bearerToken == null) { return; } diff --git a/src/main/java/com/bandwidth/sdk/model/AbstractOpenApiSchema.java b/src/main/java/com/bandwidth/sdk/model/AbstractOpenApiSchema.java index dbe969d8..60cd0928 100644 --- a/src/main/java/com/bandwidth/sdk/model/AbstractOpenApiSchema.java +++ b/src/main/java/com/bandwidth/sdk/model/AbstractOpenApiSchema.java @@ -18,12 +18,10 @@ import java.lang.reflect.Type; import java.util.Map; -//import com.fasterxml.jackson.annotation.JsonValue; - /** * Abstract class for oneOf,anyOf schemas defined in OpenAPI spec */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public abstract class AbstractOpenApiSchema { // store the actual instance of the schema/object diff --git a/src/main/java/com/bandwidth/sdk/model/AccountStatistics.java b/src/main/java/com/bandwidth/sdk/model/AccountStatistics.java index b27df3b4..70c75675 100644 --- a/src/main/java/com/bandwidth/sdk/model/AccountStatistics.java +++ b/src/main/java/com/bandwidth/sdk/model/AccountStatistics.java @@ -42,7 +42,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -50,7 +49,7 @@ /** * AccountStatistics */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class AccountStatistics { public static final String SERIALIZED_NAME_CURRENT_CALL_QUEUE_SIZE = "currentCallQueueSize"; @SerializedName(SERIALIZED_NAME_CURRENT_CALL_QUEUE_SIZE) @@ -64,7 +63,6 @@ public AccountStatistics() { } public AccountStatistics currentCallQueueSize(Integer currentCallQueueSize) { - this.currentCallQueueSize = currentCallQueueSize; return this; } @@ -78,14 +76,12 @@ public Integer getCurrentCallQueueSize() { return currentCallQueueSize; } - public void setCurrentCallQueueSize(Integer currentCallQueueSize) { this.currentCallQueueSize = currentCallQueueSize; } public AccountStatistics maxCallQueueSize(Integer maxCallQueueSize) { - this.maxCallQueueSize = maxCallQueueSize; return this; } @@ -99,7 +95,6 @@ public Integer getMaxCallQueueSize() { return maxCallQueueSize; } - public void setMaxCallQueueSize(Integer maxCallQueueSize) { this.maxCallQueueSize = maxCallQueueSize; } @@ -248,7 +243,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/AnswerCallback.java b/src/main/java/com/bandwidth/sdk/model/AnswerCallback.java index 7e585c86..df58335f 100644 --- a/src/main/java/com/bandwidth/sdk/model/AnswerCallback.java +++ b/src/main/java/com/bandwidth/sdk/model/AnswerCallback.java @@ -46,7 +46,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -54,7 +53,7 @@ /** * The Answer event is sent to the answerUrl specified in the createCall request when an outbound call is answered. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class AnswerCallback { public static final String SERIALIZED_NAME_EVENT_TYPE = "eventType"; @SerializedName(SERIALIZED_NAME_EVENT_TYPE) @@ -116,7 +115,6 @@ public AnswerCallback() { } public AnswerCallback eventType(String eventType) { - this.eventType = eventType; return this; } @@ -130,14 +128,12 @@ public String getEventType() { return eventType; } - public void setEventType(String eventType) { this.eventType = eventType; } public AnswerCallback eventTime(OffsetDateTime eventTime) { - this.eventTime = eventTime; return this; } @@ -151,14 +147,12 @@ public OffsetDateTime getEventTime() { return eventTime; } - public void setEventTime(OffsetDateTime eventTime) { this.eventTime = eventTime; } public AnswerCallback accountId(String accountId) { - this.accountId = accountId; return this; } @@ -172,14 +166,12 @@ public String getAccountId() { return accountId; } - public void setAccountId(String accountId) { this.accountId = accountId; } public AnswerCallback applicationId(String applicationId) { - this.applicationId = applicationId; return this; } @@ -193,14 +185,12 @@ public String getApplicationId() { return applicationId; } - public void setApplicationId(String applicationId) { this.applicationId = applicationId; } public AnswerCallback from(String from) { - this.from = from; return this; } @@ -214,14 +204,12 @@ public String getFrom() { return from; } - public void setFrom(String from) { this.from = from; } public AnswerCallback to(String to) { - this.to = to; return this; } @@ -235,14 +223,12 @@ public String getTo() { return to; } - public void setTo(String to) { this.to = to; } public AnswerCallback direction(CallDirectionEnum direction) { - this.direction = direction; return this; } @@ -256,14 +242,12 @@ public CallDirectionEnum getDirection() { return direction; } - public void setDirection(CallDirectionEnum direction) { this.direction = direction; } public AnswerCallback callId(String callId) { - this.callId = callId; return this; } @@ -277,14 +261,12 @@ public String getCallId() { return callId; } - public void setCallId(String callId) { this.callId = callId; } public AnswerCallback callUrl(String callUrl) { - this.callUrl = callUrl; return this; } @@ -298,14 +280,12 @@ public String getCallUrl() { return callUrl; } - public void setCallUrl(String callUrl) { this.callUrl = callUrl; } public AnswerCallback enqueuedTime(OffsetDateTime enqueuedTime) { - this.enqueuedTime = enqueuedTime; return this; } @@ -319,14 +299,12 @@ public OffsetDateTime getEnqueuedTime() { return enqueuedTime; } - public void setEnqueuedTime(OffsetDateTime enqueuedTime) { this.enqueuedTime = enqueuedTime; } public AnswerCallback startTime(OffsetDateTime startTime) { - this.startTime = startTime; return this; } @@ -340,14 +318,12 @@ public OffsetDateTime getStartTime() { return startTime; } - public void setStartTime(OffsetDateTime startTime) { this.startTime = startTime; } public AnswerCallback answerTime(OffsetDateTime answerTime) { - this.answerTime = answerTime; return this; } @@ -361,14 +337,12 @@ public OffsetDateTime getAnswerTime() { return answerTime; } - public void setAnswerTime(OffsetDateTime answerTime) { this.answerTime = answerTime; } public AnswerCallback tag(String tag) { - this.tag = tag; return this; } @@ -382,14 +356,12 @@ public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } public AnswerCallback machineDetectionResult(MachineDetectionResult machineDetectionResult) { - this.machineDetectionResult = machineDetectionResult; return this; } @@ -403,7 +375,6 @@ public MachineDetectionResult getMachineDetectionResult() { return machineDetectionResult; } - public void setMachineDetectionResult(MachineDetectionResult machineDetectionResult) { this.machineDetectionResult = machineDetectionResult; } @@ -584,6 +555,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("to") != null && !jsonObj.get("to").isJsonNull()) && !jsonObj.get("to").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `to` to be a primitive type in the JSON string but got `%s`", jsonObj.get("to").toString())); } + // validate the optional field `direction` + if (jsonObj.get("direction") != null && !jsonObj.get("direction").isJsonNull()) { + CallDirectionEnum.validateJsonElement(jsonObj.get("direction")); + } if ((jsonObj.get("callId") != null && !jsonObj.get("callId").isJsonNull()) && !jsonObj.get("callId").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `callId` to be a primitive type in the JSON string but got `%s`", jsonObj.get("callId").toString())); } @@ -627,7 +602,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/BridgeCompleteCallback.java b/src/main/java/com/bandwidth/sdk/model/BridgeCompleteCallback.java index bfc6619f..b7d7a166 100644 --- a/src/main/java/com/bandwidth/sdk/model/BridgeCompleteCallback.java +++ b/src/main/java/com/bandwidth/sdk/model/BridgeCompleteCallback.java @@ -45,7 +45,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -53,7 +52,7 @@ /** * If the target call leaves the <Bridge>, then this callback is sent to the bridgeCompleteUrl, and the BXML returned in it is executed on the call. If this webhook is sent, the Bridge Target Complete webhook is NOT sent. This callback is also sent if any problem occurs that prevents the calls to be bridged. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class BridgeCompleteCallback { public static final String SERIALIZED_NAME_EVENT_TYPE = "eventType"; @SerializedName(SERIALIZED_NAME_EVENT_TYPE) @@ -123,7 +122,6 @@ public BridgeCompleteCallback() { } public BridgeCompleteCallback eventType(String eventType) { - this.eventType = eventType; return this; } @@ -137,14 +135,12 @@ public String getEventType() { return eventType; } - public void setEventType(String eventType) { this.eventType = eventType; } public BridgeCompleteCallback eventTime(OffsetDateTime eventTime) { - this.eventTime = eventTime; return this; } @@ -158,14 +154,12 @@ public OffsetDateTime getEventTime() { return eventTime; } - public void setEventTime(OffsetDateTime eventTime) { this.eventTime = eventTime; } public BridgeCompleteCallback accountId(String accountId) { - this.accountId = accountId; return this; } @@ -179,14 +173,12 @@ public String getAccountId() { return accountId; } - public void setAccountId(String accountId) { this.accountId = accountId; } public BridgeCompleteCallback applicationId(String applicationId) { - this.applicationId = applicationId; return this; } @@ -200,14 +192,12 @@ public String getApplicationId() { return applicationId; } - public void setApplicationId(String applicationId) { this.applicationId = applicationId; } public BridgeCompleteCallback from(String from) { - this.from = from; return this; } @@ -221,14 +211,12 @@ public String getFrom() { return from; } - public void setFrom(String from) { this.from = from; } public BridgeCompleteCallback to(String to) { - this.to = to; return this; } @@ -242,14 +230,12 @@ public String getTo() { return to; } - public void setTo(String to) { this.to = to; } public BridgeCompleteCallback direction(CallDirectionEnum direction) { - this.direction = direction; return this; } @@ -263,14 +249,12 @@ public CallDirectionEnum getDirection() { return direction; } - public void setDirection(CallDirectionEnum direction) { this.direction = direction; } public BridgeCompleteCallback callId(String callId) { - this.callId = callId; return this; } @@ -284,14 +268,12 @@ public String getCallId() { return callId; } - public void setCallId(String callId) { this.callId = callId; } public BridgeCompleteCallback callUrl(String callUrl) { - this.callUrl = callUrl; return this; } @@ -305,14 +287,12 @@ public String getCallUrl() { return callUrl; } - public void setCallUrl(String callUrl) { this.callUrl = callUrl; } public BridgeCompleteCallback enqueuedTime(OffsetDateTime enqueuedTime) { - this.enqueuedTime = enqueuedTime; return this; } @@ -326,14 +306,12 @@ public OffsetDateTime getEnqueuedTime() { return enqueuedTime; } - public void setEnqueuedTime(OffsetDateTime enqueuedTime) { this.enqueuedTime = enqueuedTime; } public BridgeCompleteCallback startTime(OffsetDateTime startTime) { - this.startTime = startTime; return this; } @@ -347,14 +325,12 @@ public OffsetDateTime getStartTime() { return startTime; } - public void setStartTime(OffsetDateTime startTime) { this.startTime = startTime; } public BridgeCompleteCallback answerTime(OffsetDateTime answerTime) { - this.answerTime = answerTime; return this; } @@ -368,14 +344,12 @@ public OffsetDateTime getAnswerTime() { return answerTime; } - public void setAnswerTime(OffsetDateTime answerTime) { this.answerTime = answerTime; } public BridgeCompleteCallback tag(String tag) { - this.tag = tag; return this; } @@ -389,14 +363,12 @@ public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } public BridgeCompleteCallback cause(String cause) { - this.cause = cause; return this; } @@ -410,14 +382,12 @@ public String getCause() { return cause; } - public void setCause(String cause) { this.cause = cause; } public BridgeCompleteCallback errorMessage(String errorMessage) { - this.errorMessage = errorMessage; return this; } @@ -431,14 +401,12 @@ public String getErrorMessage() { return errorMessage; } - public void setErrorMessage(String errorMessage) { this.errorMessage = errorMessage; } public BridgeCompleteCallback errorId(String errorId) { - this.errorId = errorId; return this; } @@ -452,7 +420,6 @@ public String getErrorId() { return errorId; } - public void setErrorId(String errorId) { this.errorId = errorId; } @@ -639,6 +606,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("to") != null && !jsonObj.get("to").isJsonNull()) && !jsonObj.get("to").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `to` to be a primitive type in the JSON string but got `%s`", jsonObj.get("to").toString())); } + // validate the optional field `direction` + if (jsonObj.get("direction") != null && !jsonObj.get("direction").isJsonNull()) { + CallDirectionEnum.validateJsonElement(jsonObj.get("direction")); + } if ((jsonObj.get("callId") != null && !jsonObj.get("callId").isJsonNull()) && !jsonObj.get("callId").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `callId` to be a primitive type in the JSON string but got `%s`", jsonObj.get("callId").toString())); } @@ -687,7 +658,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/BridgeTargetCompleteCallback.java b/src/main/java/com/bandwidth/sdk/model/BridgeTargetCompleteCallback.java index 5d4f996e..f0328fcd 100644 --- a/src/main/java/com/bandwidth/sdk/model/BridgeTargetCompleteCallback.java +++ b/src/main/java/com/bandwidth/sdk/model/BridgeTargetCompleteCallback.java @@ -45,7 +45,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -53,7 +52,7 @@ /** * If the originating call leaves the <Bridge>, then this callback is sent to the bridgeTargetCompleteUrl, and the BXML returned in it is executed on the target call. If this webhook is sent, the Bridge Complete webhook is NOT sent. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class BridgeTargetCompleteCallback { public static final String SERIALIZED_NAME_EVENT_TYPE = "eventType"; @SerializedName(SERIALIZED_NAME_EVENT_TYPE) @@ -111,7 +110,6 @@ public BridgeTargetCompleteCallback() { } public BridgeTargetCompleteCallback eventType(String eventType) { - this.eventType = eventType; return this; } @@ -125,14 +123,12 @@ public String getEventType() { return eventType; } - public void setEventType(String eventType) { this.eventType = eventType; } public BridgeTargetCompleteCallback eventTime(OffsetDateTime eventTime) { - this.eventTime = eventTime; return this; } @@ -146,14 +142,12 @@ public OffsetDateTime getEventTime() { return eventTime; } - public void setEventTime(OffsetDateTime eventTime) { this.eventTime = eventTime; } public BridgeTargetCompleteCallback accountId(String accountId) { - this.accountId = accountId; return this; } @@ -167,14 +161,12 @@ public String getAccountId() { return accountId; } - public void setAccountId(String accountId) { this.accountId = accountId; } public BridgeTargetCompleteCallback applicationId(String applicationId) { - this.applicationId = applicationId; return this; } @@ -188,14 +180,12 @@ public String getApplicationId() { return applicationId; } - public void setApplicationId(String applicationId) { this.applicationId = applicationId; } public BridgeTargetCompleteCallback from(String from) { - this.from = from; return this; } @@ -209,14 +199,12 @@ public String getFrom() { return from; } - public void setFrom(String from) { this.from = from; } public BridgeTargetCompleteCallback to(String to) { - this.to = to; return this; } @@ -230,14 +218,12 @@ public String getTo() { return to; } - public void setTo(String to) { this.to = to; } public BridgeTargetCompleteCallback direction(CallDirectionEnum direction) { - this.direction = direction; return this; } @@ -251,14 +237,12 @@ public CallDirectionEnum getDirection() { return direction; } - public void setDirection(CallDirectionEnum direction) { this.direction = direction; } public BridgeTargetCompleteCallback callId(String callId) { - this.callId = callId; return this; } @@ -272,14 +256,12 @@ public String getCallId() { return callId; } - public void setCallId(String callId) { this.callId = callId; } public BridgeTargetCompleteCallback callUrl(String callUrl) { - this.callUrl = callUrl; return this; } @@ -293,14 +275,12 @@ public String getCallUrl() { return callUrl; } - public void setCallUrl(String callUrl) { this.callUrl = callUrl; } public BridgeTargetCompleteCallback enqueuedTime(OffsetDateTime enqueuedTime) { - this.enqueuedTime = enqueuedTime; return this; } @@ -314,14 +294,12 @@ public OffsetDateTime getEnqueuedTime() { return enqueuedTime; } - public void setEnqueuedTime(OffsetDateTime enqueuedTime) { this.enqueuedTime = enqueuedTime; } public BridgeTargetCompleteCallback startTime(OffsetDateTime startTime) { - this.startTime = startTime; return this; } @@ -335,14 +313,12 @@ public OffsetDateTime getStartTime() { return startTime; } - public void setStartTime(OffsetDateTime startTime) { this.startTime = startTime; } public BridgeTargetCompleteCallback answerTime(OffsetDateTime answerTime) { - this.answerTime = answerTime; return this; } @@ -356,14 +332,12 @@ public OffsetDateTime getAnswerTime() { return answerTime; } - public void setAnswerTime(OffsetDateTime answerTime) { this.answerTime = answerTime; } public BridgeTargetCompleteCallback tag(String tag) { - this.tag = tag; return this; } @@ -377,7 +351,6 @@ public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } @@ -555,6 +528,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("to") != null && !jsonObj.get("to").isJsonNull()) && !jsonObj.get("to").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `to` to be a primitive type in the JSON string but got `%s`", jsonObj.get("to").toString())); } + // validate the optional field `direction` + if (jsonObj.get("direction") != null && !jsonObj.get("direction").isJsonNull()) { + CallDirectionEnum.validateJsonElement(jsonObj.get("direction")); + } if ((jsonObj.get("callId") != null && !jsonObj.get("callId").isJsonNull()) && !jsonObj.get("callId").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `callId` to be a primitive type in the JSON string but got `%s`", jsonObj.get("callId").toString())); } @@ -594,7 +571,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/CallDirectionEnum.java b/src/main/java/com/bandwidth/sdk/model/CallDirectionEnum.java index f0891c9c..ddf8bbde 100644 --- a/src/main/java/com/bandwidth/sdk/model/CallDirectionEnum.java +++ b/src/main/java/com/bandwidth/sdk/model/CallDirectionEnum.java @@ -18,6 +18,7 @@ import java.io.IOException; import com.google.gson.TypeAdapter; +import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; @@ -68,5 +69,10 @@ public CallDirectionEnum read(final JsonReader jsonReader) throws IOException { return CallDirectionEnum.fromValue(value); } } + + public static void validateJsonElement(JsonElement jsonElement) throws IOException { + String value = jsonElement.getAsString(); + CallDirectionEnum.fromValue(value); + } } diff --git a/src/main/java/com/bandwidth/sdk/model/CallRecordingMetadata.java b/src/main/java/com/bandwidth/sdk/model/CallRecordingMetadata.java index 77e8cd7a..0ab021a3 100644 --- a/src/main/java/com/bandwidth/sdk/model/CallRecordingMetadata.java +++ b/src/main/java/com/bandwidth/sdk/model/CallRecordingMetadata.java @@ -48,7 +48,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -56,7 +55,7 @@ /** * CallRecordingMetadata */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class CallRecordingMetadata { public static final String SERIALIZED_NAME_APPLICATION_ID = "applicationId"; @SerializedName(SERIALIZED_NAME_APPLICATION_ID) @@ -134,7 +133,6 @@ public CallRecordingMetadata() { } public CallRecordingMetadata applicationId(String applicationId) { - this.applicationId = applicationId; return this; } @@ -148,14 +146,12 @@ public String getApplicationId() { return applicationId; } - public void setApplicationId(String applicationId) { this.applicationId = applicationId; } public CallRecordingMetadata accountId(String accountId) { - this.accountId = accountId; return this; } @@ -169,14 +165,12 @@ public String getAccountId() { return accountId; } - public void setAccountId(String accountId) { this.accountId = accountId; } public CallRecordingMetadata callId(String callId) { - this.callId = callId; return this; } @@ -190,14 +184,12 @@ public String getCallId() { return callId; } - public void setCallId(String callId) { this.callId = callId; } public CallRecordingMetadata parentCallId(String parentCallId) { - this.parentCallId = parentCallId; return this; } @@ -211,14 +203,12 @@ public String getParentCallId() { return parentCallId; } - public void setParentCallId(String parentCallId) { this.parentCallId = parentCallId; } public CallRecordingMetadata recordingId(String recordingId) { - this.recordingId = recordingId; return this; } @@ -232,14 +222,12 @@ public String getRecordingId() { return recordingId; } - public void setRecordingId(String recordingId) { this.recordingId = recordingId; } public CallRecordingMetadata to(String to) { - this.to = to; return this; } @@ -253,14 +241,12 @@ public String getTo() { return to; } - public void setTo(String to) { this.to = to; } public CallRecordingMetadata from(String from) { - this.from = from; return this; } @@ -274,14 +260,12 @@ public String getFrom() { return from; } - public void setFrom(String from) { this.from = from; } public CallRecordingMetadata transferCallerId(String transferCallerId) { - this.transferCallerId = transferCallerId; return this; } @@ -295,14 +279,12 @@ public String getTransferCallerId() { return transferCallerId; } - public void setTransferCallerId(String transferCallerId) { this.transferCallerId = transferCallerId; } public CallRecordingMetadata transferTo(String transferTo) { - this.transferTo = transferTo; return this; } @@ -316,14 +298,12 @@ public String getTransferTo() { return transferTo; } - public void setTransferTo(String transferTo) { this.transferTo = transferTo; } public CallRecordingMetadata duration(String duration) { - this.duration = duration; return this; } @@ -337,14 +317,12 @@ public String getDuration() { return duration; } - public void setDuration(String duration) { this.duration = duration; } public CallRecordingMetadata direction(CallDirectionEnum direction) { - this.direction = direction; return this; } @@ -358,14 +336,12 @@ public CallDirectionEnum getDirection() { return direction; } - public void setDirection(CallDirectionEnum direction) { this.direction = direction; } public CallRecordingMetadata channels(Integer channels) { - this.channels = channels; return this; } @@ -379,14 +355,12 @@ public Integer getChannels() { return channels; } - public void setChannels(Integer channels) { this.channels = channels; } public CallRecordingMetadata startTime(OffsetDateTime startTime) { - this.startTime = startTime; return this; } @@ -400,14 +374,12 @@ public OffsetDateTime getStartTime() { return startTime; } - public void setStartTime(OffsetDateTime startTime) { this.startTime = startTime; } public CallRecordingMetadata endTime(OffsetDateTime endTime) { - this.endTime = endTime; return this; } @@ -421,14 +393,12 @@ public OffsetDateTime getEndTime() { return endTime; } - public void setEndTime(OffsetDateTime endTime) { this.endTime = endTime; } public CallRecordingMetadata fileFormat(FileFormatEnum fileFormat) { - this.fileFormat = fileFormat; return this; } @@ -442,14 +412,12 @@ public FileFormatEnum getFileFormat() { return fileFormat; } - public void setFileFormat(FileFormatEnum fileFormat) { this.fileFormat = fileFormat; } public CallRecordingMetadata status(String status) { - this.status = status; return this; } @@ -463,14 +431,12 @@ public String getStatus() { return status; } - public void setStatus(String status) { this.status = status; } public CallRecordingMetadata mediaUrl(URI mediaUrl) { - this.mediaUrl = mediaUrl; return this; } @@ -484,14 +450,12 @@ public URI getMediaUrl() { return mediaUrl; } - public void setMediaUrl(URI mediaUrl) { this.mediaUrl = mediaUrl; } public CallRecordingMetadata transcription(RecordingTranscriptionMetadata transcription) { - this.transcription = transcription; return this; } @@ -505,7 +469,6 @@ public RecordingTranscriptionMetadata getTranscription() { return transcription; } - public void setTranscription(RecordingTranscriptionMetadata transcription) { this.transcription = transcription; } @@ -713,6 +676,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("duration") != null && !jsonObj.get("duration").isJsonNull()) && !jsonObj.get("duration").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `duration` to be a primitive type in the JSON string but got `%s`", jsonObj.get("duration").toString())); } + // validate the optional field `direction` + if (jsonObj.get("direction") != null && !jsonObj.get("direction").isJsonNull()) { + CallDirectionEnum.validateJsonElement(jsonObj.get("direction")); + } + // validate the optional field `fileFormat` + if (jsonObj.get("fileFormat") != null && !jsonObj.get("fileFormat").isJsonNull()) { + FileFormatEnum.validateJsonElement(jsonObj.get("fileFormat")); + } if ((jsonObj.get("status") != null && !jsonObj.get("status").isJsonNull()) && !jsonObj.get("status").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `status` to be a primitive type in the JSON string but got `%s`", jsonObj.get("status").toString())); } @@ -753,7 +724,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/CallState.java b/src/main/java/com/bandwidth/sdk/model/CallState.java index f9f2d025..d0f13890 100644 --- a/src/main/java/com/bandwidth/sdk/model/CallState.java +++ b/src/main/java/com/bandwidth/sdk/model/CallState.java @@ -47,7 +47,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -55,7 +54,7 @@ /** * CallState */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class CallState { public static final String SERIALIZED_NAME_APPLICATION_ID = "applicationId"; @SerializedName(SERIALIZED_NAME_APPLICATION_ID) @@ -133,7 +132,6 @@ public CallState() { } public CallState applicationId(String applicationId) { - this.applicationId = applicationId; return this; } @@ -147,14 +145,12 @@ public String getApplicationId() { return applicationId; } - public void setApplicationId(String applicationId) { this.applicationId = applicationId; } public CallState accountId(String accountId) { - this.accountId = accountId; return this; } @@ -168,14 +164,12 @@ public String getAccountId() { return accountId; } - public void setAccountId(String accountId) { this.accountId = accountId; } public CallState callId(String callId) { - this.callId = callId; return this; } @@ -189,14 +183,12 @@ public String getCallId() { return callId; } - public void setCallId(String callId) { this.callId = callId; } public CallState parentCallId(String parentCallId) { - this.parentCallId = parentCallId; return this; } @@ -210,14 +202,12 @@ public String getParentCallId() { return parentCallId; } - public void setParentCallId(String parentCallId) { this.parentCallId = parentCallId; } public CallState to(String to) { - this.to = to; return this; } @@ -231,14 +221,12 @@ public String getTo() { return to; } - public void setTo(String to) { this.to = to; } public CallState from(String from) { - this.from = from; return this; } @@ -252,14 +240,12 @@ public String getFrom() { return from; } - public void setFrom(String from) { this.from = from; } public CallState direction(CallDirectionEnum direction) { - this.direction = direction; return this; } @@ -273,14 +259,12 @@ public CallDirectionEnum getDirection() { return direction; } - public void setDirection(CallDirectionEnum direction) { this.direction = direction; } public CallState state(String state) { - this.state = state; return this; } @@ -294,14 +278,12 @@ public String getState() { return state; } - public void setState(String state) { this.state = state; } public CallState stirShaken(Map stirShaken) { - this.stirShaken = stirShaken; return this; } @@ -323,14 +305,12 @@ public Map getStirShaken() { return stirShaken; } - public void setStirShaken(Map stirShaken) { this.stirShaken = stirShaken; } public CallState identity(String identity) { - this.identity = identity; return this; } @@ -344,14 +324,12 @@ public String getIdentity() { return identity; } - public void setIdentity(String identity) { this.identity = identity; } public CallState enqueuedTime(OffsetDateTime enqueuedTime) { - this.enqueuedTime = enqueuedTime; return this; } @@ -365,14 +343,12 @@ public OffsetDateTime getEnqueuedTime() { return enqueuedTime; } - public void setEnqueuedTime(OffsetDateTime enqueuedTime) { this.enqueuedTime = enqueuedTime; } public CallState startTime(OffsetDateTime startTime) { - this.startTime = startTime; return this; } @@ -386,14 +362,12 @@ public OffsetDateTime getStartTime() { return startTime; } - public void setStartTime(OffsetDateTime startTime) { this.startTime = startTime; } public CallState answerTime(OffsetDateTime answerTime) { - this.answerTime = answerTime; return this; } @@ -407,14 +381,12 @@ public OffsetDateTime getAnswerTime() { return answerTime; } - public void setAnswerTime(OffsetDateTime answerTime) { this.answerTime = answerTime; } public CallState endTime(OffsetDateTime endTime) { - this.endTime = endTime; return this; } @@ -428,14 +400,12 @@ public OffsetDateTime getEndTime() { return endTime; } - public void setEndTime(OffsetDateTime endTime) { this.endTime = endTime; } public CallState disconnectCause(String disconnectCause) { - this.disconnectCause = disconnectCause; return this; } @@ -449,14 +419,12 @@ public String getDisconnectCause() { return disconnectCause; } - public void setDisconnectCause(String disconnectCause) { this.disconnectCause = disconnectCause; } public CallState errorMessage(String errorMessage) { - this.errorMessage = errorMessage; return this; } @@ -470,14 +438,12 @@ public String getErrorMessage() { return errorMessage; } - public void setErrorMessage(String errorMessage) { this.errorMessage = errorMessage; } public CallState errorId(String errorId) { - this.errorId = errorId; return this; } @@ -491,14 +457,12 @@ public String getErrorId() { return errorId; } - public void setErrorId(String errorId) { this.errorId = errorId; } public CallState lastUpdate(OffsetDateTime lastUpdate) { - this.lastUpdate = lastUpdate; return this; } @@ -512,7 +476,6 @@ public OffsetDateTime getLastUpdate() { return lastUpdate; } - public void setLastUpdate(OffsetDateTime lastUpdate) { this.lastUpdate = lastUpdate; } @@ -708,6 +671,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("from") != null && !jsonObj.get("from").isJsonNull()) && !jsonObj.get("from").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `from` to be a primitive type in the JSON string but got `%s`", jsonObj.get("from").toString())); } + // validate the optional field `direction` + if (jsonObj.get("direction") != null && !jsonObj.get("direction").isJsonNull()) { + CallDirectionEnum.validateJsonElement(jsonObj.get("direction")); + } if ((jsonObj.get("state") != null && !jsonObj.get("state").isJsonNull()) && !jsonObj.get("state").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `state` to be a primitive type in the JSON string but got `%s`", jsonObj.get("state").toString())); } @@ -753,7 +720,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/CallStateEnum.java b/src/main/java/com/bandwidth/sdk/model/CallStateEnum.java index 24b1224c..64fd1045 100644 --- a/src/main/java/com/bandwidth/sdk/model/CallStateEnum.java +++ b/src/main/java/com/bandwidth/sdk/model/CallStateEnum.java @@ -18,6 +18,7 @@ import java.io.IOException; import com.google.gson.TypeAdapter; +import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; @@ -68,5 +69,10 @@ public CallStateEnum read(final JsonReader jsonReader) throws IOException { return CallStateEnum.fromValue(value); } } + + public static void validateJsonElement(JsonElement jsonElement) throws IOException { + String value = jsonElement.getAsString(); + CallStateEnum.fromValue(value); + } } diff --git a/src/main/java/com/bandwidth/sdk/model/CallTranscription.java b/src/main/java/com/bandwidth/sdk/model/CallTranscription.java index ffaa7874..cd778a8c 100644 --- a/src/main/java/com/bandwidth/sdk/model/CallTranscription.java +++ b/src/main/java/com/bandwidth/sdk/model/CallTranscription.java @@ -42,7 +42,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -50,7 +49,7 @@ /** * CallTranscription */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class CallTranscription { /** * The detected language for this transcription. @@ -99,6 +98,11 @@ public DetectedLanguageEnum read(final JsonReader jsonReader) throws IOException return DetectedLanguageEnum.fromValue(value); } } + + public static void validateJsonElement(JsonElement jsonElement) throws IOException { + String value = jsonElement.getAsString(); + DetectedLanguageEnum.fromValue(value); + } } public static final String SERIALIZED_NAME_DETECTED_LANGUAGE = "detectedLanguage"; @@ -150,6 +154,11 @@ public TrackEnum read(final JsonReader jsonReader) throws IOException { return TrackEnum.fromValue(value); } } + + public static void validateJsonElement(JsonElement jsonElement) throws IOException { + String value = jsonElement.getAsString(); + TrackEnum.fromValue(value); + } } public static final String SERIALIZED_NAME_TRACK = "track"; @@ -168,7 +177,6 @@ public CallTranscription() { } public CallTranscription detectedLanguage(DetectedLanguageEnum detectedLanguage) { - this.detectedLanguage = detectedLanguage; return this; } @@ -182,14 +190,12 @@ public DetectedLanguageEnum getDetectedLanguage() { return detectedLanguage; } - public void setDetectedLanguage(DetectedLanguageEnum detectedLanguage) { this.detectedLanguage = detectedLanguage; } public CallTranscription track(TrackEnum track) { - this.track = track; return this; } @@ -203,14 +209,12 @@ public TrackEnum getTrack() { return track; } - public void setTrack(TrackEnum track) { this.track = track; } public CallTranscription text(String text) { - this.text = text; return this; } @@ -224,14 +228,12 @@ public String getText() { return text; } - public void setText(String text) { this.text = text; } public CallTranscription confidence(Double confidence) { - this.confidence = confidence; return this; } @@ -247,7 +249,6 @@ public Double getConfidence() { return confidence; } - public void setConfidence(Double confidence) { this.confidence = confidence; } @@ -375,9 +376,17 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("detectedLanguage") != null && !jsonObj.get("detectedLanguage").isJsonNull()) && !jsonObj.get("detectedLanguage").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `detectedLanguage` to be a primitive type in the JSON string but got `%s`", jsonObj.get("detectedLanguage").toString())); } + // validate the optional field `detectedLanguage` + if (jsonObj.get("detectedLanguage") != null && !jsonObj.get("detectedLanguage").isJsonNull()) { + DetectedLanguageEnum.validateJsonElement(jsonObj.get("detectedLanguage")); + } if ((jsonObj.get("track") != null && !jsonObj.get("track").isJsonNull()) && !jsonObj.get("track").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `track` to be a primitive type in the JSON string but got `%s`", jsonObj.get("track").toString())); } + // validate the optional field `track` + if (jsonObj.get("track") != null && !jsonObj.get("track").isJsonNull()) { + TrackEnum.validateJsonElement(jsonObj.get("track")); + } if ((jsonObj.get("text") != null && !jsonObj.get("text").isJsonNull()) && !jsonObj.get("text").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `text` to be a primitive type in the JSON string but got `%s`", jsonObj.get("text").toString())); } @@ -411,7 +420,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/CallTranscriptionMetadata.java b/src/main/java/com/bandwidth/sdk/model/CallTranscriptionMetadata.java index 1e83e57f..30e0eba5 100644 --- a/src/main/java/com/bandwidth/sdk/model/CallTranscriptionMetadata.java +++ b/src/main/java/com/bandwidth/sdk/model/CallTranscriptionMetadata.java @@ -42,7 +42,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -50,7 +49,7 @@ /** * CallTranscriptionMetadata */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class CallTranscriptionMetadata { public static final String SERIALIZED_NAME_TRANSCRIPTION_ID = "transcriptionId"; @SerializedName(SERIALIZED_NAME_TRANSCRIPTION_ID) @@ -64,7 +63,6 @@ public CallTranscriptionMetadata() { } public CallTranscriptionMetadata transcriptionId(String transcriptionId) { - this.transcriptionId = transcriptionId; return this; } @@ -78,14 +76,12 @@ public String getTranscriptionId() { return transcriptionId; } - public void setTranscriptionId(String transcriptionId) { this.transcriptionId = transcriptionId; } public CallTranscriptionMetadata transcriptionUrl(String transcriptionUrl) { - this.transcriptionUrl = transcriptionUrl; return this; } @@ -99,7 +95,6 @@ public String getTranscriptionUrl() { return transcriptionUrl; } - public void setTranscriptionUrl(String transcriptionUrl) { this.transcriptionUrl = transcriptionUrl; } @@ -254,7 +249,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/CallTranscriptionResponse.java b/src/main/java/com/bandwidth/sdk/model/CallTranscriptionResponse.java index f52be69c..1814433e 100644 --- a/src/main/java/com/bandwidth/sdk/model/CallTranscriptionResponse.java +++ b/src/main/java/com/bandwidth/sdk/model/CallTranscriptionResponse.java @@ -45,7 +45,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -53,7 +52,7 @@ /** * CallTranscriptionResponse */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class CallTranscriptionResponse { public static final String SERIALIZED_NAME_ACCOUNT_ID = "accountId"; @SerializedName(SERIALIZED_NAME_ACCOUNT_ID) @@ -69,13 +68,12 @@ public class CallTranscriptionResponse { public static final String SERIALIZED_NAME_TRACKS = "tracks"; @SerializedName(SERIALIZED_NAME_TRACKS) - private List tracks; + private List tracks = new ArrayList<>(); public CallTranscriptionResponse() { } public CallTranscriptionResponse accountId(String accountId) { - this.accountId = accountId; return this; } @@ -89,14 +87,12 @@ public String getAccountId() { return accountId; } - public void setAccountId(String accountId) { this.accountId = accountId; } public CallTranscriptionResponse callId(String callId) { - this.callId = callId; return this; } @@ -110,14 +106,12 @@ public String getCallId() { return callId; } - public void setCallId(String callId) { this.callId = callId; } public CallTranscriptionResponse transcriptionId(String transcriptionId) { - this.transcriptionId = transcriptionId; return this; } @@ -131,14 +125,12 @@ public String getTranscriptionId() { return transcriptionId; } - public void setTranscriptionId(String transcriptionId) { this.transcriptionId = transcriptionId; } public CallTranscriptionResponse tracks(List tracks) { - this.tracks = tracks; return this; } @@ -160,7 +152,6 @@ public List getTracks() { return tracks; } - public void setTracks(List tracks) { this.tracks = tracks; } @@ -338,7 +329,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/CallbackMethodEnum.java b/src/main/java/com/bandwidth/sdk/model/CallbackMethodEnum.java index fef1dcce..3e169433 100644 --- a/src/main/java/com/bandwidth/sdk/model/CallbackMethodEnum.java +++ b/src/main/java/com/bandwidth/sdk/model/CallbackMethodEnum.java @@ -18,6 +18,7 @@ import java.io.IOException; import com.google.gson.TypeAdapter; +import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; @@ -68,5 +69,10 @@ public CallbackMethodEnum read(final JsonReader jsonReader) throws IOException { return CallbackMethodEnum.fromValue(value); } } + + public static void validateJsonElement(JsonElement jsonElement) throws IOException { + String value = jsonElement.getAsString(); + CallbackMethodEnum.fromValue(value); + } } diff --git a/src/main/java/com/bandwidth/sdk/model/CodeRequest.java b/src/main/java/com/bandwidth/sdk/model/CodeRequest.java index 5f0253ee..59a827f8 100644 --- a/src/main/java/com/bandwidth/sdk/model/CodeRequest.java +++ b/src/main/java/com/bandwidth/sdk/model/CodeRequest.java @@ -42,7 +42,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -50,7 +49,7 @@ /** * CodeRequest */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class CodeRequest { public static final String SERIALIZED_NAME_TO = "to"; @SerializedName(SERIALIZED_NAME_TO) @@ -80,7 +79,6 @@ public CodeRequest() { } public CodeRequest to(String to) { - this.to = to; return this; } @@ -94,14 +92,12 @@ public String getTo() { return to; } - public void setTo(String to) { this.to = to; } public CodeRequest from(String from) { - this.from = from; return this; } @@ -115,14 +111,12 @@ public String getFrom() { return from; } - public void setFrom(String from) { this.from = from; } public CodeRequest applicationId(String applicationId) { - this.applicationId = applicationId; return this; } @@ -136,14 +130,12 @@ public String getApplicationId() { return applicationId; } - public void setApplicationId(String applicationId) { this.applicationId = applicationId; } public CodeRequest scope(String scope) { - this.scope = scope; return this; } @@ -157,14 +149,12 @@ public String getScope() { return scope; } - public void setScope(String scope) { this.scope = scope; } public CodeRequest message(String message) { - this.message = message; return this; } @@ -178,14 +168,12 @@ public String getMessage() { return message; } - public void setMessage(String message) { this.message = message; } public CodeRequest digits(Integer digits) { - this.digits = digits; return this; } @@ -201,7 +189,6 @@ public Integer getDigits() { return digits; } - public void setDigits(Integer digits) { this.digits = digits; } @@ -389,7 +376,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/Conference.java b/src/main/java/com/bandwidth/sdk/model/Conference.java index 91f59645..509a0b15 100644 --- a/src/main/java/com/bandwidth/sdk/model/Conference.java +++ b/src/main/java/com/bandwidth/sdk/model/Conference.java @@ -49,7 +49,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -57,7 +56,7 @@ /** * Conference */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class Conference { public static final String SERIALIZED_NAME_ID = "id"; @SerializedName(SERIALIZED_NAME_ID) @@ -95,7 +94,6 @@ public Conference() { } public Conference id(String id) { - this.id = id; return this; } @@ -109,14 +107,12 @@ public String getId() { return id; } - public void setId(String id) { this.id = id; } public Conference name(String name) { - this.name = name; return this; } @@ -130,14 +126,12 @@ public String getName() { return name; } - public void setName(String name) { this.name = name; } public Conference createdTime(OffsetDateTime createdTime) { - this.createdTime = createdTime; return this; } @@ -151,14 +145,12 @@ public OffsetDateTime getCreatedTime() { return createdTime; } - public void setCreatedTime(OffsetDateTime createdTime) { this.createdTime = createdTime; } public Conference completedTime(OffsetDateTime completedTime) { - this.completedTime = completedTime; return this; } @@ -172,14 +164,12 @@ public OffsetDateTime getCompletedTime() { return completedTime; } - public void setCompletedTime(OffsetDateTime completedTime) { this.completedTime = completedTime; } public Conference conferenceEventUrl(URI conferenceEventUrl) { - this.conferenceEventUrl = conferenceEventUrl; return this; } @@ -193,14 +183,12 @@ public URI getConferenceEventUrl() { return conferenceEventUrl; } - public void setConferenceEventUrl(URI conferenceEventUrl) { this.conferenceEventUrl = conferenceEventUrl; } public Conference conferenceEventMethod(CallbackMethodEnum conferenceEventMethod) { - this.conferenceEventMethod = conferenceEventMethod; return this; } @@ -214,14 +202,12 @@ public CallbackMethodEnum getConferenceEventMethod() { return conferenceEventMethod; } - public void setConferenceEventMethod(CallbackMethodEnum conferenceEventMethod) { this.conferenceEventMethod = conferenceEventMethod; } public Conference tag(String tag) { - this.tag = tag; return this; } @@ -235,14 +221,12 @@ public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } public Conference activeMembers(List activeMembers) { - this.activeMembers = activeMembers; return this; } @@ -264,7 +248,6 @@ public List getActiveMembers() { return activeMembers; } - public void setActiveMembers(List activeMembers) { this.activeMembers = activeMembers; } @@ -421,6 +404,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("conferenceEventUrl") != null && !jsonObj.get("conferenceEventUrl").isJsonNull()) && !jsonObj.get("conferenceEventUrl").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `conferenceEventUrl` to be a primitive type in the JSON string but got `%s`", jsonObj.get("conferenceEventUrl").toString())); } + // validate the optional field `conferenceEventMethod` + if (jsonObj.get("conferenceEventMethod") != null && !jsonObj.get("conferenceEventMethod").isJsonNull()) { + CallbackMethodEnum.validateJsonElement(jsonObj.get("conferenceEventMethod")); + } if ((jsonObj.get("tag") != null && !jsonObj.get("tag").isJsonNull()) && !jsonObj.get("tag").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `tag` to be a primitive type in the JSON string but got `%s`", jsonObj.get("tag").toString())); } @@ -468,7 +455,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/ConferenceCompletedCallback.java b/src/main/java/com/bandwidth/sdk/model/ConferenceCompletedCallback.java index d0987304..257c8bad 100644 --- a/src/main/java/com/bandwidth/sdk/model/ConferenceCompletedCallback.java +++ b/src/main/java/com/bandwidth/sdk/model/ConferenceCompletedCallback.java @@ -44,7 +44,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -52,7 +51,7 @@ /** * The Conference Completed event is fired when the last member leaves the conference. The response to this event may not contain BXML. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class ConferenceCompletedCallback { public static final String SERIALIZED_NAME_EVENT_TYPE = "eventType"; @SerializedName(SERIALIZED_NAME_EVENT_TYPE) @@ -78,7 +77,6 @@ public ConferenceCompletedCallback() { } public ConferenceCompletedCallback eventType(String eventType) { - this.eventType = eventType; return this; } @@ -92,14 +90,12 @@ public String getEventType() { return eventType; } - public void setEventType(String eventType) { this.eventType = eventType; } public ConferenceCompletedCallback eventTime(OffsetDateTime eventTime) { - this.eventTime = eventTime; return this; } @@ -113,14 +109,12 @@ public OffsetDateTime getEventTime() { return eventTime; } - public void setEventTime(OffsetDateTime eventTime) { this.eventTime = eventTime; } public ConferenceCompletedCallback conferenceId(String conferenceId) { - this.conferenceId = conferenceId; return this; } @@ -134,14 +128,12 @@ public String getConferenceId() { return conferenceId; } - public void setConferenceId(String conferenceId) { this.conferenceId = conferenceId; } public ConferenceCompletedCallback name(String name) { - this.name = name; return this; } @@ -155,14 +147,12 @@ public String getName() { return name; } - public void setName(String name) { this.name = name; } public ConferenceCompletedCallback tag(String tag) { - this.tag = tag; return this; } @@ -176,7 +166,6 @@ public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } @@ -357,7 +346,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/ConferenceCreatedCallback.java b/src/main/java/com/bandwidth/sdk/model/ConferenceCreatedCallback.java index 705be5c1..d0cb449d 100644 --- a/src/main/java/com/bandwidth/sdk/model/ConferenceCreatedCallback.java +++ b/src/main/java/com/bandwidth/sdk/model/ConferenceCreatedCallback.java @@ -44,7 +44,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -52,7 +51,7 @@ /** * The Conference Created event is fired whenever a new conference that specified a callbackUrl is created. The response may be either empty or a BXML document. Only the following verbs are valid for conferences: PlayAudio, SpeakSentence, StartRecording, StopRecording, PauseRecording, ResumeRecording. Audio verbs will be heard by all members of the conference. Recordings capture audio from all members who are not muted or on hold, as well as any audio verbs that are played into the conference. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class ConferenceCreatedCallback { public static final String SERIALIZED_NAME_EVENT_TYPE = "eventType"; @SerializedName(SERIALIZED_NAME_EVENT_TYPE) @@ -78,7 +77,6 @@ public ConferenceCreatedCallback() { } public ConferenceCreatedCallback eventType(String eventType) { - this.eventType = eventType; return this; } @@ -92,14 +90,12 @@ public String getEventType() { return eventType; } - public void setEventType(String eventType) { this.eventType = eventType; } public ConferenceCreatedCallback eventTime(OffsetDateTime eventTime) { - this.eventTime = eventTime; return this; } @@ -113,14 +109,12 @@ public OffsetDateTime getEventTime() { return eventTime; } - public void setEventTime(OffsetDateTime eventTime) { this.eventTime = eventTime; } public ConferenceCreatedCallback conferenceId(String conferenceId) { - this.conferenceId = conferenceId; return this; } @@ -134,14 +128,12 @@ public String getConferenceId() { return conferenceId; } - public void setConferenceId(String conferenceId) { this.conferenceId = conferenceId; } public ConferenceCreatedCallback name(String name) { - this.name = name; return this; } @@ -155,14 +147,12 @@ public String getName() { return name; } - public void setName(String name) { this.name = name; } public ConferenceCreatedCallback tag(String tag) { - this.tag = tag; return this; } @@ -176,7 +166,6 @@ public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } @@ -357,7 +346,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/ConferenceMember.java b/src/main/java/com/bandwidth/sdk/model/ConferenceMember.java index c599189f..ebae4f4a 100644 --- a/src/main/java/com/bandwidth/sdk/model/ConferenceMember.java +++ b/src/main/java/com/bandwidth/sdk/model/ConferenceMember.java @@ -45,7 +45,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -53,7 +52,7 @@ /** * ConferenceMember */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class ConferenceMember { public static final String SERIALIZED_NAME_CALL_ID = "callId"; @SerializedName(SERIALIZED_NAME_CALL_ID) @@ -83,7 +82,6 @@ public ConferenceMember() { } public ConferenceMember callId(String callId) { - this.callId = callId; return this; } @@ -97,14 +95,12 @@ public String getCallId() { return callId; } - public void setCallId(String callId) { this.callId = callId; } public ConferenceMember conferenceId(String conferenceId) { - this.conferenceId = conferenceId; return this; } @@ -118,14 +114,12 @@ public String getConferenceId() { return conferenceId; } - public void setConferenceId(String conferenceId) { this.conferenceId = conferenceId; } public ConferenceMember memberUrl(String memberUrl) { - this.memberUrl = memberUrl; return this; } @@ -139,14 +133,12 @@ public String getMemberUrl() { return memberUrl; } - public void setMemberUrl(String memberUrl) { this.memberUrl = memberUrl; } public ConferenceMember mute(Boolean mute) { - this.mute = mute; return this; } @@ -160,14 +152,12 @@ public Boolean getMute() { return mute; } - public void setMute(Boolean mute) { this.mute = mute; } public ConferenceMember hold(Boolean hold) { - this.hold = hold; return this; } @@ -181,14 +171,12 @@ public Boolean getHold() { return hold; } - public void setHold(Boolean hold) { this.hold = hold; } public ConferenceMember callIdsToCoach(List callIdsToCoach) { - this.callIdsToCoach = callIdsToCoach; return this; } @@ -210,7 +198,6 @@ public List getCallIdsToCoach() { return callIdsToCoach; } - public void setCallIdsToCoach(List callIdsToCoach) { this.callIdsToCoach = callIdsToCoach; } @@ -395,7 +382,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/ConferenceMemberExitCallback.java b/src/main/java/com/bandwidth/sdk/model/ConferenceMemberExitCallback.java index ac74ee38..662408af 100644 --- a/src/main/java/com/bandwidth/sdk/model/ConferenceMemberExitCallback.java +++ b/src/main/java/com/bandwidth/sdk/model/ConferenceMemberExitCallback.java @@ -44,7 +44,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -52,7 +51,7 @@ /** * The Conference Member Exit event is fired whenever a caller exits a conference that specified a callbackUrl. The response may be either empty or a BXML document. Only the following verbs are valid for conferences: PlayAudio, SpeakSentence, StartRecording, StopRecording, PauseRecording, ResumeRecording. Audio verbs will be heard by all members of the conference. Recordings capture audio from all members who are not muted or on hold, as well as any audio verbs that are played into the conference. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class ConferenceMemberExitCallback { public static final String SERIALIZED_NAME_EVENT_TYPE = "eventType"; @SerializedName(SERIALIZED_NAME_EVENT_TYPE) @@ -90,7 +89,6 @@ public ConferenceMemberExitCallback() { } public ConferenceMemberExitCallback eventType(String eventType) { - this.eventType = eventType; return this; } @@ -104,14 +102,12 @@ public String getEventType() { return eventType; } - public void setEventType(String eventType) { this.eventType = eventType; } public ConferenceMemberExitCallback eventTime(OffsetDateTime eventTime) { - this.eventTime = eventTime; return this; } @@ -125,14 +121,12 @@ public OffsetDateTime getEventTime() { return eventTime; } - public void setEventTime(OffsetDateTime eventTime) { this.eventTime = eventTime; } public ConferenceMemberExitCallback conferenceId(String conferenceId) { - this.conferenceId = conferenceId; return this; } @@ -146,14 +140,12 @@ public String getConferenceId() { return conferenceId; } - public void setConferenceId(String conferenceId) { this.conferenceId = conferenceId; } public ConferenceMemberExitCallback name(String name) { - this.name = name; return this; } @@ -167,14 +159,12 @@ public String getName() { return name; } - public void setName(String name) { this.name = name; } public ConferenceMemberExitCallback from(String from) { - this.from = from; return this; } @@ -188,14 +178,12 @@ public String getFrom() { return from; } - public void setFrom(String from) { this.from = from; } public ConferenceMemberExitCallback to(String to) { - this.to = to; return this; } @@ -209,14 +197,12 @@ public String getTo() { return to; } - public void setTo(String to) { this.to = to; } public ConferenceMemberExitCallback callId(String callId) { - this.callId = callId; return this; } @@ -230,14 +216,12 @@ public String getCallId() { return callId; } - public void setCallId(String callId) { this.callId = callId; } public ConferenceMemberExitCallback tag(String tag) { - this.tag = tag; return this; } @@ -251,7 +235,6 @@ public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } @@ -450,7 +433,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/ConferenceMemberJoinCallback.java b/src/main/java/com/bandwidth/sdk/model/ConferenceMemberJoinCallback.java index 1524aa62..349fa9a2 100644 --- a/src/main/java/com/bandwidth/sdk/model/ConferenceMemberJoinCallback.java +++ b/src/main/java/com/bandwidth/sdk/model/ConferenceMemberJoinCallback.java @@ -44,7 +44,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -52,7 +51,7 @@ /** * The Conference Member Join event is fired whenever a caller joins a conference that specified a callbackUrl. The response may be either empty or a BXML document. Only the following verbs are valid for conferences: PlayAudio, SpeakSentence, StartRecording, StopRecording, PauseRecording, ResumeRecording. Audio verbs will be heard by all members of the conference. Recordings capture audio from all members who are not muted or on hold, as well as any audio verbs that are played into the conference. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class ConferenceMemberJoinCallback { public static final String SERIALIZED_NAME_EVENT_TYPE = "eventType"; @SerializedName(SERIALIZED_NAME_EVENT_TYPE) @@ -90,7 +89,6 @@ public ConferenceMemberJoinCallback() { } public ConferenceMemberJoinCallback eventType(String eventType) { - this.eventType = eventType; return this; } @@ -104,14 +102,12 @@ public String getEventType() { return eventType; } - public void setEventType(String eventType) { this.eventType = eventType; } public ConferenceMemberJoinCallback eventTime(OffsetDateTime eventTime) { - this.eventTime = eventTime; return this; } @@ -125,14 +121,12 @@ public OffsetDateTime getEventTime() { return eventTime; } - public void setEventTime(OffsetDateTime eventTime) { this.eventTime = eventTime; } public ConferenceMemberJoinCallback conferenceId(String conferenceId) { - this.conferenceId = conferenceId; return this; } @@ -146,14 +140,12 @@ public String getConferenceId() { return conferenceId; } - public void setConferenceId(String conferenceId) { this.conferenceId = conferenceId; } public ConferenceMemberJoinCallback name(String name) { - this.name = name; return this; } @@ -167,14 +159,12 @@ public String getName() { return name; } - public void setName(String name) { this.name = name; } public ConferenceMemberJoinCallback from(String from) { - this.from = from; return this; } @@ -188,14 +178,12 @@ public String getFrom() { return from; } - public void setFrom(String from) { this.from = from; } public ConferenceMemberJoinCallback to(String to) { - this.to = to; return this; } @@ -209,14 +197,12 @@ public String getTo() { return to; } - public void setTo(String to) { this.to = to; } public ConferenceMemberJoinCallback callId(String callId) { - this.callId = callId; return this; } @@ -230,14 +216,12 @@ public String getCallId() { return callId; } - public void setCallId(String callId) { this.callId = callId; } public ConferenceMemberJoinCallback tag(String tag) { - this.tag = tag; return this; } @@ -251,7 +235,6 @@ public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } @@ -450,7 +433,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/ConferenceRecordingAvailableCallback.java b/src/main/java/com/bandwidth/sdk/model/ConferenceRecordingAvailableCallback.java index c0785daf..2663f047 100644 --- a/src/main/java/com/bandwidth/sdk/model/ConferenceRecordingAvailableCallback.java +++ b/src/main/java/com/bandwidth/sdk/model/ConferenceRecordingAvailableCallback.java @@ -46,7 +46,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -54,7 +53,7 @@ /** * The Conference Recording Available event is sent after a conference recording has been processed. It indicates that the recording is available for download. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class ConferenceRecordingAvailableCallback { public static final String SERIALIZED_NAME_EVENT_TYPE = "eventType"; @SerializedName(SERIALIZED_NAME_EVENT_TYPE) @@ -116,7 +115,6 @@ public ConferenceRecordingAvailableCallback() { } public ConferenceRecordingAvailableCallback eventType(String eventType) { - this.eventType = eventType; return this; } @@ -130,14 +128,12 @@ public String getEventType() { return eventType; } - public void setEventType(String eventType) { this.eventType = eventType; } public ConferenceRecordingAvailableCallback eventTime(OffsetDateTime eventTime) { - this.eventTime = eventTime; return this; } @@ -151,14 +147,12 @@ public OffsetDateTime getEventTime() { return eventTime; } - public void setEventTime(OffsetDateTime eventTime) { this.eventTime = eventTime; } public ConferenceRecordingAvailableCallback conferenceId(String conferenceId) { - this.conferenceId = conferenceId; return this; } @@ -172,14 +166,12 @@ public String getConferenceId() { return conferenceId; } - public void setConferenceId(String conferenceId) { this.conferenceId = conferenceId; } public ConferenceRecordingAvailableCallback name(String name) { - this.name = name; return this; } @@ -193,14 +185,12 @@ public String getName() { return name; } - public void setName(String name) { this.name = name; } public ConferenceRecordingAvailableCallback accountId(String accountId) { - this.accountId = accountId; return this; } @@ -214,14 +204,12 @@ public String getAccountId() { return accountId; } - public void setAccountId(String accountId) { this.accountId = accountId; } public ConferenceRecordingAvailableCallback recordingId(String recordingId) { - this.recordingId = recordingId; return this; } @@ -235,14 +223,12 @@ public String getRecordingId() { return recordingId; } - public void setRecordingId(String recordingId) { this.recordingId = recordingId; } public ConferenceRecordingAvailableCallback channels(Integer channels) { - this.channels = channels; return this; } @@ -256,14 +242,12 @@ public Integer getChannels() { return channels; } - public void setChannels(Integer channels) { this.channels = channels; } public ConferenceRecordingAvailableCallback startTime(OffsetDateTime startTime) { - this.startTime = startTime; return this; } @@ -277,14 +261,12 @@ public OffsetDateTime getStartTime() { return startTime; } - public void setStartTime(OffsetDateTime startTime) { this.startTime = startTime; } public ConferenceRecordingAvailableCallback endTime(OffsetDateTime endTime) { - this.endTime = endTime; return this; } @@ -298,14 +280,12 @@ public OffsetDateTime getEndTime() { return endTime; } - public void setEndTime(OffsetDateTime endTime) { this.endTime = endTime; } public ConferenceRecordingAvailableCallback duration(String duration) { - this.duration = duration; return this; } @@ -319,14 +299,12 @@ public String getDuration() { return duration; } - public void setDuration(String duration) { this.duration = duration; } public ConferenceRecordingAvailableCallback fileFormat(FileFormatEnum fileFormat) { - this.fileFormat = fileFormat; return this; } @@ -340,14 +318,12 @@ public FileFormatEnum getFileFormat() { return fileFormat; } - public void setFileFormat(FileFormatEnum fileFormat) { this.fileFormat = fileFormat; } public ConferenceRecordingAvailableCallback mediaUrl(URI mediaUrl) { - this.mediaUrl = mediaUrl; return this; } @@ -361,14 +337,12 @@ public URI getMediaUrl() { return mediaUrl; } - public void setMediaUrl(URI mediaUrl) { this.mediaUrl = mediaUrl; } public ConferenceRecordingAvailableCallback tag(String tag) { - this.tag = tag; return this; } @@ -382,14 +356,12 @@ public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } public ConferenceRecordingAvailableCallback status(String status) { - this.status = status; return this; } @@ -403,7 +375,6 @@ public String getStatus() { return status; } - public void setStatus(String status) { this.status = status; } @@ -587,6 +558,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("duration") != null && !jsonObj.get("duration").isJsonNull()) && !jsonObj.get("duration").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `duration` to be a primitive type in the JSON string but got `%s`", jsonObj.get("duration").toString())); } + // validate the optional field `fileFormat` + if (jsonObj.get("fileFormat") != null && !jsonObj.get("fileFormat").isJsonNull()) { + FileFormatEnum.validateJsonElement(jsonObj.get("fileFormat")); + } if ((jsonObj.get("mediaUrl") != null && !jsonObj.get("mediaUrl").isJsonNull()) && !jsonObj.get("mediaUrl").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `mediaUrl` to be a primitive type in the JSON string but got `%s`", jsonObj.get("mediaUrl").toString())); } @@ -626,7 +601,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/ConferenceRecordingMetadata.java b/src/main/java/com/bandwidth/sdk/model/ConferenceRecordingMetadata.java index 17e88457..02ae4b98 100644 --- a/src/main/java/com/bandwidth/sdk/model/ConferenceRecordingMetadata.java +++ b/src/main/java/com/bandwidth/sdk/model/ConferenceRecordingMetadata.java @@ -46,7 +46,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -54,7 +53,7 @@ /** * ConferenceRecordingMetadata */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class ConferenceRecordingMetadata { public static final String SERIALIZED_NAME_ACCOUNT_ID = "accountId"; @SerializedName(SERIALIZED_NAME_ACCOUNT_ID) @@ -104,7 +103,6 @@ public ConferenceRecordingMetadata() { } public ConferenceRecordingMetadata accountId(String accountId) { - this.accountId = accountId; return this; } @@ -118,14 +116,12 @@ public String getAccountId() { return accountId; } - public void setAccountId(String accountId) { this.accountId = accountId; } public ConferenceRecordingMetadata conferenceId(String conferenceId) { - this.conferenceId = conferenceId; return this; } @@ -139,14 +135,12 @@ public String getConferenceId() { return conferenceId; } - public void setConferenceId(String conferenceId) { this.conferenceId = conferenceId; } public ConferenceRecordingMetadata name(String name) { - this.name = name; return this; } @@ -160,14 +154,12 @@ public String getName() { return name; } - public void setName(String name) { this.name = name; } public ConferenceRecordingMetadata recordingId(String recordingId) { - this.recordingId = recordingId; return this; } @@ -181,14 +173,12 @@ public String getRecordingId() { return recordingId; } - public void setRecordingId(String recordingId) { this.recordingId = recordingId; } public ConferenceRecordingMetadata duration(String duration) { - this.duration = duration; return this; } @@ -202,14 +192,12 @@ public String getDuration() { return duration; } - public void setDuration(String duration) { this.duration = duration; } public ConferenceRecordingMetadata channels(Integer channels) { - this.channels = channels; return this; } @@ -223,14 +211,12 @@ public Integer getChannels() { return channels; } - public void setChannels(Integer channels) { this.channels = channels; } public ConferenceRecordingMetadata startTime(OffsetDateTime startTime) { - this.startTime = startTime; return this; } @@ -244,14 +230,12 @@ public OffsetDateTime getStartTime() { return startTime; } - public void setStartTime(OffsetDateTime startTime) { this.startTime = startTime; } public ConferenceRecordingMetadata endTime(OffsetDateTime endTime) { - this.endTime = endTime; return this; } @@ -265,14 +249,12 @@ public OffsetDateTime getEndTime() { return endTime; } - public void setEndTime(OffsetDateTime endTime) { this.endTime = endTime; } public ConferenceRecordingMetadata fileFormat(FileFormatEnum fileFormat) { - this.fileFormat = fileFormat; return this; } @@ -286,14 +268,12 @@ public FileFormatEnum getFileFormat() { return fileFormat; } - public void setFileFormat(FileFormatEnum fileFormat) { this.fileFormat = fileFormat; } public ConferenceRecordingMetadata status(String status) { - this.status = status; return this; } @@ -307,14 +287,12 @@ public String getStatus() { return status; } - public void setStatus(String status) { this.status = status; } public ConferenceRecordingMetadata mediaUrl(URI mediaUrl) { - this.mediaUrl = mediaUrl; return this; } @@ -328,7 +306,6 @@ public URI getMediaUrl() { return mediaUrl; } - public void setMediaUrl(URI mediaUrl) { this.mediaUrl = mediaUrl; } @@ -500,6 +477,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("duration") != null && !jsonObj.get("duration").isJsonNull()) && !jsonObj.get("duration").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `duration` to be a primitive type in the JSON string but got `%s`", jsonObj.get("duration").toString())); } + // validate the optional field `fileFormat` + if (jsonObj.get("fileFormat") != null && !jsonObj.get("fileFormat").isJsonNull()) { + FileFormatEnum.validateJsonElement(jsonObj.get("fileFormat")); + } if ((jsonObj.get("status") != null && !jsonObj.get("status").isJsonNull()) && !jsonObj.get("status").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `status` to be a primitive type in the JSON string but got `%s`", jsonObj.get("status").toString())); } @@ -536,7 +517,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/ConferenceRedirectCallback.java b/src/main/java/com/bandwidth/sdk/model/ConferenceRedirectCallback.java index 6158fcbf..0857f61d 100644 --- a/src/main/java/com/bandwidth/sdk/model/ConferenceRedirectCallback.java +++ b/src/main/java/com/bandwidth/sdk/model/ConferenceRedirectCallback.java @@ -44,7 +44,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -52,7 +51,7 @@ /** * The Conference Redirect event is fired whenever an existing conference is modified via a POST request made to the /conferences/{conferenceId} endpoint. The response may be either empty or a BXML document. Only the following verbs are valid for conferences: PlayAudio, SpeakSentence, StartRecording, StopRecording, PauseRecording, ResumeRecording. Audio verbs will be heard by all members of the conference. Recordings capture audio from all members who are not muted or on hold, as well as any audio verbs that are played into the conference. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class ConferenceRedirectCallback { public static final String SERIALIZED_NAME_EVENT_TYPE = "eventType"; @SerializedName(SERIALIZED_NAME_EVENT_TYPE) @@ -78,7 +77,6 @@ public ConferenceRedirectCallback() { } public ConferenceRedirectCallback eventType(String eventType) { - this.eventType = eventType; return this; } @@ -92,14 +90,12 @@ public String getEventType() { return eventType; } - public void setEventType(String eventType) { this.eventType = eventType; } public ConferenceRedirectCallback eventTime(OffsetDateTime eventTime) { - this.eventTime = eventTime; return this; } @@ -113,14 +109,12 @@ public OffsetDateTime getEventTime() { return eventTime; } - public void setEventTime(OffsetDateTime eventTime) { this.eventTime = eventTime; } public ConferenceRedirectCallback conferenceId(String conferenceId) { - this.conferenceId = conferenceId; return this; } @@ -134,14 +128,12 @@ public String getConferenceId() { return conferenceId; } - public void setConferenceId(String conferenceId) { this.conferenceId = conferenceId; } public ConferenceRedirectCallback name(String name) { - this.name = name; return this; } @@ -155,14 +147,12 @@ public String getName() { return name; } - public void setName(String name) { this.name = name; } public ConferenceRedirectCallback tag(String tag) { - this.tag = tag; return this; } @@ -176,7 +166,6 @@ public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } @@ -357,7 +346,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/ConferenceStateEnum.java b/src/main/java/com/bandwidth/sdk/model/ConferenceStateEnum.java index 76446226..8f457611 100644 --- a/src/main/java/com/bandwidth/sdk/model/ConferenceStateEnum.java +++ b/src/main/java/com/bandwidth/sdk/model/ConferenceStateEnum.java @@ -18,6 +18,7 @@ import java.io.IOException; import com.google.gson.TypeAdapter; +import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; @@ -68,5 +69,10 @@ public ConferenceStateEnum read(final JsonReader jsonReader) throws IOException return ConferenceStateEnum.fromValue(value); } } + + public static void validateJsonElement(JsonElement jsonElement) throws IOException { + String value = jsonElement.getAsString(); + ConferenceStateEnum.fromValue(value); + } } diff --git a/src/main/java/com/bandwidth/sdk/model/CreateCall.java b/src/main/java/com/bandwidth/sdk/model/CreateCall.java index a965c1d7..101308ca 100644 --- a/src/main/java/com/bandwidth/sdk/model/CreateCall.java +++ b/src/main/java/com/bandwidth/sdk/model/CreateCall.java @@ -46,7 +46,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -54,7 +53,7 @@ /** * CreateCall */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class CreateCall { public static final String SERIALIZED_NAME_TO = "to"; @SerializedName(SERIALIZED_NAME_TO) @@ -140,7 +139,6 @@ public CreateCall() { } public CreateCall to(String to) { - this.to = to; return this; } @@ -154,14 +152,12 @@ public String getTo() { return to; } - public void setTo(String to) { this.to = to; } public CreateCall from(String from) { - this.from = from; return this; } @@ -175,14 +171,12 @@ public String getFrom() { return from; } - public void setFrom(String from) { this.from = from; } public CreateCall displayName(String displayName) { - this.displayName = displayName; return this; } @@ -196,14 +190,12 @@ public String getDisplayName() { return displayName; } - public void setDisplayName(String displayName) { this.displayName = displayName; } public CreateCall uui(String uui) { - this.uui = uui; return this; } @@ -217,14 +209,12 @@ public String getUui() { return uui; } - public void setUui(String uui) { this.uui = uui; } public CreateCall applicationId(String applicationId) { - this.applicationId = applicationId; return this; } @@ -238,14 +228,12 @@ public String getApplicationId() { return applicationId; } - public void setApplicationId(String applicationId) { this.applicationId = applicationId; } public CreateCall answerUrl(URI answerUrl) { - this.answerUrl = answerUrl; return this; } @@ -259,14 +247,12 @@ public URI getAnswerUrl() { return answerUrl; } - public void setAnswerUrl(URI answerUrl) { this.answerUrl = answerUrl; } public CreateCall answerMethod(CallbackMethodEnum answerMethod) { - this.answerMethod = answerMethod; return this; } @@ -280,14 +266,12 @@ public CallbackMethodEnum getAnswerMethod() { return answerMethod; } - public void setAnswerMethod(CallbackMethodEnum answerMethod) { this.answerMethod = answerMethod; } public CreateCall username(String username) { - this.username = username; return this; } @@ -301,14 +285,12 @@ public String getUsername() { return username; } - public void setUsername(String username) { this.username = username; } public CreateCall password(String password) { - this.password = password; return this; } @@ -322,14 +304,12 @@ public String getPassword() { return password; } - public void setPassword(String password) { this.password = password; } public CreateCall answerFallbackUrl(URI answerFallbackUrl) { - this.answerFallbackUrl = answerFallbackUrl; return this; } @@ -343,14 +323,12 @@ public URI getAnswerFallbackUrl() { return answerFallbackUrl; } - public void setAnswerFallbackUrl(URI answerFallbackUrl) { this.answerFallbackUrl = answerFallbackUrl; } public CreateCall answerFallbackMethod(CallbackMethodEnum answerFallbackMethod) { - this.answerFallbackMethod = answerFallbackMethod; return this; } @@ -364,14 +342,12 @@ public CallbackMethodEnum getAnswerFallbackMethod() { return answerFallbackMethod; } - public void setAnswerFallbackMethod(CallbackMethodEnum answerFallbackMethod) { this.answerFallbackMethod = answerFallbackMethod; } public CreateCall fallbackUsername(String fallbackUsername) { - this.fallbackUsername = fallbackUsername; return this; } @@ -385,14 +361,12 @@ public String getFallbackUsername() { return fallbackUsername; } - public void setFallbackUsername(String fallbackUsername) { this.fallbackUsername = fallbackUsername; } public CreateCall fallbackPassword(String fallbackPassword) { - this.fallbackPassword = fallbackPassword; return this; } @@ -406,14 +380,12 @@ public String getFallbackPassword() { return fallbackPassword; } - public void setFallbackPassword(String fallbackPassword) { this.fallbackPassword = fallbackPassword; } public CreateCall disconnectUrl(URI disconnectUrl) { - this.disconnectUrl = disconnectUrl; return this; } @@ -427,14 +399,12 @@ public URI getDisconnectUrl() { return disconnectUrl; } - public void setDisconnectUrl(URI disconnectUrl) { this.disconnectUrl = disconnectUrl; } public CreateCall disconnectMethod(CallbackMethodEnum disconnectMethod) { - this.disconnectMethod = disconnectMethod; return this; } @@ -448,14 +418,12 @@ public CallbackMethodEnum getDisconnectMethod() { return disconnectMethod; } - public void setDisconnectMethod(CallbackMethodEnum disconnectMethod) { this.disconnectMethod = disconnectMethod; } public CreateCall callTimeout(Double callTimeout) { - this.callTimeout = callTimeout; return this; } @@ -471,14 +439,12 @@ public Double getCallTimeout() { return callTimeout; } - public void setCallTimeout(Double callTimeout) { this.callTimeout = callTimeout; } public CreateCall callbackTimeout(Double callbackTimeout) { - this.callbackTimeout = callbackTimeout; return this; } @@ -494,14 +460,12 @@ public Double getCallbackTimeout() { return callbackTimeout; } - public void setCallbackTimeout(Double callbackTimeout) { this.callbackTimeout = callbackTimeout; } public CreateCall machineDetection(MachineDetectionConfiguration machineDetection) { - this.machineDetection = machineDetection; return this; } @@ -515,14 +479,12 @@ public MachineDetectionConfiguration getMachineDetection() { return machineDetection; } - public void setMachineDetection(MachineDetectionConfiguration machineDetection) { this.machineDetection = machineDetection; } public CreateCall priority(Integer priority) { - this.priority = priority; return this; } @@ -538,14 +500,12 @@ public Integer getPriority() { return priority; } - public void setPriority(Integer priority) { this.priority = priority; } public CreateCall tag(String tag) { - this.tag = tag; return this; } @@ -559,7 +519,6 @@ public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } @@ -772,6 +731,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if (!jsonObj.get("answerUrl").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `answerUrl` to be a primitive type in the JSON string but got `%s`", jsonObj.get("answerUrl").toString())); } + // validate the optional field `answerMethod` + if (jsonObj.get("answerMethod") != null && !jsonObj.get("answerMethod").isJsonNull()) { + CallbackMethodEnum.validateJsonElement(jsonObj.get("answerMethod")); + } if ((jsonObj.get("username") != null && !jsonObj.get("username").isJsonNull()) && !jsonObj.get("username").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `username` to be a primitive type in the JSON string but got `%s`", jsonObj.get("username").toString())); } @@ -781,6 +744,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("answerFallbackUrl") != null && !jsonObj.get("answerFallbackUrl").isJsonNull()) && !jsonObj.get("answerFallbackUrl").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `answerFallbackUrl` to be a primitive type in the JSON string but got `%s`", jsonObj.get("answerFallbackUrl").toString())); } + // validate the optional field `answerFallbackMethod` + if (jsonObj.get("answerFallbackMethod") != null && !jsonObj.get("answerFallbackMethod").isJsonNull()) { + CallbackMethodEnum.validateJsonElement(jsonObj.get("answerFallbackMethod")); + } if ((jsonObj.get("fallbackUsername") != null && !jsonObj.get("fallbackUsername").isJsonNull()) && !jsonObj.get("fallbackUsername").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `fallbackUsername` to be a primitive type in the JSON string but got `%s`", jsonObj.get("fallbackUsername").toString())); } @@ -790,6 +757,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("disconnectUrl") != null && !jsonObj.get("disconnectUrl").isJsonNull()) && !jsonObj.get("disconnectUrl").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `disconnectUrl` to be a primitive type in the JSON string but got `%s`", jsonObj.get("disconnectUrl").toString())); } + // validate the optional field `disconnectMethod` + if (jsonObj.get("disconnectMethod") != null && !jsonObj.get("disconnectMethod").isJsonNull()) { + CallbackMethodEnum.validateJsonElement(jsonObj.get("disconnectMethod")); + } // validate the optional field `machineDetection` if (jsonObj.get("machineDetection") != null && !jsonObj.get("machineDetection").isJsonNull()) { MachineDetectionConfiguration.validateJsonElement(jsonObj.get("machineDetection")); @@ -827,7 +798,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/CreateCallResponse.java b/src/main/java/com/bandwidth/sdk/model/CreateCallResponse.java index e99359cc..78bf72b6 100644 --- a/src/main/java/com/bandwidth/sdk/model/CreateCallResponse.java +++ b/src/main/java/com/bandwidth/sdk/model/CreateCallResponse.java @@ -46,7 +46,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -54,7 +53,7 @@ /** * CreateCallResponse */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class CreateCallResponse { public static final String SERIALIZED_NAME_APPLICATION_ID = "applicationId"; @SerializedName(SERIALIZED_NAME_APPLICATION_ID) @@ -144,7 +143,6 @@ public CreateCallResponse() { } public CreateCallResponse applicationId(String applicationId) { - this.applicationId = applicationId; return this; } @@ -158,14 +156,12 @@ public String getApplicationId() { return applicationId; } - public void setApplicationId(String applicationId) { this.applicationId = applicationId; } public CreateCallResponse accountId(String accountId) { - this.accountId = accountId; return this; } @@ -179,14 +175,12 @@ public String getAccountId() { return accountId; } - public void setAccountId(String accountId) { this.accountId = accountId; } public CreateCallResponse callId(String callId) { - this.callId = callId; return this; } @@ -200,14 +194,12 @@ public String getCallId() { return callId; } - public void setCallId(String callId) { this.callId = callId; } public CreateCallResponse to(String to) { - this.to = to; return this; } @@ -221,14 +213,12 @@ public String getTo() { return to; } - public void setTo(String to) { this.to = to; } public CreateCallResponse from(String from) { - this.from = from; return this; } @@ -242,14 +232,12 @@ public String getFrom() { return from; } - public void setFrom(String from) { this.from = from; } public CreateCallResponse enqueuedTime(OffsetDateTime enqueuedTime) { - this.enqueuedTime = enqueuedTime; return this; } @@ -263,14 +251,12 @@ public OffsetDateTime getEnqueuedTime() { return enqueuedTime; } - public void setEnqueuedTime(OffsetDateTime enqueuedTime) { this.enqueuedTime = enqueuedTime; } public CreateCallResponse callUrl(URI callUrl) { - this.callUrl = callUrl; return this; } @@ -284,14 +270,12 @@ public URI getCallUrl() { return callUrl; } - public void setCallUrl(URI callUrl) { this.callUrl = callUrl; } public CreateCallResponse callTimeout(Double callTimeout) { - this.callTimeout = callTimeout; return this; } @@ -305,14 +289,12 @@ public Double getCallTimeout() { return callTimeout; } - public void setCallTimeout(Double callTimeout) { this.callTimeout = callTimeout; } public CreateCallResponse callbackTimeout(Double callbackTimeout) { - this.callbackTimeout = callbackTimeout; return this; } @@ -326,14 +308,12 @@ public Double getCallbackTimeout() { return callbackTimeout; } - public void setCallbackTimeout(Double callbackTimeout) { this.callbackTimeout = callbackTimeout; } public CreateCallResponse tag(String tag) { - this.tag = tag; return this; } @@ -347,14 +327,12 @@ public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } public CreateCallResponse answerMethod(CallbackMethodEnum answerMethod) { - this.answerMethod = answerMethod; return this; } @@ -368,14 +346,12 @@ public CallbackMethodEnum getAnswerMethod() { return answerMethod; } - public void setAnswerMethod(CallbackMethodEnum answerMethod) { this.answerMethod = answerMethod; } public CreateCallResponse answerUrl(URI answerUrl) { - this.answerUrl = answerUrl; return this; } @@ -389,14 +365,12 @@ public URI getAnswerUrl() { return answerUrl; } - public void setAnswerUrl(URI answerUrl) { this.answerUrl = answerUrl; } public CreateCallResponse answerFallbackMethod(CallbackMethodEnum answerFallbackMethod) { - this.answerFallbackMethod = answerFallbackMethod; return this; } @@ -410,14 +384,12 @@ public CallbackMethodEnum getAnswerFallbackMethod() { return answerFallbackMethod; } - public void setAnswerFallbackMethod(CallbackMethodEnum answerFallbackMethod) { this.answerFallbackMethod = answerFallbackMethod; } public CreateCallResponse answerFallbackUrl(URI answerFallbackUrl) { - this.answerFallbackUrl = answerFallbackUrl; return this; } @@ -431,14 +403,12 @@ public URI getAnswerFallbackUrl() { return answerFallbackUrl; } - public void setAnswerFallbackUrl(URI answerFallbackUrl) { this.answerFallbackUrl = answerFallbackUrl; } public CreateCallResponse disconnectMethod(CallbackMethodEnum disconnectMethod) { - this.disconnectMethod = disconnectMethod; return this; } @@ -452,14 +422,12 @@ public CallbackMethodEnum getDisconnectMethod() { return disconnectMethod; } - public void setDisconnectMethod(CallbackMethodEnum disconnectMethod) { this.disconnectMethod = disconnectMethod; } public CreateCallResponse disconnectUrl(URI disconnectUrl) { - this.disconnectUrl = disconnectUrl; return this; } @@ -473,14 +441,12 @@ public URI getDisconnectUrl() { return disconnectUrl; } - public void setDisconnectUrl(URI disconnectUrl) { this.disconnectUrl = disconnectUrl; } public CreateCallResponse username(String username) { - this.username = username; return this; } @@ -494,14 +460,12 @@ public String getUsername() { return username; } - public void setUsername(String username) { this.username = username; } public CreateCallResponse password(String password) { - this.password = password; return this; } @@ -515,14 +479,12 @@ public String getPassword() { return password; } - public void setPassword(String password) { this.password = password; } public CreateCallResponse fallbackUsername(String fallbackUsername) { - this.fallbackUsername = fallbackUsername; return this; } @@ -536,14 +498,12 @@ public String getFallbackUsername() { return fallbackUsername; } - public void setFallbackUsername(String fallbackUsername) { this.fallbackUsername = fallbackUsername; } public CreateCallResponse fallbackPassword(String fallbackPassword) { - this.fallbackPassword = fallbackPassword; return this; } @@ -557,14 +517,12 @@ public String getFallbackPassword() { return fallbackPassword; } - public void setFallbackPassword(String fallbackPassword) { this.fallbackPassword = fallbackPassword; } public CreateCallResponse priority(Integer priority) { - this.priority = priority; return this; } @@ -578,7 +536,6 @@ public Integer getPriority() { return priority; } - public void setPriority(Integer priority) { this.priority = priority; } @@ -802,12 +759,20 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("tag") != null && !jsonObj.get("tag").isJsonNull()) && !jsonObj.get("tag").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `tag` to be a primitive type in the JSON string but got `%s`", jsonObj.get("tag").toString())); } + // validate the required field `answerMethod` + CallbackMethodEnum.validateJsonElement(jsonObj.get("answerMethod")); if (!jsonObj.get("answerUrl").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `answerUrl` to be a primitive type in the JSON string but got `%s`", jsonObj.get("answerUrl").toString())); } + // validate the optional field `answerFallbackMethod` + if (jsonObj.get("answerFallbackMethod") != null && !jsonObj.get("answerFallbackMethod").isJsonNull()) { + CallbackMethodEnum.validateJsonElement(jsonObj.get("answerFallbackMethod")); + } if ((jsonObj.get("answerFallbackUrl") != null && !jsonObj.get("answerFallbackUrl").isJsonNull()) && !jsonObj.get("answerFallbackUrl").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `answerFallbackUrl` to be a primitive type in the JSON string but got `%s`", jsonObj.get("answerFallbackUrl").toString())); } + // validate the required field `disconnectMethod` + CallbackMethodEnum.validateJsonElement(jsonObj.get("disconnectMethod")); if ((jsonObj.get("disconnectUrl") != null && !jsonObj.get("disconnectUrl").isJsonNull()) && !jsonObj.get("disconnectUrl").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `disconnectUrl` to be a primitive type in the JSON string but got `%s`", jsonObj.get("disconnectUrl").toString())); } @@ -853,7 +818,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/CreateLookupResponse.java b/src/main/java/com/bandwidth/sdk/model/CreateLookupResponse.java index 5a9bdcab..35a1012c 100644 --- a/src/main/java/com/bandwidth/sdk/model/CreateLookupResponse.java +++ b/src/main/java/com/bandwidth/sdk/model/CreateLookupResponse.java @@ -43,7 +43,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -51,7 +50,7 @@ /** * The request has been accepted for processing but not yet finished and in a terminal state (COMPLETE, PARTIAL_COMPLETE, or FAILED). */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class CreateLookupResponse { public static final String SERIALIZED_NAME_REQUEST_ID = "requestId"; @SerializedName(SERIALIZED_NAME_REQUEST_ID) @@ -65,7 +64,6 @@ public CreateLookupResponse() { } public CreateLookupResponse requestId(String requestId) { - this.requestId = requestId; return this; } @@ -79,14 +77,12 @@ public String getRequestId() { return requestId; } - public void setRequestId(String requestId) { this.requestId = requestId; } public CreateLookupResponse status(LookupStatusEnum status) { - this.status = status; return this; } @@ -100,7 +96,6 @@ public LookupStatusEnum getStatus() { return status; } - public void setStatus(LookupStatusEnum status) { this.status = status; } @@ -222,6 +217,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("requestId") != null && !jsonObj.get("requestId").isJsonNull()) && !jsonObj.get("requestId").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `requestId` to be a primitive type in the JSON string but got `%s`", jsonObj.get("requestId").toString())); } + // validate the optional field `status` + if (jsonObj.get("status") != null && !jsonObj.get("status").isJsonNull()) { + LookupStatusEnum.validateJsonElement(jsonObj.get("status")); + } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -252,7 +251,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/CreateMessageRequestError.java b/src/main/java/com/bandwidth/sdk/model/CreateMessageRequestError.java index a54042d2..9191f939 100644 --- a/src/main/java/com/bandwidth/sdk/model/CreateMessageRequestError.java +++ b/src/main/java/com/bandwidth/sdk/model/CreateMessageRequestError.java @@ -45,7 +45,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -53,7 +52,7 @@ /** * CreateMessageRequestError */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class CreateMessageRequestError { public static final String SERIALIZED_NAME_TYPE = "type"; @SerializedName(SERIALIZED_NAME_TYPE) @@ -65,13 +64,12 @@ public class CreateMessageRequestError { public static final String SERIALIZED_NAME_FIELD_ERRORS = "fieldErrors"; @SerializedName(SERIALIZED_NAME_FIELD_ERRORS) - private List fieldErrors; + private List fieldErrors = new ArrayList<>(); public CreateMessageRequestError() { } public CreateMessageRequestError type(String type) { - this.type = type; return this; } @@ -85,14 +83,12 @@ public String getType() { return type; } - public void setType(String type) { this.type = type; } public CreateMessageRequestError description(String description) { - this.description = description; return this; } @@ -106,14 +102,12 @@ public String getDescription() { return description; } - public void setDescription(String description) { this.description = description; } public CreateMessageRequestError fieldErrors(List fieldErrors) { - this.fieldErrors = fieldErrors; return this; } @@ -135,7 +129,6 @@ public List getFieldErrors() { return fieldErrors; } - public void setFieldErrors(List fieldErrors) { this.fieldErrors = fieldErrors; } @@ -316,7 +309,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/DeferredResult.java b/src/main/java/com/bandwidth/sdk/model/DeferredResult.java index 2a480d08..ae14eab6 100644 --- a/src/main/java/com/bandwidth/sdk/model/DeferredResult.java +++ b/src/main/java/com/bandwidth/sdk/model/DeferredResult.java @@ -42,7 +42,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -50,7 +49,7 @@ /** * DeferredResult */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class DeferredResult { public static final String SERIALIZED_NAME_RESULT = "result"; @SerializedName(SERIALIZED_NAME_RESULT) @@ -64,7 +63,6 @@ public DeferredResult() { } public DeferredResult result(Object result) { - this.result = result; return this; } @@ -78,14 +76,12 @@ public Object getResult() { return result; } - public void setResult(Object result) { this.result = result; } public DeferredResult setOrExpired(Boolean setOrExpired) { - this.setOrExpired = setOrExpired; return this; } @@ -99,7 +95,6 @@ public Boolean getSetOrExpired() { return setOrExpired; } - public void setSetOrExpired(Boolean setOrExpired) { this.setOrExpired = setOrExpired; } @@ -248,7 +243,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/DisconnectCallback.java b/src/main/java/com/bandwidth/sdk/model/DisconnectCallback.java index f0e11ec8..d8877d64 100644 --- a/src/main/java/com/bandwidth/sdk/model/DisconnectCallback.java +++ b/src/main/java/com/bandwidth/sdk/model/DisconnectCallback.java @@ -45,7 +45,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -53,7 +52,7 @@ /** * The Disconnect event is fired when a call ends, for any reason. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class DisconnectCallback { public static final String SERIALIZED_NAME_EVENT_TYPE = "eventType"; @SerializedName(SERIALIZED_NAME_EVENT_TYPE) @@ -127,7 +126,6 @@ public DisconnectCallback() { } public DisconnectCallback eventType(String eventType) { - this.eventType = eventType; return this; } @@ -141,14 +139,12 @@ public String getEventType() { return eventType; } - public void setEventType(String eventType) { this.eventType = eventType; } public DisconnectCallback eventTime(OffsetDateTime eventTime) { - this.eventTime = eventTime; return this; } @@ -162,14 +158,12 @@ public OffsetDateTime getEventTime() { return eventTime; } - public void setEventTime(OffsetDateTime eventTime) { this.eventTime = eventTime; } public DisconnectCallback accountId(String accountId) { - this.accountId = accountId; return this; } @@ -183,14 +177,12 @@ public String getAccountId() { return accountId; } - public void setAccountId(String accountId) { this.accountId = accountId; } public DisconnectCallback applicationId(String applicationId) { - this.applicationId = applicationId; return this; } @@ -204,14 +196,12 @@ public String getApplicationId() { return applicationId; } - public void setApplicationId(String applicationId) { this.applicationId = applicationId; } public DisconnectCallback from(String from) { - this.from = from; return this; } @@ -225,14 +215,12 @@ public String getFrom() { return from; } - public void setFrom(String from) { this.from = from; } public DisconnectCallback to(String to) { - this.to = to; return this; } @@ -246,14 +234,12 @@ public String getTo() { return to; } - public void setTo(String to) { this.to = to; } public DisconnectCallback callId(String callId) { - this.callId = callId; return this; } @@ -267,14 +253,12 @@ public String getCallId() { return callId; } - public void setCallId(String callId) { this.callId = callId; } public DisconnectCallback direction(CallDirectionEnum direction) { - this.direction = direction; return this; } @@ -288,14 +272,12 @@ public CallDirectionEnum getDirection() { return direction; } - public void setDirection(CallDirectionEnum direction) { this.direction = direction; } public DisconnectCallback callUrl(String callUrl) { - this.callUrl = callUrl; return this; } @@ -309,14 +291,12 @@ public String getCallUrl() { return callUrl; } - public void setCallUrl(String callUrl) { this.callUrl = callUrl; } public DisconnectCallback enqueuedTime(OffsetDateTime enqueuedTime) { - this.enqueuedTime = enqueuedTime; return this; } @@ -330,14 +310,12 @@ public OffsetDateTime getEnqueuedTime() { return enqueuedTime; } - public void setEnqueuedTime(OffsetDateTime enqueuedTime) { this.enqueuedTime = enqueuedTime; } public DisconnectCallback startTime(OffsetDateTime startTime) { - this.startTime = startTime; return this; } @@ -351,14 +329,12 @@ public OffsetDateTime getStartTime() { return startTime; } - public void setStartTime(OffsetDateTime startTime) { this.startTime = startTime; } public DisconnectCallback answerTime(OffsetDateTime answerTime) { - this.answerTime = answerTime; return this; } @@ -372,14 +348,12 @@ public OffsetDateTime getAnswerTime() { return answerTime; } - public void setAnswerTime(OffsetDateTime answerTime) { this.answerTime = answerTime; } public DisconnectCallback endTime(OffsetDateTime endTime) { - this.endTime = endTime; return this; } @@ -393,14 +367,12 @@ public OffsetDateTime getEndTime() { return endTime; } - public void setEndTime(OffsetDateTime endTime) { this.endTime = endTime; } public DisconnectCallback cause(String cause) { - this.cause = cause; return this; } @@ -414,14 +386,12 @@ public String getCause() { return cause; } - public void setCause(String cause) { this.cause = cause; } public DisconnectCallback errorMessage(String errorMessage) { - this.errorMessage = errorMessage; return this; } @@ -435,14 +405,12 @@ public String getErrorMessage() { return errorMessage; } - public void setErrorMessage(String errorMessage) { this.errorMessage = errorMessage; } public DisconnectCallback errorId(String errorId) { - this.errorId = errorId; return this; } @@ -456,14 +424,12 @@ public String getErrorId() { return errorId; } - public void setErrorId(String errorId) { this.errorId = errorId; } public DisconnectCallback tag(String tag) { - this.tag = tag; return this; } @@ -477,7 +443,6 @@ public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } @@ -670,6 +635,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("callId") != null && !jsonObj.get("callId").isJsonNull()) && !jsonObj.get("callId").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `callId` to be a primitive type in the JSON string but got `%s`", jsonObj.get("callId").toString())); } + // validate the optional field `direction` + if (jsonObj.get("direction") != null && !jsonObj.get("direction").isJsonNull()) { + CallDirectionEnum.validateJsonElement(jsonObj.get("direction")); + } if ((jsonObj.get("callUrl") != null && !jsonObj.get("callUrl").isJsonNull()) && !jsonObj.get("callUrl").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `callUrl` to be a primitive type in the JSON string but got `%s`", jsonObj.get("callUrl").toString())); } @@ -715,7 +684,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/Diversion.java b/src/main/java/com/bandwidth/sdk/model/Diversion.java index 78fc646b..3e7ccb17 100644 --- a/src/main/java/com/bandwidth/sdk/model/Diversion.java +++ b/src/main/java/com/bandwidth/sdk/model/Diversion.java @@ -42,7 +42,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -50,7 +49,7 @@ /** * Diversion */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class Diversion { public static final String SERIALIZED_NAME_REASON = "reason"; @SerializedName(SERIALIZED_NAME_REASON) @@ -84,7 +83,6 @@ public Diversion() { } public Diversion reason(String reason) { - this.reason = reason; return this; } @@ -98,14 +96,12 @@ public String getReason() { return reason; } - public void setReason(String reason) { this.reason = reason; } public Diversion privacy(String privacy) { - this.privacy = privacy; return this; } @@ -119,14 +115,12 @@ public String getPrivacy() { return privacy; } - public void setPrivacy(String privacy) { this.privacy = privacy; } public Diversion screen(String screen) { - this.screen = screen; return this; } @@ -140,14 +134,12 @@ public String getScreen() { return screen; } - public void setScreen(String screen) { this.screen = screen; } public Diversion counter(String counter) { - this.counter = counter; return this; } @@ -161,14 +153,12 @@ public String getCounter() { return counter; } - public void setCounter(String counter) { this.counter = counter; } public Diversion limit(String limit) { - this.limit = limit; return this; } @@ -182,14 +172,12 @@ public String getLimit() { return limit; } - public void setLimit(String limit) { this.limit = limit; } public Diversion unknown(String unknown) { - this.unknown = unknown; return this; } @@ -203,14 +191,12 @@ public String getUnknown() { return unknown; } - public void setUnknown(String unknown) { this.unknown = unknown; } public Diversion origTo(String origTo) { - this.origTo = origTo; return this; } @@ -224,7 +210,6 @@ public String getOrigTo() { return origTo; } - public void setOrigTo(String origTo) { this.origTo = origTo; } @@ -409,7 +394,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/DtmfCallback.java b/src/main/java/com/bandwidth/sdk/model/DtmfCallback.java index 73fd1608..15a899d9 100644 --- a/src/main/java/com/bandwidth/sdk/model/DtmfCallback.java +++ b/src/main/java/com/bandwidth/sdk/model/DtmfCallback.java @@ -45,7 +45,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -53,7 +52,7 @@ /** * The DTMF event is sent for every digit detected after a <StartGather> verb is executed. You may not respond to this event with BXML. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class DtmfCallback { public static final String SERIALIZED_NAME_EVENT_TYPE = "eventType"; @SerializedName(SERIALIZED_NAME_EVENT_TYPE) @@ -127,7 +126,6 @@ public DtmfCallback() { } public DtmfCallback eventType(String eventType) { - this.eventType = eventType; return this; } @@ -141,14 +139,12 @@ public String getEventType() { return eventType; } - public void setEventType(String eventType) { this.eventType = eventType; } public DtmfCallback eventTime(OffsetDateTime eventTime) { - this.eventTime = eventTime; return this; } @@ -162,14 +158,12 @@ public OffsetDateTime getEventTime() { return eventTime; } - public void setEventTime(OffsetDateTime eventTime) { this.eventTime = eventTime; } public DtmfCallback accountId(String accountId) { - this.accountId = accountId; return this; } @@ -183,14 +177,12 @@ public String getAccountId() { return accountId; } - public void setAccountId(String accountId) { this.accountId = accountId; } public DtmfCallback applicationId(String applicationId) { - this.applicationId = applicationId; return this; } @@ -204,14 +196,12 @@ public String getApplicationId() { return applicationId; } - public void setApplicationId(String applicationId) { this.applicationId = applicationId; } public DtmfCallback from(String from) { - this.from = from; return this; } @@ -225,14 +215,12 @@ public String getFrom() { return from; } - public void setFrom(String from) { this.from = from; } public DtmfCallback to(String to) { - this.to = to; return this; } @@ -246,14 +234,12 @@ public String getTo() { return to; } - public void setTo(String to) { this.to = to; } public DtmfCallback callId(String callId) { - this.callId = callId; return this; } @@ -267,14 +253,12 @@ public String getCallId() { return callId; } - public void setCallId(String callId) { this.callId = callId; } public DtmfCallback direction(CallDirectionEnum direction) { - this.direction = direction; return this; } @@ -288,14 +272,12 @@ public CallDirectionEnum getDirection() { return direction; } - public void setDirection(CallDirectionEnum direction) { this.direction = direction; } public DtmfCallback digit(String digit) { - this.digit = digit; return this; } @@ -309,14 +291,12 @@ public String getDigit() { return digit; } - public void setDigit(String digit) { this.digit = digit; } public DtmfCallback callUrl(String callUrl) { - this.callUrl = callUrl; return this; } @@ -330,14 +310,12 @@ public String getCallUrl() { return callUrl; } - public void setCallUrl(String callUrl) { this.callUrl = callUrl; } public DtmfCallback enqueuedTime(OffsetDateTime enqueuedTime) { - this.enqueuedTime = enqueuedTime; return this; } @@ -351,14 +329,12 @@ public OffsetDateTime getEnqueuedTime() { return enqueuedTime; } - public void setEnqueuedTime(OffsetDateTime enqueuedTime) { this.enqueuedTime = enqueuedTime; } public DtmfCallback startTime(OffsetDateTime startTime) { - this.startTime = startTime; return this; } @@ -372,14 +348,12 @@ public OffsetDateTime getStartTime() { return startTime; } - public void setStartTime(OffsetDateTime startTime) { this.startTime = startTime; } public DtmfCallback answerTime(OffsetDateTime answerTime) { - this.answerTime = answerTime; return this; } @@ -393,14 +367,12 @@ public OffsetDateTime getAnswerTime() { return answerTime; } - public void setAnswerTime(OffsetDateTime answerTime) { this.answerTime = answerTime; } public DtmfCallback parentCallId(String parentCallId) { - this.parentCallId = parentCallId; return this; } @@ -414,14 +386,12 @@ public String getParentCallId() { return parentCallId; } - public void setParentCallId(String parentCallId) { this.parentCallId = parentCallId; } public DtmfCallback transferCallerId(String transferCallerId) { - this.transferCallerId = transferCallerId; return this; } @@ -435,14 +405,12 @@ public String getTransferCallerId() { return transferCallerId; } - public void setTransferCallerId(String transferCallerId) { this.transferCallerId = transferCallerId; } public DtmfCallback transferTo(String transferTo) { - this.transferTo = transferTo; return this; } @@ -456,14 +424,12 @@ public String getTransferTo() { return transferTo; } - public void setTransferTo(String transferTo) { this.transferTo = transferTo; } public DtmfCallback tag(String tag) { - this.tag = tag; return this; } @@ -477,7 +443,6 @@ public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } @@ -670,6 +635,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("callId") != null && !jsonObj.get("callId").isJsonNull()) && !jsonObj.get("callId").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `callId` to be a primitive type in the JSON string but got `%s`", jsonObj.get("callId").toString())); } + // validate the optional field `direction` + if (jsonObj.get("direction") != null && !jsonObj.get("direction").isJsonNull()) { + CallDirectionEnum.validateJsonElement(jsonObj.get("direction")); + } if ((jsonObj.get("digit") != null && !jsonObj.get("digit").isJsonNull()) && !jsonObj.get("digit").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `digit` to be a primitive type in the JSON string but got `%s`", jsonObj.get("digit").toString())); } @@ -718,7 +687,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/FieldError.java b/src/main/java/com/bandwidth/sdk/model/FieldError.java index 46618903..92914b7e 100644 --- a/src/main/java/com/bandwidth/sdk/model/FieldError.java +++ b/src/main/java/com/bandwidth/sdk/model/FieldError.java @@ -42,7 +42,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -50,7 +49,7 @@ /** * FieldError */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class FieldError { public static final String SERIALIZED_NAME_FIELD_NAME = "fieldName"; @SerializedName(SERIALIZED_NAME_FIELD_NAME) @@ -64,7 +63,6 @@ public FieldError() { } public FieldError fieldName(String fieldName) { - this.fieldName = fieldName; return this; } @@ -78,14 +76,12 @@ public String getFieldName() { return fieldName; } - public void setFieldName(String fieldName) { this.fieldName = fieldName; } public FieldError description(String description) { - this.description = description; return this; } @@ -99,7 +95,6 @@ public String getDescription() { return description; } - public void setDescription(String description) { this.description = description; } @@ -254,7 +249,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/FileFormatEnum.java b/src/main/java/com/bandwidth/sdk/model/FileFormatEnum.java index 69296f70..1f27ba16 100644 --- a/src/main/java/com/bandwidth/sdk/model/FileFormatEnum.java +++ b/src/main/java/com/bandwidth/sdk/model/FileFormatEnum.java @@ -18,6 +18,7 @@ import java.io.IOException; import com.google.gson.TypeAdapter; +import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; @@ -68,5 +69,10 @@ public FileFormatEnum read(final JsonReader jsonReader) throws IOException { return FileFormatEnum.fromValue(value); } } + + public static void validateJsonElement(JsonElement jsonElement) throws IOException { + String value = jsonElement.getAsString(); + FileFormatEnum.fromValue(value); + } } diff --git a/src/main/java/com/bandwidth/sdk/model/GatherCallback.java b/src/main/java/com/bandwidth/sdk/model/GatherCallback.java index 8ac36f91..d25d9193 100644 --- a/src/main/java/com/bandwidth/sdk/model/GatherCallback.java +++ b/src/main/java/com/bandwidth/sdk/model/GatherCallback.java @@ -45,7 +45,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -53,7 +52,7 @@ /** * The gather event is sent after a <Gather> verb is executed. Its purpose is to report the gathered digits to the calling application. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class GatherCallback { public static final String SERIALIZED_NAME_EVENT_TYPE = "eventType"; @SerializedName(SERIALIZED_NAME_EVENT_TYPE) @@ -131,7 +130,6 @@ public GatherCallback() { } public GatherCallback eventType(String eventType) { - this.eventType = eventType; return this; } @@ -145,14 +143,12 @@ public String getEventType() { return eventType; } - public void setEventType(String eventType) { this.eventType = eventType; } public GatherCallback eventTime(OffsetDateTime eventTime) { - this.eventTime = eventTime; return this; } @@ -166,14 +162,12 @@ public OffsetDateTime getEventTime() { return eventTime; } - public void setEventTime(OffsetDateTime eventTime) { this.eventTime = eventTime; } public GatherCallback accountId(String accountId) { - this.accountId = accountId; return this; } @@ -187,14 +181,12 @@ public String getAccountId() { return accountId; } - public void setAccountId(String accountId) { this.accountId = accountId; } public GatherCallback applicationId(String applicationId) { - this.applicationId = applicationId; return this; } @@ -208,14 +200,12 @@ public String getApplicationId() { return applicationId; } - public void setApplicationId(String applicationId) { this.applicationId = applicationId; } public GatherCallback from(String from) { - this.from = from; return this; } @@ -229,14 +219,12 @@ public String getFrom() { return from; } - public void setFrom(String from) { this.from = from; } public GatherCallback to(String to) { - this.to = to; return this; } @@ -250,14 +238,12 @@ public String getTo() { return to; } - public void setTo(String to) { this.to = to; } public GatherCallback direction(CallDirectionEnum direction) { - this.direction = direction; return this; } @@ -271,14 +257,12 @@ public CallDirectionEnum getDirection() { return direction; } - public void setDirection(CallDirectionEnum direction) { this.direction = direction; } public GatherCallback callId(String callId) { - this.callId = callId; return this; } @@ -292,14 +276,12 @@ public String getCallId() { return callId; } - public void setCallId(String callId) { this.callId = callId; } public GatherCallback digits(String digits) { - this.digits = digits; return this; } @@ -313,14 +295,12 @@ public String getDigits() { return digits; } - public void setDigits(String digits) { this.digits = digits; } public GatherCallback callUrl(String callUrl) { - this.callUrl = callUrl; return this; } @@ -334,14 +314,12 @@ public String getCallUrl() { return callUrl; } - public void setCallUrl(String callUrl) { this.callUrl = callUrl; } public GatherCallback enqueuedTime(OffsetDateTime enqueuedTime) { - this.enqueuedTime = enqueuedTime; return this; } @@ -355,14 +333,12 @@ public OffsetDateTime getEnqueuedTime() { return enqueuedTime; } - public void setEnqueuedTime(OffsetDateTime enqueuedTime) { this.enqueuedTime = enqueuedTime; } public GatherCallback startTime(OffsetDateTime startTime) { - this.startTime = startTime; return this; } @@ -376,14 +352,12 @@ public OffsetDateTime getStartTime() { return startTime; } - public void setStartTime(OffsetDateTime startTime) { this.startTime = startTime; } public GatherCallback answerTime(OffsetDateTime answerTime) { - this.answerTime = answerTime; return this; } @@ -397,14 +371,12 @@ public OffsetDateTime getAnswerTime() { return answerTime; } - public void setAnswerTime(OffsetDateTime answerTime) { this.answerTime = answerTime; } public GatherCallback parentCallId(String parentCallId) { - this.parentCallId = parentCallId; return this; } @@ -418,14 +390,12 @@ public String getParentCallId() { return parentCallId; } - public void setParentCallId(String parentCallId) { this.parentCallId = parentCallId; } public GatherCallback terminatingDigit(String terminatingDigit) { - this.terminatingDigit = terminatingDigit; return this; } @@ -439,14 +409,12 @@ public String getTerminatingDigit() { return terminatingDigit; } - public void setTerminatingDigit(String terminatingDigit) { this.terminatingDigit = terminatingDigit; } public GatherCallback transferCallerId(String transferCallerId) { - this.transferCallerId = transferCallerId; return this; } @@ -460,14 +428,12 @@ public String getTransferCallerId() { return transferCallerId; } - public void setTransferCallerId(String transferCallerId) { this.transferCallerId = transferCallerId; } public GatherCallback transferTo(String transferTo) { - this.transferTo = transferTo; return this; } @@ -481,14 +447,12 @@ public String getTransferTo() { return transferTo; } - public void setTransferTo(String transferTo) { this.transferTo = transferTo; } public GatherCallback tag(String tag) { - this.tag = tag; return this; } @@ -502,7 +466,6 @@ public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } @@ -695,6 +658,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("to") != null && !jsonObj.get("to").isJsonNull()) && !jsonObj.get("to").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `to` to be a primitive type in the JSON string but got `%s`", jsonObj.get("to").toString())); } + // validate the optional field `direction` + if (jsonObj.get("direction") != null && !jsonObj.get("direction").isJsonNull()) { + CallDirectionEnum.validateJsonElement(jsonObj.get("direction")); + } if ((jsonObj.get("callId") != null && !jsonObj.get("callId").isJsonNull()) && !jsonObj.get("callId").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `callId` to be a primitive type in the JSON string but got `%s`", jsonObj.get("callId").toString())); } @@ -749,7 +716,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/InboundMessageCallback.java b/src/main/java/com/bandwidth/sdk/model/InboundMessageCallback.java index 1ba464ec..8dca880d 100644 --- a/src/main/java/com/bandwidth/sdk/model/InboundMessageCallback.java +++ b/src/main/java/com/bandwidth/sdk/model/InboundMessageCallback.java @@ -44,7 +44,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -52,7 +51,7 @@ /** * Inbound Message Callback */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class InboundMessageCallback { public static final String SERIALIZED_NAME_TIME = "time"; @SerializedName(SERIALIZED_NAME_TIME) @@ -78,7 +77,6 @@ public InboundMessageCallback() { } public InboundMessageCallback time(OffsetDateTime time) { - this.time = time; return this; } @@ -92,14 +90,12 @@ public OffsetDateTime getTime() { return time; } - public void setTime(OffsetDateTime time) { this.time = time; } public InboundMessageCallback type(String type) { - this.type = type; return this; } @@ -113,14 +109,12 @@ public String getType() { return type; } - public void setType(String type) { this.type = type; } public InboundMessageCallback to(String to) { - this.to = to; return this; } @@ -134,14 +128,12 @@ public String getTo() { return to; } - public void setTo(String to) { this.to = to; } public InboundMessageCallback description(String description) { - this.description = description; return this; } @@ -155,14 +147,12 @@ public String getDescription() { return description; } - public void setDescription(String description) { this.description = description; } public InboundMessageCallback message(InboundMessageCallbackMessage message) { - this.message = message; return this; } @@ -176,7 +166,6 @@ public InboundMessageCallbackMessage getMessage() { return message; } - public void setMessage(InboundMessageCallbackMessage message) { this.message = message; } @@ -357,7 +346,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/InboundMessageCallbackMessage.java b/src/main/java/com/bandwidth/sdk/model/InboundMessageCallbackMessage.java index 9d5d99d9..ac08aa7e 100644 --- a/src/main/java/com/bandwidth/sdk/model/InboundMessageCallbackMessage.java +++ b/src/main/java/com/bandwidth/sdk/model/InboundMessageCallbackMessage.java @@ -50,7 +50,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -58,7 +57,7 @@ /** * Inbound Message Callback Message Schema */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class InboundMessageCallbackMessage { public static final String SERIALIZED_NAME_ID = "id"; @SerializedName(SERIALIZED_NAME_ID) @@ -102,7 +101,7 @@ public class InboundMessageCallbackMessage { public static final String SERIALIZED_NAME_MEDIA = "media"; @SerializedName(SERIALIZED_NAME_MEDIA) - private List media; + private List media = new ArrayList<>(); public static final String SERIALIZED_NAME_PRIORITY = "priority"; @SerializedName(SERIALIZED_NAME_PRIORITY) @@ -112,7 +111,6 @@ public InboundMessageCallbackMessage() { } public InboundMessageCallbackMessage id(String id) { - this.id = id; return this; } @@ -126,14 +124,12 @@ public String getId() { return id; } - public void setId(String id) { this.id = id; } public InboundMessageCallbackMessage owner(String owner) { - this.owner = owner; return this; } @@ -147,14 +143,12 @@ public String getOwner() { return owner; } - public void setOwner(String owner) { this.owner = owner; } public InboundMessageCallbackMessage applicationId(String applicationId) { - this.applicationId = applicationId; return this; } @@ -168,14 +162,12 @@ public String getApplicationId() { return applicationId; } - public void setApplicationId(String applicationId) { this.applicationId = applicationId; } public InboundMessageCallbackMessage time(OffsetDateTime time) { - this.time = time; return this; } @@ -189,14 +181,12 @@ public OffsetDateTime getTime() { return time; } - public void setTime(OffsetDateTime time) { this.time = time; } public InboundMessageCallbackMessage segmentCount(Integer segmentCount) { - this.segmentCount = segmentCount; return this; } @@ -210,14 +200,12 @@ public Integer getSegmentCount() { return segmentCount; } - public void setSegmentCount(Integer segmentCount) { this.segmentCount = segmentCount; } public InboundMessageCallbackMessage direction(MessageDirectionEnum direction) { - this.direction = direction; return this; } @@ -231,14 +219,12 @@ public MessageDirectionEnum getDirection() { return direction; } - public void setDirection(MessageDirectionEnum direction) { this.direction = direction; } public InboundMessageCallbackMessage to(Set to) { - this.to = to; return this; } @@ -260,14 +246,12 @@ public Set getTo() { return to; } - public void setTo(Set to) { this.to = to; } public InboundMessageCallbackMessage from(String from) { - this.from = from; return this; } @@ -281,14 +265,12 @@ public String getFrom() { return from; } - public void setFrom(String from) { this.from = from; } public InboundMessageCallbackMessage text(String text) { - this.text = text; return this; } @@ -302,14 +284,12 @@ public String getText() { return text; } - public void setText(String text) { this.text = text; } public InboundMessageCallbackMessage tag(String tag) { - this.tag = tag; return this; } @@ -323,14 +303,12 @@ public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } public InboundMessageCallbackMessage media(List media) { - this.media = media; return this; } @@ -352,14 +330,12 @@ public List getMedia() { return media; } - public void setMedia(List media) { this.media = media; } public InboundMessageCallbackMessage priority(PriorityEnum priority) { - this.priority = priority; return this; } @@ -373,7 +349,6 @@ public PriorityEnum getPriority() { return priority; } - public void setPriority(PriorityEnum priority) { this.priority = priority; } @@ -547,6 +522,8 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if (!jsonObj.get("applicationId").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `applicationId` to be a primitive type in the JSON string but got `%s`", jsonObj.get("applicationId").toString())); } + // validate the required field `direction` + MessageDirectionEnum.validateJsonElement(jsonObj.get("direction")); // ensure the required json array is present if (jsonObj.get("to") == null) { throw new IllegalArgumentException("Expected the field `linkedContent` to be an array in the JSON string but got `null`"); @@ -566,6 +543,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if (jsonObj.get("media") != null && !jsonObj.get("media").isJsonNull() && !jsonObj.get("media").isJsonArray()) { throw new IllegalArgumentException(String.format("Expected the field `media` to be an array in the JSON string but got `%s`", jsonObj.get("media").toString())); } + // validate the optional field `priority` + if (jsonObj.get("priority") != null && !jsonObj.get("priority").isJsonNull()) { + PriorityEnum.validateJsonElement(jsonObj.get("priority")); + } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -596,7 +577,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/InitiateCallback.java b/src/main/java/com/bandwidth/sdk/model/InitiateCallback.java index ed3e6394..e1e271ef 100644 --- a/src/main/java/com/bandwidth/sdk/model/InitiateCallback.java +++ b/src/main/java/com/bandwidth/sdk/model/InitiateCallback.java @@ -46,7 +46,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -54,7 +53,7 @@ /** * The Initiate event is fired when an inbound call is received for a Telephone Number on your Account. It is sent to the URL specified in the application associated with the location (sip-peer) that the called telephone number belongs to. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class InitiateCallback { public static final String SERIALIZED_NAME_EVENT_TYPE = "eventType"; @SerializedName(SERIALIZED_NAME_EVENT_TYPE) @@ -108,7 +107,6 @@ public InitiateCallback() { } public InitiateCallback eventType(String eventType) { - this.eventType = eventType; return this; } @@ -122,14 +120,12 @@ public String getEventType() { return eventType; } - public void setEventType(String eventType) { this.eventType = eventType; } public InitiateCallback eventTime(OffsetDateTime eventTime) { - this.eventTime = eventTime; return this; } @@ -143,14 +139,12 @@ public OffsetDateTime getEventTime() { return eventTime; } - public void setEventTime(OffsetDateTime eventTime) { this.eventTime = eventTime; } public InitiateCallback accountId(String accountId) { - this.accountId = accountId; return this; } @@ -164,14 +158,12 @@ public String getAccountId() { return accountId; } - public void setAccountId(String accountId) { this.accountId = accountId; } public InitiateCallback applicationId(String applicationId) { - this.applicationId = applicationId; return this; } @@ -185,14 +177,12 @@ public String getApplicationId() { return applicationId; } - public void setApplicationId(String applicationId) { this.applicationId = applicationId; } public InitiateCallback from(String from) { - this.from = from; return this; } @@ -206,14 +196,12 @@ public String getFrom() { return from; } - public void setFrom(String from) { this.from = from; } public InitiateCallback to(String to) { - this.to = to; return this; } @@ -227,14 +215,12 @@ public String getTo() { return to; } - public void setTo(String to) { this.to = to; } public InitiateCallback direction(CallDirectionEnum direction) { - this.direction = direction; return this; } @@ -248,14 +234,12 @@ public CallDirectionEnum getDirection() { return direction; } - public void setDirection(CallDirectionEnum direction) { this.direction = direction; } public InitiateCallback callId(String callId) { - this.callId = callId; return this; } @@ -269,14 +253,12 @@ public String getCallId() { return callId; } - public void setCallId(String callId) { this.callId = callId; } public InitiateCallback callUrl(String callUrl) { - this.callUrl = callUrl; return this; } @@ -290,14 +272,12 @@ public String getCallUrl() { return callUrl; } - public void setCallUrl(String callUrl) { this.callUrl = callUrl; } public InitiateCallback startTime(OffsetDateTime startTime) { - this.startTime = startTime; return this; } @@ -311,14 +291,12 @@ public OffsetDateTime getStartTime() { return startTime; } - public void setStartTime(OffsetDateTime startTime) { this.startTime = startTime; } public InitiateCallback diversion(Diversion diversion) { - this.diversion = diversion; return this; } @@ -332,14 +310,12 @@ public Diversion getDiversion() { return diversion; } - public void setDiversion(Diversion diversion) { this.diversion = diversion; } public InitiateCallback stirShaken(StirShaken stirShaken) { - this.stirShaken = stirShaken; return this; } @@ -353,7 +329,6 @@ public StirShaken getStirShaken() { return stirShaken; } - public void setStirShaken(StirShaken stirShaken) { this.stirShaken = stirShaken; } @@ -517,6 +492,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("to") != null && !jsonObj.get("to").isJsonNull()) && !jsonObj.get("to").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `to` to be a primitive type in the JSON string but got `%s`", jsonObj.get("to").toString())); } + // validate the optional field `direction` + if (jsonObj.get("direction") != null && !jsonObj.get("direction").isJsonNull()) { + CallDirectionEnum.validateJsonElement(jsonObj.get("direction")); + } if ((jsonObj.get("callId") != null && !jsonObj.get("callId").isJsonNull()) && !jsonObj.get("callId").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `callId` to be a primitive type in the JSON string but got `%s`", jsonObj.get("callId").toString())); } @@ -561,7 +540,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/ListMessageDirectionEnum.java b/src/main/java/com/bandwidth/sdk/model/ListMessageDirectionEnum.java index 5fbe269b..f175c9cd 100644 --- a/src/main/java/com/bandwidth/sdk/model/ListMessageDirectionEnum.java +++ b/src/main/java/com/bandwidth/sdk/model/ListMessageDirectionEnum.java @@ -18,6 +18,7 @@ import java.io.IOException; import com.google.gson.TypeAdapter; +import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; @@ -68,5 +69,10 @@ public ListMessageDirectionEnum read(final JsonReader jsonReader) throws IOExcep return ListMessageDirectionEnum.fromValue(value); } } + + public static void validateJsonElement(JsonElement jsonElement) throws IOException { + String value = jsonElement.getAsString(); + ListMessageDirectionEnum.fromValue(value); + } } diff --git a/src/main/java/com/bandwidth/sdk/model/ListMessageItem.java b/src/main/java/com/bandwidth/sdk/model/ListMessageItem.java index 465c76f0..988186b3 100644 --- a/src/main/java/com/bandwidth/sdk/model/ListMessageItem.java +++ b/src/main/java/com/bandwidth/sdk/model/ListMessageItem.java @@ -47,7 +47,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -55,7 +54,7 @@ /** * ListMessageItem */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class ListMessageItem { public static final String SERIALIZED_NAME_MESSAGE_ID = "messageId"; @SerializedName(SERIALIZED_NAME_MESSAGE_ID) @@ -129,7 +128,6 @@ public ListMessageItem() { } public ListMessageItem messageId(String messageId) { - this.messageId = messageId; return this; } @@ -143,14 +141,12 @@ public String getMessageId() { return messageId; } - public void setMessageId(String messageId) { this.messageId = messageId; } public ListMessageItem accountId(String accountId) { - this.accountId = accountId; return this; } @@ -164,14 +160,12 @@ public String getAccountId() { return accountId; } - public void setAccountId(String accountId) { this.accountId = accountId; } public ListMessageItem sourceTn(String sourceTn) { - this.sourceTn = sourceTn; return this; } @@ -185,14 +179,12 @@ public String getSourceTn() { return sourceTn; } - public void setSourceTn(String sourceTn) { this.sourceTn = sourceTn; } public ListMessageItem destinationTn(String destinationTn) { - this.destinationTn = destinationTn; return this; } @@ -206,14 +198,12 @@ public String getDestinationTn() { return destinationTn; } - public void setDestinationTn(String destinationTn) { this.destinationTn = destinationTn; } public ListMessageItem messageStatus(MessageStatusEnum messageStatus) { - this.messageStatus = messageStatus; return this; } @@ -227,14 +217,12 @@ public MessageStatusEnum getMessageStatus() { return messageStatus; } - public void setMessageStatus(MessageStatusEnum messageStatus) { this.messageStatus = messageStatus; } public ListMessageItem messageDirection(ListMessageDirectionEnum messageDirection) { - this.messageDirection = messageDirection; return this; } @@ -248,14 +236,12 @@ public ListMessageDirectionEnum getMessageDirection() { return messageDirection; } - public void setMessageDirection(ListMessageDirectionEnum messageDirection) { this.messageDirection = messageDirection; } public ListMessageItem messageType(MessageTypeEnum messageType) { - this.messageType = messageType; return this; } @@ -269,14 +255,12 @@ public MessageTypeEnum getMessageType() { return messageType; } - public void setMessageType(MessageTypeEnum messageType) { this.messageType = messageType; } public ListMessageItem segmentCount(Integer segmentCount) { - this.segmentCount = segmentCount; return this; } @@ -290,14 +274,12 @@ public Integer getSegmentCount() { return segmentCount; } - public void setSegmentCount(Integer segmentCount) { this.segmentCount = segmentCount; } public ListMessageItem errorCode(Integer errorCode) { - this.errorCode = errorCode; return this; } @@ -311,14 +293,12 @@ public Integer getErrorCode() { return errorCode; } - public void setErrorCode(Integer errorCode) { this.errorCode = errorCode; } public ListMessageItem receiveTime(OffsetDateTime receiveTime) { - this.receiveTime = receiveTime; return this; } @@ -332,14 +312,12 @@ public OffsetDateTime getReceiveTime() { return receiveTime; } - public void setReceiveTime(OffsetDateTime receiveTime) { this.receiveTime = receiveTime; } public ListMessageItem carrierName(String carrierName) { - this.carrierName = carrierName; return this; } @@ -353,14 +331,12 @@ public String getCarrierName() { return carrierName; } - public void setCarrierName(String carrierName) { this.carrierName = carrierName; } public ListMessageItem messageSize(Integer messageSize) { - this.messageSize = messageSize; return this; } @@ -374,14 +350,12 @@ public Integer getMessageSize() { return messageSize; } - public void setMessageSize(Integer messageSize) { this.messageSize = messageSize; } public ListMessageItem messageLength(Integer messageLength) { - this.messageLength = messageLength; return this; } @@ -395,14 +369,12 @@ public Integer getMessageLength() { return messageLength; } - public void setMessageLength(Integer messageLength) { this.messageLength = messageLength; } public ListMessageItem attachmentCount(Integer attachmentCount) { - this.attachmentCount = attachmentCount; return this; } @@ -416,14 +388,12 @@ public Integer getAttachmentCount() { return attachmentCount; } - public void setAttachmentCount(Integer attachmentCount) { this.attachmentCount = attachmentCount; } public ListMessageItem recipientCount(Integer recipientCount) { - this.recipientCount = recipientCount; return this; } @@ -437,14 +407,12 @@ public Integer getRecipientCount() { return recipientCount; } - public void setRecipientCount(Integer recipientCount) { this.recipientCount = recipientCount; } public ListMessageItem campaignClass(String campaignClass) { - this.campaignClass = campaignClass; return this; } @@ -458,14 +426,12 @@ public String getCampaignClass() { return campaignClass; } - public void setCampaignClass(String campaignClass) { this.campaignClass = campaignClass; } public ListMessageItem campaignId(String campaignId) { - this.campaignId = campaignId; return this; } @@ -479,7 +445,6 @@ public String getCampaignId() { return campaignId; } - public void setCampaignId(String campaignId) { this.campaignId = campaignId; } @@ -666,6 +631,18 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("destinationTn") != null && !jsonObj.get("destinationTn").isJsonNull()) && !jsonObj.get("destinationTn").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `destinationTn` to be a primitive type in the JSON string but got `%s`", jsonObj.get("destinationTn").toString())); } + // validate the optional field `messageStatus` + if (jsonObj.get("messageStatus") != null && !jsonObj.get("messageStatus").isJsonNull()) { + MessageStatusEnum.validateJsonElement(jsonObj.get("messageStatus")); + } + // validate the optional field `messageDirection` + if (jsonObj.get("messageDirection") != null && !jsonObj.get("messageDirection").isJsonNull()) { + ListMessageDirectionEnum.validateJsonElement(jsonObj.get("messageDirection")); + } + // validate the optional field `messageType` + if (jsonObj.get("messageType") != null && !jsonObj.get("messageType").isJsonNull()) { + MessageTypeEnum.validateJsonElement(jsonObj.get("messageType")); + } if ((jsonObj.get("carrierName") != null && !jsonObj.get("carrierName").isJsonNull()) && !jsonObj.get("carrierName").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `carrierName` to be a primitive type in the JSON string but got `%s`", jsonObj.get("carrierName").toString())); } @@ -705,7 +682,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/LookupRequest.java b/src/main/java/com/bandwidth/sdk/model/LookupRequest.java index f41a7f01..75414526 100644 --- a/src/main/java/com/bandwidth/sdk/model/LookupRequest.java +++ b/src/main/java/com/bandwidth/sdk/model/LookupRequest.java @@ -44,7 +44,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -52,7 +51,7 @@ /** * Create phone number lookup request. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class LookupRequest { public static final String SERIALIZED_NAME_TNS = "tns"; @SerializedName(SERIALIZED_NAME_TNS) @@ -62,7 +61,6 @@ public LookupRequest() { } public LookupRequest tns(List tns) { - this.tns = tns; return this; } @@ -84,7 +82,6 @@ public List getTns() { return tns; } - public void setTns(List tns) { this.tns = tns; } @@ -244,7 +241,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/LookupResult.java b/src/main/java/com/bandwidth/sdk/model/LookupResult.java index 7238b192..e9079cb3 100644 --- a/src/main/java/com/bandwidth/sdk/model/LookupResult.java +++ b/src/main/java/com/bandwidth/sdk/model/LookupResult.java @@ -42,7 +42,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -50,7 +49,7 @@ /** * Carrier information results for the specified telephone number. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class LookupResult { public static final String SERIALIZED_NAME_RESPONSE_CODE = "Response Code"; @SerializedName(SERIALIZED_NAME_RESPONSE_CODE) @@ -92,7 +91,6 @@ public LookupResult() { } public LookupResult responseCode(Integer responseCode) { - this.responseCode = responseCode; return this; } @@ -106,14 +104,12 @@ public Integer getResponseCode() { return responseCode; } - public void setResponseCode(Integer responseCode) { this.responseCode = responseCode; } public LookupResult message(String message) { - this.message = message; return this; } @@ -127,14 +123,12 @@ public String getMessage() { return message; } - public void setMessage(String message) { this.message = message; } public LookupResult e164Format(String e164Format) { - this.e164Format = e164Format; return this; } @@ -148,14 +142,12 @@ public String getE164Format() { return e164Format; } - public void setE164Format(String e164Format) { this.e164Format = e164Format; } public LookupResult formatted(String formatted) { - this.formatted = formatted; return this; } @@ -169,14 +161,12 @@ public String getFormatted() { return formatted; } - public void setFormatted(String formatted) { this.formatted = formatted; } public LookupResult country(String country) { - this.country = country; return this; } @@ -190,14 +180,12 @@ public String getCountry() { return country; } - public void setCountry(String country) { this.country = country; } public LookupResult lineType(String lineType) { - this.lineType = lineType; return this; } @@ -211,14 +199,12 @@ public String getLineType() { return lineType; } - public void setLineType(String lineType) { this.lineType = lineType; } public LookupResult lineProvider(String lineProvider) { - this.lineProvider = lineProvider; return this; } @@ -232,14 +218,12 @@ public String getLineProvider() { return lineProvider; } - public void setLineProvider(String lineProvider) { this.lineProvider = lineProvider; } public LookupResult mobileCountryCode(String mobileCountryCode) { - this.mobileCountryCode = mobileCountryCode; return this; } @@ -253,14 +237,12 @@ public String getMobileCountryCode() { return mobileCountryCode; } - public void setMobileCountryCode(String mobileCountryCode) { this.mobileCountryCode = mobileCountryCode; } public LookupResult mobileNetworkCode(String mobileNetworkCode) { - this.mobileNetworkCode = mobileNetworkCode; return this; } @@ -274,7 +256,6 @@ public String getMobileNetworkCode() { return mobileNetworkCode; } - public void setMobileNetworkCode(String mobileNetworkCode) { this.mobileNetworkCode = mobileNetworkCode; } @@ -468,7 +449,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/LookupStatus.java b/src/main/java/com/bandwidth/sdk/model/LookupStatus.java index 227b1bd3..dfca01c8 100644 --- a/src/main/java/com/bandwidth/sdk/model/LookupStatus.java +++ b/src/main/java/com/bandwidth/sdk/model/LookupStatus.java @@ -46,7 +46,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -54,7 +53,7 @@ /** * If requestId exists, the result for that request is returned. See the Examples for details on the various responses that you can receive. Generally, if you see a Response Code of 0 in a result for a TN, information will be available for it. Any other Response Code will indicate no information was available for the TN. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class LookupStatus { public static final String SERIALIZED_NAME_REQUEST_ID = "requestId"; @SerializedName(SERIALIZED_NAME_REQUEST_ID) @@ -66,17 +65,16 @@ public class LookupStatus { public static final String SERIALIZED_NAME_RESULT = "result"; @SerializedName(SERIALIZED_NAME_RESULT) - private List result; + private List result = new ArrayList<>(); public static final String SERIALIZED_NAME_FAILED_TELEPHONE_NUMBERS = "failedTelephoneNumbers"; @SerializedName(SERIALIZED_NAME_FAILED_TELEPHONE_NUMBERS) - private List failedTelephoneNumbers; + private List failedTelephoneNumbers = new ArrayList<>(); public LookupStatus() { } public LookupStatus requestId(String requestId) { - this.requestId = requestId; return this; } @@ -90,14 +88,12 @@ public String getRequestId() { return requestId; } - public void setRequestId(String requestId) { this.requestId = requestId; } public LookupStatus status(LookupStatusEnum status) { - this.status = status; return this; } @@ -111,14 +107,12 @@ public LookupStatusEnum getStatus() { return status; } - public void setStatus(LookupStatusEnum status) { this.status = status; } public LookupStatus result(List result) { - this.result = result; return this; } @@ -140,14 +134,12 @@ public List getResult() { return result; } - public void setResult(List result) { this.result = result; } public LookupStatus failedTelephoneNumbers(List failedTelephoneNumbers) { - this.failedTelephoneNumbers = failedTelephoneNumbers; return this; } @@ -169,7 +161,6 @@ public List getFailedTelephoneNumbers() { return failedTelephoneNumbers; } - public void setFailedTelephoneNumbers(List failedTelephoneNumbers) { this.failedTelephoneNumbers = failedTelephoneNumbers; } @@ -297,6 +288,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("requestId") != null && !jsonObj.get("requestId").isJsonNull()) && !jsonObj.get("requestId").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `requestId` to be a primitive type in the JSON string but got `%s`", jsonObj.get("requestId").toString())); } + // validate the optional field `status` + if (jsonObj.get("status") != null && !jsonObj.get("status").isJsonNull()) { + LookupStatusEnum.validateJsonElement(jsonObj.get("status")); + } if (jsonObj.get("result") != null && !jsonObj.get("result").isJsonNull()) { JsonArray jsonArrayresult = jsonObj.getAsJsonArray("result"); if (jsonArrayresult != null) { @@ -345,7 +340,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/LookupStatusEnum.java b/src/main/java/com/bandwidth/sdk/model/LookupStatusEnum.java index 59798a1f..02a72484 100644 --- a/src/main/java/com/bandwidth/sdk/model/LookupStatusEnum.java +++ b/src/main/java/com/bandwidth/sdk/model/LookupStatusEnum.java @@ -18,6 +18,7 @@ import java.io.IOException; import com.google.gson.TypeAdapter; +import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; @@ -72,5 +73,10 @@ public LookupStatusEnum read(final JsonReader jsonReader) throws IOException { return LookupStatusEnum.fromValue(value); } } + + public static void validateJsonElement(JsonElement jsonElement) throws IOException { + String value = jsonElement.getAsString(); + LookupStatusEnum.fromValue(value); + } } diff --git a/src/main/java/com/bandwidth/sdk/model/MachineDetectionCompleteCallback.java b/src/main/java/com/bandwidth/sdk/model/MachineDetectionCompleteCallback.java index 1e3e414f..ab17c1b3 100644 --- a/src/main/java/com/bandwidth/sdk/model/MachineDetectionCompleteCallback.java +++ b/src/main/java/com/bandwidth/sdk/model/MachineDetectionCompleteCallback.java @@ -46,7 +46,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -54,7 +53,7 @@ /** * This event is sent to the url informed when requesting a machine detection operation. It contains the machine detection operation result, which can be: human, answering-machine, silence, timeout, error. This event is not sent when sync answering machine detection mode is chosen. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class MachineDetectionCompleteCallback { public static final String SERIALIZED_NAME_EVENT_TYPE = "eventType"; @SerializedName(SERIALIZED_NAME_EVENT_TYPE) @@ -116,7 +115,6 @@ public MachineDetectionCompleteCallback() { } public MachineDetectionCompleteCallback eventType(String eventType) { - this.eventType = eventType; return this; } @@ -130,14 +128,12 @@ public String getEventType() { return eventType; } - public void setEventType(String eventType) { this.eventType = eventType; } public MachineDetectionCompleteCallback eventTime(OffsetDateTime eventTime) { - this.eventTime = eventTime; return this; } @@ -151,14 +147,12 @@ public OffsetDateTime getEventTime() { return eventTime; } - public void setEventTime(OffsetDateTime eventTime) { this.eventTime = eventTime; } public MachineDetectionCompleteCallback accountId(String accountId) { - this.accountId = accountId; return this; } @@ -172,14 +166,12 @@ public String getAccountId() { return accountId; } - public void setAccountId(String accountId) { this.accountId = accountId; } public MachineDetectionCompleteCallback applicationId(String applicationId) { - this.applicationId = applicationId; return this; } @@ -193,14 +185,12 @@ public String getApplicationId() { return applicationId; } - public void setApplicationId(String applicationId) { this.applicationId = applicationId; } public MachineDetectionCompleteCallback from(String from) { - this.from = from; return this; } @@ -214,14 +204,12 @@ public String getFrom() { return from; } - public void setFrom(String from) { this.from = from; } public MachineDetectionCompleteCallback to(String to) { - this.to = to; return this; } @@ -235,14 +223,12 @@ public String getTo() { return to; } - public void setTo(String to) { this.to = to; } public MachineDetectionCompleteCallback direction(CallDirectionEnum direction) { - this.direction = direction; return this; } @@ -256,14 +242,12 @@ public CallDirectionEnum getDirection() { return direction; } - public void setDirection(CallDirectionEnum direction) { this.direction = direction; } public MachineDetectionCompleteCallback callId(String callId) { - this.callId = callId; return this; } @@ -277,14 +261,12 @@ public String getCallId() { return callId; } - public void setCallId(String callId) { this.callId = callId; } public MachineDetectionCompleteCallback callUrl(String callUrl) { - this.callUrl = callUrl; return this; } @@ -298,14 +280,12 @@ public String getCallUrl() { return callUrl; } - public void setCallUrl(String callUrl) { this.callUrl = callUrl; } public MachineDetectionCompleteCallback enqueuedTime(OffsetDateTime enqueuedTime) { - this.enqueuedTime = enqueuedTime; return this; } @@ -319,14 +299,12 @@ public OffsetDateTime getEnqueuedTime() { return enqueuedTime; } - public void setEnqueuedTime(OffsetDateTime enqueuedTime) { this.enqueuedTime = enqueuedTime; } public MachineDetectionCompleteCallback startTime(OffsetDateTime startTime) { - this.startTime = startTime; return this; } @@ -340,14 +318,12 @@ public OffsetDateTime getStartTime() { return startTime; } - public void setStartTime(OffsetDateTime startTime) { this.startTime = startTime; } public MachineDetectionCompleteCallback answerTime(OffsetDateTime answerTime) { - this.answerTime = answerTime; return this; } @@ -361,14 +337,12 @@ public OffsetDateTime getAnswerTime() { return answerTime; } - public void setAnswerTime(OffsetDateTime answerTime) { this.answerTime = answerTime; } public MachineDetectionCompleteCallback tag(String tag) { - this.tag = tag; return this; } @@ -382,14 +356,12 @@ public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } public MachineDetectionCompleteCallback machineDetectionResult(MachineDetectionResult machineDetectionResult) { - this.machineDetectionResult = machineDetectionResult; return this; } @@ -403,7 +375,6 @@ public MachineDetectionResult getMachineDetectionResult() { return machineDetectionResult; } - public void setMachineDetectionResult(MachineDetectionResult machineDetectionResult) { this.machineDetectionResult = machineDetectionResult; } @@ -584,6 +555,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("to") != null && !jsonObj.get("to").isJsonNull()) && !jsonObj.get("to").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `to` to be a primitive type in the JSON string but got `%s`", jsonObj.get("to").toString())); } + // validate the optional field `direction` + if (jsonObj.get("direction") != null && !jsonObj.get("direction").isJsonNull()) { + CallDirectionEnum.validateJsonElement(jsonObj.get("direction")); + } if ((jsonObj.get("callId") != null && !jsonObj.get("callId").isJsonNull()) && !jsonObj.get("callId").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `callId` to be a primitive type in the JSON string but got `%s`", jsonObj.get("callId").toString())); } @@ -627,7 +602,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/MachineDetectionConfiguration.java b/src/main/java/com/bandwidth/sdk/model/MachineDetectionConfiguration.java index 041100f6..57d22b12 100644 --- a/src/main/java/com/bandwidth/sdk/model/MachineDetectionConfiguration.java +++ b/src/main/java/com/bandwidth/sdk/model/MachineDetectionConfiguration.java @@ -46,7 +46,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -54,7 +53,7 @@ /** * The machine detection request used to perform <a href='/docs/voice/guides/machineDetection'>machine detection</a> on the call. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class MachineDetectionConfiguration { public static final String SERIALIZED_NAME_MODE = "mode"; @SerializedName(SERIALIZED_NAME_MODE) @@ -120,7 +119,6 @@ public MachineDetectionConfiguration() { } public MachineDetectionConfiguration mode(MachineDetectionModeEnum mode) { - this.mode = mode; return this; } @@ -134,14 +132,12 @@ public MachineDetectionModeEnum getMode() { return mode; } - public void setMode(MachineDetectionModeEnum mode) { this.mode = mode; } public MachineDetectionConfiguration detectionTimeout(Double detectionTimeout) { - this.detectionTimeout = detectionTimeout; return this; } @@ -155,14 +151,12 @@ public Double getDetectionTimeout() { return detectionTimeout; } - public void setDetectionTimeout(Double detectionTimeout) { this.detectionTimeout = detectionTimeout; } public MachineDetectionConfiguration silenceTimeout(Double silenceTimeout) { - this.silenceTimeout = silenceTimeout; return this; } @@ -176,14 +170,12 @@ public Double getSilenceTimeout() { return silenceTimeout; } - public void setSilenceTimeout(Double silenceTimeout) { this.silenceTimeout = silenceTimeout; } public MachineDetectionConfiguration speechThreshold(Double speechThreshold) { - this.speechThreshold = speechThreshold; return this; } @@ -197,14 +189,12 @@ public Double getSpeechThreshold() { return speechThreshold; } - public void setSpeechThreshold(Double speechThreshold) { this.speechThreshold = speechThreshold; } public MachineDetectionConfiguration speechEndThreshold(Double speechEndThreshold) { - this.speechEndThreshold = speechEndThreshold; return this; } @@ -218,14 +208,12 @@ public Double getSpeechEndThreshold() { return speechEndThreshold; } - public void setSpeechEndThreshold(Double speechEndThreshold) { this.speechEndThreshold = speechEndThreshold; } public MachineDetectionConfiguration machineSpeechEndThreshold(Double machineSpeechEndThreshold) { - this.machineSpeechEndThreshold = machineSpeechEndThreshold; return this; } @@ -239,14 +227,12 @@ public Double getMachineSpeechEndThreshold() { return machineSpeechEndThreshold; } - public void setMachineSpeechEndThreshold(Double machineSpeechEndThreshold) { this.machineSpeechEndThreshold = machineSpeechEndThreshold; } public MachineDetectionConfiguration delayResult(Boolean delayResult) { - this.delayResult = delayResult; return this; } @@ -260,14 +246,12 @@ public Boolean getDelayResult() { return delayResult; } - public void setDelayResult(Boolean delayResult) { this.delayResult = delayResult; } public MachineDetectionConfiguration callbackUrl(URI callbackUrl) { - this.callbackUrl = callbackUrl; return this; } @@ -281,14 +265,12 @@ public URI getCallbackUrl() { return callbackUrl; } - public void setCallbackUrl(URI callbackUrl) { this.callbackUrl = callbackUrl; } public MachineDetectionConfiguration callbackMethod(CallbackMethodEnum callbackMethod) { - this.callbackMethod = callbackMethod; return this; } @@ -302,14 +284,12 @@ public CallbackMethodEnum getCallbackMethod() { return callbackMethod; } - public void setCallbackMethod(CallbackMethodEnum callbackMethod) { this.callbackMethod = callbackMethod; } public MachineDetectionConfiguration username(String username) { - this.username = username; return this; } @@ -323,14 +303,12 @@ public String getUsername() { return username; } - public void setUsername(String username) { this.username = username; } public MachineDetectionConfiguration password(String password) { - this.password = password; return this; } @@ -344,14 +322,12 @@ public String getPassword() { return password; } - public void setPassword(String password) { this.password = password; } public MachineDetectionConfiguration fallbackUrl(URI fallbackUrl) { - this.fallbackUrl = fallbackUrl; return this; } @@ -365,14 +341,12 @@ public URI getFallbackUrl() { return fallbackUrl; } - public void setFallbackUrl(URI fallbackUrl) { this.fallbackUrl = fallbackUrl; } public MachineDetectionConfiguration fallbackMethod(CallbackMethodEnum fallbackMethod) { - this.fallbackMethod = fallbackMethod; return this; } @@ -386,14 +360,12 @@ public CallbackMethodEnum getFallbackMethod() { return fallbackMethod; } - public void setFallbackMethod(CallbackMethodEnum fallbackMethod) { this.fallbackMethod = fallbackMethod; } public MachineDetectionConfiguration fallbackUsername(String fallbackUsername) { - this.fallbackUsername = fallbackUsername; return this; } @@ -407,14 +379,12 @@ public String getFallbackUsername() { return fallbackUsername; } - public void setFallbackUsername(String fallbackUsername) { this.fallbackUsername = fallbackUsername; } public MachineDetectionConfiguration fallbackPassword(String fallbackPassword) { - this.fallbackPassword = fallbackPassword; return this; } @@ -428,7 +398,6 @@ public String getFallbackPassword() { return fallbackPassword; } - public void setFallbackPassword(String fallbackPassword) { this.fallbackPassword = fallbackPassword; } @@ -597,9 +566,17 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti } } JsonObject jsonObj = jsonElement.getAsJsonObject(); + // validate the optional field `mode` + if (jsonObj.get("mode") != null && !jsonObj.get("mode").isJsonNull()) { + MachineDetectionModeEnum.validateJsonElement(jsonObj.get("mode")); + } if ((jsonObj.get("callbackUrl") != null && !jsonObj.get("callbackUrl").isJsonNull()) && !jsonObj.get("callbackUrl").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `callbackUrl` to be a primitive type in the JSON string but got `%s`", jsonObj.get("callbackUrl").toString())); } + // validate the optional field `callbackMethod` + if (jsonObj.get("callbackMethod") != null && !jsonObj.get("callbackMethod").isJsonNull()) { + CallbackMethodEnum.validateJsonElement(jsonObj.get("callbackMethod")); + } if ((jsonObj.get("username") != null && !jsonObj.get("username").isJsonNull()) && !jsonObj.get("username").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `username` to be a primitive type in the JSON string but got `%s`", jsonObj.get("username").toString())); } @@ -609,6 +586,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("fallbackUrl") != null && !jsonObj.get("fallbackUrl").isJsonNull()) && !jsonObj.get("fallbackUrl").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `fallbackUrl` to be a primitive type in the JSON string but got `%s`", jsonObj.get("fallbackUrl").toString())); } + // validate the optional field `fallbackMethod` + if (jsonObj.get("fallbackMethod") != null && !jsonObj.get("fallbackMethod").isJsonNull()) { + CallbackMethodEnum.validateJsonElement(jsonObj.get("fallbackMethod")); + } if ((jsonObj.get("fallbackUsername") != null && !jsonObj.get("fallbackUsername").isJsonNull()) && !jsonObj.get("fallbackUsername").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `fallbackUsername` to be a primitive type in the JSON string but got `%s`", jsonObj.get("fallbackUsername").toString())); } @@ -645,7 +626,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/MachineDetectionModeEnum.java b/src/main/java/com/bandwidth/sdk/model/MachineDetectionModeEnum.java index 07bba122..633c38e1 100644 --- a/src/main/java/com/bandwidth/sdk/model/MachineDetectionModeEnum.java +++ b/src/main/java/com/bandwidth/sdk/model/MachineDetectionModeEnum.java @@ -18,6 +18,7 @@ import java.io.IOException; import com.google.gson.TypeAdapter; +import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; @@ -68,5 +69,10 @@ public MachineDetectionModeEnum read(final JsonReader jsonReader) throws IOExcep return MachineDetectionModeEnum.fromValue(value); } } + + public static void validateJsonElement(JsonElement jsonElement) throws IOException { + String value = jsonElement.getAsString(); + MachineDetectionModeEnum.fromValue(value); + } } diff --git a/src/main/java/com/bandwidth/sdk/model/MachineDetectionResult.java b/src/main/java/com/bandwidth/sdk/model/MachineDetectionResult.java index 135144a7..f3ff2b2e 100644 --- a/src/main/java/com/bandwidth/sdk/model/MachineDetectionResult.java +++ b/src/main/java/com/bandwidth/sdk/model/MachineDetectionResult.java @@ -42,7 +42,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -50,7 +49,7 @@ /** * (optional) if machine detection was requested in sync mode, the result will be specified here. Possible values are the same as the async counterpart: Machine Detection Complete */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class MachineDetectionResult { public static final String SERIALIZED_NAME_VALUE = "value"; @SerializedName(SERIALIZED_NAME_VALUE) @@ -64,7 +63,6 @@ public MachineDetectionResult() { } public MachineDetectionResult value(String value) { - this.value = value; return this; } @@ -78,14 +76,12 @@ public String getValue() { return value; } - public void setValue(String value) { this.value = value; } public MachineDetectionResult duration(String duration) { - this.duration = duration; return this; } @@ -99,7 +95,6 @@ public String getDuration() { return duration; } - public void setDuration(String duration) { this.duration = duration; } @@ -254,7 +249,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/Media.java b/src/main/java/com/bandwidth/sdk/model/Media.java index 5465ff98..f31d58bf 100644 --- a/src/main/java/com/bandwidth/sdk/model/Media.java +++ b/src/main/java/com/bandwidth/sdk/model/Media.java @@ -42,7 +42,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -50,7 +49,7 @@ /** * Media */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class Media { public static final String SERIALIZED_NAME_CONTENT = "content"; @SerializedName(SERIALIZED_NAME_CONTENT) @@ -68,7 +67,6 @@ public Media() { } public Media content(String content) { - this.content = content; return this; } @@ -82,14 +80,12 @@ public String getContent() { return content; } - public void setContent(String content) { this.content = content; } public Media contentLength(Integer contentLength) { - this.contentLength = contentLength; return this; } @@ -103,14 +99,12 @@ public Integer getContentLength() { return contentLength; } - public void setContentLength(Integer contentLength) { this.contentLength = contentLength; } public Media mediaName(String mediaName) { - this.mediaName = mediaName; return this; } @@ -124,7 +118,6 @@ public String getMediaName() { return mediaName; } - public void setMediaName(String mediaName) { this.mediaName = mediaName; } @@ -282,7 +275,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/Message.java b/src/main/java/com/bandwidth/sdk/model/Message.java index a6d830dd..f7893107 100644 --- a/src/main/java/com/bandwidth/sdk/model/Message.java +++ b/src/main/java/com/bandwidth/sdk/model/Message.java @@ -47,7 +47,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -55,7 +54,7 @@ /** * Message */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class Message { public static final String SERIALIZED_NAME_ID = "id"; @SerializedName(SERIALIZED_NAME_ID) @@ -83,7 +82,7 @@ public class Message { public static final String SERIALIZED_NAME_TO = "to"; @SerializedName(SERIALIZED_NAME_TO) - private Set to; + private Set to = new LinkedHashSet<>(); public static final String SERIALIZED_NAME_FROM = "from"; @SerializedName(SERIALIZED_NAME_FROM) @@ -91,7 +90,7 @@ public class Message { public static final String SERIALIZED_NAME_MEDIA = "media"; @SerializedName(SERIALIZED_NAME_MEDIA) - private Set media; + private Set media = new LinkedHashSet<>(); public static final String SERIALIZED_NAME_TEXT = "text"; @SerializedName(SERIALIZED_NAME_TEXT) @@ -113,7 +112,6 @@ public Message() { } public Message id(String id) { - this.id = id; return this; } @@ -127,14 +125,12 @@ public String getId() { return id; } - public void setId(String id) { this.id = id; } public Message owner(String owner) { - this.owner = owner; return this; } @@ -148,14 +144,12 @@ public String getOwner() { return owner; } - public void setOwner(String owner) { this.owner = owner; } public Message applicationId(String applicationId) { - this.applicationId = applicationId; return this; } @@ -169,14 +163,12 @@ public String getApplicationId() { return applicationId; } - public void setApplicationId(String applicationId) { this.applicationId = applicationId; } public Message time(OffsetDateTime time) { - this.time = time; return this; } @@ -190,14 +182,12 @@ public OffsetDateTime getTime() { return time; } - public void setTime(OffsetDateTime time) { this.time = time; } public Message segmentCount(Integer segmentCount) { - this.segmentCount = segmentCount; return this; } @@ -211,14 +201,12 @@ public Integer getSegmentCount() { return segmentCount; } - public void setSegmentCount(Integer segmentCount) { this.segmentCount = segmentCount; } public Message direction(MessageDirectionEnum direction) { - this.direction = direction; return this; } @@ -232,14 +220,12 @@ public MessageDirectionEnum getDirection() { return direction; } - public void setDirection(MessageDirectionEnum direction) { this.direction = direction; } public Message to(Set to) { - this.to = to; return this; } @@ -261,14 +247,12 @@ public Set getTo() { return to; } - public void setTo(Set to) { this.to = to; } public Message from(String from) { - this.from = from; return this; } @@ -282,14 +266,12 @@ public String getFrom() { return from; } - public void setFrom(String from) { this.from = from; } public Message media(Set media) { - this.media = media; return this; } @@ -311,14 +293,12 @@ public Set getMedia() { return media; } - public void setMedia(Set media) { this.media = media; } public Message text(String text) { - this.text = text; return this; } @@ -332,14 +312,12 @@ public String getText() { return text; } - public void setText(String text) { this.text = text; } public Message tag(String tag) { - this.tag = tag; return this; } @@ -353,14 +331,12 @@ public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } public Message priority(PriorityEnum priority) { - this.priority = priority; return this; } @@ -374,14 +350,12 @@ public PriorityEnum getPriority() { return priority; } - public void setPriority(PriorityEnum priority) { this.priority = priority; } public Message expiration(OffsetDateTime expiration) { - this.expiration = expiration; return this; } @@ -395,7 +369,6 @@ public OffsetDateTime getExpiration() { return expiration; } - public void setExpiration(OffsetDateTime expiration) { this.expiration = expiration; } @@ -556,6 +529,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("applicationId") != null && !jsonObj.get("applicationId").isJsonNull()) && !jsonObj.get("applicationId").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `applicationId` to be a primitive type in the JSON string but got `%s`", jsonObj.get("applicationId").toString())); } + // validate the optional field `direction` + if (jsonObj.get("direction") != null && !jsonObj.get("direction").isJsonNull()) { + MessageDirectionEnum.validateJsonElement(jsonObj.get("direction")); + } // ensure the optional json data is an array if present if (jsonObj.get("to") != null && !jsonObj.get("to").isJsonNull() && !jsonObj.get("to").isJsonArray()) { throw new IllegalArgumentException(String.format("Expected the field `to` to be an array in the JSON string but got `%s`", jsonObj.get("to").toString())); @@ -573,6 +550,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("tag") != null && !jsonObj.get("tag").isJsonNull()) && !jsonObj.get("tag").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `tag` to be a primitive type in the JSON string but got `%s`", jsonObj.get("tag").toString())); } + // validate the optional field `priority` + if (jsonObj.get("priority") != null && !jsonObj.get("priority").isJsonNull()) { + PriorityEnum.validateJsonElement(jsonObj.get("priority")); + } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -603,7 +584,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/MessageDeliveredCallback.java b/src/main/java/com/bandwidth/sdk/model/MessageDeliveredCallback.java index 7a3a30c7..fe3ce3db 100644 --- a/src/main/java/com/bandwidth/sdk/model/MessageDeliveredCallback.java +++ b/src/main/java/com/bandwidth/sdk/model/MessageDeliveredCallback.java @@ -44,7 +44,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -52,7 +51,7 @@ /** * Message Delivered Callback */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class MessageDeliveredCallback { public static final String SERIALIZED_NAME_TIME = "time"; @SerializedName(SERIALIZED_NAME_TIME) @@ -78,7 +77,6 @@ public MessageDeliveredCallback() { } public MessageDeliveredCallback time(OffsetDateTime time) { - this.time = time; return this; } @@ -92,14 +90,12 @@ public OffsetDateTime getTime() { return time; } - public void setTime(OffsetDateTime time) { this.time = time; } public MessageDeliveredCallback type(String type) { - this.type = type; return this; } @@ -113,14 +109,12 @@ public String getType() { return type; } - public void setType(String type) { this.type = type; } public MessageDeliveredCallback to(String to) { - this.to = to; return this; } @@ -134,14 +128,12 @@ public String getTo() { return to; } - public void setTo(String to) { this.to = to; } public MessageDeliveredCallback description(String description) { - this.description = description; return this; } @@ -155,14 +147,12 @@ public String getDescription() { return description; } - public void setDescription(String description) { this.description = description; } public MessageDeliveredCallback message(MessageDeliveredCallbackMessage message) { - this.message = message; return this; } @@ -176,7 +166,6 @@ public MessageDeliveredCallbackMessage getMessage() { return message; } - public void setMessage(MessageDeliveredCallbackMessage message) { this.message = message; } @@ -357,7 +346,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/MessageDeliveredCallbackMessage.java b/src/main/java/com/bandwidth/sdk/model/MessageDeliveredCallbackMessage.java index 144c4c0e..dbafd12b 100644 --- a/src/main/java/com/bandwidth/sdk/model/MessageDeliveredCallbackMessage.java +++ b/src/main/java/com/bandwidth/sdk/model/MessageDeliveredCallbackMessage.java @@ -50,7 +50,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -58,7 +57,7 @@ /** * Message Delivered Callback Message Schema */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class MessageDeliveredCallbackMessage { public static final String SERIALIZED_NAME_ID = "id"; @SerializedName(SERIALIZED_NAME_ID) @@ -102,7 +101,7 @@ public class MessageDeliveredCallbackMessage { public static final String SERIALIZED_NAME_MEDIA = "media"; @SerializedName(SERIALIZED_NAME_MEDIA) - private List media; + private List media = new ArrayList<>(); public static final String SERIALIZED_NAME_PRIORITY = "priority"; @SerializedName(SERIALIZED_NAME_PRIORITY) @@ -112,7 +111,6 @@ public MessageDeliveredCallbackMessage() { } public MessageDeliveredCallbackMessage id(String id) { - this.id = id; return this; } @@ -126,14 +124,12 @@ public String getId() { return id; } - public void setId(String id) { this.id = id; } public MessageDeliveredCallbackMessage owner(String owner) { - this.owner = owner; return this; } @@ -147,14 +143,12 @@ public String getOwner() { return owner; } - public void setOwner(String owner) { this.owner = owner; } public MessageDeliveredCallbackMessage applicationId(String applicationId) { - this.applicationId = applicationId; return this; } @@ -168,14 +162,12 @@ public String getApplicationId() { return applicationId; } - public void setApplicationId(String applicationId) { this.applicationId = applicationId; } public MessageDeliveredCallbackMessage time(OffsetDateTime time) { - this.time = time; return this; } @@ -189,14 +181,12 @@ public OffsetDateTime getTime() { return time; } - public void setTime(OffsetDateTime time) { this.time = time; } public MessageDeliveredCallbackMessage segmentCount(Integer segmentCount) { - this.segmentCount = segmentCount; return this; } @@ -210,14 +200,12 @@ public Integer getSegmentCount() { return segmentCount; } - public void setSegmentCount(Integer segmentCount) { this.segmentCount = segmentCount; } public MessageDeliveredCallbackMessage direction(MessageDirectionEnum direction) { - this.direction = direction; return this; } @@ -231,14 +219,12 @@ public MessageDirectionEnum getDirection() { return direction; } - public void setDirection(MessageDirectionEnum direction) { this.direction = direction; } public MessageDeliveredCallbackMessage to(Set to) { - this.to = to; return this; } @@ -260,14 +246,12 @@ public Set getTo() { return to; } - public void setTo(Set to) { this.to = to; } public MessageDeliveredCallbackMessage from(String from) { - this.from = from; return this; } @@ -281,14 +265,12 @@ public String getFrom() { return from; } - public void setFrom(String from) { this.from = from; } public MessageDeliveredCallbackMessage text(String text) { - this.text = text; return this; } @@ -302,14 +284,12 @@ public String getText() { return text; } - public void setText(String text) { this.text = text; } public MessageDeliveredCallbackMessage tag(String tag) { - this.tag = tag; return this; } @@ -323,14 +303,12 @@ public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } public MessageDeliveredCallbackMessage media(List media) { - this.media = media; return this; } @@ -352,14 +330,12 @@ public List getMedia() { return media; } - public void setMedia(List media) { this.media = media; } public MessageDeliveredCallbackMessage priority(PriorityEnum priority) { - this.priority = priority; return this; } @@ -373,7 +349,6 @@ public PriorityEnum getPriority() { return priority; } - public void setPriority(PriorityEnum priority) { this.priority = priority; } @@ -548,6 +523,8 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if (!jsonObj.get("applicationId").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `applicationId` to be a primitive type in the JSON string but got `%s`", jsonObj.get("applicationId").toString())); } + // validate the required field `direction` + MessageDirectionEnum.validateJsonElement(jsonObj.get("direction")); // ensure the required json array is present if (jsonObj.get("to") == null) { throw new IllegalArgumentException("Expected the field `linkedContent` to be an array in the JSON string but got `null`"); @@ -567,6 +544,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if (jsonObj.get("media") != null && !jsonObj.get("media").isJsonNull() && !jsonObj.get("media").isJsonArray()) { throw new IllegalArgumentException(String.format("Expected the field `media` to be an array in the JSON string but got `%s`", jsonObj.get("media").toString())); } + // validate the optional field `priority` + if (jsonObj.get("priority") != null && !jsonObj.get("priority").isJsonNull()) { + PriorityEnum.validateJsonElement(jsonObj.get("priority")); + } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -597,7 +578,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/MessageDirectionEnum.java b/src/main/java/com/bandwidth/sdk/model/MessageDirectionEnum.java index 4713b361..52886e8a 100644 --- a/src/main/java/com/bandwidth/sdk/model/MessageDirectionEnum.java +++ b/src/main/java/com/bandwidth/sdk/model/MessageDirectionEnum.java @@ -18,6 +18,7 @@ import java.io.IOException; import com.google.gson.TypeAdapter; +import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; @@ -68,5 +69,10 @@ public MessageDirectionEnum read(final JsonReader jsonReader) throws IOException return MessageDirectionEnum.fromValue(value); } } + + public static void validateJsonElement(JsonElement jsonElement) throws IOException { + String value = jsonElement.getAsString(); + MessageDirectionEnum.fromValue(value); + } } diff --git a/src/main/java/com/bandwidth/sdk/model/MessageFailedCallback.java b/src/main/java/com/bandwidth/sdk/model/MessageFailedCallback.java index 7969be97..49153874 100644 --- a/src/main/java/com/bandwidth/sdk/model/MessageFailedCallback.java +++ b/src/main/java/com/bandwidth/sdk/model/MessageFailedCallback.java @@ -44,7 +44,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -52,7 +51,7 @@ /** * Message Failed Callback */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class MessageFailedCallback { public static final String SERIALIZED_NAME_TIME = "time"; @SerializedName(SERIALIZED_NAME_TIME) @@ -82,7 +81,6 @@ public MessageFailedCallback() { } public MessageFailedCallback time(OffsetDateTime time) { - this.time = time; return this; } @@ -96,14 +94,12 @@ public OffsetDateTime getTime() { return time; } - public void setTime(OffsetDateTime time) { this.time = time; } public MessageFailedCallback type(String type) { - this.type = type; return this; } @@ -117,14 +113,12 @@ public String getType() { return type; } - public void setType(String type) { this.type = type; } public MessageFailedCallback to(String to) { - this.to = to; return this; } @@ -138,14 +132,12 @@ public String getTo() { return to; } - public void setTo(String to) { this.to = to; } public MessageFailedCallback description(String description) { - this.description = description; return this; } @@ -159,14 +151,12 @@ public String getDescription() { return description; } - public void setDescription(String description) { this.description = description; } public MessageFailedCallback message(MessageFailedCallbackMessage message) { - this.message = message; return this; } @@ -180,14 +170,12 @@ public MessageFailedCallbackMessage getMessage() { return message; } - public void setMessage(MessageFailedCallbackMessage message) { this.message = message; } public MessageFailedCallback errorCode(Integer errorCode) { - this.errorCode = errorCode; return this; } @@ -201,7 +189,6 @@ public Integer getErrorCode() { return errorCode; } - public void setErrorCode(Integer errorCode) { this.errorCode = errorCode; } @@ -386,7 +373,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/MessageFailedCallbackMessage.java b/src/main/java/com/bandwidth/sdk/model/MessageFailedCallbackMessage.java index 6d65d19f..12dc3384 100644 --- a/src/main/java/com/bandwidth/sdk/model/MessageFailedCallbackMessage.java +++ b/src/main/java/com/bandwidth/sdk/model/MessageFailedCallbackMessage.java @@ -50,7 +50,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -58,7 +57,7 @@ /** * Message Failed Callback Message Schema */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class MessageFailedCallbackMessage { public static final String SERIALIZED_NAME_ID = "id"; @SerializedName(SERIALIZED_NAME_ID) @@ -102,7 +101,7 @@ public class MessageFailedCallbackMessage { public static final String SERIALIZED_NAME_MEDIA = "media"; @SerializedName(SERIALIZED_NAME_MEDIA) - private List media; + private List media = new ArrayList<>(); public static final String SERIALIZED_NAME_PRIORITY = "priority"; @SerializedName(SERIALIZED_NAME_PRIORITY) @@ -112,7 +111,6 @@ public MessageFailedCallbackMessage() { } public MessageFailedCallbackMessage id(String id) { - this.id = id; return this; } @@ -126,14 +124,12 @@ public String getId() { return id; } - public void setId(String id) { this.id = id; } public MessageFailedCallbackMessage owner(String owner) { - this.owner = owner; return this; } @@ -147,14 +143,12 @@ public String getOwner() { return owner; } - public void setOwner(String owner) { this.owner = owner; } public MessageFailedCallbackMessage applicationId(String applicationId) { - this.applicationId = applicationId; return this; } @@ -168,14 +162,12 @@ public String getApplicationId() { return applicationId; } - public void setApplicationId(String applicationId) { this.applicationId = applicationId; } public MessageFailedCallbackMessage time(OffsetDateTime time) { - this.time = time; return this; } @@ -189,14 +181,12 @@ public OffsetDateTime getTime() { return time; } - public void setTime(OffsetDateTime time) { this.time = time; } public MessageFailedCallbackMessage segmentCount(Integer segmentCount) { - this.segmentCount = segmentCount; return this; } @@ -210,14 +200,12 @@ public Integer getSegmentCount() { return segmentCount; } - public void setSegmentCount(Integer segmentCount) { this.segmentCount = segmentCount; } public MessageFailedCallbackMessage direction(MessageDirectionEnum direction) { - this.direction = direction; return this; } @@ -231,14 +219,12 @@ public MessageDirectionEnum getDirection() { return direction; } - public void setDirection(MessageDirectionEnum direction) { this.direction = direction; } public MessageFailedCallbackMessage to(Set to) { - this.to = to; return this; } @@ -260,14 +246,12 @@ public Set getTo() { return to; } - public void setTo(Set to) { this.to = to; } public MessageFailedCallbackMessage from(String from) { - this.from = from; return this; } @@ -281,14 +265,12 @@ public String getFrom() { return from; } - public void setFrom(String from) { this.from = from; } public MessageFailedCallbackMessage text(String text) { - this.text = text; return this; } @@ -302,14 +284,12 @@ public String getText() { return text; } - public void setText(String text) { this.text = text; } public MessageFailedCallbackMessage tag(String tag) { - this.tag = tag; return this; } @@ -323,14 +303,12 @@ public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } public MessageFailedCallbackMessage media(List media) { - this.media = media; return this; } @@ -352,14 +330,12 @@ public List getMedia() { return media; } - public void setMedia(List media) { this.media = media; } public MessageFailedCallbackMessage priority(PriorityEnum priority) { - this.priority = priority; return this; } @@ -373,7 +349,6 @@ public PriorityEnum getPriority() { return priority; } - public void setPriority(PriorityEnum priority) { this.priority = priority; } @@ -549,6 +524,8 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if (!jsonObj.get("applicationId").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `applicationId` to be a primitive type in the JSON string but got `%s`", jsonObj.get("applicationId").toString())); } + // validate the required field `direction` + MessageDirectionEnum.validateJsonElement(jsonObj.get("direction")); // ensure the required json array is present if (jsonObj.get("to") == null) { throw new IllegalArgumentException("Expected the field `linkedContent` to be an array in the JSON string but got `null`"); @@ -568,6 +545,8 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if (jsonObj.get("media") != null && !jsonObj.get("media").isJsonNull() && !jsonObj.get("media").isJsonArray()) { throw new IllegalArgumentException(String.format("Expected the field `media` to be an array in the JSON string but got `%s`", jsonObj.get("media").toString())); } + // validate the required field `priority` + PriorityEnum.validateJsonElement(jsonObj.get("priority")); } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -598,7 +577,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/MessageRequest.java b/src/main/java/com/bandwidth/sdk/model/MessageRequest.java index 8ae0dad4..44b019c0 100644 --- a/src/main/java/com/bandwidth/sdk/model/MessageRequest.java +++ b/src/main/java/com/bandwidth/sdk/model/MessageRequest.java @@ -49,7 +49,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -57,7 +56,7 @@ /** * MessageRequest */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class MessageRequest { public static final String SERIALIZED_NAME_APPLICATION_ID = "applicationId"; @SerializedName(SERIALIZED_NAME_APPLICATION_ID) @@ -77,7 +76,7 @@ public class MessageRequest { public static final String SERIALIZED_NAME_MEDIA = "media"; @SerializedName(SERIALIZED_NAME_MEDIA) - private List media; + private List media = new ArrayList<>(); public static final String SERIALIZED_NAME_TAG = "tag"; @SerializedName(SERIALIZED_NAME_TAG) @@ -95,7 +94,6 @@ public MessageRequest() { } public MessageRequest applicationId(String applicationId) { - this.applicationId = applicationId; return this; } @@ -109,14 +107,12 @@ public String getApplicationId() { return applicationId; } - public void setApplicationId(String applicationId) { this.applicationId = applicationId; } public MessageRequest to(Set to) { - this.to = to; return this; } @@ -138,14 +134,12 @@ public Set getTo() { return to; } - public void setTo(Set to) { this.to = to; } public MessageRequest from(String from) { - this.from = from; return this; } @@ -159,14 +153,12 @@ public String getFrom() { return from; } - public void setFrom(String from) { this.from = from; } public MessageRequest text(String text) { - this.text = text; return this; } @@ -180,14 +172,12 @@ public String getText() { return text; } - public void setText(String text) { this.text = text; } public MessageRequest media(List media) { - this.media = media; return this; } @@ -209,14 +199,12 @@ public List getMedia() { return media; } - public void setMedia(List media) { this.media = media; } public MessageRequest tag(String tag) { - this.tag = tag; return this; } @@ -230,14 +218,12 @@ public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } public MessageRequest priority(PriorityEnum priority) { - this.priority = priority; return this; } @@ -251,14 +237,12 @@ public PriorityEnum getPriority() { return priority; } - public void setPriority(PriorityEnum priority) { this.priority = priority; } public MessageRequest expiration(OffsetDateTime expiration) { - this.expiration = expiration; return this; } @@ -272,7 +256,6 @@ public OffsetDateTime getExpiration() { return expiration; } - public void setExpiration(OffsetDateTime expiration) { this.expiration = expiration; } @@ -441,6 +424,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("tag") != null && !jsonObj.get("tag").isJsonNull()) && !jsonObj.get("tag").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `tag` to be a primitive type in the JSON string but got `%s`", jsonObj.get("tag").toString())); } + // validate the optional field `priority` + if (jsonObj.get("priority") != null && !jsonObj.get("priority").isJsonNull()) { + PriorityEnum.validateJsonElement(jsonObj.get("priority")); + } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -471,7 +458,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/MessageSendingCallback.java b/src/main/java/com/bandwidth/sdk/model/MessageSendingCallback.java index 4be4d232..97861788 100644 --- a/src/main/java/com/bandwidth/sdk/model/MessageSendingCallback.java +++ b/src/main/java/com/bandwidth/sdk/model/MessageSendingCallback.java @@ -44,7 +44,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -52,7 +51,7 @@ /** * Message Sending Callback */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class MessageSendingCallback { public static final String SERIALIZED_NAME_TIME = "time"; @SerializedName(SERIALIZED_NAME_TIME) @@ -78,7 +77,6 @@ public MessageSendingCallback() { } public MessageSendingCallback time(OffsetDateTime time) { - this.time = time; return this; } @@ -92,14 +90,12 @@ public OffsetDateTime getTime() { return time; } - public void setTime(OffsetDateTime time) { this.time = time; } public MessageSendingCallback type(String type) { - this.type = type; return this; } @@ -113,14 +109,12 @@ public String getType() { return type; } - public void setType(String type) { this.type = type; } public MessageSendingCallback to(String to) { - this.to = to; return this; } @@ -134,14 +128,12 @@ public String getTo() { return to; } - public void setTo(String to) { this.to = to; } public MessageSendingCallback description(String description) { - this.description = description; return this; } @@ -155,14 +147,12 @@ public String getDescription() { return description; } - public void setDescription(String description) { this.description = description; } public MessageSendingCallback message(MessageSendingCallbackMessage message) { - this.message = message; return this; } @@ -176,7 +166,6 @@ public MessageSendingCallbackMessage getMessage() { return message; } - public void setMessage(MessageSendingCallbackMessage message) { this.message = message; } @@ -357,7 +346,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/MessageSendingCallbackMessage.java b/src/main/java/com/bandwidth/sdk/model/MessageSendingCallbackMessage.java index 1bced475..14f30700 100644 --- a/src/main/java/com/bandwidth/sdk/model/MessageSendingCallbackMessage.java +++ b/src/main/java/com/bandwidth/sdk/model/MessageSendingCallbackMessage.java @@ -50,7 +50,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -58,7 +57,7 @@ /** * Message Sending Callback Message Schema */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class MessageSendingCallbackMessage { public static final String SERIALIZED_NAME_ID = "id"; @SerializedName(SERIALIZED_NAME_ID) @@ -112,7 +111,6 @@ public MessageSendingCallbackMessage() { } public MessageSendingCallbackMessage id(String id) { - this.id = id; return this; } @@ -126,14 +124,12 @@ public String getId() { return id; } - public void setId(String id) { this.id = id; } public MessageSendingCallbackMessage owner(String owner) { - this.owner = owner; return this; } @@ -147,14 +143,12 @@ public String getOwner() { return owner; } - public void setOwner(String owner) { this.owner = owner; } public MessageSendingCallbackMessage applicationId(String applicationId) { - this.applicationId = applicationId; return this; } @@ -168,14 +162,12 @@ public String getApplicationId() { return applicationId; } - public void setApplicationId(String applicationId) { this.applicationId = applicationId; } public MessageSendingCallbackMessage time(OffsetDateTime time) { - this.time = time; return this; } @@ -189,14 +181,12 @@ public OffsetDateTime getTime() { return time; } - public void setTime(OffsetDateTime time) { this.time = time; } public MessageSendingCallbackMessage segmentCount(Integer segmentCount) { - this.segmentCount = segmentCount; return this; } @@ -210,14 +200,12 @@ public Integer getSegmentCount() { return segmentCount; } - public void setSegmentCount(Integer segmentCount) { this.segmentCount = segmentCount; } public MessageSendingCallbackMessage direction(MessageDirectionEnum direction) { - this.direction = direction; return this; } @@ -231,14 +219,12 @@ public MessageDirectionEnum getDirection() { return direction; } - public void setDirection(MessageDirectionEnum direction) { this.direction = direction; } public MessageSendingCallbackMessage to(Set to) { - this.to = to; return this; } @@ -260,14 +246,12 @@ public Set getTo() { return to; } - public void setTo(Set to) { this.to = to; } public MessageSendingCallbackMessage from(String from) { - this.from = from; return this; } @@ -281,14 +265,12 @@ public String getFrom() { return from; } - public void setFrom(String from) { this.from = from; } public MessageSendingCallbackMessage text(String text) { - this.text = text; return this; } @@ -302,14 +284,12 @@ public String getText() { return text; } - public void setText(String text) { this.text = text; } public MessageSendingCallbackMessage tag(String tag) { - this.tag = tag; return this; } @@ -323,14 +303,12 @@ public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } public MessageSendingCallbackMessage media(List media) { - this.media = media; return this; } @@ -352,14 +330,12 @@ public List getMedia() { return media; } - public void setMedia(List media) { this.media = media; } public MessageSendingCallbackMessage priority(PriorityEnum priority) { - this.priority = priority; return this; } @@ -373,7 +349,6 @@ public PriorityEnum getPriority() { return priority; } - public void setPriority(PriorityEnum priority) { this.priority = priority; } @@ -549,6 +524,8 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if (!jsonObj.get("applicationId").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `applicationId` to be a primitive type in the JSON string but got `%s`", jsonObj.get("applicationId").toString())); } + // validate the required field `direction` + MessageDirectionEnum.validateJsonElement(jsonObj.get("direction")); // ensure the required json array is present if (jsonObj.get("to") == null) { throw new IllegalArgumentException("Expected the field `linkedContent` to be an array in the JSON string but got `null`"); @@ -570,6 +547,8 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti } else if (!jsonObj.get("media").isJsonArray()) { throw new IllegalArgumentException(String.format("Expected the field `media` to be an array in the JSON string but got `%s`", jsonObj.get("media").toString())); } + // validate the required field `priority` + PriorityEnum.validateJsonElement(jsonObj.get("priority")); } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -600,7 +579,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/MessageStatusEnum.java b/src/main/java/com/bandwidth/sdk/model/MessageStatusEnum.java index 90a978bf..80760f09 100644 --- a/src/main/java/com/bandwidth/sdk/model/MessageStatusEnum.java +++ b/src/main/java/com/bandwidth/sdk/model/MessageStatusEnum.java @@ -18,6 +18,7 @@ import java.io.IOException; import com.google.gson.TypeAdapter; +import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; @@ -80,5 +81,10 @@ public MessageStatusEnum read(final JsonReader jsonReader) throws IOException { return MessageStatusEnum.fromValue(value); } } + + public static void validateJsonElement(JsonElement jsonElement) throws IOException { + String value = jsonElement.getAsString(); + MessageStatusEnum.fromValue(value); + } } diff --git a/src/main/java/com/bandwidth/sdk/model/MessageTypeEnum.java b/src/main/java/com/bandwidth/sdk/model/MessageTypeEnum.java index 8ce1bc4b..e12241ca 100644 --- a/src/main/java/com/bandwidth/sdk/model/MessageTypeEnum.java +++ b/src/main/java/com/bandwidth/sdk/model/MessageTypeEnum.java @@ -18,6 +18,7 @@ import java.io.IOException; import com.google.gson.TypeAdapter; +import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; @@ -68,5 +69,10 @@ public MessageTypeEnum read(final JsonReader jsonReader) throws IOException { return MessageTypeEnum.fromValue(value); } } + + public static void validateJsonElement(JsonElement jsonElement) throws IOException { + String value = jsonElement.getAsString(); + MessageTypeEnum.fromValue(value); + } } diff --git a/src/main/java/com/bandwidth/sdk/model/MessagesList.java b/src/main/java/com/bandwidth/sdk/model/MessagesList.java index 8c40885c..13bc6bce 100644 --- a/src/main/java/com/bandwidth/sdk/model/MessagesList.java +++ b/src/main/java/com/bandwidth/sdk/model/MessagesList.java @@ -46,7 +46,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -54,7 +53,7 @@ /** * MessagesList */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class MessagesList { public static final String SERIALIZED_NAME_TOTAL_COUNT = "totalCount"; @SerializedName(SERIALIZED_NAME_TOTAL_COUNT) @@ -66,13 +65,12 @@ public class MessagesList { public static final String SERIALIZED_NAME_MESSAGES = "messages"; @SerializedName(SERIALIZED_NAME_MESSAGES) - private List messages; + private List messages = new ArrayList<>(); public MessagesList() { } public MessagesList totalCount(Integer totalCount) { - this.totalCount = totalCount; return this; } @@ -86,14 +84,12 @@ public Integer getTotalCount() { return totalCount; } - public void setTotalCount(Integer totalCount) { this.totalCount = totalCount; } public MessagesList pageInfo(PageInfo pageInfo) { - this.pageInfo = pageInfo; return this; } @@ -107,14 +103,12 @@ public PageInfo getPageInfo() { return pageInfo; } - public void setPageInfo(PageInfo pageInfo) { this.pageInfo = pageInfo; } public MessagesList messages(List messages) { - this.messages = messages; return this; } @@ -136,7 +130,6 @@ public List getMessages() { return messages; } - public void setMessages(List messages) { this.messages = messages; } @@ -306,7 +299,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/MessagingCodeResponse.java b/src/main/java/com/bandwidth/sdk/model/MessagingCodeResponse.java index fb5f2e3d..d4224fb0 100644 --- a/src/main/java/com/bandwidth/sdk/model/MessagingCodeResponse.java +++ b/src/main/java/com/bandwidth/sdk/model/MessagingCodeResponse.java @@ -42,7 +42,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -50,7 +49,7 @@ /** * MessagingCodeResponse */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class MessagingCodeResponse { public static final String SERIALIZED_NAME_MESSAGE_ID = "messageId"; @SerializedName(SERIALIZED_NAME_MESSAGE_ID) @@ -60,7 +59,6 @@ public MessagingCodeResponse() { } public MessagingCodeResponse messageId(String messageId) { - this.messageId = messageId; return this; } @@ -74,7 +72,6 @@ public String getMessageId() { return messageId; } - public void setMessageId(String messageId) { this.messageId = messageId; } @@ -223,7 +220,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/MessagingRequestError.java b/src/main/java/com/bandwidth/sdk/model/MessagingRequestError.java index a0f4af11..8097ac14 100644 --- a/src/main/java/com/bandwidth/sdk/model/MessagingRequestError.java +++ b/src/main/java/com/bandwidth/sdk/model/MessagingRequestError.java @@ -42,7 +42,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -50,7 +49,7 @@ /** * MessagingRequestError */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class MessagingRequestError { public static final String SERIALIZED_NAME_TYPE = "type"; @SerializedName(SERIALIZED_NAME_TYPE) @@ -64,7 +63,6 @@ public MessagingRequestError() { } public MessagingRequestError type(String type) { - this.type = type; return this; } @@ -78,14 +76,12 @@ public String getType() { return type; } - public void setType(String type) { this.type = type; } public MessagingRequestError description(String description) { - this.description = description; return this; } @@ -99,7 +95,6 @@ public String getDescription() { return description; } - public void setDescription(String description) { this.description = description; } @@ -263,7 +258,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/MfaForbiddenRequestError.java b/src/main/java/com/bandwidth/sdk/model/MfaForbiddenRequestError.java index 9905efdd..96e1f5ee 100644 --- a/src/main/java/com/bandwidth/sdk/model/MfaForbiddenRequestError.java +++ b/src/main/java/com/bandwidth/sdk/model/MfaForbiddenRequestError.java @@ -42,7 +42,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -50,7 +49,7 @@ /** * MfaForbiddenRequestError */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class MfaForbiddenRequestError { public static final String SERIALIZED_NAME_MESSAGE = "message"; @SerializedName(SERIALIZED_NAME_MESSAGE) @@ -60,7 +59,6 @@ public MfaForbiddenRequestError() { } public MfaForbiddenRequestError message(String message) { - this.message = message; return this; } @@ -74,7 +72,6 @@ public String getMessage() { return message; } - public void setMessage(String message) { this.message = message; } @@ -223,7 +220,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/MfaRequestError.java b/src/main/java/com/bandwidth/sdk/model/MfaRequestError.java index 84b45f8a..fec8d616 100644 --- a/src/main/java/com/bandwidth/sdk/model/MfaRequestError.java +++ b/src/main/java/com/bandwidth/sdk/model/MfaRequestError.java @@ -42,7 +42,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -50,7 +49,7 @@ /** * MfaRequestError */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class MfaRequestError { public static final String SERIALIZED_NAME_ERROR = "error"; @SerializedName(SERIALIZED_NAME_ERROR) @@ -64,7 +63,6 @@ public MfaRequestError() { } public MfaRequestError error(String error) { - this.error = error; return this; } @@ -78,14 +76,12 @@ public String getError() { return error; } - public void setError(String error) { this.error = error; } public MfaRequestError requestId(String requestId) { - this.requestId = requestId; return this; } @@ -99,7 +95,6 @@ public String getRequestId() { return requestId; } - public void setRequestId(String requestId) { this.requestId = requestId; } @@ -254,7 +249,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/MfaUnauthorizedRequestError.java b/src/main/java/com/bandwidth/sdk/model/MfaUnauthorizedRequestError.java index 67320cae..1c9d9966 100644 --- a/src/main/java/com/bandwidth/sdk/model/MfaUnauthorizedRequestError.java +++ b/src/main/java/com/bandwidth/sdk/model/MfaUnauthorizedRequestError.java @@ -42,7 +42,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -50,7 +49,7 @@ /** * MfaUnauthorizedRequestError */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class MfaUnauthorizedRequestError { public static final String SERIALIZED_NAME_MESSAGE = "message"; @SerializedName(SERIALIZED_NAME_MESSAGE) @@ -60,7 +59,6 @@ public MfaUnauthorizedRequestError() { } public MfaUnauthorizedRequestError message(String message) { - this.message = message; return this; } @@ -74,7 +72,6 @@ public String getMessage() { return message; } - public void setMessage(String message) { this.message = message; } @@ -223,7 +220,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/PageInfo.java b/src/main/java/com/bandwidth/sdk/model/PageInfo.java index a1c5d8fc..fdc30505 100644 --- a/src/main/java/com/bandwidth/sdk/model/PageInfo.java +++ b/src/main/java/com/bandwidth/sdk/model/PageInfo.java @@ -42,7 +42,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -50,7 +49,7 @@ /** * PageInfo */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class PageInfo { public static final String SERIALIZED_NAME_PREV_PAGE = "prevPage"; @SerializedName(SERIALIZED_NAME_PREV_PAGE) @@ -72,7 +71,6 @@ public PageInfo() { } public PageInfo prevPage(String prevPage) { - this.prevPage = prevPage; return this; } @@ -86,14 +84,12 @@ public String getPrevPage() { return prevPage; } - public void setPrevPage(String prevPage) { this.prevPage = prevPage; } public PageInfo nextPage(String nextPage) { - this.nextPage = nextPage; return this; } @@ -107,14 +103,12 @@ public String getNextPage() { return nextPage; } - public void setNextPage(String nextPage) { this.nextPage = nextPage; } public PageInfo prevPageToken(String prevPageToken) { - this.prevPageToken = prevPageToken; return this; } @@ -128,14 +122,12 @@ public String getPrevPageToken() { return prevPageToken; } - public void setPrevPageToken(String prevPageToken) { this.prevPageToken = prevPageToken; } public PageInfo nextPageToken(String nextPageToken) { - this.nextPageToken = nextPageToken; return this; } @@ -149,7 +141,6 @@ public String getNextPageToken() { return nextPageToken; } - public void setNextPageToken(String nextPageToken) { this.nextPageToken = nextPageToken; } @@ -316,7 +307,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/PriorityEnum.java b/src/main/java/com/bandwidth/sdk/model/PriorityEnum.java index 6200bb49..75f872e1 100644 --- a/src/main/java/com/bandwidth/sdk/model/PriorityEnum.java +++ b/src/main/java/com/bandwidth/sdk/model/PriorityEnum.java @@ -18,6 +18,7 @@ import java.io.IOException; import com.google.gson.TypeAdapter; +import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; @@ -68,5 +69,10 @@ public PriorityEnum read(final JsonReader jsonReader) throws IOException { return PriorityEnum.fromValue(value); } } + + public static void validateJsonElement(JsonElement jsonElement) throws IOException { + String value = jsonElement.getAsString(); + PriorityEnum.fromValue(value); + } } diff --git a/src/main/java/com/bandwidth/sdk/model/RecordingAvailableCallback.java b/src/main/java/com/bandwidth/sdk/model/RecordingAvailableCallback.java index 2c3cd0be..d34978ed 100644 --- a/src/main/java/com/bandwidth/sdk/model/RecordingAvailableCallback.java +++ b/src/main/java/com/bandwidth/sdk/model/RecordingAvailableCallback.java @@ -47,7 +47,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -55,7 +54,7 @@ /** * The Recording Available event is sent after a recording has been processed. It indicates that the recording is available for download. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class RecordingAvailableCallback { public static final String SERIALIZED_NAME_EVENT_TYPE = "eventType"; @SerializedName(SERIALIZED_NAME_EVENT_TYPE) @@ -149,7 +148,6 @@ public RecordingAvailableCallback() { } public RecordingAvailableCallback eventType(String eventType) { - this.eventType = eventType; return this; } @@ -163,14 +161,12 @@ public String getEventType() { return eventType; } - public void setEventType(String eventType) { this.eventType = eventType; } public RecordingAvailableCallback eventTime(OffsetDateTime eventTime) { - this.eventTime = eventTime; return this; } @@ -184,14 +180,12 @@ public OffsetDateTime getEventTime() { return eventTime; } - public void setEventTime(OffsetDateTime eventTime) { this.eventTime = eventTime; } public RecordingAvailableCallback accountId(String accountId) { - this.accountId = accountId; return this; } @@ -205,14 +199,12 @@ public String getAccountId() { return accountId; } - public void setAccountId(String accountId) { this.accountId = accountId; } public RecordingAvailableCallback applicationId(String applicationId) { - this.applicationId = applicationId; return this; } @@ -226,14 +218,12 @@ public String getApplicationId() { return applicationId; } - public void setApplicationId(String applicationId) { this.applicationId = applicationId; } public RecordingAvailableCallback from(String from) { - this.from = from; return this; } @@ -247,14 +237,12 @@ public String getFrom() { return from; } - public void setFrom(String from) { this.from = from; } public RecordingAvailableCallback to(String to) { - this.to = to; return this; } @@ -268,14 +256,12 @@ public String getTo() { return to; } - public void setTo(String to) { this.to = to; } public RecordingAvailableCallback direction(CallDirectionEnum direction) { - this.direction = direction; return this; } @@ -289,14 +275,12 @@ public CallDirectionEnum getDirection() { return direction; } - public void setDirection(CallDirectionEnum direction) { this.direction = direction; } public RecordingAvailableCallback callId(String callId) { - this.callId = callId; return this; } @@ -310,14 +294,12 @@ public String getCallId() { return callId; } - public void setCallId(String callId) { this.callId = callId; } public RecordingAvailableCallback callUrl(String callUrl) { - this.callUrl = callUrl; return this; } @@ -331,14 +313,12 @@ public String getCallUrl() { return callUrl; } - public void setCallUrl(String callUrl) { this.callUrl = callUrl; } public RecordingAvailableCallback parentCallId(String parentCallId) { - this.parentCallId = parentCallId; return this; } @@ -352,14 +332,12 @@ public String getParentCallId() { return parentCallId; } - public void setParentCallId(String parentCallId) { this.parentCallId = parentCallId; } public RecordingAvailableCallback recordingId(String recordingId) { - this.recordingId = recordingId; return this; } @@ -373,14 +351,12 @@ public String getRecordingId() { return recordingId; } - public void setRecordingId(String recordingId) { this.recordingId = recordingId; } public RecordingAvailableCallback mediaUrl(URI mediaUrl) { - this.mediaUrl = mediaUrl; return this; } @@ -394,14 +370,12 @@ public URI getMediaUrl() { return mediaUrl; } - public void setMediaUrl(URI mediaUrl) { this.mediaUrl = mediaUrl; } public RecordingAvailableCallback enqueuedTime(OffsetDateTime enqueuedTime) { - this.enqueuedTime = enqueuedTime; return this; } @@ -415,14 +389,12 @@ public OffsetDateTime getEnqueuedTime() { return enqueuedTime; } - public void setEnqueuedTime(OffsetDateTime enqueuedTime) { this.enqueuedTime = enqueuedTime; } public RecordingAvailableCallback startTime(OffsetDateTime startTime) { - this.startTime = startTime; return this; } @@ -436,14 +408,12 @@ public OffsetDateTime getStartTime() { return startTime; } - public void setStartTime(OffsetDateTime startTime) { this.startTime = startTime; } public RecordingAvailableCallback endTime(OffsetDateTime endTime) { - this.endTime = endTime; return this; } @@ -457,14 +427,12 @@ public OffsetDateTime getEndTime() { return endTime; } - public void setEndTime(OffsetDateTime endTime) { this.endTime = endTime; } public RecordingAvailableCallback duration(String duration) { - this.duration = duration; return this; } @@ -478,14 +446,12 @@ public String getDuration() { return duration; } - public void setDuration(String duration) { this.duration = duration; } public RecordingAvailableCallback fileFormat(FileFormatEnum fileFormat) { - this.fileFormat = fileFormat; return this; } @@ -499,14 +465,12 @@ public FileFormatEnum getFileFormat() { return fileFormat; } - public void setFileFormat(FileFormatEnum fileFormat) { this.fileFormat = fileFormat; } public RecordingAvailableCallback channels(Integer channels) { - this.channels = channels; return this; } @@ -520,14 +484,12 @@ public Integer getChannels() { return channels; } - public void setChannels(Integer channels) { this.channels = channels; } public RecordingAvailableCallback tag(String tag) { - this.tag = tag; return this; } @@ -541,14 +503,12 @@ public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } public RecordingAvailableCallback status(String status) { - this.status = status; return this; } @@ -562,14 +522,12 @@ public String getStatus() { return status; } - public void setStatus(String status) { this.status = status; } public RecordingAvailableCallback transferCallerId(String transferCallerId) { - this.transferCallerId = transferCallerId; return this; } @@ -583,14 +541,12 @@ public String getTransferCallerId() { return transferCallerId; } - public void setTransferCallerId(String transferCallerId) { this.transferCallerId = transferCallerId; } public RecordingAvailableCallback transferTo(String transferTo) { - this.transferTo = transferTo; return this; } @@ -604,7 +560,6 @@ public String getTransferTo() { return transferTo; } - public void setTransferTo(String transferTo) { this.transferTo = transferTo; } @@ -809,6 +764,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("to") != null && !jsonObj.get("to").isJsonNull()) && !jsonObj.get("to").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `to` to be a primitive type in the JSON string but got `%s`", jsonObj.get("to").toString())); } + // validate the optional field `direction` + if (jsonObj.get("direction") != null && !jsonObj.get("direction").isJsonNull()) { + CallDirectionEnum.validateJsonElement(jsonObj.get("direction")); + } if ((jsonObj.get("callId") != null && !jsonObj.get("callId").isJsonNull()) && !jsonObj.get("callId").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `callId` to be a primitive type in the JSON string but got `%s`", jsonObj.get("callId").toString())); } @@ -827,6 +786,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("duration") != null && !jsonObj.get("duration").isJsonNull()) && !jsonObj.get("duration").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `duration` to be a primitive type in the JSON string but got `%s`", jsonObj.get("duration").toString())); } + // validate the optional field `fileFormat` + if (jsonObj.get("fileFormat") != null && !jsonObj.get("fileFormat").isJsonNull()) { + FileFormatEnum.validateJsonElement(jsonObj.get("fileFormat")); + } if ((jsonObj.get("tag") != null && !jsonObj.get("tag").isJsonNull()) && !jsonObj.get("tag").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `tag` to be a primitive type in the JSON string but got `%s`", jsonObj.get("tag").toString())); } @@ -869,7 +832,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/RecordingCompleteCallback.java b/src/main/java/com/bandwidth/sdk/model/RecordingCompleteCallback.java index 02e92e37..3253834b 100644 --- a/src/main/java/com/bandwidth/sdk/model/RecordingCompleteCallback.java +++ b/src/main/java/com/bandwidth/sdk/model/RecordingCompleteCallback.java @@ -47,7 +47,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -55,7 +54,7 @@ /** * The Record Complete event is sent after a <Record> verb has executed if the call is still active. The BXML returned by this callback is executed next. When the recording is available for download, a Recording Available event will be sent. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class RecordingCompleteCallback { public static final String SERIALIZED_NAME_EVENT_TYPE = "eventType"; @SerializedName(SERIALIZED_NAME_EVENT_TYPE) @@ -149,7 +148,6 @@ public RecordingCompleteCallback() { } public RecordingCompleteCallback eventType(String eventType) { - this.eventType = eventType; return this; } @@ -163,14 +161,12 @@ public String getEventType() { return eventType; } - public void setEventType(String eventType) { this.eventType = eventType; } public RecordingCompleteCallback eventTime(OffsetDateTime eventTime) { - this.eventTime = eventTime; return this; } @@ -184,14 +180,12 @@ public OffsetDateTime getEventTime() { return eventTime; } - public void setEventTime(OffsetDateTime eventTime) { this.eventTime = eventTime; } public RecordingCompleteCallback accountId(String accountId) { - this.accountId = accountId; return this; } @@ -205,14 +199,12 @@ public String getAccountId() { return accountId; } - public void setAccountId(String accountId) { this.accountId = accountId; } public RecordingCompleteCallback applicationId(String applicationId) { - this.applicationId = applicationId; return this; } @@ -226,14 +218,12 @@ public String getApplicationId() { return applicationId; } - public void setApplicationId(String applicationId) { this.applicationId = applicationId; } public RecordingCompleteCallback from(String from) { - this.from = from; return this; } @@ -247,14 +237,12 @@ public String getFrom() { return from; } - public void setFrom(String from) { this.from = from; } public RecordingCompleteCallback to(String to) { - this.to = to; return this; } @@ -268,14 +256,12 @@ public String getTo() { return to; } - public void setTo(String to) { this.to = to; } public RecordingCompleteCallback direction(CallDirectionEnum direction) { - this.direction = direction; return this; } @@ -289,14 +275,12 @@ public CallDirectionEnum getDirection() { return direction; } - public void setDirection(CallDirectionEnum direction) { this.direction = direction; } public RecordingCompleteCallback callId(String callId) { - this.callId = callId; return this; } @@ -310,14 +294,12 @@ public String getCallId() { return callId; } - public void setCallId(String callId) { this.callId = callId; } public RecordingCompleteCallback callUrl(String callUrl) { - this.callUrl = callUrl; return this; } @@ -331,14 +313,12 @@ public String getCallUrl() { return callUrl; } - public void setCallUrl(String callUrl) { this.callUrl = callUrl; } public RecordingCompleteCallback parentCallId(String parentCallId) { - this.parentCallId = parentCallId; return this; } @@ -352,14 +332,12 @@ public String getParentCallId() { return parentCallId; } - public void setParentCallId(String parentCallId) { this.parentCallId = parentCallId; } public RecordingCompleteCallback recordingId(String recordingId) { - this.recordingId = recordingId; return this; } @@ -373,14 +351,12 @@ public String getRecordingId() { return recordingId; } - public void setRecordingId(String recordingId) { this.recordingId = recordingId; } public RecordingCompleteCallback mediaUrl(URI mediaUrl) { - this.mediaUrl = mediaUrl; return this; } @@ -394,14 +370,12 @@ public URI getMediaUrl() { return mediaUrl; } - public void setMediaUrl(URI mediaUrl) { this.mediaUrl = mediaUrl; } public RecordingCompleteCallback enqueuedTime(OffsetDateTime enqueuedTime) { - this.enqueuedTime = enqueuedTime; return this; } @@ -415,14 +389,12 @@ public OffsetDateTime getEnqueuedTime() { return enqueuedTime; } - public void setEnqueuedTime(OffsetDateTime enqueuedTime) { this.enqueuedTime = enqueuedTime; } public RecordingCompleteCallback startTime(OffsetDateTime startTime) { - this.startTime = startTime; return this; } @@ -436,14 +408,12 @@ public OffsetDateTime getStartTime() { return startTime; } - public void setStartTime(OffsetDateTime startTime) { this.startTime = startTime; } public RecordingCompleteCallback answerTime(OffsetDateTime answerTime) { - this.answerTime = answerTime; return this; } @@ -457,14 +427,12 @@ public OffsetDateTime getAnswerTime() { return answerTime; } - public void setAnswerTime(OffsetDateTime answerTime) { this.answerTime = answerTime; } public RecordingCompleteCallback endTime(OffsetDateTime endTime) { - this.endTime = endTime; return this; } @@ -478,14 +446,12 @@ public OffsetDateTime getEndTime() { return endTime; } - public void setEndTime(OffsetDateTime endTime) { this.endTime = endTime; } public RecordingCompleteCallback duration(String duration) { - this.duration = duration; return this; } @@ -499,14 +465,12 @@ public String getDuration() { return duration; } - public void setDuration(String duration) { this.duration = duration; } public RecordingCompleteCallback fileFormat(FileFormatEnum fileFormat) { - this.fileFormat = fileFormat; return this; } @@ -520,14 +484,12 @@ public FileFormatEnum getFileFormat() { return fileFormat; } - public void setFileFormat(FileFormatEnum fileFormat) { this.fileFormat = fileFormat; } public RecordingCompleteCallback channels(Integer channels) { - this.channels = channels; return this; } @@ -541,14 +503,12 @@ public Integer getChannels() { return channels; } - public void setChannels(Integer channels) { this.channels = channels; } public RecordingCompleteCallback tag(String tag) { - this.tag = tag; return this; } @@ -562,14 +522,12 @@ public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } public RecordingCompleteCallback transferCallerId(String transferCallerId) { - this.transferCallerId = transferCallerId; return this; } @@ -583,14 +541,12 @@ public String getTransferCallerId() { return transferCallerId; } - public void setTransferCallerId(String transferCallerId) { this.transferCallerId = transferCallerId; } public RecordingCompleteCallback transferTo(String transferTo) { - this.transferTo = transferTo; return this; } @@ -604,7 +560,6 @@ public String getTransferTo() { return transferTo; } - public void setTransferTo(String transferTo) { this.transferTo = transferTo; } @@ -809,6 +764,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("to") != null && !jsonObj.get("to").isJsonNull()) && !jsonObj.get("to").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `to` to be a primitive type in the JSON string but got `%s`", jsonObj.get("to").toString())); } + // validate the optional field `direction` + if (jsonObj.get("direction") != null && !jsonObj.get("direction").isJsonNull()) { + CallDirectionEnum.validateJsonElement(jsonObj.get("direction")); + } if ((jsonObj.get("callId") != null && !jsonObj.get("callId").isJsonNull()) && !jsonObj.get("callId").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `callId` to be a primitive type in the JSON string but got `%s`", jsonObj.get("callId").toString())); } @@ -827,6 +786,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("duration") != null && !jsonObj.get("duration").isJsonNull()) && !jsonObj.get("duration").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `duration` to be a primitive type in the JSON string but got `%s`", jsonObj.get("duration").toString())); } + // validate the optional field `fileFormat` + if (jsonObj.get("fileFormat") != null && !jsonObj.get("fileFormat").isJsonNull()) { + FileFormatEnum.validateJsonElement(jsonObj.get("fileFormat")); + } if ((jsonObj.get("tag") != null && !jsonObj.get("tag").isJsonNull()) && !jsonObj.get("tag").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `tag` to be a primitive type in the JSON string but got `%s`", jsonObj.get("tag").toString())); } @@ -866,7 +829,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/RecordingStateEnum.java b/src/main/java/com/bandwidth/sdk/model/RecordingStateEnum.java index 9e32ec07..ff3d9507 100644 --- a/src/main/java/com/bandwidth/sdk/model/RecordingStateEnum.java +++ b/src/main/java/com/bandwidth/sdk/model/RecordingStateEnum.java @@ -18,6 +18,7 @@ import java.io.IOException; import com.google.gson.TypeAdapter; +import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; @@ -68,5 +69,10 @@ public RecordingStateEnum read(final JsonReader jsonReader) throws IOException { return RecordingStateEnum.fromValue(value); } } + + public static void validateJsonElement(JsonElement jsonElement) throws IOException { + String value = jsonElement.getAsString(); + RecordingStateEnum.fromValue(value); + } } diff --git a/src/main/java/com/bandwidth/sdk/model/RecordingTranscriptionMetadata.java b/src/main/java/com/bandwidth/sdk/model/RecordingTranscriptionMetadata.java index f9132276..c93b9c4f 100644 --- a/src/main/java/com/bandwidth/sdk/model/RecordingTranscriptionMetadata.java +++ b/src/main/java/com/bandwidth/sdk/model/RecordingTranscriptionMetadata.java @@ -43,7 +43,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -51,7 +50,7 @@ /** * If the recording was transcribed, metadata about the transcription */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class RecordingTranscriptionMetadata { public static final String SERIALIZED_NAME_ID = "id"; @SerializedName(SERIALIZED_NAME_ID) @@ -73,7 +72,6 @@ public RecordingTranscriptionMetadata() { } public RecordingTranscriptionMetadata id(String id) { - this.id = id; return this; } @@ -87,14 +85,12 @@ public String getId() { return id; } - public void setId(String id) { this.id = id; } public RecordingTranscriptionMetadata status(String status) { - this.status = status; return this; } @@ -108,14 +104,12 @@ public String getStatus() { return status; } - public void setStatus(String status) { this.status = status; } public RecordingTranscriptionMetadata completedTime(String completedTime) { - this.completedTime = completedTime; return this; } @@ -129,14 +123,12 @@ public String getCompletedTime() { return completedTime; } - public void setCompletedTime(String completedTime) { this.completedTime = completedTime; } public RecordingTranscriptionMetadata url(URI url) { - this.url = url; return this; } @@ -150,7 +142,6 @@ public URI getUrl() { return url; } - public void setUrl(URI url) { this.url = url; } @@ -317,7 +308,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/RecordingTranscriptions.java b/src/main/java/com/bandwidth/sdk/model/RecordingTranscriptions.java index 3d66395c..96087470 100644 --- a/src/main/java/com/bandwidth/sdk/model/RecordingTranscriptions.java +++ b/src/main/java/com/bandwidth/sdk/model/RecordingTranscriptions.java @@ -45,7 +45,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -53,17 +52,16 @@ /** * RecordingTranscriptions */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class RecordingTranscriptions { public static final String SERIALIZED_NAME_TRANSCRIPTS = "transcripts"; @SerializedName(SERIALIZED_NAME_TRANSCRIPTS) - private List transcripts; + private List transcripts = new ArrayList<>(); public RecordingTranscriptions() { } public RecordingTranscriptions transcripts(List transcripts) { - this.transcripts = transcripts; return this; } @@ -85,7 +83,6 @@ public List getTranscripts() { return transcripts; } - public void setTranscripts(List transcripts) { this.transcripts = transcripts; } @@ -245,7 +242,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/RedirectCallback.java b/src/main/java/com/bandwidth/sdk/model/RedirectCallback.java index 1cb5b0e2..ea4f7ca3 100644 --- a/src/main/java/com/bandwidth/sdk/model/RedirectCallback.java +++ b/src/main/java/com/bandwidth/sdk/model/RedirectCallback.java @@ -45,7 +45,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -53,7 +52,7 @@ /** * The Redirect event is fired when a <Redirect> verb is executed. Its purpose is to get the next set of verbs from the calling application. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class RedirectCallback { public static final String SERIALIZED_NAME_EVENT_TYPE = "eventType"; @SerializedName(SERIALIZED_NAME_EVENT_TYPE) @@ -123,7 +122,6 @@ public RedirectCallback() { } public RedirectCallback eventType(String eventType) { - this.eventType = eventType; return this; } @@ -137,14 +135,12 @@ public String getEventType() { return eventType; } - public void setEventType(String eventType) { this.eventType = eventType; } public RedirectCallback eventTime(OffsetDateTime eventTime) { - this.eventTime = eventTime; return this; } @@ -158,14 +154,12 @@ public OffsetDateTime getEventTime() { return eventTime; } - public void setEventTime(OffsetDateTime eventTime) { this.eventTime = eventTime; } public RedirectCallback accountId(String accountId) { - this.accountId = accountId; return this; } @@ -179,14 +173,12 @@ public String getAccountId() { return accountId; } - public void setAccountId(String accountId) { this.accountId = accountId; } public RedirectCallback applicationId(String applicationId) { - this.applicationId = applicationId; return this; } @@ -200,14 +192,12 @@ public String getApplicationId() { return applicationId; } - public void setApplicationId(String applicationId) { this.applicationId = applicationId; } public RedirectCallback from(String from) { - this.from = from; return this; } @@ -221,14 +211,12 @@ public String getFrom() { return from; } - public void setFrom(String from) { this.from = from; } public RedirectCallback to(String to) { - this.to = to; return this; } @@ -242,14 +230,12 @@ public String getTo() { return to; } - public void setTo(String to) { this.to = to; } public RedirectCallback direction(CallDirectionEnum direction) { - this.direction = direction; return this; } @@ -263,14 +249,12 @@ public CallDirectionEnum getDirection() { return direction; } - public void setDirection(CallDirectionEnum direction) { this.direction = direction; } public RedirectCallback callId(String callId) { - this.callId = callId; return this; } @@ -284,14 +268,12 @@ public String getCallId() { return callId; } - public void setCallId(String callId) { this.callId = callId; } public RedirectCallback callUrl(String callUrl) { - this.callUrl = callUrl; return this; } @@ -305,14 +287,12 @@ public String getCallUrl() { return callUrl; } - public void setCallUrl(String callUrl) { this.callUrl = callUrl; } public RedirectCallback parentCallId(String parentCallId) { - this.parentCallId = parentCallId; return this; } @@ -326,14 +306,12 @@ public String getParentCallId() { return parentCallId; } - public void setParentCallId(String parentCallId) { this.parentCallId = parentCallId; } public RedirectCallback enqueuedTime(OffsetDateTime enqueuedTime) { - this.enqueuedTime = enqueuedTime; return this; } @@ -347,14 +325,12 @@ public OffsetDateTime getEnqueuedTime() { return enqueuedTime; } - public void setEnqueuedTime(OffsetDateTime enqueuedTime) { this.enqueuedTime = enqueuedTime; } public RedirectCallback startTime(OffsetDateTime startTime) { - this.startTime = startTime; return this; } @@ -368,14 +344,12 @@ public OffsetDateTime getStartTime() { return startTime; } - public void setStartTime(OffsetDateTime startTime) { this.startTime = startTime; } public RedirectCallback answerTime(OffsetDateTime answerTime) { - this.answerTime = answerTime; return this; } @@ -389,14 +363,12 @@ public OffsetDateTime getAnswerTime() { return answerTime; } - public void setAnswerTime(OffsetDateTime answerTime) { this.answerTime = answerTime; } public RedirectCallback tag(String tag) { - this.tag = tag; return this; } @@ -410,14 +382,12 @@ public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } public RedirectCallback transferCallerId(String transferCallerId) { - this.transferCallerId = transferCallerId; return this; } @@ -431,14 +401,12 @@ public String getTransferCallerId() { return transferCallerId; } - public void setTransferCallerId(String transferCallerId) { this.transferCallerId = transferCallerId; } public RedirectCallback transferTo(String transferTo) { - this.transferTo = transferTo; return this; } @@ -452,7 +420,6 @@ public String getTransferTo() { return transferTo; } - public void setTransferTo(String transferTo) { this.transferTo = transferTo; } @@ -639,6 +606,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("to") != null && !jsonObj.get("to").isJsonNull()) && !jsonObj.get("to").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `to` to be a primitive type in the JSON string but got `%s`", jsonObj.get("to").toString())); } + // validate the optional field `direction` + if (jsonObj.get("direction") != null && !jsonObj.get("direction").isJsonNull()) { + CallDirectionEnum.validateJsonElement(jsonObj.get("direction")); + } if ((jsonObj.get("callId") != null && !jsonObj.get("callId").isJsonNull()) && !jsonObj.get("callId").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `callId` to be a primitive type in the JSON string but got `%s`", jsonObj.get("callId").toString())); } @@ -687,7 +658,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/RedirectMethodEnum.java b/src/main/java/com/bandwidth/sdk/model/RedirectMethodEnum.java index 18c26b22..ef3d6bfd 100644 --- a/src/main/java/com/bandwidth/sdk/model/RedirectMethodEnum.java +++ b/src/main/java/com/bandwidth/sdk/model/RedirectMethodEnum.java @@ -18,6 +18,7 @@ import java.io.IOException; import com.google.gson.TypeAdapter; +import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; @@ -68,5 +69,10 @@ public RedirectMethodEnum read(final JsonReader jsonReader) throws IOException { return RedirectMethodEnum.fromValue(value); } } + + public static void validateJsonElement(JsonElement jsonElement) throws IOException { + String value = jsonElement.getAsString(); + RedirectMethodEnum.fromValue(value); + } } diff --git a/src/main/java/com/bandwidth/sdk/model/StirShaken.java b/src/main/java/com/bandwidth/sdk/model/StirShaken.java index 37f2ed35..ce8dc501 100644 --- a/src/main/java/com/bandwidth/sdk/model/StirShaken.java +++ b/src/main/java/com/bandwidth/sdk/model/StirShaken.java @@ -42,7 +42,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -50,7 +49,7 @@ /** * StirShaken */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class StirShaken { public static final String SERIALIZED_NAME_VERSTAT = "verstat"; @SerializedName(SERIALIZED_NAME_VERSTAT) @@ -68,7 +67,6 @@ public StirShaken() { } public StirShaken verstat(String verstat) { - this.verstat = verstat; return this; } @@ -82,14 +80,12 @@ public String getVerstat() { return verstat; } - public void setVerstat(String verstat) { this.verstat = verstat; } public StirShaken attestationIndicator(String attestationIndicator) { - this.attestationIndicator = attestationIndicator; return this; } @@ -103,14 +99,12 @@ public String getAttestationIndicator() { return attestationIndicator; } - public void setAttestationIndicator(String attestationIndicator) { this.attestationIndicator = attestationIndicator; } public StirShaken originatingId(String originatingId) { - this.originatingId = originatingId; return this; } @@ -124,7 +118,6 @@ public String getOriginatingId() { return originatingId; } - public void setOriginatingId(String originatingId) { this.originatingId = originatingId; } @@ -285,7 +278,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/Tag.java b/src/main/java/com/bandwidth/sdk/model/Tag.java index 6964e4d8..0607f53c 100644 --- a/src/main/java/com/bandwidth/sdk/model/Tag.java +++ b/src/main/java/com/bandwidth/sdk/model/Tag.java @@ -42,7 +42,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -50,7 +49,7 @@ /** * Tag */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class Tag { public static final String SERIALIZED_NAME_KEY = "key"; @SerializedName(SERIALIZED_NAME_KEY) @@ -64,7 +63,6 @@ public Tag() { } public Tag key(String key) { - this.key = key; return this; } @@ -78,14 +76,12 @@ public String getKey() { return key; } - public void setKey(String key) { this.key = key; } public Tag value(String value) { - this.value = value; return this; } @@ -99,7 +95,6 @@ public String getValue() { return value; } - public void setValue(String value) { this.value = value; } @@ -254,7 +249,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/TnLookupRequestError.java b/src/main/java/com/bandwidth/sdk/model/TnLookupRequestError.java index 1cfa0ab4..8737295b 100644 --- a/src/main/java/com/bandwidth/sdk/model/TnLookupRequestError.java +++ b/src/main/java/com/bandwidth/sdk/model/TnLookupRequestError.java @@ -42,7 +42,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -50,7 +49,7 @@ /** * TnLookupRequestError */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class TnLookupRequestError { public static final String SERIALIZED_NAME_MESSAGE = "message"; @SerializedName(SERIALIZED_NAME_MESSAGE) @@ -60,7 +59,6 @@ public TnLookupRequestError() { } public TnLookupRequestError message(String message) { - this.message = message; return this; } @@ -74,7 +72,6 @@ public String getMessage() { return message; } - public void setMessage(String message) { this.message = message; } @@ -223,7 +220,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/TranscribeRecording.java b/src/main/java/com/bandwidth/sdk/model/TranscribeRecording.java index f5680890..4bcf208f 100644 --- a/src/main/java/com/bandwidth/sdk/model/TranscribeRecording.java +++ b/src/main/java/com/bandwidth/sdk/model/TranscribeRecording.java @@ -45,7 +45,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -53,7 +52,7 @@ /** * TranscribeRecording */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class TranscribeRecording { public static final String SERIALIZED_NAME_CALLBACK_URL = "callbackUrl"; @SerializedName(SERIALIZED_NAME_CALLBACK_URL) @@ -87,7 +86,6 @@ public TranscribeRecording() { } public TranscribeRecording callbackUrl(URI callbackUrl) { - this.callbackUrl = callbackUrl; return this; } @@ -101,14 +99,12 @@ public URI getCallbackUrl() { return callbackUrl; } - public void setCallbackUrl(URI callbackUrl) { this.callbackUrl = callbackUrl; } public TranscribeRecording callbackMethod(CallbackMethodEnum callbackMethod) { - this.callbackMethod = callbackMethod; return this; } @@ -122,14 +118,12 @@ public CallbackMethodEnum getCallbackMethod() { return callbackMethod; } - public void setCallbackMethod(CallbackMethodEnum callbackMethod) { this.callbackMethod = callbackMethod; } public TranscribeRecording username(String username) { - this.username = username; return this; } @@ -143,14 +137,12 @@ public String getUsername() { return username; } - public void setUsername(String username) { this.username = username; } public TranscribeRecording password(String password) { - this.password = password; return this; } @@ -164,14 +156,12 @@ public String getPassword() { return password; } - public void setPassword(String password) { this.password = password; } public TranscribeRecording tag(String tag) { - this.tag = tag; return this; } @@ -185,14 +175,12 @@ public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } public TranscribeRecording callbackTimeout(Double callbackTimeout) { - this.callbackTimeout = callbackTimeout; return this; } @@ -208,14 +196,12 @@ public Double getCallbackTimeout() { return callbackTimeout; } - public void setCallbackTimeout(Double callbackTimeout) { this.callbackTimeout = callbackTimeout; } public TranscribeRecording detectLanguage(Boolean detectLanguage) { - this.detectLanguage = detectLanguage; return this; } @@ -229,7 +215,6 @@ public Boolean getDetectLanguage() { return detectLanguage; } - public void setDetectLanguage(Boolean detectLanguage) { this.detectLanguage = detectLanguage; } @@ -377,6 +362,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("callbackUrl") != null && !jsonObj.get("callbackUrl").isJsonNull()) && !jsonObj.get("callbackUrl").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `callbackUrl` to be a primitive type in the JSON string but got `%s`", jsonObj.get("callbackUrl").toString())); } + // validate the optional field `callbackMethod` + if (jsonObj.get("callbackMethod") != null && !jsonObj.get("callbackMethod").isJsonNull()) { + CallbackMethodEnum.validateJsonElement(jsonObj.get("callbackMethod")); + } if ((jsonObj.get("username") != null && !jsonObj.get("username").isJsonNull()) && !jsonObj.get("username").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `username` to be a primitive type in the JSON string but got `%s`", jsonObj.get("username").toString())); } @@ -416,7 +405,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/Transcription.java b/src/main/java/com/bandwidth/sdk/model/Transcription.java index dc3f1c32..69a77729 100644 --- a/src/main/java/com/bandwidth/sdk/model/Transcription.java +++ b/src/main/java/com/bandwidth/sdk/model/Transcription.java @@ -42,7 +42,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -50,7 +49,7 @@ /** * Transcription */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class Transcription { public static final String SERIALIZED_NAME_TEXT = "text"; @SerializedName(SERIALIZED_NAME_TEXT) @@ -64,7 +63,6 @@ public Transcription() { } public Transcription text(String text) { - this.text = text; return this; } @@ -78,14 +76,12 @@ public String getText() { return text; } - public void setText(String text) { this.text = text; } public Transcription confidence(Double confidence) { - this.confidence = confidence; return this; } @@ -99,7 +95,6 @@ public Double getConfidence() { return confidence; } - public void setConfidence(Double confidence) { this.confidence = confidence; } @@ -251,7 +246,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/TranscriptionAvailableCallback.java b/src/main/java/com/bandwidth/sdk/model/TranscriptionAvailableCallback.java index 9b40b70f..cc7873e6 100644 --- a/src/main/java/com/bandwidth/sdk/model/TranscriptionAvailableCallback.java +++ b/src/main/java/com/bandwidth/sdk/model/TranscriptionAvailableCallback.java @@ -48,7 +48,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -56,7 +55,7 @@ /** * The Transcription Available event is sent when the recording transcription is available to be downloaded. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class TranscriptionAvailableCallback { public static final String SERIALIZED_NAME_EVENT_TYPE = "eventType"; @SerializedName(SERIALIZED_NAME_EVENT_TYPE) @@ -146,7 +145,6 @@ public TranscriptionAvailableCallback() { } public TranscriptionAvailableCallback eventType(String eventType) { - this.eventType = eventType; return this; } @@ -160,14 +158,12 @@ public String getEventType() { return eventType; } - public void setEventType(String eventType) { this.eventType = eventType; } public TranscriptionAvailableCallback eventTime(OffsetDateTime eventTime) { - this.eventTime = eventTime; return this; } @@ -181,14 +177,12 @@ public OffsetDateTime getEventTime() { return eventTime; } - public void setEventTime(OffsetDateTime eventTime) { this.eventTime = eventTime; } public TranscriptionAvailableCallback accountId(String accountId) { - this.accountId = accountId; return this; } @@ -202,14 +196,12 @@ public String getAccountId() { return accountId; } - public void setAccountId(String accountId) { this.accountId = accountId; } public TranscriptionAvailableCallback applicationId(String applicationId) { - this.applicationId = applicationId; return this; } @@ -223,14 +215,12 @@ public String getApplicationId() { return applicationId; } - public void setApplicationId(String applicationId) { this.applicationId = applicationId; } public TranscriptionAvailableCallback from(String from) { - this.from = from; return this; } @@ -244,14 +234,12 @@ public String getFrom() { return from; } - public void setFrom(String from) { this.from = from; } public TranscriptionAvailableCallback to(String to) { - this.to = to; return this; } @@ -265,14 +253,12 @@ public String getTo() { return to; } - public void setTo(String to) { this.to = to; } public TranscriptionAvailableCallback direction(CallDirectionEnum direction) { - this.direction = direction; return this; } @@ -286,14 +272,12 @@ public CallDirectionEnum getDirection() { return direction; } - public void setDirection(CallDirectionEnum direction) { this.direction = direction; } public TranscriptionAvailableCallback callId(String callId) { - this.callId = callId; return this; } @@ -307,14 +291,12 @@ public String getCallId() { return callId; } - public void setCallId(String callId) { this.callId = callId; } public TranscriptionAvailableCallback callUrl(String callUrl) { - this.callUrl = callUrl; return this; } @@ -328,14 +310,12 @@ public String getCallUrl() { return callUrl; } - public void setCallUrl(String callUrl) { this.callUrl = callUrl; } public TranscriptionAvailableCallback mediaUrl(URI mediaUrl) { - this.mediaUrl = mediaUrl; return this; } @@ -349,14 +329,12 @@ public URI getMediaUrl() { return mediaUrl; } - public void setMediaUrl(URI mediaUrl) { this.mediaUrl = mediaUrl; } public TranscriptionAvailableCallback parentCallId(String parentCallId) { - this.parentCallId = parentCallId; return this; } @@ -370,14 +348,12 @@ public String getParentCallId() { return parentCallId; } - public void setParentCallId(String parentCallId) { this.parentCallId = parentCallId; } public TranscriptionAvailableCallback recordingId(String recordingId) { - this.recordingId = recordingId; return this; } @@ -391,14 +367,12 @@ public String getRecordingId() { return recordingId; } - public void setRecordingId(String recordingId) { this.recordingId = recordingId; } public TranscriptionAvailableCallback enqueuedTime(OffsetDateTime enqueuedTime) { - this.enqueuedTime = enqueuedTime; return this; } @@ -412,14 +386,12 @@ public OffsetDateTime getEnqueuedTime() { return enqueuedTime; } - public void setEnqueuedTime(OffsetDateTime enqueuedTime) { this.enqueuedTime = enqueuedTime; } public TranscriptionAvailableCallback startTime(OffsetDateTime startTime) { - this.startTime = startTime; return this; } @@ -433,14 +405,12 @@ public OffsetDateTime getStartTime() { return startTime; } - public void setStartTime(OffsetDateTime startTime) { this.startTime = startTime; } public TranscriptionAvailableCallback endTime(OffsetDateTime endTime) { - this.endTime = endTime; return this; } @@ -454,14 +424,12 @@ public OffsetDateTime getEndTime() { return endTime; } - public void setEndTime(OffsetDateTime endTime) { this.endTime = endTime; } public TranscriptionAvailableCallback duration(String duration) { - this.duration = duration; return this; } @@ -475,14 +443,12 @@ public String getDuration() { return duration; } - public void setDuration(String duration) { this.duration = duration; } public TranscriptionAvailableCallback fileFormat(FileFormatEnum fileFormat) { - this.fileFormat = fileFormat; return this; } @@ -496,14 +462,12 @@ public FileFormatEnum getFileFormat() { return fileFormat; } - public void setFileFormat(FileFormatEnum fileFormat) { this.fileFormat = fileFormat; } public TranscriptionAvailableCallback tag(String tag) { - this.tag = tag; return this; } @@ -517,14 +481,12 @@ public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } public TranscriptionAvailableCallback transcription(Transcription transcription) { - this.transcription = transcription; return this; } @@ -538,14 +500,12 @@ public Transcription getTranscription() { return transcription; } - public void setTranscription(Transcription transcription) { this.transcription = transcription; } public TranscriptionAvailableCallback transferCallerId(String transferCallerId) { - this.transferCallerId = transferCallerId; return this; } @@ -559,14 +519,12 @@ public String getTransferCallerId() { return transferCallerId; } - public void setTransferCallerId(String transferCallerId) { this.transferCallerId = transferCallerId; } public TranscriptionAvailableCallback transferTo(String transferTo) { - this.transferTo = transferTo; return this; } @@ -580,7 +538,6 @@ public String getTransferTo() { return transferTo; } - public void setTransferTo(String transferTo) { this.transferTo = transferTo; } @@ -782,6 +739,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("to") != null && !jsonObj.get("to").isJsonNull()) && !jsonObj.get("to").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `to` to be a primitive type in the JSON string but got `%s`", jsonObj.get("to").toString())); } + // validate the optional field `direction` + if (jsonObj.get("direction") != null && !jsonObj.get("direction").isJsonNull()) { + CallDirectionEnum.validateJsonElement(jsonObj.get("direction")); + } if ((jsonObj.get("callId") != null && !jsonObj.get("callId").isJsonNull()) && !jsonObj.get("callId").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `callId` to be a primitive type in the JSON string but got `%s`", jsonObj.get("callId").toString())); } @@ -800,6 +761,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("duration") != null && !jsonObj.get("duration").isJsonNull()) && !jsonObj.get("duration").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `duration` to be a primitive type in the JSON string but got `%s`", jsonObj.get("duration").toString())); } + // validate the optional field `fileFormat` + if (jsonObj.get("fileFormat") != null && !jsonObj.get("fileFormat").isJsonNull()) { + FileFormatEnum.validateJsonElement(jsonObj.get("fileFormat")); + } if ((jsonObj.get("tag") != null && !jsonObj.get("tag").isJsonNull()) && !jsonObj.get("tag").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `tag` to be a primitive type in the JSON string but got `%s`", jsonObj.get("tag").toString())); } @@ -843,7 +808,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/TransferAnswerCallback.java b/src/main/java/com/bandwidth/sdk/model/TransferAnswerCallback.java index 9ea43ba9..1861f4a1 100644 --- a/src/main/java/com/bandwidth/sdk/model/TransferAnswerCallback.java +++ b/src/main/java/com/bandwidth/sdk/model/TransferAnswerCallback.java @@ -45,7 +45,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -53,7 +52,7 @@ /** * When processing a <Transfer> verb, this event is sent when a called party (B-leg) answers. The event is sent to the endpoint specified in the transferAnswerUrl attribute of the <PhoneNumber> tag that answered. BXML returned by this callback will be executed for the called party only. After all BXML has been executed, the called party will be bridged to the original call. Most BXML verbs are allowed in response to a transferAnswer event, but some are not allowed. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class TransferAnswerCallback { public static final String SERIALIZED_NAME_EVENT_TYPE = "eventType"; @SerializedName(SERIALIZED_NAME_EVENT_TYPE) @@ -119,7 +118,6 @@ public TransferAnswerCallback() { } public TransferAnswerCallback eventType(String eventType) { - this.eventType = eventType; return this; } @@ -133,14 +131,12 @@ public String getEventType() { return eventType; } - public void setEventType(String eventType) { this.eventType = eventType; } public TransferAnswerCallback eventTime(OffsetDateTime eventTime) { - this.eventTime = eventTime; return this; } @@ -154,14 +150,12 @@ public OffsetDateTime getEventTime() { return eventTime; } - public void setEventTime(OffsetDateTime eventTime) { this.eventTime = eventTime; } public TransferAnswerCallback accountId(String accountId) { - this.accountId = accountId; return this; } @@ -175,14 +169,12 @@ public String getAccountId() { return accountId; } - public void setAccountId(String accountId) { this.accountId = accountId; } public TransferAnswerCallback applicationId(String applicationId) { - this.applicationId = applicationId; return this; } @@ -196,14 +188,12 @@ public String getApplicationId() { return applicationId; } - public void setApplicationId(String applicationId) { this.applicationId = applicationId; } public TransferAnswerCallback from(String from) { - this.from = from; return this; } @@ -217,14 +207,12 @@ public String getFrom() { return from; } - public void setFrom(String from) { this.from = from; } public TransferAnswerCallback to(String to) { - this.to = to; return this; } @@ -238,14 +226,12 @@ public String getTo() { return to; } - public void setTo(String to) { this.to = to; } public TransferAnswerCallback direction(CallDirectionEnum direction) { - this.direction = direction; return this; } @@ -259,14 +245,12 @@ public CallDirectionEnum getDirection() { return direction; } - public void setDirection(CallDirectionEnum direction) { this.direction = direction; } public TransferAnswerCallback callId(String callId) { - this.callId = callId; return this; } @@ -280,14 +264,12 @@ public String getCallId() { return callId; } - public void setCallId(String callId) { this.callId = callId; } public TransferAnswerCallback callUrl(String callUrl) { - this.callUrl = callUrl; return this; } @@ -301,14 +283,12 @@ public String getCallUrl() { return callUrl; } - public void setCallUrl(String callUrl) { this.callUrl = callUrl; } public TransferAnswerCallback enqueuedTime(OffsetDateTime enqueuedTime) { - this.enqueuedTime = enqueuedTime; return this; } @@ -322,14 +302,12 @@ public OffsetDateTime getEnqueuedTime() { return enqueuedTime; } - public void setEnqueuedTime(OffsetDateTime enqueuedTime) { this.enqueuedTime = enqueuedTime; } public TransferAnswerCallback startTime(OffsetDateTime startTime) { - this.startTime = startTime; return this; } @@ -343,14 +321,12 @@ public OffsetDateTime getStartTime() { return startTime; } - public void setStartTime(OffsetDateTime startTime) { this.startTime = startTime; } public TransferAnswerCallback answerTime(OffsetDateTime answerTime) { - this.answerTime = answerTime; return this; } @@ -364,14 +340,12 @@ public OffsetDateTime getAnswerTime() { return answerTime; } - public void setAnswerTime(OffsetDateTime answerTime) { this.answerTime = answerTime; } public TransferAnswerCallback tag(String tag) { - this.tag = tag; return this; } @@ -385,14 +359,12 @@ public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } public TransferAnswerCallback transferCallerId(String transferCallerId) { - this.transferCallerId = transferCallerId; return this; } @@ -406,14 +378,12 @@ public String getTransferCallerId() { return transferCallerId; } - public void setTransferCallerId(String transferCallerId) { this.transferCallerId = transferCallerId; } public TransferAnswerCallback transferTo(String transferTo) { - this.transferTo = transferTo; return this; } @@ -427,7 +397,6 @@ public String getTransferTo() { return transferTo; } - public void setTransferTo(String transferTo) { this.transferTo = transferTo; } @@ -611,6 +580,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("to") != null && !jsonObj.get("to").isJsonNull()) && !jsonObj.get("to").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `to` to be a primitive type in the JSON string but got `%s`", jsonObj.get("to").toString())); } + // validate the optional field `direction` + if (jsonObj.get("direction") != null && !jsonObj.get("direction").isJsonNull()) { + CallDirectionEnum.validateJsonElement(jsonObj.get("direction")); + } if ((jsonObj.get("callId") != null && !jsonObj.get("callId").isJsonNull()) && !jsonObj.get("callId").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `callId` to be a primitive type in the JSON string but got `%s`", jsonObj.get("callId").toString())); } @@ -656,7 +629,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/TransferCompleteCallback.java b/src/main/java/com/bandwidth/sdk/model/TransferCompleteCallback.java index 7b8c772b..26df82fe 100644 --- a/src/main/java/com/bandwidth/sdk/model/TransferCompleteCallback.java +++ b/src/main/java/com/bandwidth/sdk/model/TransferCompleteCallback.java @@ -45,7 +45,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -53,7 +52,7 @@ /** * This event is sent to the transferCompleteUrl of the A-leg's <Transfer> verb when the transferred call (B-leg) completes. In a simultaneous ringing scenario, only one B-leg succeeds and this event corresponds to that successful leg. If none of the calls were answered, the transferComplete event corresponds to one of the legs. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class TransferCompleteCallback { public static final String SERIALIZED_NAME_EVENT_TYPE = "eventType"; @SerializedName(SERIALIZED_NAME_EVENT_TYPE) @@ -131,7 +130,6 @@ public TransferCompleteCallback() { } public TransferCompleteCallback eventType(String eventType) { - this.eventType = eventType; return this; } @@ -145,14 +143,12 @@ public String getEventType() { return eventType; } - public void setEventType(String eventType) { this.eventType = eventType; } public TransferCompleteCallback eventTime(OffsetDateTime eventTime) { - this.eventTime = eventTime; return this; } @@ -166,14 +162,12 @@ public OffsetDateTime getEventTime() { return eventTime; } - public void setEventTime(OffsetDateTime eventTime) { this.eventTime = eventTime; } public TransferCompleteCallback accountId(String accountId) { - this.accountId = accountId; return this; } @@ -187,14 +181,12 @@ public String getAccountId() { return accountId; } - public void setAccountId(String accountId) { this.accountId = accountId; } public TransferCompleteCallback applicationId(String applicationId) { - this.applicationId = applicationId; return this; } @@ -208,14 +200,12 @@ public String getApplicationId() { return applicationId; } - public void setApplicationId(String applicationId) { this.applicationId = applicationId; } public TransferCompleteCallback from(String from) { - this.from = from; return this; } @@ -229,14 +219,12 @@ public String getFrom() { return from; } - public void setFrom(String from) { this.from = from; } public TransferCompleteCallback to(String to) { - this.to = to; return this; } @@ -250,14 +238,12 @@ public String getTo() { return to; } - public void setTo(String to) { this.to = to; } public TransferCompleteCallback direction(CallDirectionEnum direction) { - this.direction = direction; return this; } @@ -271,14 +257,12 @@ public CallDirectionEnum getDirection() { return direction; } - public void setDirection(CallDirectionEnum direction) { this.direction = direction; } public TransferCompleteCallback callId(String callId) { - this.callId = callId; return this; } @@ -292,14 +276,12 @@ public String getCallId() { return callId; } - public void setCallId(String callId) { this.callId = callId; } public TransferCompleteCallback callUrl(String callUrl) { - this.callUrl = callUrl; return this; } @@ -313,14 +295,12 @@ public String getCallUrl() { return callUrl; } - public void setCallUrl(String callUrl) { this.callUrl = callUrl; } public TransferCompleteCallback enqueuedTime(OffsetDateTime enqueuedTime) { - this.enqueuedTime = enqueuedTime; return this; } @@ -334,14 +314,12 @@ public OffsetDateTime getEnqueuedTime() { return enqueuedTime; } - public void setEnqueuedTime(OffsetDateTime enqueuedTime) { this.enqueuedTime = enqueuedTime; } public TransferCompleteCallback startTime(OffsetDateTime startTime) { - this.startTime = startTime; return this; } @@ -355,14 +333,12 @@ public OffsetDateTime getStartTime() { return startTime; } - public void setStartTime(OffsetDateTime startTime) { this.startTime = startTime; } public TransferCompleteCallback answerTime(OffsetDateTime answerTime) { - this.answerTime = answerTime; return this; } @@ -376,14 +352,12 @@ public OffsetDateTime getAnswerTime() { return answerTime; } - public void setAnswerTime(OffsetDateTime answerTime) { this.answerTime = answerTime; } public TransferCompleteCallback tag(String tag) { - this.tag = tag; return this; } @@ -397,14 +371,12 @@ public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } public TransferCompleteCallback transferCallerId(String transferCallerId) { - this.transferCallerId = transferCallerId; return this; } @@ -418,14 +390,12 @@ public String getTransferCallerId() { return transferCallerId; } - public void setTransferCallerId(String transferCallerId) { this.transferCallerId = transferCallerId; } public TransferCompleteCallback transferTo(String transferTo) { - this.transferTo = transferTo; return this; } @@ -439,14 +409,12 @@ public String getTransferTo() { return transferTo; } - public void setTransferTo(String transferTo) { this.transferTo = transferTo; } public TransferCompleteCallback cause(String cause) { - this.cause = cause; return this; } @@ -460,14 +428,12 @@ public String getCause() { return cause; } - public void setCause(String cause) { this.cause = cause; } public TransferCompleteCallback errorMessage(String errorMessage) { - this.errorMessage = errorMessage; return this; } @@ -481,14 +447,12 @@ public String getErrorMessage() { return errorMessage; } - public void setErrorMessage(String errorMessage) { this.errorMessage = errorMessage; } public TransferCompleteCallback errorId(String errorId) { - this.errorId = errorId; return this; } @@ -502,7 +466,6 @@ public String getErrorId() { return errorId; } - public void setErrorId(String errorId) { this.errorId = errorId; } @@ -695,6 +658,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("to") != null && !jsonObj.get("to").isJsonNull()) && !jsonObj.get("to").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `to` to be a primitive type in the JSON string but got `%s`", jsonObj.get("to").toString())); } + // validate the optional field `direction` + if (jsonObj.get("direction") != null && !jsonObj.get("direction").isJsonNull()) { + CallDirectionEnum.validateJsonElement(jsonObj.get("direction")); + } if ((jsonObj.get("callId") != null && !jsonObj.get("callId").isJsonNull()) && !jsonObj.get("callId").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `callId` to be a primitive type in the JSON string but got `%s`", jsonObj.get("callId").toString())); } @@ -749,7 +716,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/TransferDisconnectCallback.java b/src/main/java/com/bandwidth/sdk/model/TransferDisconnectCallback.java index 05ccefd5..4d8bf17b 100644 --- a/src/main/java/com/bandwidth/sdk/model/TransferDisconnectCallback.java +++ b/src/main/java/com/bandwidth/sdk/model/TransferDisconnectCallback.java @@ -45,7 +45,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -53,7 +52,7 @@ /** * This event is sent to the transferDisconnectUrl of each <PhoneNumber> tag when its respective call leg ends for any reason. The event is sent in the normal case, when the transferred leg is answered and later hung up, but is also sent if the new leg was never answered in the first place, if it was rejected, and if the original call leg hung up before the transferred leg. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class TransferDisconnectCallback { public static final String SERIALIZED_NAME_EVENT_TYPE = "eventType"; @SerializedName(SERIALIZED_NAME_EVENT_TYPE) @@ -139,7 +138,6 @@ public TransferDisconnectCallback() { } public TransferDisconnectCallback eventType(String eventType) { - this.eventType = eventType; return this; } @@ -153,14 +151,12 @@ public String getEventType() { return eventType; } - public void setEventType(String eventType) { this.eventType = eventType; } public TransferDisconnectCallback eventTime(OffsetDateTime eventTime) { - this.eventTime = eventTime; return this; } @@ -174,14 +170,12 @@ public OffsetDateTime getEventTime() { return eventTime; } - public void setEventTime(OffsetDateTime eventTime) { this.eventTime = eventTime; } public TransferDisconnectCallback accountId(String accountId) { - this.accountId = accountId; return this; } @@ -195,14 +189,12 @@ public String getAccountId() { return accountId; } - public void setAccountId(String accountId) { this.accountId = accountId; } public TransferDisconnectCallback applicationId(String applicationId) { - this.applicationId = applicationId; return this; } @@ -216,14 +208,12 @@ public String getApplicationId() { return applicationId; } - public void setApplicationId(String applicationId) { this.applicationId = applicationId; } public TransferDisconnectCallback from(String from) { - this.from = from; return this; } @@ -237,14 +227,12 @@ public String getFrom() { return from; } - public void setFrom(String from) { this.from = from; } public TransferDisconnectCallback to(String to) { - this.to = to; return this; } @@ -258,14 +246,12 @@ public String getTo() { return to; } - public void setTo(String to) { this.to = to; } public TransferDisconnectCallback direction(CallDirectionEnum direction) { - this.direction = direction; return this; } @@ -279,14 +265,12 @@ public CallDirectionEnum getDirection() { return direction; } - public void setDirection(CallDirectionEnum direction) { this.direction = direction; } public TransferDisconnectCallback callId(String callId) { - this.callId = callId; return this; } @@ -300,14 +284,12 @@ public String getCallId() { return callId; } - public void setCallId(String callId) { this.callId = callId; } public TransferDisconnectCallback callUrl(String callUrl) { - this.callUrl = callUrl; return this; } @@ -321,14 +303,12 @@ public String getCallUrl() { return callUrl; } - public void setCallUrl(String callUrl) { this.callUrl = callUrl; } public TransferDisconnectCallback parentCallId(String parentCallId) { - this.parentCallId = parentCallId; return this; } @@ -342,14 +322,12 @@ public String getParentCallId() { return parentCallId; } - public void setParentCallId(String parentCallId) { this.parentCallId = parentCallId; } public TransferDisconnectCallback enqueuedTime(OffsetDateTime enqueuedTime) { - this.enqueuedTime = enqueuedTime; return this; } @@ -363,14 +341,12 @@ public OffsetDateTime getEnqueuedTime() { return enqueuedTime; } - public void setEnqueuedTime(OffsetDateTime enqueuedTime) { this.enqueuedTime = enqueuedTime; } public TransferDisconnectCallback startTime(OffsetDateTime startTime) { - this.startTime = startTime; return this; } @@ -384,14 +360,12 @@ public OffsetDateTime getStartTime() { return startTime; } - public void setStartTime(OffsetDateTime startTime) { this.startTime = startTime; } public TransferDisconnectCallback answerTime(OffsetDateTime answerTime) { - this.answerTime = answerTime; return this; } @@ -405,14 +379,12 @@ public OffsetDateTime getAnswerTime() { return answerTime; } - public void setAnswerTime(OffsetDateTime answerTime) { this.answerTime = answerTime; } public TransferDisconnectCallback endTime(OffsetDateTime endTime) { - this.endTime = endTime; return this; } @@ -426,14 +398,12 @@ public OffsetDateTime getEndTime() { return endTime; } - public void setEndTime(OffsetDateTime endTime) { this.endTime = endTime; } public TransferDisconnectCallback tag(String tag) { - this.tag = tag; return this; } @@ -447,14 +417,12 @@ public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } public TransferDisconnectCallback transferCallerId(String transferCallerId) { - this.transferCallerId = transferCallerId; return this; } @@ -468,14 +436,12 @@ public String getTransferCallerId() { return transferCallerId; } - public void setTransferCallerId(String transferCallerId) { this.transferCallerId = transferCallerId; } public TransferDisconnectCallback transferTo(String transferTo) { - this.transferTo = transferTo; return this; } @@ -489,14 +455,12 @@ public String getTransferTo() { return transferTo; } - public void setTransferTo(String transferTo) { this.transferTo = transferTo; } public TransferDisconnectCallback cause(String cause) { - this.cause = cause; return this; } @@ -510,14 +474,12 @@ public String getCause() { return cause; } - public void setCause(String cause) { this.cause = cause; } public TransferDisconnectCallback errorMessage(String errorMessage) { - this.errorMessage = errorMessage; return this; } @@ -531,14 +493,12 @@ public String getErrorMessage() { return errorMessage; } - public void setErrorMessage(String errorMessage) { this.errorMessage = errorMessage; } public TransferDisconnectCallback errorId(String errorId) { - this.errorId = errorId; return this; } @@ -552,7 +512,6 @@ public String getErrorId() { return errorId; } - public void setErrorId(String errorId) { this.errorId = errorId; } @@ -751,6 +710,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("to") != null && !jsonObj.get("to").isJsonNull()) && !jsonObj.get("to").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `to` to be a primitive type in the JSON string but got `%s`", jsonObj.get("to").toString())); } + // validate the optional field `direction` + if (jsonObj.get("direction") != null && !jsonObj.get("direction").isJsonNull()) { + CallDirectionEnum.validateJsonElement(jsonObj.get("direction")); + } if ((jsonObj.get("callId") != null && !jsonObj.get("callId").isJsonNull()) && !jsonObj.get("callId").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `callId` to be a primitive type in the JSON string but got `%s`", jsonObj.get("callId").toString())); } @@ -808,7 +771,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/UpdateCall.java b/src/main/java/com/bandwidth/sdk/model/UpdateCall.java index c367471e..dd2cc35c 100644 --- a/src/main/java/com/bandwidth/sdk/model/UpdateCall.java +++ b/src/main/java/com/bandwidth/sdk/model/UpdateCall.java @@ -46,7 +46,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -54,7 +53,7 @@ /** * UpdateCall */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class UpdateCall { public static final String SERIALIZED_NAME_STATE = "state"; @SerializedName(SERIALIZED_NAME_STATE) @@ -100,7 +99,6 @@ public UpdateCall() { } public UpdateCall state(CallStateEnum state) { - this.state = state; return this; } @@ -114,14 +112,12 @@ public CallStateEnum getState() { return state; } - public void setState(CallStateEnum state) { this.state = state; } public UpdateCall redirectUrl(URI redirectUrl) { - this.redirectUrl = redirectUrl; return this; } @@ -135,14 +131,12 @@ public URI getRedirectUrl() { return redirectUrl; } - public void setRedirectUrl(URI redirectUrl) { this.redirectUrl = redirectUrl; } public UpdateCall redirectMethod(RedirectMethodEnum redirectMethod) { - this.redirectMethod = redirectMethod; return this; } @@ -156,14 +150,12 @@ public RedirectMethodEnum getRedirectMethod() { return redirectMethod; } - public void setRedirectMethod(RedirectMethodEnum redirectMethod) { this.redirectMethod = redirectMethod; } public UpdateCall username(String username) { - this.username = username; return this; } @@ -177,14 +169,12 @@ public String getUsername() { return username; } - public void setUsername(String username) { this.username = username; } public UpdateCall password(String password) { - this.password = password; return this; } @@ -198,14 +188,12 @@ public String getPassword() { return password; } - public void setPassword(String password) { this.password = password; } public UpdateCall redirectFallbackUrl(URI redirectFallbackUrl) { - this.redirectFallbackUrl = redirectFallbackUrl; return this; } @@ -219,14 +207,12 @@ public URI getRedirectFallbackUrl() { return redirectFallbackUrl; } - public void setRedirectFallbackUrl(URI redirectFallbackUrl) { this.redirectFallbackUrl = redirectFallbackUrl; } public UpdateCall redirectFallbackMethod(RedirectMethodEnum redirectFallbackMethod) { - this.redirectFallbackMethod = redirectFallbackMethod; return this; } @@ -240,14 +226,12 @@ public RedirectMethodEnum getRedirectFallbackMethod() { return redirectFallbackMethod; } - public void setRedirectFallbackMethod(RedirectMethodEnum redirectFallbackMethod) { this.redirectFallbackMethod = redirectFallbackMethod; } public UpdateCall fallbackUsername(String fallbackUsername) { - this.fallbackUsername = fallbackUsername; return this; } @@ -261,14 +245,12 @@ public String getFallbackUsername() { return fallbackUsername; } - public void setFallbackUsername(String fallbackUsername) { this.fallbackUsername = fallbackUsername; } public UpdateCall fallbackPassword(String fallbackPassword) { - this.fallbackPassword = fallbackPassword; return this; } @@ -282,14 +264,12 @@ public String getFallbackPassword() { return fallbackPassword; } - public void setFallbackPassword(String fallbackPassword) { this.fallbackPassword = fallbackPassword; } public UpdateCall tag(String tag) { - this.tag = tag; return this; } @@ -303,7 +283,6 @@ public String getTag() { return tag; } - public void setTag(String tag) { this.tag = tag; } @@ -457,9 +436,17 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti } } JsonObject jsonObj = jsonElement.getAsJsonObject(); + // validate the optional field `state` + if (jsonObj.get("state") != null && !jsonObj.get("state").isJsonNull()) { + CallStateEnum.validateJsonElement(jsonObj.get("state")); + } if ((jsonObj.get("redirectUrl") != null && !jsonObj.get("redirectUrl").isJsonNull()) && !jsonObj.get("redirectUrl").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `redirectUrl` to be a primitive type in the JSON string but got `%s`", jsonObj.get("redirectUrl").toString())); } + // validate the optional field `redirectMethod` + if (jsonObj.get("redirectMethod") != null && !jsonObj.get("redirectMethod").isJsonNull()) { + RedirectMethodEnum.validateJsonElement(jsonObj.get("redirectMethod")); + } if ((jsonObj.get("username") != null && !jsonObj.get("username").isJsonNull()) && !jsonObj.get("username").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `username` to be a primitive type in the JSON string but got `%s`", jsonObj.get("username").toString())); } @@ -469,6 +456,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("redirectFallbackUrl") != null && !jsonObj.get("redirectFallbackUrl").isJsonNull()) && !jsonObj.get("redirectFallbackUrl").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `redirectFallbackUrl` to be a primitive type in the JSON string but got `%s`", jsonObj.get("redirectFallbackUrl").toString())); } + // validate the optional field `redirectFallbackMethod` + if (jsonObj.get("redirectFallbackMethod") != null && !jsonObj.get("redirectFallbackMethod").isJsonNull()) { + RedirectMethodEnum.validateJsonElement(jsonObj.get("redirectFallbackMethod")); + } if ((jsonObj.get("fallbackUsername") != null && !jsonObj.get("fallbackUsername").isJsonNull()) && !jsonObj.get("fallbackUsername").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `fallbackUsername` to be a primitive type in the JSON string but got `%s`", jsonObj.get("fallbackUsername").toString())); } @@ -508,7 +499,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/UpdateCallRecording.java b/src/main/java/com/bandwidth/sdk/model/UpdateCallRecording.java index 90e9148f..b7eec69c 100644 --- a/src/main/java/com/bandwidth/sdk/model/UpdateCallRecording.java +++ b/src/main/java/com/bandwidth/sdk/model/UpdateCallRecording.java @@ -43,7 +43,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -51,7 +50,7 @@ /** * UpdateCallRecording */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class UpdateCallRecording { public static final String SERIALIZED_NAME_STATE = "state"; @SerializedName(SERIALIZED_NAME_STATE) @@ -61,7 +60,6 @@ public UpdateCallRecording() { } public UpdateCallRecording state(RecordingStateEnum state) { - this.state = state; return this; } @@ -75,7 +73,6 @@ public RecordingStateEnum getState() { return state; } - public void setState(RecordingStateEnum state) { this.state = state; } @@ -199,6 +196,8 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti } } JsonObject jsonObj = jsonElement.getAsJsonObject(); + // validate the required field `state` + RecordingStateEnum.validateJsonElement(jsonObj.get("state")); } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -229,7 +228,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/UpdateConference.java b/src/main/java/com/bandwidth/sdk/model/UpdateConference.java index afa2ae1c..511da727 100644 --- a/src/main/java/com/bandwidth/sdk/model/UpdateConference.java +++ b/src/main/java/com/bandwidth/sdk/model/UpdateConference.java @@ -46,7 +46,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -54,7 +53,7 @@ /** * UpdateConference */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class UpdateConference { public static final String SERIALIZED_NAME_STATUS = "status"; @SerializedName(SERIALIZED_NAME_STATUS) @@ -96,7 +95,6 @@ public UpdateConference() { } public UpdateConference status(ConferenceStateEnum status) { - this.status = status; return this; } @@ -110,14 +108,12 @@ public ConferenceStateEnum getStatus() { return status; } - public void setStatus(ConferenceStateEnum status) { this.status = status; } public UpdateConference redirectUrl(URI redirectUrl) { - this.redirectUrl = redirectUrl; return this; } @@ -131,14 +127,12 @@ public URI getRedirectUrl() { return redirectUrl; } - public void setRedirectUrl(URI redirectUrl) { this.redirectUrl = redirectUrl; } public UpdateConference redirectMethod(RedirectMethodEnum redirectMethod) { - this.redirectMethod = redirectMethod; return this; } @@ -152,14 +146,12 @@ public RedirectMethodEnum getRedirectMethod() { return redirectMethod; } - public void setRedirectMethod(RedirectMethodEnum redirectMethod) { this.redirectMethod = redirectMethod; } public UpdateConference username(String username) { - this.username = username; return this; } @@ -173,14 +165,12 @@ public String getUsername() { return username; } - public void setUsername(String username) { this.username = username; } public UpdateConference password(String password) { - this.password = password; return this; } @@ -194,14 +184,12 @@ public String getPassword() { return password; } - public void setPassword(String password) { this.password = password; } public UpdateConference redirectFallbackUrl(URI redirectFallbackUrl) { - this.redirectFallbackUrl = redirectFallbackUrl; return this; } @@ -215,14 +203,12 @@ public URI getRedirectFallbackUrl() { return redirectFallbackUrl; } - public void setRedirectFallbackUrl(URI redirectFallbackUrl) { this.redirectFallbackUrl = redirectFallbackUrl; } public UpdateConference redirectFallbackMethod(RedirectMethodEnum redirectFallbackMethod) { - this.redirectFallbackMethod = redirectFallbackMethod; return this; } @@ -236,14 +222,12 @@ public RedirectMethodEnum getRedirectFallbackMethod() { return redirectFallbackMethod; } - public void setRedirectFallbackMethod(RedirectMethodEnum redirectFallbackMethod) { this.redirectFallbackMethod = redirectFallbackMethod; } public UpdateConference fallbackUsername(String fallbackUsername) { - this.fallbackUsername = fallbackUsername; return this; } @@ -257,14 +241,12 @@ public String getFallbackUsername() { return fallbackUsername; } - public void setFallbackUsername(String fallbackUsername) { this.fallbackUsername = fallbackUsername; } public UpdateConference fallbackPassword(String fallbackPassword) { - this.fallbackPassword = fallbackPassword; return this; } @@ -278,7 +260,6 @@ public String getFallbackPassword() { return fallbackPassword; } - public void setFallbackPassword(String fallbackPassword) { this.fallbackPassword = fallbackPassword; } @@ -429,9 +410,17 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti } } JsonObject jsonObj = jsonElement.getAsJsonObject(); + // validate the optional field `status` + if (jsonObj.get("status") != null && !jsonObj.get("status").isJsonNull()) { + ConferenceStateEnum.validateJsonElement(jsonObj.get("status")); + } if ((jsonObj.get("redirectUrl") != null && !jsonObj.get("redirectUrl").isJsonNull()) && !jsonObj.get("redirectUrl").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `redirectUrl` to be a primitive type in the JSON string but got `%s`", jsonObj.get("redirectUrl").toString())); } + // validate the optional field `redirectMethod` + if (jsonObj.get("redirectMethod") != null && !jsonObj.get("redirectMethod").isJsonNull()) { + RedirectMethodEnum.validateJsonElement(jsonObj.get("redirectMethod")); + } if ((jsonObj.get("username") != null && !jsonObj.get("username").isJsonNull()) && !jsonObj.get("username").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `username` to be a primitive type in the JSON string but got `%s`", jsonObj.get("username").toString())); } @@ -441,6 +430,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("redirectFallbackUrl") != null && !jsonObj.get("redirectFallbackUrl").isJsonNull()) && !jsonObj.get("redirectFallbackUrl").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `redirectFallbackUrl` to be a primitive type in the JSON string but got `%s`", jsonObj.get("redirectFallbackUrl").toString())); } + // validate the optional field `redirectFallbackMethod` + if (jsonObj.get("redirectFallbackMethod") != null && !jsonObj.get("redirectFallbackMethod").isJsonNull()) { + RedirectMethodEnum.validateJsonElement(jsonObj.get("redirectFallbackMethod")); + } if ((jsonObj.get("fallbackUsername") != null && !jsonObj.get("fallbackUsername").isJsonNull()) && !jsonObj.get("fallbackUsername").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `fallbackUsername` to be a primitive type in the JSON string but got `%s`", jsonObj.get("fallbackUsername").toString())); } @@ -477,7 +470,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/UpdateConferenceMember.java b/src/main/java/com/bandwidth/sdk/model/UpdateConferenceMember.java index 00cffd4f..d80e102f 100644 --- a/src/main/java/com/bandwidth/sdk/model/UpdateConferenceMember.java +++ b/src/main/java/com/bandwidth/sdk/model/UpdateConferenceMember.java @@ -45,7 +45,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -53,7 +52,7 @@ /** * UpdateConferenceMember */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class UpdateConferenceMember { public static final String SERIALIZED_NAME_MUTE = "mute"; @SerializedName(SERIALIZED_NAME_MUTE) @@ -71,7 +70,6 @@ public UpdateConferenceMember() { } public UpdateConferenceMember mute(Boolean mute) { - this.mute = mute; return this; } @@ -85,14 +83,12 @@ public Boolean getMute() { return mute; } - public void setMute(Boolean mute) { this.mute = mute; } public UpdateConferenceMember hold(Boolean hold) { - this.hold = hold; return this; } @@ -106,14 +102,12 @@ public Boolean getHold() { return hold; } - public void setHold(Boolean hold) { this.hold = hold; } public UpdateConferenceMember callIdsToCoach(List callIdsToCoach) { - this.callIdsToCoach = callIdsToCoach; return this; } @@ -135,7 +129,6 @@ public List getCallIdsToCoach() { return callIdsToCoach; } - public void setCallIdsToCoach(List callIdsToCoach) { this.callIdsToCoach = callIdsToCoach; } @@ -302,7 +295,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/VerifyCodeRequest.java b/src/main/java/com/bandwidth/sdk/model/VerifyCodeRequest.java index 87c6d224..9bf0a02d 100644 --- a/src/main/java/com/bandwidth/sdk/model/VerifyCodeRequest.java +++ b/src/main/java/com/bandwidth/sdk/model/VerifyCodeRequest.java @@ -43,7 +43,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -51,7 +50,7 @@ /** * VerifyCodeRequest */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class VerifyCodeRequest { public static final String SERIALIZED_NAME_TO = "to"; @SerializedName(SERIALIZED_NAME_TO) @@ -73,7 +72,6 @@ public VerifyCodeRequest() { } public VerifyCodeRequest to(String to) { - this.to = to; return this; } @@ -87,14 +85,12 @@ public String getTo() { return to; } - public void setTo(String to) { this.to = to; } public VerifyCodeRequest scope(String scope) { - this.scope = scope; return this; } @@ -108,14 +104,12 @@ public String getScope() { return scope; } - public void setScope(String scope) { this.scope = scope; } public VerifyCodeRequest expirationTimeInMinutes(BigDecimal expirationTimeInMinutes) { - this.expirationTimeInMinutes = expirationTimeInMinutes; return this; } @@ -131,14 +125,12 @@ public BigDecimal getExpirationTimeInMinutes() { return expirationTimeInMinutes; } - public void setExpirationTimeInMinutes(BigDecimal expirationTimeInMinutes) { this.expirationTimeInMinutes = expirationTimeInMinutes; } public VerifyCodeRequest code(String code) { - this.code = code; return this; } @@ -152,7 +144,6 @@ public String getCode() { return code; } - public void setCode(String code) { this.code = code; } @@ -326,7 +317,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/VerifyCodeResponse.java b/src/main/java/com/bandwidth/sdk/model/VerifyCodeResponse.java index 595c8057..397c5e6c 100644 --- a/src/main/java/com/bandwidth/sdk/model/VerifyCodeResponse.java +++ b/src/main/java/com/bandwidth/sdk/model/VerifyCodeResponse.java @@ -42,7 +42,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -50,7 +49,7 @@ /** * VerifyCodeResponse */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class VerifyCodeResponse { public static final String SERIALIZED_NAME_VALID = "valid"; @SerializedName(SERIALIZED_NAME_VALID) @@ -60,7 +59,6 @@ public VerifyCodeResponse() { } public VerifyCodeResponse valid(Boolean valid) { - this.valid = valid; return this; } @@ -74,7 +72,6 @@ public Boolean getValid() { return valid; } - public void setValid(Boolean valid) { this.valid = valid; } @@ -220,7 +217,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/VoiceApiError.java b/src/main/java/com/bandwidth/sdk/model/VoiceApiError.java index 905ebfcd..5d049049 100644 --- a/src/main/java/com/bandwidth/sdk/model/VoiceApiError.java +++ b/src/main/java/com/bandwidth/sdk/model/VoiceApiError.java @@ -43,7 +43,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -51,7 +50,7 @@ /** * VoiceApiError */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class VoiceApiError { public static final String SERIALIZED_NAME_TYPE = "type"; @SerializedName(SERIALIZED_NAME_TYPE) @@ -69,7 +68,6 @@ public VoiceApiError() { } public VoiceApiError type(String type) { - this.type = type; return this; } @@ -83,14 +81,12 @@ public String getType() { return type; } - public void setType(String type) { this.type = type; } public VoiceApiError description(String description) { - this.description = description; return this; } @@ -104,14 +100,12 @@ public String getDescription() { return description; } - public void setDescription(String description) { this.description = description; } public VoiceApiError id(String id) { - this.id = id; return this; } @@ -125,7 +119,6 @@ public String getId() { return id; } - public void setId(String id) { this.id = id; } @@ -297,7 +290,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/main/java/com/bandwidth/sdk/model/VoiceCodeResponse.java b/src/main/java/com/bandwidth/sdk/model/VoiceCodeResponse.java index e63e8932..7976d567 100644 --- a/src/main/java/com/bandwidth/sdk/model/VoiceCodeResponse.java +++ b/src/main/java/com/bandwidth/sdk/model/VoiceCodeResponse.java @@ -42,7 +42,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import com.bandwidth.sdk.JSON; @@ -50,7 +49,7 @@ /** * VoiceCodeResponse */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.6.0") public class VoiceCodeResponse { public static final String SERIALIZED_NAME_CALL_ID = "callId"; @SerializedName(SERIALIZED_NAME_CALL_ID) @@ -60,7 +59,6 @@ public VoiceCodeResponse() { } public VoiceCodeResponse callId(String callId) { - this.callId = callId; return this; } @@ -74,7 +72,6 @@ public String getCallId() { return callId; } - public void setCallId(String callId) { this.callId = callId; } @@ -223,7 +220,12 @@ else if (entry.getValue() instanceof Boolean) else if (entry.getValue() instanceof Character) obj.addProperty(entry.getKey(), (Character) entry.getValue()); else { - obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } } } } diff --git a/src/test/java/com/bandwidth/sdk/api/TranscriptionsApiTest.java b/src/test/java/com/bandwidth/sdk/api/TranscriptionsApiTest.java index 60445ef9..ce37fbba 100644 --- a/src/test/java/com/bandwidth/sdk/api/TranscriptionsApiTest.java +++ b/src/test/java/com/bandwidth/sdk/api/TranscriptionsApiTest.java @@ -84,7 +84,7 @@ public void getAndDeleteRealTimeTranscriptionsTest() throws ApiException, Interr completeMantecaCallBody.setState(CallStateEnum.COMPLETED); - // Create call + // This is just creating the call, modifying with StartTranscript, and ending it so we can test the transcription below. TimeUnit.SECONDS.sleep(TEST_SLEEP); ApiResponse createCallResponse = callsApi.createCallWithHttpInfo(BW_ACCOUNT_ID, createMantecaCallBody); @@ -105,7 +105,7 @@ public void getAndDeleteRealTimeTranscriptionsTest() throws ApiException, Interr assertThat(completeCallResponse.getStatusCode(), is(200)); - + // The Transcriptions API tests start here ApiResponse> listRealTimeTranscriptionResponse = transcriptionsApi.listRealTimeTranscriptionsWithHttpInfo(BW_ACCOUNT_ID, createCallResponse.getData().getCallId()); String transcriptionId = listRealTimeTranscriptionResponse.getData().get(0).getTranscriptionId(); @@ -114,6 +114,7 @@ public void getAndDeleteRealTimeTranscriptionsTest() throws ApiException, Interr ApiResponse getRealTimeTranscriptionResponse = transcriptionsApi.getRealTimeTranscriptionWithHttpInfo(BW_ACCOUNT_ID, createCallResponse.getData().getCallId(), transcriptionId); assertThat(getRealTimeTranscriptionResponse.getStatusCode(), is(200)); + assertThat(getRealTimeTranscriptionResponse.getData(), hasProperty("transcriptId", is(instanceOf(String.class)))); ApiResponse deleteRealTimeTranscriptionResponse = transcriptionsApi.deleteRealTimeTranscriptionWithHttpInfo(BW_ACCOUNT_ID, createCallResponse.getData().getCallId(), transcriptionId);