diff --git a/MIGRATION-GUIDE.md b/MIGRATION-GUIDE.md index b8ed59cdf..d196eaefe 100644 --- a/MIGRATION-GUIDE.md +++ b/MIGRATION-GUIDE.md @@ -86,80 +86,88 @@ This guide lists all removed classes and interfaces from SDK V1 and how to migra #### Replacement models ##### Common models -| Old class | New class | -|-----------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| models.ActiveNumber | [com.sinch.sdk.domains.numbers.models.v1.ActiveNumber](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/ActiveNumber.html) | -| models.AvailableNumber | [com.sinch.sdk.domains.numbers.models.v1.response/AvailableNumber](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/response/AvailableNumber.html) | -| models.CallbackConfiguration | [com.sinch.sdk.domains.numbers.models.v1.response/CallbackConfigurationResponse](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/response/CallbackConfigurationResponse.html) | -| models.Capability | [com.sinch.sdk.domains.numbers.models.v1.Capability](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/Capability.html) | -| models.Money | [com.sinch.sdk.domains.numbers.models.v1.Money](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/Money.html) | -| models.NumberPattern | [com.sinch.sdk.domains.numbers.models.v1.request.SearchPattern](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/request/SearchPattern.html) | -| models.NumberType | [com.sinch.sdk.domains.numbers.models.v1.NumberType](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/NumberType.html) | -| models.OrderBy | [com.sinch.sdk.domains.numbers.models.v1.request.OrderBy](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/request/OrderBy.html) | -| models.ProvisioningStatus | [com.sinch.sdk.domains.numbers.models.v1.ProvisioningStatus](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/ProvisioningStatus.html) | -| models.Region | Part of [com.sinch.sdk.domains.numbers.models.v1.regions.available.AvailableRegion](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/regions/available/AvailableRegion.html) | -| models.SMSConfiguration | [com.sinch.sdk.domains.numbers.models.v1.SmsConfiguration](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/SmsConfiguration.html) | -| models.ScheduledSmsProvisioning | [com.sinch.sdk.domains.numbers.models.v1.ScheduledSmsProvisioning](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/ScheduledSmsProvisioning.html) | -| models.ScheduledVoiceProvisioning | [com.sinch.sdk.domains.numbers.models.v1.request/ScheduledVoiceProvisioning](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/ScheduledVoiceProvisioning.html) | -| models.SearchPattern | [com.sinch.sdk.domains.numbers.models.v1.request/SearchPosition](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/request/SearchPosition.html) | -| models.SmsErrorCode | [com.sinch.sdk.domains.numbers.models.v1.SmsErrorCode](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/SmsErrorCode.html) | -| models.VoiceConfiguration | [com.sinch.sdk.domains.numbers.models.v1.VoiceConfiguration](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/VoiceConfiguration.html) | - -| Old enum | New enum | -|---------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| SmsErrorCode.EXCEEDED_10DLC_LIMIT | [com.sinch.sdk.domains.numbers.models.v1.SmsErrorCode.EXCEEDED_10_DLC_LIMIT](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/SmsErrorCode.htmll#EXCEEDED_10_DLC_LIMIT) | -| NumberEvent.EXCEEDED_10DLC_LIMIT | [com.sinch.sdk.domains.numbers.models.v1.webhooks.NumbersEvent.EXCEEDED_10_DLC_LIMIT](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/webhooks/NumberEvent.FailureCodeEnum.html#EXCEEDED_10_DLC_LIMIT) | +| Old class | New class | +|----------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| ActiveNumber | [com.sinch.sdk.domains.numbers.models.v1.ActiveNumber](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/ActiveNumber.html) | +| AvailableNumber | [com.sinch.sdk.domains.numbers.models.v1.response/AvailableNumber](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/response/AvailableNumber.html) | +| Capability | [com.sinch.sdk.domains.numbers.models.v1.Capability](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/Capability.html) | +| Money | [com.sinch.sdk.domains.numbers.models.v1.Money](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/Money.html) | +| NumberPattern | [com.sinch.sdk.domains.numbers.models.v1.request.SearchPattern](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/request/SearchPattern.html) | +| NumberType | [com.sinch.sdk.domains.numbers.models.v1.NumberType](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/NumberType.html) | +| OrderBy | [com.sinch.sdk.domains.numbers.models.v1.request.OrderBy](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/request/OrderBy.html) | +| ProvisioningStatus | [com.sinch.sdk.domains.numbers.models.v1.ProvisioningStatus](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/ProvisioningStatus.html) | +| Region | Part of [com.sinch.sdk.domains.numbers.models.v1.regions.available.AvailableRegion](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/regions/available/AvailableRegion.html) | +| SMSConfiguration | [com.sinch.sdk.domains.numbers.models.v1.SmsConfiguration](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/SmsConfiguration.html) | +| ScheduledSmsProvisioning | [com.sinch.sdk.domains.numbers.models.v1.ScheduledSmsProvisioning](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/ScheduledSmsProvisioning.html) | +| ScheduledVoiceProvisioning | [com.sinch.sdk.domains.numbers.models.v1.request/ScheduledVoiceProvisioning](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/ScheduledVoiceProvisioning.html) | +| SearchPattern | [com.sinch.sdk.domains.numbers.models.v1.request/SearchPosition](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/request/SearchPosition.html) | +| SmsErrorCode | [com.sinch.sdk.domains.numbers.models.v1.SmsErrorCode](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/SmsErrorCode.html) | +| VoiceConfiguration | [com.sinch.sdk.domains.numbers.models.v1.VoiceConfiguration](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/VoiceConfiguration.html) | + +| Old enum | New enum | +|-----------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| SmsErrorCode.EXCEEDED_10DLC_LIMIT | [SmsErrorCode.EXCEEDED_10_DLC_LIMIT](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/SmsErrorCode.htmll#EXCEEDED_10_DLC_LIMIT) | +| NumberEvent.EXCEEDED_10DLC_LIMIT | [NumberSinchEvent.FailureCodeEnum.EXCEEDED_10_DLC_LIMIT](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/sinchevents/NumberSinchEvent.FailureCodeEnum.html#EXCEEDED_10_DLC_LIMIT) | ##### Active Numbers -| Old class | New class | -|-----------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| models.requests.ActiveNumberListRequestParameters | [com.sinch.sdk.domains.numbers.models.v1.request.ActiveNumbersListQueryParameters](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/request/ActiveNumbersListQueryParameters.html) | -| models.requests.ActiveNumberUpdateRequestParameters | [com.sinch.sdk.domains.numbers.models.v1.request.ActiveNumberUpdateRequest](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/request/ActiveNumberUpdateRequest.html) | -| models.requests.ActiveNumberUpdateSMSConfigurationRequestParameters | [com.sinch.sdk.domains.numbers.models.v1.SmsConfiguration](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/SmsConfiguration.html) | -| models.requests.ActiveNumberUpdateVoiceConfigurationRequestParameters | [com.sinch.sdk.domains.numbers.models.v1.VoiceConfiguration](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/request/VoiceConfiguration.html) | -| models.responses.ActiveNumberListResponse.java | [com.sinch.sdk.domains.numbers.models.v1.response.ActiveNumbersListResponse](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/response/ActiveNumbersListResponse.html) | +| Old class | New class | +|----------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| requests.ActiveNumberListRequestParameters | [request.ActiveNumbersListQueryParameters](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/request/ActiveNumbersListQueryParameters.html) | +| requests.ActiveNumberUpdateRequestParameters | [request.ActiveNumberUpdateRequest](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/request/ActiveNumberUpdateRequest.html) | +| requests.ActiveNumberUpdateSMSConfigurationRequestParameters | [SmsConfiguration](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/SmsConfiguration.html) | +| requests.ActiveNumberUpdateVoiceConfigurationRequestParameters | [VoiceConfiguration](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/request/VoiceConfiguration.html) | +| responses.ActiveNumberListResponse.java | [response.ActiveNumbersListResponse](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/response/ActiveNumbersListResponse.html) | + +| Renamed field | New field | +|---------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| ActiveNumber.callbackUrl | [ActiveNumber.eventDestinationTarget](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/ActiveNumber.html#getEventDestinationTarget()) | +| ActiveNumberUpdateRequest.callbackUrl | [ActiveNumberUpdateRequest.eventDestinationTarget](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/request/ActiveNumberUpdateRequest.html#getEventDestinationTarget()) | ##### Available Numbers -| Old class | New class | -|---------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| models.requests.AvailableNumberListAllRequestParameters | [com.sinch.sdk.domains.numbers.models.v1.request.AvailableNumbersListQueryParameters](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/request/AvailableNumbersListQueryParameters.html) | -| models.requests.AvailableNumberRentAnyRequestParameters | [com.sinch.sdk.domains.numbers.models.v1.request.AvailableNumberRentAnyRequest](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/request/AvailableNumberRentAnyRequest.html) | -| models.requests.AvailableNumberRentRequestParameters | [com.sinch.sdk.domains.numbers.models.v1.request.AvailableNumberRentRequest](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/request/AvailableNumberRentRequest.html) | -| models.responses.AvailableNumberListResponse | [com.sinch.sdk.domains.numbers.models.v1.response.AvailableNumbersListResponse](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/response/AvailableNumbersListResponse.html) | -| models.requests.RentSMSConfigurationRequestParameters | [com.sinch.sdk.domains.numbers.models.v1.SmsConfiguration](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/SmsConfiguration.html) | -| models.requests.RentVoiceConfigurationRequestParameters | [com.sinch.sdk.domains.numbers.models.v1.VoiceConfiguration](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/VoiceConfiguration.html) | +| Old class | New class | +|--------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| requests.AvailableNumberListAllRequestParameters | [request.AvailableNumbersListQueryParameters](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/request/AvailableNumbersListQueryParameters.html) | +| requests.AvailableNumberRentAnyRequestParameters | [request.AvailableNumberRentAnyRequest](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/request/AvailableNumberRentAnyRequest.html) | +| requests.AvailableNumberRentRequestParameters | [request.AvailableNumberRentRequest](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/request/AvailableNumberRentRequest.html) | +| responses.AvailableNumberListResponse | [response.AvailableNumbersListResponse](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/response/AvailableNumbersListResponse.html) | +| requests.RentSMSConfigurationRequestParameters | [SmsConfiguration](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/SmsConfiguration.html) | +| requests.RentVoiceConfigurationRequestParameters | [VoiceConfiguration](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/VoiceConfiguration.html) | + +| Renamed field | New field | +|-----------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| AvailableNumberRentAnyRequestParameters.callbackUrl | [AvailableNumberRentAnyRequest.eventDestinationTarget](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/request/AvailableNumberRentAnyRequest.html#getEventDestinationTarget()) | +| AvailableNumberRentRequestParameters.callbackUrl | [AvailableNumberRentRequest.eventDestinationTarget](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/request/AvailableNumberRentRequest.html#getEventDestinationTarget()) | ##### Regions -| Old class | New class | -|---------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| models.requests.AvailableRegionListAllRequestParameters | [com.sinch.sdk.domains.numbers.models.v1.regions.request.AvailableRegionsListQueryParameters](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/regions/request/AvailableRegionsListQueryParameters.html) | -| models.responses.AvailableRegionListResponse | [com.sinch.sdk.domains.numbers.models.v1.regions.response.AvailableRegionsListResponse](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/regions/response/AvailableRegionsListResponse.html) | - -##### Callbacks configuration -| Old class | New class | -|----------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| models.requests.CallbackConfigurationUpdateRequest | [com.sinch.sdk.domains.numbers.models.v1.callbacks.request.CallbackConfigurationUpdateRequest](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/callbacks/request/CallbackConfigurationUpdateRequest.html) | - -##### Webhooks -| Old class | New class | -|----------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| models.webhooks.EventNotification.java | [com.sinch.sdk.domains.numbers.models.v1.webhooks.NumberEvent](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/webhooks/NumberEvent.html) | -| models.webhooks.EventStatus.java | [com.sinch.sdk.domains.numbers.models.v1.webhooks.NumberEvent.StatusEnum](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/webhooks/NumberEvent.StatusEnum.html) | -| models.webhooks.EventType.java | [com.sinch.sdk.domains.numbers.models.v1.webhooks.NumberEvent.EventTypeEnum](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/webhooks/NumberEvent.EventTypeEnum.html) | -| models.webhooks.ResourceType.java | [com.sinch.sdk.domains.numbers.models.v1.webhooks.ResourceType](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/webhooks/ResourceType.html) | +| Old class | New class | +|---------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| regions.available.request.AvailableRegionListRequest | [regions.request.AvailableRegionsListQueryParameters](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/regions/request/AvailableRegionsListQueryParameters.html) | +| regions.available.responses.AvailableRegionListResponse | [regions.response.AvailableRegionsListResponse](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/regions/response/AvailableRegionsListResponse.html) | + +##### Event Destinations +| Old class | New class | +|------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| callbacks.request.CallbackConfigurationUpdateRequest | [eventdestinations.request.EventDestinationUpdateRequest](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/eventdestinations/request/EventDestinationUpdateRequest.html) | +| callbacks.response.CallbackConfigurationResponse | [eventdestinations.response.EventDestinationResponse](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/eventdestinations/response/EventDestinationResponse.html) | + +##### Sinch Events +| Old class | New class | +|-----------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| webhooks.NumberEvent | [sinchevents.NumberSinchEvent](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/sinchevents/NumberSinchEvent.html) | +| webhooks.ResourceType | [sinchevents.ResourceType](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/models/v1/sinchevents/ResourceType.html) | #### Replacement APIs Use the new versioned API under `numbers().v1()` to get access to [NumbersService](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/api/v1/NumbersService.html): [`sinchClient.numbers().v1()`](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0./com/sinch/sdk/domains/numbers/NumbersService.html#v1()) -| Old interface | New Equivalent in `numbers().v1()` | -|------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| active() | [Direct access from v1()](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/api/v1/NumbersService.html) | -| available() | [Direct access from v1()](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/api/v1/NumbersService.html) | -| regions() | [v1().regions()](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/api/v1/AvailableRegionsService.html) | -| callback() | [v1().callback()](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/api/v1/CallbackConfigurationService.html) | -| webhook() | [v1().webhooks()](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/api/v1/WebHooksService.html) | -| v1().callback() | [v1().callbackConfiguration()](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/api/v1/CallbackConfigurationService.html) | +| Old interface | New Equivalent in `numbers().v1()` | +|------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| active() | [Direct access from v1()](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/api/v1/NumbersService.html) | +| available() | [Direct access from v1()](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/api/v1/NumbersService.html) | +| regions() | [v1().regions()](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/api/v1/AvailableRegionsService.html) | +| callback() | [v1().callback()](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/api/v1/CallbackConfigurationService.html) | +| webhook() | [v1().sinchevents()](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/api/v1/SinchEventService.html) | +| v1().callback() | [v1().callbackConfiguration()](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/numbers/api/v1/CallbackConfigurationService.html) | ### [`SMS`](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/sms/package-summary.html) diff --git a/client/src/main/com/sinch/sdk/domains/conversation/api/v1/ConversationService.java b/client/src/main/com/sinch/sdk/domains/conversation/api/v1/ConversationService.java index 9100761a5..9ca21c74a 100644 --- a/client/src/main/com/sinch/sdk/domains/conversation/api/v1/ConversationService.java +++ b/client/src/main/com/sinch/sdk/domains/conversation/api/v1/ConversationService.java @@ -76,7 +76,7 @@ public interface ConversationService { ProjectSettingsService projectSettings(); /** - * WebHooksService Service instance + * SinchEventsService Service instance * * @return service instance for project * @since 1.3 diff --git a/client/src/main/com/sinch/sdk/domains/numbers/api/v1/NumbersService.java b/client/src/main/com/sinch/sdk/domains/numbers/api/v1/NumbersService.java index 9cdf4c772..2210b90d3 100644 --- a/client/src/main/com/sinch/sdk/domains/numbers/api/v1/NumbersService.java +++ b/client/src/main/com/sinch/sdk/domains/numbers/api/v1/NumbersService.java @@ -31,18 +31,18 @@ public interface NumbersService extends ActiveNumberService, AvailableNumberServ AvailableRegionsService regions(); /** - * Callbacks Configuration Service instance + * Event Destinations Configuration Service instance * * @return service instance for project * @since 2.0 */ - CallbackConfigurationService callbackConfiguration(); + EventDestinationsService eventDestinations(); /** - * Webhooks helpers instance + * Sinch Events helpers instance * - * @return instance service related to webhooks helpers - * @since 1.2 + * @return instance service related to Sinch Events helpers + * @since 2.0 */ - WebHooksService webhooks(); + SinchEventsService sinchEvents(); } diff --git a/client/src/main/com/sinch/sdk/domains/numbers/api/v1/WebHooksService.java b/client/src/main/com/sinch/sdk/domains/numbers/api/v1/SinchEventsService.java similarity index 89% rename from client/src/main/com/sinch/sdk/domains/numbers/api/v1/WebHooksService.java rename to client/src/main/com/sinch/sdk/domains/numbers/api/v1/SinchEventsService.java index 78eef185a..1022fd69f 100644 --- a/client/src/main/com/sinch/sdk/domains/numbers/api/v1/WebHooksService.java +++ b/client/src/main/com/sinch/sdk/domains/numbers/api/v1/SinchEventsService.java @@ -1,11 +1,11 @@ package com.sinch.sdk.domains.numbers.api.v1; import com.sinch.sdk.core.exceptions.ApiMappingException; -import com.sinch.sdk.domains.numbers.models.v1.webhooks.NumberEvent; +import com.sinch.sdk.domains.numbers.models.v1.sinchevents.NumberSinchEvent; import java.util.Map; /** - * Webhooks service + * Sinch Events service * *

Callback events are used to get notified about Numbers usage according to your configured * callback URL @@ -16,7 +16,7 @@ * * @since 1.2 */ -public interface WebHooksService { +public interface SinchEventsService { /** * The Sinch Platform can initiate callback requests to a URL you define (Callback URL) on request @@ -47,5 +47,5 @@ boolean validateAuthenticationHeader( * @return The decoded event notification instance class * @since 1.2 */ - NumberEvent parseEvent(String jsonPayload) throws ApiMappingException; + NumberSinchEvent parseEvent(String jsonPayload) throws ApiMappingException; } diff --git a/client/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/NumbersService.java b/client/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/NumbersService.java index d060f4627..86adb2311 100644 --- a/client/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/NumbersService.java +++ b/client/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/NumbersService.java @@ -8,7 +8,7 @@ import com.sinch.sdk.core.models.ServerConfiguration; import com.sinch.sdk.core.utils.StringUtil; import com.sinch.sdk.domains.numbers.api.v1.AvailableRegionsService; -import com.sinch.sdk.domains.numbers.api.v1.CallbackConfigurationService; +import com.sinch.sdk.domains.numbers.api.v1.EventDestinationsService; import com.sinch.sdk.domains.numbers.models.v1.ActiveNumber; import com.sinch.sdk.domains.numbers.models.v1.EmergencyAddress; import com.sinch.sdk.domains.numbers.models.v1.request.ActiveNumberUpdateRequest; @@ -46,8 +46,8 @@ public class NumbersService implements com.sinch.sdk.domains.numbers.api.v1.Numb private volatile AvailableNumberServiceFacade available; private volatile ActiveNumberServiceFacade active; private volatile AvailableRegionsService regions; - private volatile CallbackConfigurationService callbackConfiguration; - private volatile WebHooksService webhooks; + private volatile EventDestinationsService eventDestinations; + private volatile SinchEventsService sinchEvents; static { LocalLazyInit.init(); @@ -96,26 +96,26 @@ ActiveNumberServiceFacade active() { return this.active; } - public CallbackConfigurationService callbackConfiguration() { - if (null == this.callbackConfiguration) { + public EventDestinationsService eventDestinations() { + if (null == this.eventDestinations) { instanceLazyInit(); - this.callbackConfiguration = - new CallbackConfigurationServiceImpl( + this.eventDestinations = + new EventDestinationsServiceImpl( httpClientSupplier.get(), context.getNumbersServer(), authManagers, HttpMapper.getInstance(), uriUUID); } - return this.callbackConfiguration; + return this.eventDestinations; } - public WebHooksService webhooks() { + public SinchEventsService sinchEvents() { - if (null == this.webhooks) { - this.webhooks = new WebHooksService(new NumbersWebhooksAuthenticationValidation()); + if (null == this.sinchEvents) { + this.sinchEvents = new SinchEventsService(new SinchEventsAuthenticationValidation()); } - return this.webhooks; + return this.sinchEvents; } @Override diff --git a/client/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/NumbersWebhooksAuthenticationValidation.java b/client/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/SinchEventsAuthenticationValidation.java similarity index 93% rename from client/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/NumbersWebhooksAuthenticationValidation.java rename to client/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/SinchEventsAuthenticationValidation.java index 261e3560d..f265bd690 100644 --- a/client/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/NumbersWebhooksAuthenticationValidation.java +++ b/client/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/SinchEventsAuthenticationValidation.java @@ -11,7 +11,7 @@ import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; -public class NumbersWebhooksAuthenticationValidation { +public class SinchEventsAuthenticationValidation { public static final String SIGNATURE_HEADER = "X-Sinch-Signature"; static final String HMAC_SHA1_ALGORITHM = "HmacSHA1"; @@ -39,7 +39,7 @@ private String encode(String secret, String stringToSign) { Mac mac = Mac.getInstance(HMAC_SHA1_ALGORITHM); mac.init(secretKeySpec); byte[] hmacSha256 = mac.doFinal(stringToSign.getBytes(StandardCharsets.UTF_8)); - return NumbersWebhooksAuthenticationValidation.bytesToHex(hmacSha256); + return SinchEventsAuthenticationValidation.bytesToHex(hmacSha256); } catch (NoSuchAlgorithmException | InvalidKeyException e) { throw new ApiAuthException(e); } diff --git a/client/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/WebHooksService.java b/client/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/SinchEventsService.java similarity index 56% rename from client/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/WebHooksService.java rename to client/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/SinchEventsService.java index e89f1cfc2..c48c93b62 100644 --- a/client/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/WebHooksService.java +++ b/client/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/SinchEventsService.java @@ -3,13 +3,13 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.sinch.sdk.core.exceptions.ApiMappingException; import com.sinch.sdk.core.utils.databind.Mapper; -import com.sinch.sdk.domains.numbers.models.v1.webhooks.NumberEvent; +import com.sinch.sdk.domains.numbers.models.v1.sinchevents.NumberSinchEvent; import java.util.Map; -public class WebHooksService implements com.sinch.sdk.domains.numbers.api.v1.WebHooksService { - private final NumbersWebhooksAuthenticationValidation authenticationChecker; +public class SinchEventsService implements com.sinch.sdk.domains.numbers.api.v1.SinchEventsService { + private final SinchEventsAuthenticationValidation authenticationChecker; - public WebHooksService(NumbersWebhooksAuthenticationValidation authenticationChecker) { + public SinchEventsService(SinchEventsAuthenticationValidation authenticationChecker) { this.authenticationChecker = authenticationChecker; } @@ -20,10 +20,10 @@ public boolean validateAuthenticationHeader( } @Override - public NumberEvent parseEvent(String jsonPayload) throws ApiMappingException { + public NumberSinchEvent parseEvent(String jsonPayload) throws ApiMappingException { try { - return Mapper.getInstance().readValue(jsonPayload, NumberEvent.class); + return Mapper.getInstance().readValue(jsonPayload, NumberSinchEvent.class); } catch (JsonProcessingException e) { throw new ApiMappingException(jsonPayload, e); } diff --git a/client/src/main/com/sinch/sdk/domains/numbers/models/v1/callbacks/request/package-info.java b/client/src/main/com/sinch/sdk/domains/numbers/models/v1/callbacks/request/package-info.java deleted file mode 100644 index 617fd560e..000000000 --- a/client/src/main/com/sinch/sdk/domains/numbers/models/v1/callbacks/request/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * Numbers Callback Configuration API requests related models - * - * @since 1.2 - */ -package com.sinch.sdk.domains.numbers.models.v1.callbacks.request; diff --git a/client/src/main/com/sinch/sdk/domains/numbers/models/v1/callbacks/response/package-info.java b/client/src/main/com/sinch/sdk/domains/numbers/models/v1/callbacks/response/package-info.java deleted file mode 100644 index d0e577f91..000000000 --- a/client/src/main/com/sinch/sdk/domains/numbers/models/v1/callbacks/response/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * Numbers Callback Configuration API responses related models - * - * @since 1.2 - */ -package com.sinch.sdk.domains.numbers.models.v1.callbacks.response; diff --git a/client/src/main/com/sinch/sdk/domains/numbers/models/v1/eventdestinations/package-info.java b/client/src/main/com/sinch/sdk/domains/numbers/models/v1/eventdestinations/package-info.java new file mode 100644 index 000000000..38bb63e74 --- /dev/null +++ b/client/src/main/com/sinch/sdk/domains/numbers/models/v1/eventdestinations/package-info.java @@ -0,0 +1,6 @@ +/** + * Numbers API Event Destinations related models + * + * @since 1.2 + */ +package com.sinch.sdk.domains.numbers.models.v1.eventdestinations; diff --git a/client/src/main/com/sinch/sdk/domains/numbers/models/v1/eventdestinations/request/package-info.java b/client/src/main/com/sinch/sdk/domains/numbers/models/v1/eventdestinations/request/package-info.java new file mode 100644 index 000000000..952e29ceb --- /dev/null +++ b/client/src/main/com/sinch/sdk/domains/numbers/models/v1/eventdestinations/request/package-info.java @@ -0,0 +1,6 @@ +/** + * Numbers Event Destinations API requests related models + * + * @since 1.2 + */ +package com.sinch.sdk.domains.numbers.models.v1.eventdestinations.request; diff --git a/client/src/main/com/sinch/sdk/domains/numbers/models/v1/eventdestinations/response/package-info.java b/client/src/main/com/sinch/sdk/domains/numbers/models/v1/eventdestinations/response/package-info.java new file mode 100644 index 000000000..cd838838a --- /dev/null +++ b/client/src/main/com/sinch/sdk/domains/numbers/models/v1/eventdestinations/response/package-info.java @@ -0,0 +1,6 @@ +/** + * Numbers Event Destinations API responses related models + * + * @since 1.2 + */ +package com.sinch.sdk.domains.numbers.models.v1.eventdestinations.response; diff --git a/client/src/main/com/sinch/sdk/domains/numbers/models/v1/sinchevents/package-info.java b/client/src/main/com/sinch/sdk/domains/numbers/models/v1/sinchevents/package-info.java new file mode 100644 index 000000000..323aa4681 --- /dev/null +++ b/client/src/main/com/sinch/sdk/domains/numbers/models/v1/sinchevents/package-info.java @@ -0,0 +1,6 @@ +/** + * Models related to Numbers Sinch Events + * + * @since 1.2 + */ +package com.sinch.sdk.domains.numbers.models.v1.sinchevents; diff --git a/client/src/main/com/sinch/sdk/domains/numbers/models/v1/webhooks/package-info.java b/client/src/main/com/sinch/sdk/domains/numbers/models/v1/webhooks/package-info.java deleted file mode 100644 index 6b5188549..000000000 --- a/client/src/main/com/sinch/sdk/domains/numbers/models/v1/webhooks/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * Models related to Numbers WebHooks - * - * @since 1.2 - */ -package com.sinch.sdk.domains.numbers.models.v1.webhooks; diff --git a/client/src/test/java/com/sinch/sdk/domains/numbers/api/v1/adapters/ActiveNumberServiceTest.java b/client/src/test/java/com/sinch/sdk/domains/numbers/api/v1/adapters/ActiveNumberServiceTest.java index bb889ad3f..df0917c8a 100644 --- a/client/src/test/java/com/sinch/sdk/domains/numbers/api/v1/adapters/ActiveNumberServiceTest.java +++ b/client/src/test/java/com/sinch/sdk/domains/numbers/api/v1/adapters/ActiveNumberServiceTest.java @@ -319,7 +319,7 @@ void update() { .setDisplayName("my display name") .setSmsConfiguration(smsConfiguration) .setVoiceConfiguration(voiceConfiguration) - .setCallbackUrl("foo callback") + .setEventDestinationTarget("foo callback") .build(); HttpRequest httpRequest = diff --git a/client/src/test/java/com/sinch/sdk/domains/numbers/api/v1/adapters/AvailableNumberServiceTest.java b/client/src/test/java/com/sinch/sdk/domains/numbers/api/v1/adapters/AvailableNumberServiceTest.java index 040323909..04d6d202d 100644 --- a/client/src/test/java/com/sinch/sdk/domains/numbers/api/v1/adapters/AvailableNumberServiceTest.java +++ b/client/src/test/java/com/sinch/sdk/domains/numbers/api/v1/adapters/AvailableNumberServiceTest.java @@ -227,7 +227,7 @@ void rent() { .setSmsConfiguration( SmsConfiguration.builder().setServicePlanId("").setCampaignId("").build()) .setVoiceConfiguration(VoiceConfigurationRTC.builder().setAppId("").build()) - .setCallbackUrl("foo") + .setEventDestinationTarget("foo") .build(); HttpRequest httpRequest = diff --git a/client/src/test/java/com/sinch/sdk/domains/numbers/api/v1/adapters/CallbackConfigurationServiceTest.java b/client/src/test/java/com/sinch/sdk/domains/numbers/api/v1/adapters/EventDestinationsServiceTest.java similarity index 79% rename from client/src/test/java/com/sinch/sdk/domains/numbers/api/v1/adapters/CallbackConfigurationServiceTest.java rename to client/src/test/java/com/sinch/sdk/domains/numbers/api/v1/adapters/EventDestinationsServiceTest.java index 525e12afe..7fa6a63b5 100644 --- a/client/src/test/java/com/sinch/sdk/domains/numbers/api/v1/adapters/CallbackConfigurationServiceTest.java +++ b/client/src/test/java/com/sinch/sdk/domains/numbers/api/v1/adapters/EventDestinationsServiceTest.java @@ -19,9 +19,9 @@ import com.sinch.sdk.core.http.HttpResponse; import com.sinch.sdk.core.http.URLPathUtils; import com.sinch.sdk.core.models.ServerConfiguration; -import com.sinch.sdk.domains.numbers.api.v1.CallbackConfigurationService; -import com.sinch.sdk.domains.numbers.models.v1.CallbackConfigurationDtoTest; -import com.sinch.sdk.domains.numbers.models.v1.callbacks.response.CallbackConfigurationResponse; +import com.sinch.sdk.domains.numbers.api.v1.EventDestinationsService; +import com.sinch.sdk.domains.numbers.models.v1.EventDestinationsDtoTest; +import com.sinch.sdk.domains.numbers.models.v1.eventdestinations.response.EventDestinationResponse; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -31,15 +31,15 @@ import org.mockito.Mock; @TestWithResources -class CallbackConfigurationServiceTest extends BaseTest { +class EventDestinationsServiceTest extends BaseTest { - @GivenTextResource("/domains/numbers/v1/callbacks/callback-get-response.json") + @GivenTextResource("/domains/numbers/v1/eventdestinations/event-destination-response.json") String jsonGetResponse; @Mock HttpClient httpClient; @Mock ServerConfiguration serverConfiguration; @Mock Map authManagers; - CallbackConfigurationService service; + EventDestinationsService service; static final String uriUUID = "foo"; @@ -48,7 +48,7 @@ class CallbackConfigurationServiceTest extends BaseTest { @BeforeEach public void initMocks() { service = - new CallbackConfigurationServiceImpl( + new EventDestinationsServiceImpl( httpClient, serverConfiguration, authManagers, HttpMapper.getInstance(), uriUUID); } @@ -74,9 +74,9 @@ void get() throws ApiException { argThat(new HttpRequestMatcher(httpRequest)))) .thenReturn(httpResponse); - CallbackConfigurationResponse response = service.get(); + EventDestinationResponse response = service.get(); - TestHelpers.recursiveEquals(response, CallbackConfigurationDtoTest.getResponse); + TestHelpers.recursiveEquals(response, EventDestinationsDtoTest.getResponse); } @Test @@ -90,7 +90,7 @@ void update() { HttpMapper.getInstance() .serialize( Collections.singletonList(HttpContentType.APPLICATION_JSON), - CallbackConfigurationDtoTest.updateRequest), + EventDestinationsDtoTest.updateRequest), Collections.emptyMap(), Collections.singletonList(HttpContentType.APPLICATION_JSON), Collections.singletonList(HttpContentType.APPLICATION_JSON), @@ -104,9 +104,8 @@ void update() { argThat(new HttpRequestMatcher(httpRequest)))) .thenReturn(httpResponse); - CallbackConfigurationResponse response = - service.update(CallbackConfigurationDtoTest.updateRequest); + EventDestinationResponse response = service.update(EventDestinationsDtoTest.updateRequest); - TestHelpers.recursiveEquals(response, CallbackConfigurationDtoTest.getResponse); + TestHelpers.recursiveEquals(response, EventDestinationsDtoTest.getResponse); } } diff --git a/client/src/test/java/com/sinch/sdk/domains/numbers/api/v1/adapters/NumbersServiceTest.java b/client/src/test/java/com/sinch/sdk/domains/numbers/api/v1/adapters/NumbersServiceTest.java index 5bd3a2b98..e11fb9bd4 100644 --- a/client/src/test/java/com/sinch/sdk/domains/numbers/api/v1/adapters/NumbersServiceTest.java +++ b/client/src/test/java/com/sinch/sdk/domains/numbers/api/v1/adapters/NumbersServiceTest.java @@ -26,13 +26,14 @@ void checkCredentialsRegions() { } @Test - void checkCredentialsCallback() { + void checkCredentialsEventDestinations() { CredentialsValidationHelper.checkCredentials( - () -> httpClient, NumbersService::callbackConfiguration); + () -> httpClient, NumbersService::eventDestinations); } @Test - void checkCredentialsWebhooks() { - assertDoesNotThrow(() -> new NumbersService(null, null, null, null).webhooks(), "Init passed"); + void checkCredentialsSinchEvents() { + assertDoesNotThrow( + () -> new NumbersService(null, null, null, null).sinchEvents(), "Init passed"); } } diff --git a/client/src/test/java/com/sinch/sdk/domains/numbers/api/v1/adapters/NumbersWebhooksAuthenticationValidationTest.java b/client/src/test/java/com/sinch/sdk/domains/numbers/api/v1/adapters/SinchEventsAuthenticationValidationTest.java similarity index 68% rename from client/src/test/java/com/sinch/sdk/domains/numbers/api/v1/adapters/NumbersWebhooksAuthenticationValidationTest.java rename to client/src/test/java/com/sinch/sdk/domains/numbers/api/v1/adapters/SinchEventsAuthenticationValidationTest.java index 63dbced6a..38dce02bb 100644 --- a/client/src/test/java/com/sinch/sdk/domains/numbers/api/v1/adapters/NumbersWebhooksAuthenticationValidationTest.java +++ b/client/src/test/java/com/sinch/sdk/domains/numbers/api/v1/adapters/SinchEventsAuthenticationValidationTest.java @@ -9,13 +9,13 @@ import java.util.stream.Stream; import org.junit.jupiter.api.Test; -class NumbersWebhooksAuthenticationValidationTest { +class SinchEventsAuthenticationValidationTest { - NumbersWebhooksAuthenticationValidation webhooksService = - new NumbersWebhooksAuthenticationValidation(); + SinchEventsAuthenticationValidation sinchEventsAuthenticationValidation = + new SinchEventsAuthenticationValidation(); static final String loweredKey = - NumbersWebhooksAuthenticationValidation.SIGNATURE_HEADER.toLowerCase(); + SinchEventsAuthenticationValidation.SIGNATURE_HEADER.toLowerCase(); Map headers = Stream.of( new AbstractMap.SimpleEntry<>(loweredKey, "e289b8fac44491417aeceee28d2715840b5f1aca")) @@ -29,7 +29,7 @@ class NumbersWebhooksAuthenticationValidationTest { void checkValidateAuthenticatedRequest() { boolean authenticationResult = - webhooksService.validateAuthenticationHeader(secret, headers, body); + sinchEventsAuthenticationValidation.validateAuthenticationHeader(secret, headers, body); assertTrue(authenticationResult); } @@ -38,7 +38,8 @@ void checkValidateAuthenticatedRequest() { void checkValidateAuthenticatedRequestInvalidSecret() { boolean authenticationResult = - webhooksService.validateAuthenticationHeader("not expected secret", headers, body); + sinchEventsAuthenticationValidation.validateAuthenticationHeader( + "not expected secret", headers, body); assertFalse(authenticationResult); } @@ -47,7 +48,8 @@ void checkValidateAuthenticatedRequestInvalidSecret() { void checkValidateAuthenticatedRequestInvalidBody() { boolean authenticationResult = - webhooksService.validateAuthenticationHeader(secret, headers, "not expected body"); + sinchEventsAuthenticationValidation.validateAuthenticationHeader( + secret, headers, "not expected body"); assertFalse(authenticationResult); } @@ -61,7 +63,7 @@ void checkValidateAuthenticatedRequestMissingSignature() { .collect(Collectors.toMap(Entry::getKey, Entry::getValue)); boolean authenticationResult = - webhooksService.validateAuthenticationHeader(secret, headerSet, body); + sinchEventsAuthenticationValidation.validateAuthenticationHeader(secret, headerSet, body); assertFalse(authenticationResult); } @@ -70,7 +72,7 @@ void checkValidateAuthenticatedRequestMissingSignature() { void checkValidateAuthenticatedNoSecret() { boolean authenticationResult = - webhooksService.validateAuthenticationHeader(null, headers, body); + sinchEventsAuthenticationValidation.validateAuthenticationHeader(null, headers, body); assertFalse(authenticationResult); } @@ -78,7 +80,8 @@ void checkValidateAuthenticatedNoSecret() { @Test void checkValidateAuthenticatedEmptySecret() { - boolean authenticationResult = webhooksService.validateAuthenticationHeader("", headers, body); + boolean authenticationResult = + sinchEventsAuthenticationValidation.validateAuthenticationHeader("", headers, body); assertFalse(authenticationResult); } diff --git a/client/src/test/java/com/sinch/sdk/domains/numbers/api/v1/adapters/WebhooksServiceTest.java b/client/src/test/java/com/sinch/sdk/domains/numbers/api/v1/adapters/SinchEventsServiceTest.java similarity index 68% rename from client/src/test/java/com/sinch/sdk/domains/numbers/api/v1/adapters/WebhooksServiceTest.java rename to client/src/test/java/com/sinch/sdk/domains/numbers/api/v1/adapters/SinchEventsServiceTest.java index 896202d4f..423d354eb 100644 --- a/client/src/test/java/com/sinch/sdk/domains/numbers/api/v1/adapters/WebhooksServiceTest.java +++ b/client/src/test/java/com/sinch/sdk/domains/numbers/api/v1/adapters/SinchEventsServiceTest.java @@ -8,9 +8,9 @@ import com.sinch.sdk.SinchClient; import com.sinch.sdk.core.TestHelpers; import com.sinch.sdk.core.exceptions.ApiException; -import com.sinch.sdk.domains.numbers.api.v1.WebHooksService; -import com.sinch.sdk.domains.numbers.models.v1.WebhooksDtoTest; -import com.sinch.sdk.domains.numbers.models.v1.webhooks.NumberEvent; +import com.sinch.sdk.domains.numbers.api.v1.SinchEventsService; +import com.sinch.sdk.domains.numbers.models.v1.SinchEventsDtoTest; +import com.sinch.sdk.domains.numbers.models.v1.sinchevents.NumberSinchEvent; import com.sinch.sdk.models.Configuration; import java.io.IOException; import java.util.AbstractMap; @@ -21,12 +21,12 @@ import org.junit.jupiter.api.Test; @TestWithResources -public class WebhooksServiceTest extends BaseTest { +public class SinchEventsServiceTest extends BaseTest { - @GivenTextResource("/domains/numbers/v1/webhooks/number-event.json") - String incomingWebhookJSON; + @GivenTextResource("/domains/numbers/v1/sinchevents/number-sinch-event.json") + String incomingNumberEventJSON; - WebHooksService webHooksService; + SinchEventsService sinchEventsService; @Test void checkValidateAuthenticatedRequest() { @@ -34,7 +34,7 @@ void checkValidateAuthenticatedRequest() { Map headers = Stream.of( new AbstractMap.SimpleEntry<>( - NumbersWebhooksAuthenticationValidation.SIGNATURE_HEADER, + SinchEventsAuthenticationValidation.SIGNATURE_HEADER, "e289b8fac44491417aeceee28d2715840b5f1aca")) .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); @@ -43,7 +43,7 @@ void checkValidateAuthenticatedRequest() { "{\"eventId\":\"01j3fycq0fyqq3gkgxb0g5ekbz\",\"timestamp\":\"2024-07-23T14:02:14.415637289\",\"projectId\":\"b8bae3c6-e7df-422b-9401-8ae3ee3e0aff\",\"resourceId\":\"+12053017799\",\"resourceType\":\"ACTIVE_NUMBER\",\"eventType\":\"PROVISIONING_TO_VOICE_PLATFORM\",\"status\":\"SUCCEEDED\",\"failureCode\":null}"; boolean authenticationResult = - webHooksService.validateAuthenticationHeader(secret, headers, body); + sinchEventsService.validateAuthenticationHeader(secret, headers, body); assertTrue(authenticationResult); } @@ -51,9 +51,9 @@ void checkValidateAuthenticatedRequest() { @Test void parse() throws ApiException { - NumberEvent response = webHooksService.parseEvent(incomingWebhookJSON); + NumberSinchEvent response = sinchEventsService.parseEvent(incomingNumberEventJSON); - TestHelpers.recursiveEquals(response, WebhooksDtoTest.numberEvent); + TestHelpers.recursiveEquals(response, SinchEventsDtoTest.numberEvent); } @BeforeEach @@ -66,6 +66,6 @@ public void setUp() throws IOException { .setKeySecret("unused") .build(); - webHooksService = new SinchClient(configuration).numbers().v1().webhooks(); + sinchEventsService = new SinchClient(configuration).numbers().v1().sinchEvents(); } } diff --git a/client/src/test/java/com/sinch/sdk/e2e/domains/numbers/v1/WebhooksSteps.java b/client/src/test/java/com/sinch/sdk/e2e/domains/numbers/v1/EventDestinationsSteps.java similarity index 67% rename from client/src/test/java/com/sinch/sdk/e2e/domains/numbers/v1/WebhooksSteps.java rename to client/src/test/java/com/sinch/sdk/e2e/domains/numbers/v1/EventDestinationsSteps.java index a26085883..45630fbc6 100644 --- a/client/src/test/java/com/sinch/sdk/e2e/domains/numbers/v1/WebhooksSteps.java +++ b/client/src/test/java/com/sinch/sdk/e2e/domains/numbers/v1/EventDestinationsSteps.java @@ -1,26 +1,26 @@ package com.sinch.sdk.e2e.domains.numbers.v1; import com.sinch.sdk.core.exceptions.ApiException; -import com.sinch.sdk.domains.numbers.api.v1.CallbackConfigurationService; -import com.sinch.sdk.domains.numbers.models.v1.callbacks.request.CallbackConfigurationUpdateRequest; -import com.sinch.sdk.domains.numbers.models.v1.callbacks.response.CallbackConfigurationResponse; +import com.sinch.sdk.domains.numbers.api.v1.EventDestinationsService; +import com.sinch.sdk.domains.numbers.models.v1.eventdestinations.request.EventDestinationUpdateRequest; +import com.sinch.sdk.domains.numbers.models.v1.eventdestinations.response.EventDestinationResponse; import com.sinch.sdk.e2e.Config; import io.cucumber.java.en.Given; import io.cucumber.java.en.Then; import io.cucumber.java.en.When; import org.junit.jupiter.api.Assertions; -public class WebhooksSteps { +public class EventDestinationsSteps { - CallbackConfigurationService service; - CallbackConfigurationResponse getResponse; - CallbackConfigurationResponse updateResponse; + EventDestinationsService service; + EventDestinationResponse getResponse; + EventDestinationResponse updateResponse; ApiException updateResponseException; @Given("^the Numbers service \"Callback Configuration\" is available$") public void serviceAvailable() { - service = Config.getSinchClient().numbers().v1().callbackConfiguration(); + service = Config.getSinchClient().numbers().v1().eventDestinations(); } @When("^I send a request to retrieve the callback configuration$") @@ -32,8 +32,8 @@ public void get() { @When("I send a request to update the callback configuration with the secret {string}") public void update(String secret) { - CallbackConfigurationUpdateRequest request = - CallbackConfigurationUpdateRequest.builder().setHmacSecret(secret).build(); + EventDestinationUpdateRequest request = + EventDestinationUpdateRequest.builder().setHmacSecret(secret).build(); try { updateResponse = service.update(request); } catch (ApiException e) { @@ -44,8 +44,8 @@ public void update(String secret) { @Then("the response contains the project's callback configuration") public void getResult() { - CallbackConfigurationResponse expected = - CallbackConfigurationResponse.builder() + EventDestinationResponse expected = + EventDestinationResponse.builder() .setProjectId("12c0ffee-dada-beef-cafe-baadc0de5678") .setHmacSecret("0default-pass-word-*max-36characters") .build(); @@ -55,8 +55,8 @@ public void getResult() { @Then("the response contains the updated project's callback configuration") public void updateResult() { - CallbackConfigurationResponse expected = - CallbackConfigurationResponse.builder() + EventDestinationResponse expected = + EventDestinationResponse.builder() .setProjectId("12c0ffee-dada-beef-cafe-baadc0de5678") .setHmacSecret("strongPa$$PhraseWith36CharactersMax") .build(); diff --git a/client/src/test/java/com/sinch/sdk/e2e/domains/numbers/v1/NumbersSteps.java b/client/src/test/java/com/sinch/sdk/e2e/domains/numbers/v1/NumbersSteps.java index 4fa07abfb..656f58a09 100644 --- a/client/src/test/java/com/sinch/sdk/e2e/domains/numbers/v1/NumbersSteps.java +++ b/client/src/test/java/com/sinch/sdk/e2e/domains/numbers/v1/NumbersSteps.java @@ -169,7 +169,7 @@ public void update(String phoneNumber) { SmsConfiguration.builder().setServicePlanId("SingingMooseSociety").build()) .setVoiceConfiguration( VoiceConfigurationFAX.builder().setServiceId("01W4FFL35P4NC4K35FAXSERVICE").build()) - .setCallbackUrl("https://my-callback-server.com/numbers") + .setEventDestinationTarget("https://my-callback-server.com/numbers") .build(); updateResponse = service.update(phoneNumber, request); } @@ -276,7 +276,7 @@ public void rentAnyResponse() { .setLastUpdatedTime(Instant.parse("2024-06-06T14:42:42.604092Z")) .build()) .build()) - .setCallbackUrl("") + .setEventDestinationTarget("") .build(); Assertions.assertEquals(expected, rentAnyResponse); @@ -321,7 +321,7 @@ public void rentResponse(String phoneNumber) { .setLastUpdatedTime(Instant.parse("2024-06-06T14:42:42.604092Z")) .build()) .build()) - .setCallbackUrl("") + .setEventDestinationTarget("") .build(); Assertions.assertEquals(expected, rentResponse); @@ -378,7 +378,7 @@ public void updateResponse() { .setLastUpdatedTime(Instant.parse("2024-06-06T20:02:20.437509Z")) .build()) .build()) - .setCallbackUrl("https://my-callback-server.com/numbers") + .setEventDestinationTarget("https://my-callback-server.com/numbers") .build(); Assertions.assertEquals(expected, updateResponse); @@ -411,7 +411,7 @@ public void getResponse(String phoneNumber) { .setLastUpdatedTime(null) .setScheduledProvisioning(null) .build()) - .setCallbackUrl("https://my-callback-server.com/numbers") + .setEventDestinationTarget("https://my-callback-server.com/numbers") .build(); Assertions.assertEquals(expected, getResponse); @@ -453,7 +453,7 @@ public void getWithSmsProvisioningErrorResponse(String phoneNumber) { .setLastUpdatedTime(null) .setScheduledProvisioning(null) .build()) - .setCallbackUrl("https://my-callback-server.com/numbers") + .setEventDestinationTarget("https://my-callback-server.com/numbers") .build(); Assertions.assertEquals(expected, getResponse); @@ -493,7 +493,7 @@ public void releaseResponse(String phoneNumber) { .setLastUpdatedTime(null) .setScheduledProvisioning(null) .build()) - .setCallbackUrl("https://my-callback-server.com/numbers") + .setEventDestinationTarget("https://my-callback-server.com/numbers") .build(); Assertions.assertEquals(expected, releaseResponse); diff --git a/client/src/test/java/com/sinch/sdk/e2e/domains/numbers/v1/WebhooksEventsSteps.java b/client/src/test/java/com/sinch/sdk/e2e/domains/numbers/v1/SinchEventsSteps.java similarity index 72% rename from client/src/test/java/com/sinch/sdk/e2e/domains/numbers/v1/WebhooksEventsSteps.java rename to client/src/test/java/com/sinch/sdk/e2e/domains/numbers/v1/SinchEventsSteps.java index 18cbd9da3..a8b39cae9 100644 --- a/client/src/test/java/com/sinch/sdk/e2e/domains/numbers/v1/WebhooksEventsSteps.java +++ b/client/src/test/java/com/sinch/sdk/e2e/domains/numbers/v1/SinchEventsSteps.java @@ -1,11 +1,11 @@ package com.sinch.sdk.e2e.domains.numbers.v1; -import com.sinch.sdk.domains.numbers.api.v1.WebHooksService; -import com.sinch.sdk.domains.numbers.models.v1.webhooks.NumberEvent; -import com.sinch.sdk.domains.numbers.models.v1.webhooks.NumberEvent.EventTypeEnum; -import com.sinch.sdk.domains.numbers.models.v1.webhooks.NumberEvent.FailureCodeEnum; -import com.sinch.sdk.domains.numbers.models.v1.webhooks.NumberEvent.StatusEnum; -import com.sinch.sdk.domains.numbers.models.v1.webhooks.ResourceType; +import com.sinch.sdk.domains.numbers.api.v1.SinchEventsService; +import com.sinch.sdk.domains.numbers.models.v1.sinchevents.NumberSinchEvent; +import com.sinch.sdk.domains.numbers.models.v1.sinchevents.NumberSinchEvent.EventTypeEnum; +import com.sinch.sdk.domains.numbers.models.v1.sinchevents.NumberSinchEvent.FailureCodeEnum; +import com.sinch.sdk.domains.numbers.models.v1.sinchevents.NumberSinchEvent.StatusEnum; +import com.sinch.sdk.domains.numbers.models.v1.sinchevents.ResourceType; import com.sinch.sdk.e2e.Config; import com.sinch.sdk.e2e.domains.WebhooksHelper; import io.cucumber.java.en.Given; @@ -22,12 +22,12 @@ import java.util.stream.Stream; import org.junit.jupiter.api.Assertions; -public class WebhooksEventsSteps { +public class SinchEventsSteps { static final String WEBHOOKS_PATH = Config.NUMBERS_HOST_NAME + "/webhooks/numbers/"; static final String SECRET = "strongPa$$PhraseWith36CharactersMax"; - WebHooksService service; + SinchEventsService service; Map triggerToURL = Stream.of( @@ -39,18 +39,18 @@ public class WebhooksEventsSteps { WEBHOOKS_PATH + "provisioning_to_voice_platform/failed")) .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); - Map> receivedEvents = new ConcurrentHashMap<>(); + Map> receivedEvents = new ConcurrentHashMap<>(); @Given("^the Numbers Webhooks handler is available$") public void serviceAvailable() { - service = Config.getSinchClient().numbers().v1().webhooks(); + service = Config.getSinchClient().numbers().v1().sinchEvents(); } @When("I send a request to trigger the {string} for {string} event") public void triggerEvent(String status, String trigger) throws IOException { - WebhooksHelper.Response response = + WebhooksHelper.Response response = WebhooksHelper.callURL( new URL(triggerToURL.get(status + "_" + trigger)), service::parseEvent); receivedEvents.put(status + "_" + trigger, response); @@ -59,7 +59,8 @@ public void triggerEvent(String status, String trigger) throws IOException { @Then("the header of the {string} for {string} event contains a valid signature") public void validateEventSignature(String status, String trigger) { - WebhooksHelper.Response receivedEvent = receivedEvents.get(status + "_" + trigger); + WebhooksHelper.Response receivedEvent = + receivedEvents.get(status + "_" + trigger); boolean validated = service.validateAuthenticationHeader( @@ -70,8 +71,8 @@ public void validateEventSignature(String status, String trigger) { @Then("the event describes a {string} for {string} event") public void validateResult(String status, String trigger) { - NumberEvent expectedSuccess = - NumberEvent.builder() + NumberSinchEvent expectedSuccess = + NumberSinchEvent.builder() .setEventId("01j1wefx7p3wf2r3x6h4dh6hh9") .setTimestamp(Instant.parse("2024-06-06T14:42:42.846638361Z")) .setProjectId("12c0ffee-dada-beef-cafe-baadc0de5678") @@ -82,8 +83,8 @@ public void validateResult(String status, String trigger) { .setFailureCode(null) .build(); - NumberEvent expectedFailure = - NumberEvent.builder() + NumberSinchEvent expectedFailure = + NumberSinchEvent.builder() .setEventId("01j1wf89pq3zy4xe81wg1jhjyx") .setTimestamp(Instant.parse("2024-06-06T14:42:42.047675109Z")) .setProjectId("12c0ffee-dada-beef-cafe-baadc0de5678") @@ -94,8 +95,9 @@ public void validateResult(String status, String trigger) { .setFailureCode(FailureCodeEnum.from("PROVISIONING_TO_VOICE_PLATFORM_FAILED")) .build(); - NumberEvent expected = Objects.equals(status, "success") ? expectedSuccess : expectedFailure; - NumberEvent receivedEvent = receivedEvents.get(status + "_" + trigger).event; + NumberSinchEvent expected = + Objects.equals(status, "success") ? expectedSuccess : expectedFailure; + NumberSinchEvent receivedEvent = receivedEvents.get(status + "_" + trigger).event; Assertions.assertEquals(expected, receivedEvent); } diff --git a/examples/snippets/src/main/java/numbers/README.md b/examples/snippets/src/main/java/numbers/README.md index ca3f95208..5d046cd7f 100644 --- a/examples/snippets/src/main/java/numbers/README.md +++ b/examples/snippets/src/main/java/numbers/README.md @@ -19,7 +19,7 @@ See main [README.md](../../../../README.md) for how to execute snippets - [numbers/DeprovisionEmergencyAddress](DeprovisionEmergencyAddress.java) - Regions - [numbers/regions/List](List.java) -- Callbacks - - [numbers/callback/Get](Get.java) - - [numbers/callback/Update](Update.java) +- Event Destinations + - [numbers/eventdestinations/Get](Get.java) + - [numbers/eventdestinations/Update](Update.java) diff --git a/examples/snippets/src/main/java/numbers/callback/Get.java b/examples/snippets/src/main/java/numbers/eventdestinations/Get.java similarity index 72% rename from examples/snippets/src/main/java/numbers/callback/Get.java rename to examples/snippets/src/main/java/numbers/eventdestinations/Get.java index e19fdcd77..fda5e93d5 100644 --- a/examples/snippets/src/main/java/numbers/callback/Get.java +++ b/examples/snippets/src/main/java/numbers/eventdestinations/Get.java @@ -5,11 +5,11 @@ * *

See https://github.com/sinch/sinch-sdk-java/blob/main/examples/snippets/README.md for details */ -package numbers.callback; +package numbers.eventdestinations; import com.sinch.sdk.SinchClient; -import com.sinch.sdk.domains.numbers.api.v1.CallbackConfigurationService; -import com.sinch.sdk.domains.numbers.models.v1.callbacks.response.CallbackConfigurationResponse; +import com.sinch.sdk.domains.numbers.api.v1.EventDestinationsService; +import com.sinch.sdk.domains.numbers.models.v1.eventdestinations.response.EventDestinationResponse; import com.sinch.sdk.models.Configuration; import java.util.logging.Logger; import utils.Settings; @@ -33,12 +33,11 @@ public static void main(String[] args) { SinchClient client = new SinchClient(configuration); - CallbackConfigurationService callbackConfigurationService = - client.numbers().v1().callbackConfiguration(); + EventDestinationsService eventDestinationsService = client.numbers().v1().eventDestinations(); LOGGER.info("Get"); - CallbackConfigurationResponse value = callbackConfigurationService.get(); + EventDestinationResponse value = eventDestinationsService.get(); LOGGER.info("Response :" + value); } diff --git a/examples/snippets/src/main/java/numbers/callback/Update.java b/examples/snippets/src/main/java/numbers/eventdestinations/Update.java similarity index 62% rename from examples/snippets/src/main/java/numbers/callback/Update.java rename to examples/snippets/src/main/java/numbers/eventdestinations/Update.java index 85032a051..ef5cab07e 100644 --- a/examples/snippets/src/main/java/numbers/callback/Update.java +++ b/examples/snippets/src/main/java/numbers/eventdestinations/Update.java @@ -5,12 +5,12 @@ * *

See https://github.com/sinch/sinch-sdk-java/blob/main/examples/snippets/README.md for details */ -package numbers.callback; +package numbers.eventdestinations; import com.sinch.sdk.SinchClient; -import com.sinch.sdk.domains.numbers.api.v1.CallbackConfigurationService; -import com.sinch.sdk.domains.numbers.models.v1.callbacks.request.CallbackConfigurationUpdateRequest; -import com.sinch.sdk.domains.numbers.models.v1.callbacks.response.CallbackConfigurationResponse; +import com.sinch.sdk.domains.numbers.api.v1.EventDestinationsService; +import com.sinch.sdk.domains.numbers.models.v1.eventdestinations.request.EventDestinationUpdateRequest; +import com.sinch.sdk.domains.numbers.models.v1.eventdestinations.response.EventDestinationResponse; import com.sinch.sdk.models.Configuration; import java.util.logging.Logger; import utils.Settings; @@ -36,15 +36,14 @@ public static void main(String[] args) { SinchClient client = new SinchClient(configuration); - CallbackConfigurationService callbackConfigurationService = - client.numbers().v1().callbackConfiguration(); + EventDestinationsService eventDestinationsService = client.numbers().v1().eventDestinations(); LOGGER.info("Update callback HMAC secret"); - CallbackConfigurationUpdateRequest parameters = - CallbackConfigurationUpdateRequest.builder().setHmacSecret(hmac).build(); + EventDestinationUpdateRequest parameters = + EventDestinationUpdateRequest.builder().setHmacSecret(hmac).build(); - CallbackConfigurationResponse value = callbackConfigurationService.update(parameters); + EventDestinationResponse value = eventDestinationsService.update(parameters); LOGGER.info("Response :" + value); } diff --git a/examples/webhooks/src/main/java/com/mycompany/app/numbers/Controller.java b/examples/webhooks/src/main/java/com/mycompany/app/numbers/Controller.java index f898ce836..8d552062b 100644 --- a/examples/webhooks/src/main/java/com/mycompany/app/numbers/Controller.java +++ b/examples/webhooks/src/main/java/com/mycompany/app/numbers/Controller.java @@ -1,8 +1,8 @@ package com.mycompany.app.numbers; import com.sinch.sdk.SinchClient; -import com.sinch.sdk.domains.numbers.api.v1.WebHooksService; -import com.sinch.sdk.domains.numbers.models.v1.webhooks.NumberEvent; +import com.sinch.sdk.domains.numbers.api.v1.SinchEventsService; +import com.sinch.sdk.domains.numbers.models.v1.sinchevents.NumberSinchEvent; import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -19,7 +19,7 @@ public class Controller { private final SinchClient sinchClient; - private final ServerBusinessLogic webhooksBusinessLogic; + private final ServerBusinessLogic sinchEventsBusinessLogic; /** * The secret value used for webhook calls validation have to equals to the one configured at @@ -33,9 +33,9 @@ public class Controller { private String webhooksSecret; @Autowired - public Controller(SinchClient sinchClient, ServerBusinessLogic webhooksBusinessLogic) { + public Controller(SinchClient sinchClient, ServerBusinessLogic sinchEventsBusinessLogic) { this.sinchClient = sinchClient; - this.webhooksBusinessLogic = webhooksBusinessLogic; + this.sinchEventsBusinessLogic = sinchEventsBusinessLogic; } @PostMapping( @@ -45,7 +45,7 @@ public Controller(SinchClient sinchClient, ServerBusinessLogic webhooksBusinessL public ResponseEntity NumbersEvent( @RequestHeader Map headers, @RequestBody String body) { - WebHooksService webhooks = sinchClient.numbers().v1().webhooks(); + SinchEventsService sinchEventsService = sinchClient.numbers().v1().sinchEvents(); // see https://developers.sinch.com/docs/numbers/api-reference/numbers/tag/Numbers-Callbacks for // more information @@ -54,7 +54,7 @@ public ResponseEntity NumbersEvent( if (ensureValidAuthentication) { // ensure valid authentication to handle request var validAuth = - webhooks.validateAuthenticationHeader( + sinchEventsService.validateAuthenticationHeader( webhooksSecret, // request headers headers, @@ -68,10 +68,10 @@ public ResponseEntity NumbersEvent( } // decode the request payload - NumberEvent event = webhooks.parseEvent(body); + NumberSinchEvent event = sinchEventsService.parseEvent(body); // let business layer process the request - webhooksBusinessLogic.numbersEvent(event); + sinchEventsBusinessLogic.numbersEvent(event); return ResponseEntity.ok().build(); } diff --git a/examples/webhooks/src/main/java/com/mycompany/app/numbers/ServerBusinessLogic.java b/examples/webhooks/src/main/java/com/mycompany/app/numbers/ServerBusinessLogic.java index 773b93310..5153a363d 100644 --- a/examples/webhooks/src/main/java/com/mycompany/app/numbers/ServerBusinessLogic.java +++ b/examples/webhooks/src/main/java/com/mycompany/app/numbers/ServerBusinessLogic.java @@ -1,6 +1,6 @@ package com.mycompany.app.numbers; -import com.sinch.sdk.domains.numbers.models.v1.webhooks.NumberEvent; +import com.sinch.sdk.domains.numbers.models.v1.sinchevents.NumberSinchEvent; import java.util.logging.Logger; import org.springframework.stereotype.Component; @@ -9,7 +9,7 @@ public class ServerBusinessLogic { private static final Logger LOGGER = Logger.getLogger(ServerBusinessLogic.class.getName()); - public void numbersEvent(NumberEvent event) { + public void numbersEvent(NumberSinchEvent event) { LOGGER.info("Handle event: " + event); } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/api/v1/CallbackConfigurationService.java b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/api/v1/EventDestinationsService.java similarity index 51% rename from openapi-contracts/src/main/com/sinch/sdk/domains/numbers/api/v1/CallbackConfigurationService.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/numbers/api/v1/EventDestinationsService.java index f16d5d61a..43881e2d7 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/api/v1/CallbackConfigurationService.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/api/v1/EventDestinationsService.java @@ -11,32 +11,32 @@ package com.sinch.sdk.domains.numbers.api.v1; import com.sinch.sdk.core.exceptions.ApiException; -import com.sinch.sdk.domains.numbers.models.v1.callbacks.request.CallbackConfigurationUpdateRequest; -import com.sinch.sdk.domains.numbers.models.v1.callbacks.response.CallbackConfigurationResponse; +import com.sinch.sdk.domains.numbers.models.v1.eventdestinations.request.EventDestinationUpdateRequest; +import com.sinch.sdk.domains.numbers.models.v1.eventdestinations.response.EventDestinationResponse; -/** callback_configuration Service */ -public interface CallbackConfigurationService { +/** Event Destinations Service */ +public interface EventDestinationsService { /** * Get callbacks configuration * *

Returns the callbacks configuration for the specified project * - * @return CallbackConfigurationResponse + * @return EventDestinationResponse * @throws ApiException if fails to make API call */ - CallbackConfigurationResponse get() throws ApiException; + EventDestinationResponse get() throws ApiException; /** * Update callback configuration * *

Updates the callbacks configuration for the specified project * - * @param callbackConfigurationUpdateRequest The callback configuration details to be updated. + * @param eventDestinationUpdateRequest The callback configuration details to be updated. * (optional) - * @return CallbackConfigurationResponse + * @return EventDestinationResponse * @throws ApiException if fails to make API call */ - CallbackConfigurationResponse update( - CallbackConfigurationUpdateRequest callbackConfigurationUpdateRequest) throws ApiException; + EventDestinationResponse update(EventDestinationUpdateRequest eventDestinationUpdateRequest) + throws ApiException; } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/CallbackConfigurationServiceImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/EventDestinationsServiceImpl.java similarity index 80% rename from openapi-contracts/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/CallbackConfigurationServiceImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/EventDestinationsServiceImpl.java index dc89299d0..6f06d23c3 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/CallbackConfigurationServiceImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/EventDestinationsServiceImpl.java @@ -23,8 +23,8 @@ import com.sinch.sdk.core.http.URLParameter; import com.sinch.sdk.core.http.URLPathUtils; import com.sinch.sdk.core.models.ServerConfiguration; -import com.sinch.sdk.domains.numbers.models.v1.callbacks.request.CallbackConfigurationUpdateRequest; -import com.sinch.sdk.domains.numbers.models.v1.callbacks.response.CallbackConfigurationResponse; +import com.sinch.sdk.domains.numbers.models.v1.eventdestinations.request.EventDestinationUpdateRequest; +import com.sinch.sdk.domains.numbers.models.v1.eventdestinations.response.EventDestinationResponse; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -33,11 +33,11 @@ import java.util.Map; import java.util.logging.Logger; -public class CallbackConfigurationServiceImpl - implements com.sinch.sdk.domains.numbers.api.v1.CallbackConfigurationService { +public class EventDestinationsServiceImpl + implements com.sinch.sdk.domains.numbers.api.v1.EventDestinationsService { private static final Logger LOGGER = - Logger.getLogger(CallbackConfigurationServiceImpl.class.getName()); + Logger.getLogger(EventDestinationsServiceImpl.class.getName()); private final HttpClient httpClient; private final ServerConfiguration serverConfiguration; private final Map authManagersByOasSecuritySchemes; @@ -45,7 +45,7 @@ public class CallbackConfigurationServiceImpl private final String projectId; - public CallbackConfigurationServiceImpl( + public EventDestinationsServiceImpl( HttpClient httpClient, ServerConfiguration serverConfiguration, Map authManagersByOasSecuritySchemes, @@ -59,7 +59,7 @@ public CallbackConfigurationServiceImpl( } @Override - public CallbackConfigurationResponse get() throws ApiException { + public EventDestinationResponse get() throws ApiException { LOGGER.finest("[get]"); @@ -69,7 +69,7 @@ public CallbackConfigurationResponse get() throws ApiException { this.serverConfiguration, this.authManagersByOasSecuritySchemes, httpRequest); if (HttpStatus.isSuccessfulStatus(response.getCode())) { - return mapper.deserialize(response, new TypeReference() {}); + return mapper.deserialize(response, new TypeReference() {}); } // fallback to default errors handling: // all error cases definition are not required from specs: will try some "hardcoded" content @@ -116,22 +116,19 @@ private HttpRequest getRequestBuilder() throws ApiException { } @Override - public CallbackConfigurationResponse update( - CallbackConfigurationUpdateRequest callbackConfigurationUpdateRequest) throws ApiException { + public EventDestinationResponse update( + EventDestinationUpdateRequest eventDestinationUpdateRequest) throws ApiException { LOGGER.finest( - "[update]" - + " " - + "callbackConfigurationUpdateRequest: " - + callbackConfigurationUpdateRequest); + "[update]" + " " + "eventDestinationUpdateRequest: " + eventDestinationUpdateRequest); - HttpRequest httpRequest = updateRequestBuilder(callbackConfigurationUpdateRequest); + HttpRequest httpRequest = updateRequestBuilder(eventDestinationUpdateRequest); HttpResponse response = httpClient.invokeAPI( this.serverConfiguration, this.authManagersByOasSecuritySchemes, httpRequest); if (HttpStatus.isSuccessfulStatus(response.getCode())) { - return mapper.deserialize(response, new TypeReference() {}); + return mapper.deserialize(response, new TypeReference() {}); } // fallback to default errors handling: // all error cases definition are not required from specs: will try some "hardcoded" content @@ -143,7 +140,7 @@ public CallbackConfigurationResponse update( } private HttpRequest updateRequestBuilder( - CallbackConfigurationUpdateRequest callbackConfigurationUpdateRequest) throws ApiException { + EventDestinationUpdateRequest eventDestinationUpdateRequest) throws ApiException { // verify the required parameter 'this.projectId' is set if (this.projectId == null) { throw new ApiException( @@ -166,7 +163,7 @@ private HttpRequest updateRequestBuilder( final Collection localVarAuthNames = Arrays.asList("Basic", "OAuth2.0"); final String serializedBody = - mapper.serialize(localVarContentTypes, callbackConfigurationUpdateRequest); + mapper.serialize(localVarContentTypes, eventDestinationUpdateRequest); return new HttpRequest( localVarPath, diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/ActiveNumber.java b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/ActiveNumber.java index a1fbdc2ea..fbf58dfb1 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/ActiveNumber.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/ActiveNumber.java @@ -110,9 +110,9 @@ public interface ActiveNumber { /** * The callback URL to be called for a rented number's provisioning / deprovisioning operations. * - * @return callbackUrl + * @return eventDestinationTarget */ - String getCallbackUrl(); + String getEventDestinationTarget(); /** * Getting builder @@ -240,11 +240,11 @@ interface Builder { /** * see getter * - * @param callbackUrl see getter + * @param eventDestinationTarget see getter * @return Current builder - * @see #getCallbackUrl + * @see #getEventDestinationTarget */ - Builder setCallbackUrl(String callbackUrl); + Builder setEventDestinationTarget(String eventDestinationTarget); /** * Create instance diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/ActiveNumberImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/ActiveNumberImpl.java index 829422d40..f48220601 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/ActiveNumberImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/ActiveNumberImpl.java @@ -81,7 +81,7 @@ public class ActiveNumberImpl implements ActiveNumber { public static final String JSON_PROPERTY_CALLBACK_URL = "callbackUrl"; - private OptionalValue callbackUrl; + private OptionalValue eventDestinationTarget; public ActiveNumberImpl() {} @@ -98,7 +98,7 @@ protected ActiveNumberImpl( OptionalValue expireAt, OptionalValue smsConfiguration, OptionalValue voiceConfiguration, - OptionalValue callbackUrl) { + OptionalValue eventDestinationTarget) { this.phoneNumber = phoneNumber; this.projectId = projectId; this.displayName = displayName; @@ -111,7 +111,7 @@ protected ActiveNumberImpl( this.expireAt = expireAt; this.smsConfiguration = smsConfiguration; this.voiceConfiguration = voiceConfiguration; - this.callbackUrl = callbackUrl; + this.eventDestinationTarget = eventDestinationTarget; } @JsonIgnore @@ -244,14 +244,14 @@ public OptionalValue voiceConfiguration() { } @JsonIgnore - public String getCallbackUrl() { - return callbackUrl.orElse(null); + public String getEventDestinationTarget() { + return eventDestinationTarget.orElse(null); } @JsonProperty(JSON_PROPERTY_CALLBACK_URL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public OptionalValue callbackUrl() { - return callbackUrl; + public OptionalValue eventDestinationTarget() { + return eventDestinationTarget; } /** Return true if this ActiveNumberResponse object is equal to o. */ @@ -276,7 +276,7 @@ public boolean equals(Object o) { && Objects.equals(this.expireAt, activeNumberResponse.expireAt) && Objects.equals(this.smsConfiguration, activeNumberResponse.smsConfiguration) && Objects.equals(this.voiceConfiguration, activeNumberResponse.voiceConfiguration) - && Objects.equals(this.callbackUrl, activeNumberResponse.callbackUrl); + && Objects.equals(this.eventDestinationTarget, activeNumberResponse.eventDestinationTarget); } @Override @@ -294,7 +294,7 @@ public int hashCode() { expireAt, smsConfiguration, voiceConfiguration, - callbackUrl); + eventDestinationTarget); } @Override @@ -315,7 +315,9 @@ public String toString() { sb.append(" expireAt: ").append(toIndentedString(expireAt)).append("\n"); sb.append(" smsConfiguration: ").append(toIndentedString(smsConfiguration)).append("\n"); sb.append(" voiceConfiguration: ").append(toIndentedString(voiceConfiguration)).append("\n"); - sb.append(" callbackUrl: ").append(toIndentedString(callbackUrl)).append("\n"); + sb.append(" eventDestinationTarget: ") + .append(toIndentedString(eventDestinationTarget)) + .append("\n"); sb.append("}"); return sb.toString(); } @@ -344,7 +346,7 @@ static class Builder implements ActiveNumber.Builder { OptionalValue expireAt = OptionalValue.empty(); OptionalValue smsConfiguration = OptionalValue.empty(); OptionalValue voiceConfiguration = OptionalValue.empty(); - OptionalValue callbackUrl = OptionalValue.empty(); + OptionalValue eventDestinationTarget = OptionalValue.empty(); @JsonProperty(JSON_PROPERTY_PHONE_NUMBER) public Builder setPhoneNumber(String phoneNumber) { @@ -419,8 +421,8 @@ public Builder setVoiceConfiguration(VoiceConfiguration voiceConfiguration) { } @JsonProperty(JSON_PROPERTY_CALLBACK_URL) - public Builder setCallbackUrl(String callbackUrl) { - this.callbackUrl = OptionalValue.of(callbackUrl); + public Builder setEventDestinationTarget(String eventDestinationTarget) { + this.eventDestinationTarget = OptionalValue.of(eventDestinationTarget); return this; } @@ -438,7 +440,7 @@ public ActiveNumber build() { expireAt, smsConfiguration, voiceConfiguration, - callbackUrl); + eventDestinationTarget); } } } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/callbacks/request/CallbackConfigurationUpdateRequest.java b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/eventdestinations/request/EventDestinationUpdateRequest.java similarity index 75% rename from openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/callbacks/request/CallbackConfigurationUpdateRequest.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/eventdestinations/request/EventDestinationUpdateRequest.java index 4f56e502e..aeca3cb64 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/callbacks/request/CallbackConfigurationUpdateRequest.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/eventdestinations/request/EventDestinationUpdateRequest.java @@ -8,13 +8,13 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.numbers.models.v1.callbacks.request; +package com.sinch.sdk.domains.numbers.models.v1.eventdestinations.request; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; /** The request to update the callbacks configuration for the current project. */ -@JsonDeserialize(builder = CallbackConfigurationUpdateRequestImpl.Builder.class) -public interface CallbackConfigurationUpdateRequest { +@JsonDeserialize(builder = EventDestinationUpdateRequestImpl.Builder.class) +public interface EventDestinationUpdateRequest { /** * The HMAC secret to be updated for the specified project @@ -29,7 +29,7 @@ public interface CallbackConfigurationUpdateRequest { * @return New Builder instance */ static Builder builder() { - return new CallbackConfigurationUpdateRequestImpl.Builder(); + return new EventDestinationUpdateRequestImpl.Builder(); } /** Dedicated Builder */ @@ -49,6 +49,6 @@ interface Builder { * * @return The instance build with current builder values */ - CallbackConfigurationUpdateRequest build(); + EventDestinationUpdateRequest build(); } } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/callbacks/request/CallbackConfigurationUpdateRequestImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/eventdestinations/request/EventDestinationUpdateRequestImpl.java similarity index 73% rename from openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/callbacks/request/CallbackConfigurationUpdateRequestImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/eventdestinations/request/EventDestinationUpdateRequestImpl.java index 080990d25..472e48ace 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/callbacks/request/CallbackConfigurationUpdateRequestImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/eventdestinations/request/EventDestinationUpdateRequestImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.numbers.models.v1.callbacks.request; +package com.sinch.sdk.domains.numbers.models.v1.eventdestinations.request; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -9,19 +9,19 @@ import com.sinch.sdk.core.models.OptionalValue; import java.util.Objects; -@JsonPropertyOrder({CallbackConfigurationUpdateRequestImpl.JSON_PROPERTY_HMAC_SECRET}) +@JsonPropertyOrder({EventDestinationUpdateRequestImpl.JSON_PROPERTY_HMAC_SECRET}) @JsonFilter("uninitializedFilter") @JsonInclude(value = JsonInclude.Include.CUSTOM) -public class CallbackConfigurationUpdateRequestImpl implements CallbackConfigurationUpdateRequest { +public class EventDestinationUpdateRequestImpl implements EventDestinationUpdateRequest { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_HMAC_SECRET = "hmacSecret"; private OptionalValue hmacSecret; - public CallbackConfigurationUpdateRequestImpl() {} + public EventDestinationUpdateRequestImpl() {} - protected CallbackConfigurationUpdateRequestImpl(OptionalValue hmacSecret) { + protected EventDestinationUpdateRequestImpl(OptionalValue hmacSecret) { this.hmacSecret = hmacSecret; } @@ -45,8 +45,8 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - CallbackConfigurationUpdateRequestImpl callbackConfigurationUpdate = - (CallbackConfigurationUpdateRequestImpl) o; + EventDestinationUpdateRequestImpl callbackConfigurationUpdate = + (EventDestinationUpdateRequestImpl) o; return Objects.equals(this.hmacSecret, callbackConfigurationUpdate.hmacSecret); } @@ -58,7 +58,7 @@ public int hashCode() { @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("class CallbackConfigurationUpdateRequestImpl {\n"); + sb.append("class EventDestinationUpdateRequestImpl {\n"); sb.append(" hmacSecret: ").append(toIndentedString(hmacSecret)).append("\n"); sb.append("}"); return sb.toString(); @@ -75,7 +75,7 @@ private String toIndentedString(Object o) { } @JsonPOJOBuilder(withPrefix = "set") - static class Builder implements CallbackConfigurationUpdateRequest.Builder { + static class Builder implements EventDestinationUpdateRequest.Builder { OptionalValue hmacSecret = OptionalValue.empty(); @JsonProperty(JSON_PROPERTY_HMAC_SECRET) @@ -84,8 +84,8 @@ public Builder setHmacSecret(String hmacSecret) { return this; } - public CallbackConfigurationUpdateRequest build() { - return new CallbackConfigurationUpdateRequestImpl(hmacSecret); + public EventDestinationUpdateRequest build() { + return new EventDestinationUpdateRequestImpl(hmacSecret); } } } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/callbacks/response/CallbackConfigurationResponse.java b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/eventdestinations/response/EventDestinationResponse.java similarity index 82% rename from openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/callbacks/response/CallbackConfigurationResponse.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/eventdestinations/response/EventDestinationResponse.java index a438b32f7..039098c8e 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/callbacks/response/CallbackConfigurationResponse.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/eventdestinations/response/EventDestinationResponse.java @@ -8,13 +8,13 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.numbers.models.v1.callbacks.response; +package com.sinch.sdk.domains.numbers.models.v1.eventdestinations.response; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; /** Response message containing the callbacks configuration for a specific project. */ -@JsonDeserialize(builder = CallbackConfigurationResponseImpl.Builder.class) -public interface CallbackConfigurationResponse { +@JsonDeserialize(builder = EventDestinationResponseImpl.Builder.class) +public interface EventDestinationResponse { /** * ID of the project the configuration belongs to. @@ -37,7 +37,7 @@ public interface CallbackConfigurationResponse { * @return New Builder instance */ static Builder builder() { - return new CallbackConfigurationResponseImpl.Builder(); + return new EventDestinationResponseImpl.Builder(); } /** Dedicated Builder */ @@ -66,6 +66,6 @@ interface Builder { * * @return The instance build with current builder values */ - CallbackConfigurationResponse build(); + EventDestinationResponse build(); } } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/callbacks/response/CallbackConfigurationResponseImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/eventdestinations/response/EventDestinationResponseImpl.java similarity index 80% rename from openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/callbacks/response/CallbackConfigurationResponseImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/eventdestinations/response/EventDestinationResponseImpl.java index dd365f8cc..08f63d28d 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/callbacks/response/CallbackConfigurationResponseImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/eventdestinations/response/EventDestinationResponseImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.numbers.models.v1.callbacks.response; +package com.sinch.sdk.domains.numbers.models.v1.eventdestinations.response; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -10,12 +10,12 @@ import java.util.Objects; @JsonPropertyOrder({ - CallbackConfigurationResponseImpl.JSON_PROPERTY_PROJECT_ID, - CallbackConfigurationResponseImpl.JSON_PROPERTY_HMAC_SECRET + EventDestinationResponseImpl.JSON_PROPERTY_PROJECT_ID, + EventDestinationResponseImpl.JSON_PROPERTY_HMAC_SECRET }) @JsonFilter("uninitializedFilter") @JsonInclude(value = JsonInclude.Include.CUSTOM) -public class CallbackConfigurationResponseImpl implements CallbackConfigurationResponse { +public class EventDestinationResponseImpl implements EventDestinationResponse { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_PROJECT_ID = "projectId"; @@ -26,9 +26,9 @@ public class CallbackConfigurationResponseImpl implements CallbackConfigurationR private OptionalValue hmacSecret; - public CallbackConfigurationResponseImpl() {} + public EventDestinationResponseImpl() {} - protected CallbackConfigurationResponseImpl( + protected EventDestinationResponseImpl( OptionalValue projectId, OptionalValue hmacSecret) { this.projectId = projectId; this.hmacSecret = hmacSecret; @@ -65,7 +65,7 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - CallbackConfigurationResponseImpl callbackConfiguration = (CallbackConfigurationResponseImpl) o; + EventDestinationResponseImpl callbackConfiguration = (EventDestinationResponseImpl) o; return Objects.equals(this.projectId, callbackConfiguration.projectId) && Objects.equals(this.hmacSecret, callbackConfiguration.hmacSecret); } @@ -78,7 +78,7 @@ public int hashCode() { @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("class CallbackConfigurationResponseImpl {\n"); + sb.append("class EventDestinationResponseImpl {\n"); sb.append(" projectId: ").append(toIndentedString(projectId)).append("\n"); sb.append(" hmacSecret: ").append(toIndentedString(hmacSecret)).append("\n"); sb.append("}"); @@ -96,7 +96,7 @@ private String toIndentedString(Object o) { } @JsonPOJOBuilder(withPrefix = "set") - static class Builder implements CallbackConfigurationResponse.Builder { + static class Builder implements EventDestinationResponse.Builder { OptionalValue projectId = OptionalValue.empty(); OptionalValue hmacSecret = OptionalValue.empty(); @@ -112,8 +112,8 @@ public Builder setHmacSecret(String hmacSecret) { return this; } - public CallbackConfigurationResponse build() { - return new CallbackConfigurationResponseImpl(projectId, hmacSecret); + public EventDestinationResponse build() { + return new EventDestinationResponseImpl(projectId, hmacSecret); } } } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/request/ActiveNumberUpdateRequest.java b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/request/ActiveNumberUpdateRequest.java index 9639d0811..b908917bf 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/request/ActiveNumberUpdateRequest.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/request/ActiveNumberUpdateRequest.java @@ -42,9 +42,9 @@ public interface ActiveNumberUpdateRequest { /** * The callback URL to be called for a rented number's provisioning / deprovisioning operations. * - * @return callbackUrl + * @return eventDestinationTarget */ - String getCallbackUrl(); + String getEventDestinationTarget(); /** * Getting builder @@ -88,11 +88,11 @@ interface Builder { /** * see getter * - * @param callbackUrl see getter + * @param eventDestinationTarget see getter * @return Current builder - * @see #getCallbackUrl + * @see #getEventDestinationTarget */ - Builder setCallbackUrl(String callbackUrl); + Builder setEventDestinationTarget(String eventDestinationTarget); /** * Create instance diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/request/ActiveNumberUpdateRequestImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/request/ActiveNumberUpdateRequestImpl.java index 98c3837c7..eb405da6a 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/request/ActiveNumberUpdateRequestImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/request/ActiveNumberUpdateRequestImpl.java @@ -36,7 +36,7 @@ public class ActiveNumberUpdateRequestImpl implements ActiveNumberUpdateRequest public static final String JSON_PROPERTY_CALLBACK_URL = "callbackUrl"; - private OptionalValue callbackUrl; + private OptionalValue eventDestinationTarget; public ActiveNumberUpdateRequestImpl() {} @@ -44,11 +44,11 @@ protected ActiveNumberUpdateRequestImpl( OptionalValue displayName, OptionalValue smsConfiguration, OptionalValue voiceConfiguration, - OptionalValue callbackUrl) { + OptionalValue eventDestinationTarget) { this.displayName = displayName; this.smsConfiguration = smsConfiguration; this.voiceConfiguration = voiceConfiguration; - this.callbackUrl = callbackUrl; + this.eventDestinationTarget = eventDestinationTarget; } @JsonIgnore @@ -85,14 +85,14 @@ public OptionalValue voiceConfiguration() { } @JsonIgnore - public String getCallbackUrl() { - return callbackUrl.orElse(null); + public String getEventDestinationTarget() { + return eventDestinationTarget.orElse(null); } @JsonProperty(JSON_PROPERTY_CALLBACK_URL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public OptionalValue callbackUrl() { - return callbackUrl; + public OptionalValue eventDestinationTarget() { + return eventDestinationTarget; } /** Return true if this ActiveNumberRequest object is equal to o. */ @@ -108,12 +108,12 @@ public boolean equals(Object o) { return Objects.equals(this.displayName, activeNumberRequest.displayName) && Objects.equals(this.smsConfiguration, activeNumberRequest.smsConfiguration) && Objects.equals(this.voiceConfiguration, activeNumberRequest.voiceConfiguration) - && Objects.equals(this.callbackUrl, activeNumberRequest.callbackUrl); + && Objects.equals(this.eventDestinationTarget, activeNumberRequest.eventDestinationTarget); } @Override public int hashCode() { - return Objects.hash(displayName, smsConfiguration, voiceConfiguration, callbackUrl); + return Objects.hash(displayName, smsConfiguration, voiceConfiguration, eventDestinationTarget); } @Override @@ -123,7 +123,9 @@ public String toString() { sb.append(" displayName: ").append(toIndentedString(displayName)).append("\n"); sb.append(" smsConfiguration: ").append(toIndentedString(smsConfiguration)).append("\n"); sb.append(" voiceConfiguration: ").append(toIndentedString(voiceConfiguration)).append("\n"); - sb.append(" callbackUrl: ").append(toIndentedString(callbackUrl)).append("\n"); + sb.append(" eventDestinationTarget: ") + .append(toIndentedString(eventDestinationTarget)) + .append("\n"); sb.append("}"); return sb.toString(); } @@ -143,7 +145,7 @@ static class Builder implements ActiveNumberUpdateRequest.Builder { OptionalValue displayName = OptionalValue.empty(); OptionalValue smsConfiguration = OptionalValue.empty(); OptionalValue voiceConfiguration = OptionalValue.empty(); - OptionalValue callbackUrl = OptionalValue.empty(); + OptionalValue eventDestinationTarget = OptionalValue.empty(); @JsonProperty(JSON_PROPERTY_DISPLAY_NAME) public Builder setDisplayName(String displayName) { @@ -164,14 +166,14 @@ public Builder setVoiceConfiguration(VoiceConfiguration voiceConfiguration) { } @JsonProperty(JSON_PROPERTY_CALLBACK_URL) - public Builder setCallbackUrl(String callbackUrl) { - this.callbackUrl = OptionalValue.of(callbackUrl); + public Builder setEventDestinationTarget(String eventDestinationTarget) { + this.eventDestinationTarget = OptionalValue.of(eventDestinationTarget); return this; } public ActiveNumberUpdateRequest build() { return new ActiveNumberUpdateRequestImpl( - displayName, smsConfiguration, voiceConfiguration, callbackUrl); + displayName, smsConfiguration, voiceConfiguration, eventDestinationTarget); } } } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/request/AvailableNumberRentAnyRequest.java b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/request/AvailableNumberRentAnyRequest.java index 42544c69b..59ff9f0c3 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/request/AvailableNumberRentAnyRequest.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/request/AvailableNumberRentAnyRequest.java @@ -72,9 +72,9 @@ public interface AvailableNumberRentAnyRequest { /** * The callback URL to be called for a rented number's provisioning / deprovisioning operations. * - * @return callbackUrl + * @return eventDestinationTarget */ - String getCallbackUrl(); + String getEventDestinationTarget(); /** * Getting builder @@ -145,11 +145,11 @@ interface Builder { /** * see getter * - * @param callbackUrl see getter + * @param eventDestinationTarget see getter * @return Current builder - * @see #getCallbackUrl + * @see #getEventDestinationTarget */ - Builder setCallbackUrl(String callbackUrl); + Builder setEventDestinationTarget(String eventDestinationTarget); /** * Create instance diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/request/AvailableNumberRentAnyRequestImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/request/AvailableNumberRentAnyRequestImpl.java index fabeab45e..fb54781bf 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/request/AvailableNumberRentAnyRequestImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/request/AvailableNumberRentAnyRequestImpl.java @@ -54,7 +54,7 @@ public class AvailableNumberRentAnyRequestImpl implements AvailableNumberRentAny public static final String JSON_PROPERTY_CALLBACK_URL = "callbackUrl"; - private OptionalValue callbackUrl; + private OptionalValue eventDestinationTarget; public AvailableNumberRentAnyRequestImpl() {} @@ -65,14 +65,14 @@ protected AvailableNumberRentAnyRequestImpl( OptionalValue> capabilities, OptionalValue smsConfiguration, OptionalValue voiceConfiguration, - OptionalValue callbackUrl) { + OptionalValue eventDestinationTarget) { this.numberPattern = numberPattern; this.regionCode = regionCode; this.type = type; this.capabilities = capabilities; this.smsConfiguration = smsConfiguration; this.voiceConfiguration = voiceConfiguration; - this.callbackUrl = callbackUrl; + this.eventDestinationTarget = eventDestinationTarget; } @JsonIgnore @@ -142,14 +142,14 @@ public OptionalValue voiceConfiguration() { } @JsonIgnore - public String getCallbackUrl() { - return callbackUrl.orElse(null); + public String getEventDestinationTarget() { + return eventDestinationTarget.orElse(null); } @JsonProperty(JSON_PROPERTY_CALLBACK_URL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public OptionalValue callbackUrl() { - return callbackUrl; + public OptionalValue eventDestinationTarget() { + return eventDestinationTarget; } /** Return true if this RentAnyNumberRequest object is equal to o. */ @@ -168,7 +168,7 @@ public boolean equals(Object o) { && Objects.equals(this.capabilities, rentAnyNumberRequest.capabilities) && Objects.equals(this.smsConfiguration, rentAnyNumberRequest.smsConfiguration) && Objects.equals(this.voiceConfiguration, rentAnyNumberRequest.voiceConfiguration) - && Objects.equals(this.callbackUrl, rentAnyNumberRequest.callbackUrl); + && Objects.equals(this.eventDestinationTarget, rentAnyNumberRequest.eventDestinationTarget); } @Override @@ -180,7 +180,7 @@ public int hashCode() { capabilities, smsConfiguration, voiceConfiguration, - callbackUrl); + eventDestinationTarget); } @Override @@ -193,7 +193,9 @@ public String toString() { sb.append(" capabilities: ").append(toIndentedString(capabilities)).append("\n"); sb.append(" smsConfiguration: ").append(toIndentedString(smsConfiguration)).append("\n"); sb.append(" voiceConfiguration: ").append(toIndentedString(voiceConfiguration)).append("\n"); - sb.append(" callbackUrl: ").append(toIndentedString(callbackUrl)).append("\n"); + sb.append(" eventDestinationTarget: ") + .append(toIndentedString(eventDestinationTarget)) + .append("\n"); sb.append("}"); return sb.toString(); } @@ -216,7 +218,7 @@ static class Builder implements AvailableNumberRentAnyRequest.Builder { OptionalValue> capabilities = OptionalValue.empty(); OptionalValue smsConfiguration = OptionalValue.empty(); OptionalValue voiceConfiguration = OptionalValue.empty(); - OptionalValue callbackUrl = OptionalValue.empty(); + OptionalValue eventDestinationTarget = OptionalValue.empty(); @JsonProperty(JSON_PROPERTY_NUMBER_PATTERN) public Builder setNumberPattern(SearchPattern numberPattern) { @@ -255,8 +257,8 @@ public Builder setVoiceConfiguration(VoiceConfiguration voiceConfiguration) { } @JsonProperty(JSON_PROPERTY_CALLBACK_URL) - public Builder setCallbackUrl(String callbackUrl) { - this.callbackUrl = OptionalValue.of(callbackUrl); + public Builder setEventDestinationTarget(String eventDestinationTarget) { + this.eventDestinationTarget = OptionalValue.of(eventDestinationTarget); return this; } @@ -268,7 +270,7 @@ public AvailableNumberRentAnyRequest build() { capabilities, smsConfiguration, voiceConfiguration, - callbackUrl); + eventDestinationTarget); } } } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/request/AvailableNumberRentRequest.java b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/request/AvailableNumberRentRequest.java index badb359d2..4c49310bc 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/request/AvailableNumberRentRequest.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/request/AvailableNumberRentRequest.java @@ -35,9 +35,9 @@ public interface AvailableNumberRentRequest { /** * The callback URL to be called for a rented number's provisioning / deprovisioning operations. * - * @return callbackUrl + * @return eventDestinationTarget */ - String getCallbackUrl(); + String getEventDestinationTarget(); /** * Getting builder @@ -72,11 +72,11 @@ interface Builder { /** * see getter * - * @param callbackUrl see getter + * @param eventDestinationTarget see getter * @return Current builder - * @see #getCallbackUrl + * @see #getEventDestinationTarget */ - Builder setCallbackUrl(String callbackUrl); + Builder setEventDestinationTarget(String eventDestinationTarget); /** * Create instance diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/request/AvailableNumberRentRequestImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/request/AvailableNumberRentRequestImpl.java index e383509f1..b1517e268 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/request/AvailableNumberRentRequestImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/request/AvailableNumberRentRequestImpl.java @@ -31,17 +31,17 @@ public class AvailableNumberRentRequestImpl implements AvailableNumberRentReques public static final String JSON_PROPERTY_CALLBACK_URL = "callbackUrl"; - private OptionalValue callbackUrl; + private OptionalValue eventDestinationTarget; public AvailableNumberRentRequestImpl() {} protected AvailableNumberRentRequestImpl( OptionalValue smsConfiguration, OptionalValue voiceConfiguration, - OptionalValue callbackUrl) { + OptionalValue eventDestinationTarget) { this.smsConfiguration = smsConfiguration; this.voiceConfiguration = voiceConfiguration; - this.callbackUrl = callbackUrl; + this.eventDestinationTarget = eventDestinationTarget; } @JsonIgnore @@ -67,14 +67,14 @@ public OptionalValue voiceConfiguration() { } @JsonIgnore - public String getCallbackUrl() { - return callbackUrl.orElse(null); + public String getEventDestinationTarget() { + return eventDestinationTarget.orElse(null); } @JsonProperty(JSON_PROPERTY_CALLBACK_URL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public OptionalValue callbackUrl() { - return callbackUrl; + public OptionalValue eventDestinationTarget() { + return eventDestinationTarget; } /** Return true if this RentNumberRequest object is equal to o. */ @@ -89,12 +89,12 @@ public boolean equals(Object o) { AvailableNumberRentRequestImpl rentNumberRequest = (AvailableNumberRentRequestImpl) o; return Objects.equals(this.smsConfiguration, rentNumberRequest.smsConfiguration) && Objects.equals(this.voiceConfiguration, rentNumberRequest.voiceConfiguration) - && Objects.equals(this.callbackUrl, rentNumberRequest.callbackUrl); + && Objects.equals(this.eventDestinationTarget, rentNumberRequest.eventDestinationTarget); } @Override public int hashCode() { - return Objects.hash(smsConfiguration, voiceConfiguration, callbackUrl); + return Objects.hash(smsConfiguration, voiceConfiguration, eventDestinationTarget); } @Override @@ -103,7 +103,9 @@ public String toString() { sb.append("class AvailableNumberRentRequestImpl {\n"); sb.append(" smsConfiguration: ").append(toIndentedString(smsConfiguration)).append("\n"); sb.append(" voiceConfiguration: ").append(toIndentedString(voiceConfiguration)).append("\n"); - sb.append(" callbackUrl: ").append(toIndentedString(callbackUrl)).append("\n"); + sb.append(" eventDestinationTarget: ") + .append(toIndentedString(eventDestinationTarget)) + .append("\n"); sb.append("}"); return sb.toString(); } @@ -122,7 +124,7 @@ private String toIndentedString(Object o) { static class Builder implements AvailableNumberRentRequest.Builder { OptionalValue smsConfiguration = OptionalValue.empty(); OptionalValue voiceConfiguration = OptionalValue.empty(); - OptionalValue callbackUrl = OptionalValue.empty(); + OptionalValue eventDestinationTarget = OptionalValue.empty(); @JsonProperty(JSON_PROPERTY_SMS_CONFIGURATION) public Builder setSmsConfiguration(SmsConfiguration smsConfiguration) { @@ -137,13 +139,14 @@ public Builder setVoiceConfiguration(VoiceConfiguration voiceConfiguration) { } @JsonProperty(JSON_PROPERTY_CALLBACK_URL) - public Builder setCallbackUrl(String callbackUrl) { - this.callbackUrl = OptionalValue.of(callbackUrl); + public Builder setEventDestinationTarget(String eventDestinationTarget) { + this.eventDestinationTarget = OptionalValue.of(eventDestinationTarget); return this; } public AvailableNumberRentRequest build() { - return new AvailableNumberRentRequestImpl(smsConfiguration, voiceConfiguration, callbackUrl); + return new AvailableNumberRentRequestImpl( + smsConfiguration, voiceConfiguration, eventDestinationTarget); } } } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/webhooks/NumberEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/sinchevents/NumberSinchEvent.java similarity index 97% rename from openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/webhooks/NumberEvent.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/sinchevents/NumberSinchEvent.java index ce7517181..3492004d6 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/webhooks/NumberEvent.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/sinchevents/NumberSinchEvent.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.numbers.models.v1.webhooks; +package com.sinch.sdk.domains.numbers.models.v1.sinchevents; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.sinch.sdk.core.utils.EnumDynamic; @@ -17,9 +17,9 @@ import java.util.Arrays; import java.util.stream.Stream; -/** NumberEvent */ -@JsonDeserialize(builder = NumberEventImpl.Builder.class) -public interface NumberEvent { +/** NumberSinchEvent */ +@JsonDeserialize(builder = NumberSinchEventImpl.Builder.class) +public interface NumberSinchEvent { /** * The ID of the event. @@ -228,7 +228,7 @@ public static String valueOf(FailureCodeEnum e) { * @return New Builder instance */ static Builder builder() { - return new NumberEventImpl.Builder(); + return new NumberSinchEventImpl.Builder(); } /** Dedicated Builder */ @@ -311,6 +311,6 @@ interface Builder { * * @return The instance build with current builder values */ - NumberEvent build(); + NumberSinchEvent build(); } } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/webhooks/NumberEventImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/sinchevents/NumberSinchEventImpl.java similarity index 90% rename from openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/webhooks/NumberEventImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/sinchevents/NumberSinchEventImpl.java index 4243c1320..fb7003b65 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/webhooks/NumberEventImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/sinchevents/NumberSinchEventImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.numbers.models.v1.webhooks; +package com.sinch.sdk.domains.numbers.models.v1.sinchevents; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -11,18 +11,18 @@ import java.util.Objects; @JsonPropertyOrder({ - NumberEventImpl.JSON_PROPERTY_EVENT_ID, - NumberEventImpl.JSON_PROPERTY_TIMESTAMP, - NumberEventImpl.JSON_PROPERTY_PROJECT_ID, - NumberEventImpl.JSON_PROPERTY_RESOURCE_ID, - NumberEventImpl.JSON_PROPERTY_RESOURCE_TYPE, - NumberEventImpl.JSON_PROPERTY_EVENT_TYPE, - NumberEventImpl.JSON_PROPERTY_STATUS, - NumberEventImpl.JSON_PROPERTY_FAILURE_CODE + NumberSinchEventImpl.JSON_PROPERTY_EVENT_ID, + NumberSinchEventImpl.JSON_PROPERTY_TIMESTAMP, + NumberSinchEventImpl.JSON_PROPERTY_PROJECT_ID, + NumberSinchEventImpl.JSON_PROPERTY_RESOURCE_ID, + NumberSinchEventImpl.JSON_PROPERTY_RESOURCE_TYPE, + NumberSinchEventImpl.JSON_PROPERTY_EVENT_TYPE, + NumberSinchEventImpl.JSON_PROPERTY_STATUS, + NumberSinchEventImpl.JSON_PROPERTY_FAILURE_CODE }) @JsonFilter("uninitializedFilter") @JsonInclude(value = JsonInclude.Include.CUSTOM) -public class NumberEventImpl implements NumberEvent { +public class NumberSinchEventImpl implements NumberSinchEvent { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_EVENT_ID = "eventId"; @@ -57,9 +57,9 @@ public class NumberEventImpl implements NumberEvent { private OptionalValue failureCode; - public NumberEventImpl() {} + public NumberSinchEventImpl() {} - protected NumberEventImpl( + protected NumberSinchEventImpl( OptionalValue eventId, OptionalValue timestamp, OptionalValue projectId, @@ -175,7 +175,7 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - NumberEventImpl callbackPayload = (NumberEventImpl) o; + NumberSinchEventImpl callbackPayload = (NumberSinchEventImpl) o; return Objects.equals(this.eventId, callbackPayload.eventId) && Objects.equals(this.timestamp, callbackPayload.timestamp) && Objects.equals(this.projectId, callbackPayload.projectId) @@ -195,7 +195,7 @@ public int hashCode() { @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("class NumberEventImpl {\n"); + sb.append("class NumberSinchEventImpl {\n"); sb.append(" eventId: ").append(toIndentedString(eventId)).append("\n"); sb.append(" timestamp: ").append(toIndentedString(timestamp)).append("\n"); sb.append(" projectId: ").append(toIndentedString(projectId)).append("\n"); @@ -219,7 +219,7 @@ private String toIndentedString(Object o) { } @JsonPOJOBuilder(withPrefix = "set") - static class Builder implements NumberEvent.Builder { + static class Builder implements NumberSinchEvent.Builder { OptionalValue eventId = OptionalValue.empty(); OptionalValue timestamp = OptionalValue.empty(); OptionalValue projectId = OptionalValue.empty(); @@ -277,8 +277,8 @@ public Builder setFailureCode(FailureCodeEnum failureCode) { return this; } - public NumberEvent build() { - return new NumberEventImpl( + public NumberSinchEvent build() { + return new NumberSinchEventImpl( eventId, timestamp, projectId, resourceId, resourceType, eventType, status, failureCode); } } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/webhooks/ResourceType.java b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/sinchevents/ResourceType.java similarity index 94% rename from openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/webhooks/ResourceType.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/sinchevents/ResourceType.java index b73dafda6..a817cf610 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/webhooks/ResourceType.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/models/v1/sinchevents/ResourceType.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.numbers.models.v1.webhooks; +package com.sinch.sdk.domains.numbers.models.v1.sinchevents; import com.sinch.sdk.core.utils.EnumDynamic; import com.sinch.sdk.core.utils.EnumSupportDynamic; diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/numbers/models/v1/ActiveNumberDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/numbers/models/v1/ActiveNumberDtoTest.java index 26b91c0b5..fcca7bfd9 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/numbers/models/v1/ActiveNumberDtoTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/numbers/models/v1/ActiveNumberDtoTest.java @@ -42,7 +42,7 @@ public class ActiveNumberDtoTest extends NumbersBaseTest { .setExpireAt(Instant.parse("2023-10-06T15:49:58.813381Z")) .setSmsConfiguration(SmsConfigurationDtoTest.configurationResponse) .setVoiceConfiguration(VoiceConfigurationDtoTest.configurationResponseRTC) - .setCallbackUrl("foo callback") + .setEventDestinationTarget("foo callback") .build(); public static ActiveNumberUpdateRequest activeNumberUpdateRequest = @@ -57,7 +57,7 @@ public class ActiveNumberDtoTest extends NumbersBaseTest { VoiceConfigurationRTC.builder() .setAppId("AAAAAAAA-BBBB-CCCC-DDDD-EEEEEEEEEE") .build()) - .setCallbackUrl("foo callback") + .setEventDestinationTarget("foo callback") .build(); public static ActiveNumbersListResponseInternal activeNumberList = @@ -89,7 +89,7 @@ public class ActiveNumberDtoTest extends NumbersBaseTest { .build()) .setVoiceConfiguration( VoiceConfigurationRTC.builder().setAppId("app id").build()) - .setCallbackUrl("") + .setEventDestinationTarget("") .build())) .setNextPageToken("") .setTotalSize(1) diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/numbers/models/v1/CallbackConfigurationDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/numbers/models/v1/EventDestinationsDtoTest.java similarity index 55% rename from openapi-contracts/src/test/java/com/sinch/sdk/domains/numbers/models/v1/CallbackConfigurationDtoTest.java rename to openapi-contracts/src/test/java/com/sinch/sdk/domains/numbers/models/v1/EventDestinationsDtoTest.java index 362f941c5..3c1a3ab88 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/numbers/models/v1/CallbackConfigurationDtoTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/numbers/models/v1/EventDestinationsDtoTest.java @@ -5,26 +5,26 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.sinch.sdk.core.TestHelpers; import com.sinch.sdk.domains.numbers.api.v1.adapters.NumbersBaseTest; -import com.sinch.sdk.domains.numbers.models.v1.callbacks.request.CallbackConfigurationUpdateRequest; -import com.sinch.sdk.domains.numbers.models.v1.callbacks.response.CallbackConfigurationResponse; +import com.sinch.sdk.domains.numbers.models.v1.eventdestinations.request.EventDestinationUpdateRequest; +import com.sinch.sdk.domains.numbers.models.v1.eventdestinations.response.EventDestinationResponse; import org.json.JSONException; import org.junit.jupiter.api.Test; import org.skyscreamer.jsonassert.JSONAssert; @TestWithResources -public class CallbackConfigurationDtoTest extends NumbersBaseTest { +public class EventDestinationsDtoTest extends NumbersBaseTest { - @GivenTextResource("/domains/numbers/v1/callbacks/callback-get-response.json") + @GivenTextResource("/domains/numbers/v1/eventdestinations/event-destination-response.json") String callbackGetResponseJson; - @GivenTextResource("/domains/numbers/v1/callbacks/callback-update-request.json") + @GivenTextResource("/domains/numbers/v1/eventdestinations/event-destination-update-request.json") String callbackUpdateRequestJson; - public static CallbackConfigurationUpdateRequest updateRequest = - CallbackConfigurationUpdateRequest.builder().setHmacSecret("HMAC value").build(); + public static EventDestinationUpdateRequest updateRequest = + EventDestinationUpdateRequest.builder().setHmacSecret("HMAC value").build(); - public static CallbackConfigurationResponse getResponse = - CallbackConfigurationResponse.builder() + public static EventDestinationResponse getResponse = + EventDestinationResponse.builder() .setProjectId("Project ID value") .setHmacSecret("HMAC value") .build(); @@ -40,8 +40,8 @@ void serializeUpdateRequest() throws JsonProcessingException, JSONException { @Test void deserializeGetResponse() throws JsonProcessingException { - CallbackConfigurationResponse deserializedString = - objectMapper.readValue(callbackGetResponseJson, CallbackConfigurationResponse.class); + EventDestinationResponse deserializedString = + objectMapper.readValue(callbackGetResponseJson, EventDestinationResponse.class); TestHelpers.recursiveEquals(getResponse, deserializedString); } diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/numbers/models/v1/WebhooksDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/numbers/models/v1/SinchEventsDtoTest.java similarity index 59% rename from openapi-contracts/src/test/java/com/sinch/sdk/domains/numbers/models/v1/WebhooksDtoTest.java rename to openapi-contracts/src/test/java/com/sinch/sdk/domains/numbers/models/v1/SinchEventsDtoTest.java index 1bcdbe6d5..19cbcc587 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/numbers/models/v1/WebhooksDtoTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/numbers/models/v1/SinchEventsDtoTest.java @@ -6,21 +6,21 @@ import com.sinch.sdk.core.TestHelpers; import com.sinch.sdk.core.utils.DateUtil; import com.sinch.sdk.domains.numbers.api.v1.adapters.NumbersBaseTest; -import com.sinch.sdk.domains.numbers.models.v1.webhooks.NumberEvent; -import com.sinch.sdk.domains.numbers.models.v1.webhooks.NumberEvent.EventTypeEnum; -import com.sinch.sdk.domains.numbers.models.v1.webhooks.NumberEvent.FailureCodeEnum; -import com.sinch.sdk.domains.numbers.models.v1.webhooks.NumberEvent.StatusEnum; -import com.sinch.sdk.domains.numbers.models.v1.webhooks.ResourceType; +import com.sinch.sdk.domains.numbers.models.v1.sinchevents.NumberSinchEvent; +import com.sinch.sdk.domains.numbers.models.v1.sinchevents.NumberSinchEvent.EventTypeEnum; +import com.sinch.sdk.domains.numbers.models.v1.sinchevents.NumberSinchEvent.FailureCodeEnum; +import com.sinch.sdk.domains.numbers.models.v1.sinchevents.NumberSinchEvent.StatusEnum; +import com.sinch.sdk.domains.numbers.models.v1.sinchevents.ResourceType; import org.junit.jupiter.api.Test; @TestWithResources -public class WebhooksDtoTest extends NumbersBaseTest { +public class SinchEventsDtoTest extends NumbersBaseTest { - @GivenTextResource("/domains/numbers/v1/webhooks/number-event.json") + @GivenTextResource("/domains/numbers/v1/sinchevents/number-sinch-event.json") String numberEventJSON; - public static NumberEvent numberEvent = - NumberEvent.builder() + public static NumberSinchEvent numberEvent = + NumberSinchEvent.builder() .setEventId("abcd1234efghijklmnop567890") .setTimestamp(DateUtil.failSafeTimeStampToInstant("2023-06-06T07:45:27.78789")) .setProjectId("abcd12ef-ab12-ab12-bc34-abcdef123456") @@ -34,7 +34,8 @@ public class WebhooksDtoTest extends NumbersBaseTest { @Test void deserialize() throws JsonProcessingException { - NumberEvent deserializedString = objectMapper.readValue(numberEventJSON, NumberEvent.class); + NumberSinchEvent deserializedString = + objectMapper.readValue(numberEventJSON, NumberSinchEvent.class); TestHelpers.recursiveEquals(numberEvent, deserializedString); } diff --git a/openapi-contracts/src/test/resources/domains/numbers/v1/callbacks/callback-get-response.json b/openapi-contracts/src/test/resources/domains/numbers/v1/eventdestinations/event-destination-response.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/numbers/v1/callbacks/callback-get-response.json rename to openapi-contracts/src/test/resources/domains/numbers/v1/eventdestinations/event-destination-response.json diff --git a/openapi-contracts/src/test/resources/domains/numbers/v1/callbacks/callback-update-request.json b/openapi-contracts/src/test/resources/domains/numbers/v1/eventdestinations/event-destination-update-request.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/numbers/v1/callbacks/callback-update-request.json rename to openapi-contracts/src/test/resources/domains/numbers/v1/eventdestinations/event-destination-update-request.json diff --git a/openapi-contracts/src/test/resources/domains/numbers/v1/webhooks/number-event.json b/openapi-contracts/src/test/resources/domains/numbers/v1/sinchevents/number-sinch-event.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/numbers/v1/webhooks/number-event.json rename to openapi-contracts/src/test/resources/domains/numbers/v1/sinchevents/number-sinch-event.json