diff --git a/MIGRATION-GUIDE.md b/MIGRATION-GUIDE.md index 6a9f41b49..a4b8a2dd5 100644 --- a/MIGRATION-GUIDE.md +++ b/MIGRATION-GUIDE.md @@ -290,18 +290,21 @@ Use the new versioned API under `sms().v1()` to get access to [SMSService](https ### [`Voice`](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/package-summary.html) - `Applications.listNumbers()` is returning a `[OwnedNumbersListResponse](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/application/response/OwnedNumbersListResponse.html)` instead of a list of `OwnedNumbersResponse`. The new response still contains the list of assigned numbers but support the pagination of the results by iterator. +- Deprecated `Applications.queryNumber()` is removed and `NumberInformation`, `QueryNumber` related classes no longer available. #### Replacement APIs Use the new versioned API under `voice().v1()` to get access to [VoiceService](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/api/v1/VoiceService.html): [`sinchClient.voice().v1()`](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0./com/sinch/sdk/domains/voice/VoiceService.html#v1()) -| Old interface | New Equivalent in `voice().v1()` | -|----------------|--------------------------------------------------------------------------------------------------------------------------------------------------| -| applications() | [v1().applications()](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/api/v1/ApplicationsService.html) | -| callouts() | [v1().callouts()](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/api/v1/CalloutsService.html) | -| calls() | [v1().calls()](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/api/v1/CallsService.html) | -| conferences() | [v1().conferences()](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/api/v1/ConferencesService.html) | -| webhooks() | [v1().webhooks()](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/api/v1/WebHooksService.html) | +| Old interface | New Equivalent in `voice().v1()` | +|-------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| applications() | [v1().applications()](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/api/v1/ApplicationsService.html) | +| applications().getCallbackUrls() | [v1().applications().getEventDestinations()](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/api/v1/ApplicationsService.html#getEventDestinations(java.lang.String)) | +| applications().updateCallbackUrls() | [v1().applications().updateEventDestinations()](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/api/v1/ApplicationsService.html#updateEventDestinations(java.lang.String,com.sinch.sdk.domains.voice.models.v1.applications.EventDestinations)) | +| callouts() | [v1().callouts()](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/api/v1/CalloutsService.html) | +| calls() | [v1().calls()](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/api/v1/CallsService.html) | +| conferences() | [v1().conferences()](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/api/v1/ConferencesService.html) | +| webhooks() | [v1().sinchEvents()](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/api/v1/SinchEventService.html) | #### Replacement models @@ -327,10 +330,8 @@ Use the new versioned API under `voice().v1()` to get access to [VoiceService](h |------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | models/ApplicationAssignedNumber | [com.sinch.sdk.domains.voice.models.v1.applications.response](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/applications/response/OwnedNumberInformation.html) | | models/response/AssignedNumbers | [com.sinch.sdk.domains.voice.models.v1.applications.response.OwnedNumbersListResponse](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/applications/response/OwnedNumbersListResponse.html) | -| models/CallbackUrls | [com.sinch.sdk.domains.voice.models.v1.applications.Callbacks](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/applications/Callbacks.html) | -| models/ApplicationURL | [com.sinch.sdk.domains.voice.models.v1.applications.CallbacksUrl](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/applications/CallbacksUrl.html) | -| models/NumberInformation | [com.sinch.sdk.domains.voice.models.v1.applications.response.QueryNumberInformation](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/applications/response/QueryNumberInformation.html) | -| models/response/QueryNumber | [com.sinch.sdk.domains.voice.models.v1.applications.response.QueryNumberResponse](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/applications/response/QueryNumberResponse.html) | +| models/Callbacks | [com.sinch.sdk.domains.voice.models.v1.applications.EventDestinations](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/applications/EventDestinations.html) | +| models/CallbacskUrls | [com.sinch.sdk.domains.voice.models.v1.applications.EventDestinationsTarget](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/applications/EventDestinationsTarget.html) | | models/requests/ApplicationsAssignNumbersRequestParameters | [com.sinch.sdk.domains.voice.models.v1.applications.request.UpdateNumbersRequest](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/applications/request/UpdateNumbersRequest.html) | | models/NumberType | N/A | | models/CapabilityType | [com.sinch.sdk.domains.voice.models.v1.applications.Capability](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/applications/Capability.html) | @@ -397,23 +398,20 @@ Use the new versioned API under `voice().v1()` to get access to [VoiceService](h | models/svaml/StartRecordingOptions | [com.sinch.sdk.domains.voice.models.v1.svaml.instruction.StartRecordingOptions](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/svaml/instruction/StartRecordingOptions.html) | | models/svaml/TranscriptionOptions | [com.sinch.sdk.domains.voice.models.v1.svaml.instruction.TranscriptionOptions](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/svaml/instruction/TranscriptionOptions.html) | -##### Webhooks -| Old class | New class | -|---------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| models/v1/webhooks/AnsweredCallEventAnsweringMachineDetection | [com.sinch.sdk.domains.voice.models.v1.webhooks.AnsweringMachineDetection](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/webhooks/AnsweringMachineDetection.html) | -| models/webhooks/AmdAnswer | [com.sinch.sdk.domains.voice.models.v1.webhooks.AnsweringMachineDetection](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/webhooks/AnsweringMachineDetection.html) | -| models/webhooks/AmdAnswerReasonType | [com.sinch.sdk.domains.voice.models.v1.webhooks.AnsweringMachineDetection.ReasonEnum](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/webhooks/AnsweringMachineDetection.ReasonEnum.html) | -| models/webhooks/AmdAnswerStatusType | [com.sinch.sdk.domains.voice.models.v1.webhooks.AnsweringMachineDetection.StatusEnum](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/webhooks/AnsweringMachineDetection.StatusEnum.html) | -| models/webhooks/AnsweredCallEvent | [com.sinch.sdk.domains.voice.models.v1.webhooks.AnsweredCallEvent](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/webhooks/AnsweredCallEvent.html) | -| models/webhooks/CallEvent | [com.sinch.sdk.domains.voice.models.v1.webhooks.VoiceWebhookCallEvent](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/webhooks/VoiceWebhookCallEvent.html) | -| models/webhooks/DisconnectCallEvent | [com.sinch.sdk.domains.voice.models.v1.webhooks.DisconnectedCallEvent](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/webhooks/DisconnectedCallEvent.html) | -| models/webhooks/IncomingCallEvent | [com.sinch.sdk.domains.voice.models.v1.webhooks.IncomingCallEvent](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/webhooks/IncomingCallEvent.html) | -| models/webhooks/MenuInputType | [com.sinch.sdk.domains.voice.models.v1.webhooks.MenuResult.TypeEnum](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/webhooks/MenuResult.TypeEnum.html) | -| models/webhooks/MenuResult | [com.sinch.sdk.domains.voice.models.v1.webhooks.MenuResult](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/webhooks/MenuResult.html) | -| models/webhooks/MenuResultInputMethodType | [com.sinch.sdk.domains.voice.models.v1.webhooks.MenuResult.InputMethodEnum](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/webhooks/MenuResult.InputMethodEnum.html) | -| models/webhooks/NotifyEvent | [com.sinch.sdk.domains.voice.models.v1.webhooks.NotificationEvent](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/webhooks/NotificationEvent.html) | -| models/webhooks/PromptInputEvent | [com.sinch.sdk.domains.voice.models.v1.webhooks.PromptInputEvent](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/webhooks/PromptInputEvent.html) | -| models/webhooks/WebhooksEvent | [com.sinch.sdk.domains.voice.models.v1.webhooks.VoiceWebhookEvent](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/webhooks/VoiceWebhookEvent.html) | +##### Sinch Events +| Old class | New class | +|---------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| models/v1/webhooks/AnsweredCallEventAnsweringMachineDetection | Replaced by [com.sinch.sdk.domains.voice.models.v1.sinchevents.AnsweringMachineDetection](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/sinchevents/AnsweringMachineDetection.html) | +| models/v1/webhooks/AnsweringMachineDetection | [com.sinch.sdk.domains.voice.models.v1.sinchevents.AnsweringMachineDetection](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/sinchevents/AnsweringMachineDetection.html) | +| models/v1/webhooks/AnsweredCallEvent | [com.sinch.sdk.domains.voice.models.v1.sinchevents.AnsweredCallEvent](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/sinchevents/AnsweredCallEvent.html) | +| models/v1/webhooks/DisconnectCallEvent | [com.sinch.sdk.domains.voice.models.v1.sinchevents.DisconnectedCallEvent](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/sinchevents/DisconnectedCallEvent.html) | +| models/v1/webhooks/IncomingCallEvent | [com.sinch.sdk.domains.voice.models.v1.sinchevents.IncomingCallEvent](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/sinchevents/IncomingCallEvent.html) | +| models/v1/webhooks/MenuResult | [com.sinch.sdk.domains.voice.models.v1.sinchevents.MenuResult](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/sinchevents/MenuResult.html) | +| models/v1/webhooks/NotifyEvent | [com.sinch.sdk.domains.voice.models.v1.sinchevents.NotificationEvent](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/sinchevents/NotificationEvent.html) ; | +| models/v1/webhooks/PromptInputEvent | [com.sinch.sdk.domains.voice.models.v1.sinchevents.PromptInputEvent](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/sinchevents/PromptInputEvent.html) | +| models/v1/webhooks/CallEvent | [com.sinch.sdk.domains.voice.models.v1.sinchevents.VoiceCallSinchEvent](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/sinchevents/VoiceCallSinchEvent.html) | +| models/v1/webhooks/VoiceWebhookEvent | [com.sinch.sdk.domains.voice.models.v1.sinchevents.VoiceSinchEvent](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/sinchevents/VoiceSinchEvent.html) | +| models/v1/webhooks/WebhooksEventRequestType | [com.sinch.sdk.domains.voice.models.v1.sinchevents.SinchEventType](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/models/v1/sinchevents/SinchEventType.html) | ### [`Verification`](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/verification/package-summary.html) diff --git a/client/src/main/com/sinch/sdk/domains/voice/api/v1/WebHooksService.java b/client/src/main/com/sinch/sdk/domains/voice/api/v1/SinchEventsService.java similarity index 87% rename from client/src/main/com/sinch/sdk/domains/voice/api/v1/WebHooksService.java rename to client/src/main/com/sinch/sdk/domains/voice/api/v1/SinchEventsService.java index fca05fc90..1dc053dc9 100644 --- a/client/src/main/com/sinch/sdk/domains/voice/api/v1/WebHooksService.java +++ b/client/src/main/com/sinch/sdk/domains/voice/api/v1/SinchEventsService.java @@ -1,18 +1,18 @@ package com.sinch.sdk.domains.voice.api.v1; import com.sinch.sdk.core.exceptions.ApiMappingException; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.VoiceSinchEvent; import com.sinch.sdk.domains.voice.models.v1.svaml.SvamlControl; -import com.sinch.sdk.domains.voice.models.v1.webhooks.VoiceWebhookEvent; import java.util.Map; /** - * Webhooks service + * Sinch Events service * * @see https://developers.sinch.com/docs/voice/api-reference/voice/tag/Callbacks/ - * @since 1.4 + * @since 2.0 */ -public interface WebHooksService { +public interface SinchEventsService { /** * The Sinch Platform can initiate callback requests to a URL you define (Callback URL) on request @@ -26,10 +26,10 @@ public interface WebHooksService { * @param path The path to you backend endpoint used for callback * @param headers Received headers * @param jsonPayload Received payload - * @return Is authentication is validated (true) or not (false) + * @return Is authentication validated (true) or not (false) *

see https://developers.sinch.com/docs/voice/api-reference/authentication/callback-signed-request/ - * @since 1.4 + * @since 2.0 */ boolean validateAuthenticationHeader( String method, String path, Map headers, String jsonPayload); @@ -42,9 +42,9 @@ boolean validateAuthenticationHeader( * @return The Voice event instance class *

see https://developers.sinch.com/docs/voice/api-reference/voice/tag/Callbacks/ - * @since 1.4 + * @since 2.0 */ - VoiceWebhookEvent parseEvent(String jsonPayload) throws ApiMappingException; + VoiceSinchEvent parseEvent(String jsonPayload) throws ApiMappingException; /** * This function can be called to serialize a Voice response to be sent as JSON @@ -53,7 +53,7 @@ boolean validateAuthenticationHeader( * @return The JSON string to be sent *

see https://developers.sinch.com/docs/voice/api-reference/voice/tag/Callbacks/ - * @since 1.4 + * @since 2.0 */ String serializeResponse(SvamlControl response) throws ApiMappingException; } diff --git a/client/src/main/com/sinch/sdk/domains/voice/api/v1/VoiceService.java b/client/src/main/com/sinch/sdk/domains/voice/api/v1/VoiceService.java index 21ec5834e..fb60dd24f 100644 --- a/client/src/main/com/sinch/sdk/domains/voice/api/v1/VoiceService.java +++ b/client/src/main/com/sinch/sdk/domains/voice/api/v1/VoiceService.java @@ -42,10 +42,10 @@ public interface VoiceService { ApplicationsService applications(); /** - * Webhooks helpers instance + * Sinch Events helpers instance * - * @return instance service related to webhooks helpers - * @since 1.4 + * @return service instance for project + * @since 2.0 */ - WebHooksService webhooks(); + SinchEventsService sinchEvents(); } diff --git a/client/src/main/com/sinch/sdk/domains/voice/api/v1/adapters/WebHooksService.java b/client/src/main/com/sinch/sdk/domains/voice/api/v1/adapters/SinchEventsService.java similarity index 73% rename from client/src/main/com/sinch/sdk/domains/voice/api/v1/adapters/WebHooksService.java rename to client/src/main/com/sinch/sdk/domains/voice/api/v1/adapters/SinchEventsService.java index 4457caac2..d22ec3e9f 100644 --- a/client/src/main/com/sinch/sdk/domains/voice/api/v1/adapters/WebHooksService.java +++ b/client/src/main/com/sinch/sdk/domains/voice/api/v1/adapters/SinchEventsService.java @@ -6,18 +6,18 @@ import com.sinch.sdk.core.utils.MapUtils; import com.sinch.sdk.core.utils.StringUtil; import com.sinch.sdk.core.utils.databind.Mapper; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.VoiceSinchEvent; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.internal.SinchEventInternalImpl; import com.sinch.sdk.domains.voice.models.v1.svaml.SvamlControl; -import com.sinch.sdk.domains.voice.models.v1.webhooks.VoiceWebhookEvent; -import com.sinch.sdk.domains.voice.models.v1.webhooks.internal.WebhooksEventInternalImpl; import java.util.Map; import java.util.logging.Logger; -public class WebHooksService implements com.sinch.sdk.domains.voice.api.v1.WebHooksService { - private static final Logger LOGGER = Logger.getLogger(WebHooksService.class.getName()); +public class SinchEventsService implements com.sinch.sdk.domains.voice.api.v1.SinchEventsService { + private static final Logger LOGGER = Logger.getLogger(SinchEventsService.class.getName()); private final Map authManagers; - public WebHooksService(Map authManagers) { + public SinchEventsService(Map authManagers) { this.authManagers = authManagers; } @@ -47,11 +47,11 @@ public boolean validateAuthenticationHeader( } @Override - public VoiceWebhookEvent parseEvent(String jsonPayload) throws ApiMappingException { + public VoiceSinchEvent parseEvent(String jsonPayload) throws ApiMappingException { try { - WebhooksEventInternalImpl o = - Mapper.getInstance().readValue(jsonPayload, WebhooksEventInternalImpl.class); - return (VoiceWebhookEvent) o.getActualInstance(); + SinchEventInternalImpl o = + Mapper.getInstance().readValue(jsonPayload, SinchEventInternalImpl.class); + return (VoiceSinchEvent) o.getActualInstance(); } catch (JsonProcessingException e) { throw new ApiMappingException(jsonPayload, e); } diff --git a/client/src/main/com/sinch/sdk/domains/voice/api/v1/adapters/VoiceService.java b/client/src/main/com/sinch/sdk/domains/voice/api/v1/adapters/VoiceService.java index da53004c0..2b94788b0 100644 --- a/client/src/main/com/sinch/sdk/domains/voice/api/v1/adapters/VoiceService.java +++ b/client/src/main/com/sinch/sdk/domains/voice/api/v1/adapters/VoiceService.java @@ -37,7 +37,7 @@ public class VoiceService implements com.sinch.sdk.domains.voice.api.v1.VoiceSer private volatile ConferencesService conferences; private volatile CallsService calls; private volatile ApplicationsService applications; - private volatile WebHooksService webhooks; + private volatile SinchEventsService sinchEvents; private volatile Map clientAuthManagers; private volatile Map webhooksAuthManagers; @@ -126,12 +126,12 @@ public ApplicationsService applications() { return this.applications; } - public WebHooksService webhooks() { - if (null == this.webhooks) { + public SinchEventsService sinchEvents() { + if (null == this.sinchEvents) { instanceLazyInit(); - this.webhooks = new WebHooksService(webhooksAuthManagers); + this.sinchEvents = new SinchEventsService(webhooksAuthManagers); } - return this.webhooks; + return this.sinchEvents; } private void instanceLazyInit() { diff --git a/client/src/test/java/com/sinch/sdk/domains/voice/api/v1/adapters/ApplicationsServiceTest.java b/client/src/test/java/com/sinch/sdk/domains/voice/api/v1/adapters/ApplicationsServiceTest.java index 28a954179..1f4d37f7f 100644 --- a/client/src/test/java/com/sinch/sdk/domains/voice/api/v1/adapters/ApplicationsServiceTest.java +++ b/client/src/test/java/com/sinch/sdk/domains/voice/api/v1/adapters/ApplicationsServiceTest.java @@ -21,11 +21,11 @@ import com.sinch.sdk.core.models.pagination.Page; import com.sinch.sdk.domains.voice.adapters.VoiceBaseTest; import com.sinch.sdk.domains.voice.api.v1.ApplicationsService; -import com.sinch.sdk.domains.voice.models.v1.applications.Callbacks; +import com.sinch.sdk.domains.voice.models.v1.applications.EventDestinations; import com.sinch.sdk.domains.voice.models.v1.applications.request.UnAssignNumberRequestTest; -import com.sinch.sdk.domains.voice.models.v1.applications.request.UpdateCallbackUrlsRequestTest; +import com.sinch.sdk.domains.voice.models.v1.applications.request.UpdateEventDestinationsRequestTest; import com.sinch.sdk.domains.voice.models.v1.applications.request.UpdateNumbersRequestTest; -import com.sinch.sdk.domains.voice.models.v1.applications.response.GetCallbackUrlsResponseTest; +import com.sinch.sdk.domains.voice.models.v1.applications.response.GetEventDestinationsResponseTest; import com.sinch.sdk.domains.voice.models.v1.applications.response.OwnedNumberInformation; import com.sinch.sdk.domains.voice.models.v1.applications.response.OwnedNumbersListResponse; import com.sinch.sdk.domains.voice.models.v1.applications.response.OwnedNumbersResponseTest; @@ -45,11 +45,12 @@ public class ApplicationsServiceTest extends VoiceBaseTest { @GivenTextResource("/domains/voice/v1/applications/response/OwnedNumbersResponseDto.json") String ownedNumbersResponseDto; - @GivenTextResource("/domains/voice/v1/applications/response/GetCallbackUrlsResponseDto.json") - String getCallbackUrlsResponseDto; + @GivenTextResource("/domains/voice/v1/applications/response/GetEventDestinationsResponseDto.json") + String getEventDestinationsResponseDto; - @GivenTextResource("/domains/voice/v1/applications/request/UpdateCallbackUrlsRequestDto.json") - String updateCallbackUrlsRequestDto; + @GivenTextResource( + "/domains/voice/v1/applications/request/UpdateEventDestinationsRequestDto.json") + String updateEventDestinationsRequestDto; @GivenTextResource("/domains/voice/v1/applications/request/UpdateNumbersRequestDto.json") String updateNumbersRequestDto; @@ -111,7 +112,7 @@ void getNumbers() throws ApiException { } @Test - void getCallbackUrls() throws ApiException { + void getEventDestinations() throws ApiException { HttpRequest httpRequest = new HttpRequest( @@ -124,7 +125,8 @@ void getCallbackUrls() throws ApiException { Collections.emptyList(), AUTH_NAMES); HttpResponse httpResponse = - new HttpResponse(200, null, Collections.emptyMap(), getCallbackUrlsResponseDto.getBytes()); + new HttpResponse( + 200, null, Collections.emptyMap(), getEventDestinationsResponseDto.getBytes()); when(httpClient.invokeAPI( eq(serverConfiguration), @@ -132,20 +134,20 @@ void getCallbackUrls() throws ApiException { argThat(new HttpRequestMatcher(httpRequest)))) .thenReturn(httpResponse); - Callbacks response = service.getCallbackUrls("app/id"); + EventDestinations response = service.getEventDestinations("app/id"); - TestHelpers.recursiveEquals(response, GetCallbackUrlsResponseTest.expected); + TestHelpers.recursiveEquals(response, GetEventDestinationsResponseTest.expected); } @Test - void updateCallbackUrls() { + void updateEventDestinations() { HttpRequest httpRequest = new HttpRequest( "/v1/configuration/callbacks/applications/" + URLPathUtils.encodePathSegment("app/key"), HttpMethod.POST, Collections.emptyList(), - updateCallbackUrlsRequestDto, + updateEventDestinationsRequestDto, Collections.emptyMap(), Collections.emptyList(), Collections.singletonList(HttpContentType.APPLICATION_JSON), @@ -158,7 +160,7 @@ void updateCallbackUrls() { argThat(new HttpRequestMatcher(httpRequest)))) .thenReturn(httpResponse); - service.updateCallbackUrls("app/key", UpdateCallbackUrlsRequestTest.expected); + service.updateEventDestinations("app/key", UpdateEventDestinationsRequestTest.expected); } @Test diff --git a/client/src/test/java/com/sinch/sdk/domains/voice/api/v1/adapters/VoiceServiceTest.java b/client/src/test/java/com/sinch/sdk/domains/voice/api/v1/adapters/VoiceServiceTest.java index 6637e7842..63db1c350 100644 --- a/client/src/test/java/com/sinch/sdk/domains/voice/api/v1/adapters/VoiceServiceTest.java +++ b/client/src/test/java/com/sinch/sdk/domains/voice/api/v1/adapters/VoiceServiceTest.java @@ -30,6 +30,6 @@ void checkCredentialsVoiceConferences() { @Test void checkCredentialsVoiceWebhooks() { - CredentialsValidationHelper.checkCredentials(() -> httpClient, VoiceService::webhooks); + CredentialsValidationHelper.checkCredentials(() -> httpClient, VoiceService::sinchEvents); } } diff --git a/client/src/test/java/com/sinch/sdk/e2e/domains/voice/v1/ApplicationsSteps.java b/client/src/test/java/com/sinch/sdk/e2e/domains/voice/v1/ApplicationsSteps.java index cd01784a9..23978ad9b 100644 --- a/client/src/test/java/com/sinch/sdk/e2e/domains/voice/v1/ApplicationsSteps.java +++ b/client/src/test/java/com/sinch/sdk/e2e/domains/voice/v1/ApplicationsSteps.java @@ -2,9 +2,9 @@ import com.sinch.sdk.core.TestHelpers; import com.sinch.sdk.domains.voice.api.v1.ApplicationsService; -import com.sinch.sdk.domains.voice.models.v1.applications.Callbacks; -import com.sinch.sdk.domains.voice.models.v1.applications.CallbacksUrl; import com.sinch.sdk.domains.voice.models.v1.applications.Capability; +import com.sinch.sdk.domains.voice.models.v1.applications.EventDestinationTarget; +import com.sinch.sdk.domains.voice.models.v1.applications.EventDestinations; import com.sinch.sdk.domains.voice.models.v1.applications.request.UnAssignNumberRequest; import com.sinch.sdk.domains.voice.models.v1.applications.request.UpdateNumbersRequest; import com.sinch.sdk.domains.voice.models.v1.applications.response.OwnedNumberInformation; @@ -27,8 +27,8 @@ public class ApplicationsSteps { Boolean assignNumbersPassed; Boolean unassignNumberPassed; - Callbacks getCallbackUrlsResult; - Boolean updateCallbackUrlsPassed; + EventDestinations getEventDestinationsResult; + Boolean updateEventDestinationsPassed; @Given("^the Voice service \"Applications\" is available") public void serviceAvailable() { @@ -65,22 +65,23 @@ public void unassignNumber() { } @When("^I send a request to get the callback URLs associated to an application$") - public void getCallbackUrls() { + public void getEventDestinations() { - getCallbackUrlsResult = service.getCallbackUrls("f00dcafe-abba-c0de-1dea-dabb1ed4caf3"); + getEventDestinationsResult = + service.getEventDestinations("f00dcafe-abba-c0de-1dea-dabb1ed4caf3"); } @When("^I send a request to update the callback URLs associated to an application$") - public void updateCallbackUrls() { - Callbacks request = - Callbacks.builder() - .setUrl( - CallbacksUrl.builder() + public void updateEventDestinations() { + EventDestinations request = + EventDestinations.builder() + .setTarget( + EventDestinationTarget.builder() .setPrimary("https://my-new.callback-server.com/voice") .build()) .build(); - service.updateCallbackUrls("f00dcafe-abba-c0de-1dea-dabb1ed4caf3", request); - updateCallbackUrlsPassed = true; + service.updateEventDestinations("f00dcafe-abba-c0de-1dea-dabb1ed4caf3", request); + updateEventDestinationsPassed = true; } @Then("the response contains details about the numbers that I own") @@ -121,20 +122,20 @@ public void unassignNumberResult() { } @Then("the response contains callback URLs details") - public void getCallbackUrlsResult() { - Callbacks expected = - Callbacks.builder() - .setUrl( - CallbacksUrl.builder() + public void getEventDestinationsResult() { + EventDestinations expected = + EventDestinations.builder() + .setTarget( + EventDestinationTarget.builder() .setPrimary("https://my.callback-server.com/voice") .setFallback("https://my.fallback-server.com/voice") .build()) .build(); - TestHelpers.recursiveEquals(getCallbackUrlsResult, expected); + TestHelpers.recursiveEquals(getEventDestinationsResult, expected); } @Then("the update callback URLs response contains no data") - public void updateCallbackUrlsResult() { - Assertions.assertTrue(updateCallbackUrlsPassed); + public void updateEventDestinationsResult() { + Assertions.assertTrue(updateEventDestinationsPassed); } } diff --git a/client/src/test/java/com/sinch/sdk/e2e/domains/voice/v1/WebhooksEventsSteps.java b/client/src/test/java/com/sinch/sdk/e2e/domains/voice/v1/SinchEventsSteps.java similarity index 86% rename from client/src/test/java/com/sinch/sdk/e2e/domains/voice/v1/WebhooksEventsSteps.java rename to client/src/test/java/com/sinch/sdk/e2e/domains/voice/v1/SinchEventsSteps.java index 93353fd47..917bcb112 100644 --- a/client/src/test/java/com/sinch/sdk/e2e/domains/voice/v1/WebhooksEventsSteps.java +++ b/client/src/test/java/com/sinch/sdk/e2e/domains/voice/v1/SinchEventsSteps.java @@ -1,22 +1,22 @@ package com.sinch.sdk.e2e.domains.voice.v1; import com.sinch.sdk.core.TestHelpers; -import com.sinch.sdk.domains.voice.api.v1.WebHooksService; +import com.sinch.sdk.domains.voice.api.v1.SinchEventsService; import com.sinch.sdk.domains.voice.models.v1.Domain; import com.sinch.sdk.domains.voice.models.v1.Price; import com.sinch.sdk.domains.voice.models.v1.calls.response.CallResult; import com.sinch.sdk.domains.voice.models.v1.destination.DestinationDid; import com.sinch.sdk.domains.voice.models.v1.destination.DestinationPstn; -import com.sinch.sdk.domains.voice.models.v1.webhooks.AnsweredCallEvent; -import com.sinch.sdk.domains.voice.models.v1.webhooks.DisconnectedCallEvent; -import com.sinch.sdk.domains.voice.models.v1.webhooks.DisconnectedCallEvent.ReasonEnum; -import com.sinch.sdk.domains.voice.models.v1.webhooks.IncomingCallEvent; -import com.sinch.sdk.domains.voice.models.v1.webhooks.MenuResult; -import com.sinch.sdk.domains.voice.models.v1.webhooks.MenuResult.InputMethodEnum; -import com.sinch.sdk.domains.voice.models.v1.webhooks.MenuResult.TypeEnum; -import com.sinch.sdk.domains.voice.models.v1.webhooks.NotificationEvent; -import com.sinch.sdk.domains.voice.models.v1.webhooks.PromptInputEvent; -import com.sinch.sdk.domains.voice.models.v1.webhooks.VoiceWebhookEvent; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.AnsweredCallEvent; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.DisconnectedCallEvent; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.DisconnectedCallEvent.ReasonEnum; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.IncomingCallEvent; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.MenuResult; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.MenuResult.InputMethodEnum; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.MenuResult.TypeEnum; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.NotificationEvent; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.PromptInputEvent; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.VoiceSinchEvent; import com.sinch.sdk.e2e.Config; import com.sinch.sdk.e2e.domains.WebhooksHelper; import io.cucumber.java.en.Given; @@ -27,21 +27,21 @@ import java.time.Instant; import org.junit.jupiter.api.Assertions; -public class WebhooksEventsSteps { +public class SinchEventsSteps { static final String WEBHOOKS_PATH_PREFIX = "/webhooks/voice"; static final String WEBHOOKS_URL = Config.VOICE_HOST_NAME + WEBHOOKS_PATH_PREFIX; - WebHooksService service; + SinchEventsService service; - WebhooksHelper.Response pieReturn; - WebhooksHelper.Response pieSequence; - WebhooksHelper.Response diceEvent; - WebhooksHelper.Response aceEvent; - WebhooksHelper.Response iceEvent; - WebhooksHelper.Response recordingFinishedEvent; - WebhooksHelper.Response recordingAvailableEvent; - WebhooksHelper.Response transcriptionAvailableEvent; + WebhooksHelper.Response pieReturn; + WebhooksHelper.Response pieSequence; + WebhooksHelper.Response diceEvent; + WebhooksHelper.Response aceEvent; + WebhooksHelper.Response iceEvent; + WebhooksHelper.Response recordingFinishedEvent; + WebhooksHelper.Response recordingAvailableEvent; + WebhooksHelper.Response transcriptionAvailableEvent; PromptInputEvent expectedPieReturnEvent = PromptInputEvent.builder() @@ -140,7 +140,7 @@ public class WebhooksEventsSteps { @Given("^the Voice Webhooks handler is available$") public void serviceAvailable() { - service = Config.getSinchClient().voice().v1().webhooks(); + service = Config.getSinchClient().voice().v1().sinchEvents(); } @When("^I send a request to trigger a \"PIE\" event with a \"return\" type$") @@ -236,7 +236,7 @@ public void validateHeader(String event) { public void validateTypeEvent(String event, String type) { WebhooksHelper.Response receivedEvent = null; - VoiceWebhookEvent expectedEvent = null; + VoiceSinchEvent expectedEvent = null; if (event.equals("PIE") && type.equals("return")) { receivedEvent = pieReturn; expectedEvent = expectedPieReturnEvent; @@ -263,7 +263,7 @@ public void validateTypeEvent(String event, String type) { public void validateEvent(String event) { WebhooksHelper.Response receivedEvent = null; - VoiceWebhookEvent expectedEvent = null; + VoiceSinchEvent expectedEvent = null; if (event.equals("DICE")) { receivedEvent = diceEvent; expectedEvent = expectedDiceEvent; diff --git a/examples/getting-started/voice/respond-to-incoming-call/src/main/java/com/mycompany/app/voice/Controller.java b/examples/getting-started/voice/respond-to-incoming-call/src/main/java/com/mycompany/app/voice/Controller.java index c57b311c5..92fcbbf8e 100644 --- a/examples/getting-started/voice/respond-to-incoming-call/src/main/java/com/mycompany/app/voice/Controller.java +++ b/examples/getting-started/voice/respond-to-incoming-call/src/main/java/com/mycompany/app/voice/Controller.java @@ -1,9 +1,9 @@ package com.mycompany.app.voice; import com.sinch.sdk.SinchClient; -import com.sinch.sdk.domains.voice.api.v1.WebHooksService; -import com.sinch.sdk.domains.voice.models.v1.webhooks.DisconnectedCallEvent; -import com.sinch.sdk.domains.voice.models.v1.webhooks.IncomingCallEvent; +import com.sinch.sdk.domains.voice.api.v1.SinchEventsService; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.DisconnectedCallEvent; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.IncomingCallEvent; import java.util.Map; import java.util.logging.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -20,13 +20,13 @@ public class Controller { private final SinchClient sinchClient; - private final ServerBusinessLogic webhooksBusinessLogic; + private final ServerBusinessLogic serverBusinessLogic; private static final Logger LOGGER = Logger.getLogger(Controller.class.getName()); @Autowired - public Controller(SinchClient sinchClient, ServerBusinessLogic webhooksBusinessLogic) { + public Controller(SinchClient sinchClient, ServerBusinessLogic serverBusinessLogic) { this.sinchClient = sinchClient; - this.webhooksBusinessLogic = webhooksBusinessLogic; + this.serverBusinessLogic = serverBusinessLogic; } @PostMapping( @@ -36,7 +36,7 @@ public Controller(SinchClient sinchClient, ServerBusinessLogic webhooksBusinessL public ResponseEntity VoiceEvent( @RequestHeader Map headers, @RequestBody String body) { - WebHooksService webhooks = sinchClient.voice().v1().webhooks(); + SinchEventsService sinchEvents = sinchClient.voice().v1().sinchEvents(); // ensure valid authentication to handle request // see @@ -48,7 +48,7 @@ public ResponseEntity VoiceEvent( if (ensureValidAuthentication) { // ensure valid authentication to handle request var validAuth = - webhooks.validateAuthenticationHeader( + sinchEvents.validateAuthenticationHeader( // The HTTP verb this controller is managing "POST", // The URI this controller is managing @@ -65,14 +65,14 @@ public ResponseEntity VoiceEvent( } // decode the payload request - var event = webhooks.parseEvent(body); + var event = sinchEvents.parseEvent(body); // let business layer process the request var response = switch (event) { - case IncomingCallEvent e -> webhooksBusinessLogic.incoming(e); + case IncomingCallEvent e -> serverBusinessLogic.incoming(e); case DisconnectedCallEvent e -> { - webhooksBusinessLogic.disconnect(e); + serverBusinessLogic.disconnect(e); yield null; } default -> throw new IllegalStateException("Unexpected value: " + event); @@ -80,7 +80,7 @@ public ResponseEntity VoiceEvent( String serializedResponse = ""; if (null != response) { - serializedResponse = webhooks.serializeResponse(response); + serializedResponse = sinchEvents.serializeResponse(response); } LOGGER.finest("JSON response: " + serializedResponse); diff --git a/examples/getting-started/voice/respond-to-incoming-call/src/main/java/com/mycompany/app/voice/ServerBusinessLogic.java b/examples/getting-started/voice/respond-to-incoming-call/src/main/java/com/mycompany/app/voice/ServerBusinessLogic.java index c339699d3..f4f33492a 100644 --- a/examples/getting-started/voice/respond-to-incoming-call/src/main/java/com/mycompany/app/voice/ServerBusinessLogic.java +++ b/examples/getting-started/voice/respond-to-incoming-call/src/main/java/com/mycompany/app/voice/ServerBusinessLogic.java @@ -1,10 +1,10 @@ package com.mycompany.app.voice; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.DisconnectedCallEvent; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.IncomingCallEvent; import com.sinch.sdk.domains.voice.models.v1.svaml.SvamlControl; import com.sinch.sdk.domains.voice.models.v1.svaml.action.SvamlActionHangup; import com.sinch.sdk.domains.voice.models.v1.svaml.instruction.SvamlInstructionSay; -import com.sinch.sdk.domains.voice.models.v1.webhooks.DisconnectedCallEvent; -import com.sinch.sdk.domains.voice.models.v1.webhooks.IncomingCallEvent; import java.util.Collections; import java.util.logging.Logger; import org.springframework.stereotype.Component; diff --git a/examples/snippets/src/main/java/voice/README.md b/examples/snippets/src/main/java/voice/README.md index 8cee1e56a..4b7569734 100644 --- a/examples/snippets/src/main/java/voice/README.md +++ b/examples/snippets/src/main/java/voice/README.md @@ -19,5 +19,5 @@ See main [README.md](../../../../README.md) for how to execute snippets - [voice/applications/ListNumbers](./applications/ListNumbers.java) - [voice/applications/AssignNumbers](./applications/AssignNumbers.java) - [voice/applications/UnAssignNumber](./applications/UnAssignNumber.java) - - [voice/applications/GetCallbackUrls](./applications/GetCallbackUrls.java) - - [voice/applications/UpdateCallbackUrls](./applications/UpdateCallbackUrls.java) + - [voice/applications/GetEventDestinations](./applications/GetEventDestinations.java) + - [voice/applications/UpdateEventDestinations](./applications/UpdateEventDestinations.java) diff --git a/examples/snippets/src/main/java/voice/applications/GetCallbackUrls.java b/examples/snippets/src/main/java/voice/applications/GetEventDestinations.java similarity index 72% rename from examples/snippets/src/main/java/voice/applications/GetCallbackUrls.java rename to examples/snippets/src/main/java/voice/applications/GetEventDestinations.java index bf4aef967..65caf228e 100644 --- a/examples/snippets/src/main/java/voice/applications/GetCallbackUrls.java +++ b/examples/snippets/src/main/java/voice/applications/GetEventDestinations.java @@ -9,14 +9,14 @@ import com.sinch.sdk.SinchClient; import com.sinch.sdk.domains.voice.api.v1.ApplicationsService; -import com.sinch.sdk.domains.voice.models.v1.applications.Callbacks; +import com.sinch.sdk.domains.voice.models.v1.applications.EventDestinations; import com.sinch.sdk.models.Configuration; import java.util.logging.Logger; import utils.Settings; -public class GetCallbackUrls { +public class GetEventDestinations { - private static final Logger LOGGER = Logger.getLogger(GetCallbackUrls.class.getName()); + private static final Logger LOGGER = Logger.getLogger(GetEventDestinations.class.getName()); public static void main(String[] args) { @@ -33,9 +33,9 @@ public static void main(String[] args) { ApplicationsService applicationsService = client.voice().v1().applications(); - LOGGER.info(String.format("Get callback URLs for application key '%s'", applicationKey)); + LOGGER.info(String.format("Get even destinations for application key '%s'", applicationKey)); - Callbacks response = applicationsService.getCallbackUrls(applicationKey); + EventDestinations response = applicationsService.getEventDestinations(applicationKey); LOGGER.info("Response: " + response); } diff --git a/examples/snippets/src/main/java/voice/applications/UpdateCallbackUrls.java b/examples/snippets/src/main/java/voice/applications/UpdateEventDestinations.java similarity index 56% rename from examples/snippets/src/main/java/voice/applications/UpdateCallbackUrls.java rename to examples/snippets/src/main/java/voice/applications/UpdateEventDestinations.java index e08de6e76..b80462ce2 100644 --- a/examples/snippets/src/main/java/voice/applications/UpdateCallbackUrls.java +++ b/examples/snippets/src/main/java/voice/applications/UpdateEventDestinations.java @@ -9,23 +9,23 @@ import com.sinch.sdk.SinchClient; import com.sinch.sdk.domains.voice.api.v1.ApplicationsService; -import com.sinch.sdk.domains.voice.models.v1.applications.Callbacks; -import com.sinch.sdk.domains.voice.models.v1.applications.CallbacksUrl; +import com.sinch.sdk.domains.voice.models.v1.applications.EventDestinationTarget; +import com.sinch.sdk.domains.voice.models.v1.applications.EventDestinations; import com.sinch.sdk.models.Configuration; import java.util.logging.Logger; import utils.Settings; -public class UpdateCallbackUrls { +public class UpdateEventDestinations { - private static final Logger LOGGER = Logger.getLogger(UpdateCallbackUrls.class.getName()); + private static final Logger LOGGER = Logger.getLogger(UpdateEventDestinations.class.getName()); public static void main(String[] args) { String applicationKey = Settings.getApplicationKey().orElse("MY_APPLICATION_KEY"); String applicationSecret = Settings.getApplicationSecret().orElse("MY_APPLICATION_SECRET"); - // The new callback URL to set for the application - String callbackURL = "https://my.callback.url/voice"; + // The new event destination target URL to set for the application + String eventDestinationTarget = "https://my.callback.url/voice"; Configuration configuration = Configuration.builder() @@ -37,14 +37,17 @@ public static void main(String[] args) { ApplicationsService applicationsService = client.voice().v1().applications(); - Callbacks request = - Callbacks.builder().setUrl(CallbacksUrl.builder().setPrimary(callbackURL).build()).build(); + EventDestinations request = + EventDestinations.builder() + .setTarget(EventDestinationTarget.builder().setPrimary(eventDestinationTarget).build()) + .build(); LOGGER.info( String.format( - "Update callback URLs for application key '%s': '%s'", applicationKey, request)); + "Update event destinations URLs for application key '%s': '%s'", + applicationKey, request)); - applicationsService.updateCallbackUrls(applicationKey, request); + applicationsService.updateEventDestinations(applicationKey, request); LOGGER.info("Done"); } diff --git a/examples/tutorials/voice/capture-leads-app/src/main/java/com/mycompany/app/voice/Controller.java b/examples/tutorials/voice/capture-leads-app/src/main/java/com/mycompany/app/voice/Controller.java index 618dc179c..693d84892 100644 --- a/examples/tutorials/voice/capture-leads-app/src/main/java/com/mycompany/app/voice/Controller.java +++ b/examples/tutorials/voice/capture-leads-app/src/main/java/com/mycompany/app/voice/Controller.java @@ -1,10 +1,10 @@ package com.mycompany.app.voice; import com.sinch.sdk.domains.voice.VoiceService; -import com.sinch.sdk.domains.voice.api.v1.WebHooksService; +import com.sinch.sdk.domains.voice.api.v1.SinchEventsService; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.AnsweredCallEvent; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.PromptInputEvent; import com.sinch.sdk.domains.voice.models.v1.svaml.SvamlControl; -import com.sinch.sdk.domains.voice.models.v1.webhooks.AnsweredCallEvent; -import com.sinch.sdk.domains.voice.models.v1.webhooks.PromptInputEvent; import java.util.Map; import java.util.Optional; import org.springframework.beans.factory.annotation.Autowired; @@ -20,13 +20,13 @@ @RestController("Voice") public class Controller { - private final WebHooksService webhooks; - private final ServerBusinessLogic webhooksBusinessLogic; + private final SinchEventsService sinchEvents; + private final ServerBusinessLogic sinchEventsBusinessLogic; @Autowired - public Controller(VoiceService voiceService, ServerBusinessLogic webhooksBusinessLogic) { - this.webhooks = voiceService.v1().webhooks(); - this.webhooksBusinessLogic = webhooksBusinessLogic; + public Controller(VoiceService voiceService, ServerBusinessLogic sinchEventsBusinessLogic) { + this.sinchEvents = voiceService.v1().sinchEvents(); + this.sinchEventsBusinessLogic = sinchEventsBusinessLogic; } @PostMapping( @@ -39,16 +39,16 @@ public ResponseEntity VoiceEvent( validateRequest(headers, body); // decode the request payload - var event = webhooks.parseEvent(body); + var event = sinchEvents.parseEvent(body); Optional response = Optional.empty(); // let business layer process the request if (event instanceof AnsweredCallEvent e) { - response = Optional.of(webhooksBusinessLogic.answeredCallEvent(e)); + response = Optional.of(sinchEventsBusinessLogic.answeredCallEvent(e)); } if (event instanceof PromptInputEvent e) { - response = Optional.of(webhooksBusinessLogic.promptInputEvent(e)); + response = Optional.of(sinchEventsBusinessLogic.promptInputEvent(e)); } if (response.isEmpty()) { @@ -57,7 +57,7 @@ public ResponseEntity VoiceEvent( ResponseEntity responseEntity = ResponseEntity.ok().body(null); - String serializedResponse = webhooks.serializeResponse(response.get()); + String serializedResponse = sinchEvents.serializeResponse(response.get()); return ResponseEntity.ok().body(serializedResponse); } @@ -75,7 +75,7 @@ void validateRequest(Map headers, String body) { } var validAuth = - webhooks.validateAuthenticationHeader( + sinchEvents.validateAuthenticationHeader( // The HTTP verb this controller is managing "POST", // The URI this controller is managing diff --git a/examples/tutorials/voice/capture-leads-app/src/main/java/com/mycompany/app/voice/ServerBusinessLogic.java b/examples/tutorials/voice/capture-leads-app/src/main/java/com/mycompany/app/voice/ServerBusinessLogic.java index e8d4286f6..6f6d8f9e4 100644 --- a/examples/tutorials/voice/capture-leads-app/src/main/java/com/mycompany/app/voice/ServerBusinessLogic.java +++ b/examples/tutorials/voice/capture-leads-app/src/main/java/com/mycompany/app/voice/ServerBusinessLogic.java @@ -1,6 +1,9 @@ package com.mycompany.app.voice; import com.sinch.sdk.domains.voice.models.v1.destination.DestinationSip; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.AnsweredCallEvent; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.AnsweringMachineDetection.StatusEnum; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.PromptInputEvent; import com.sinch.sdk.domains.voice.models.v1.svaml.SvamlControl; import com.sinch.sdk.domains.voice.models.v1.svaml.action.Menu; import com.sinch.sdk.domains.voice.models.v1.svaml.action.MenuOption; @@ -10,9 +13,6 @@ import com.sinch.sdk.domains.voice.models.v1.svaml.action.SvamlActionHangup; import com.sinch.sdk.domains.voice.models.v1.svaml.action.SvamlActionRunMenu; import com.sinch.sdk.domains.voice.models.v1.svaml.instruction.SvamlInstructionSay; -import com.sinch.sdk.domains.voice.models.v1.webhooks.AnsweredCallEvent; -import com.sinch.sdk.domains.voice.models.v1.webhooks.AnsweringMachineDetection.StatusEnum; -import com.sinch.sdk.domains.voice.models.v1.webhooks.PromptInputEvent; import com.sinch.sdk.models.DualToneMultiFrequency; import java.util.Arrays; import java.util.Collections; diff --git a/examples/webhooks/src/main/java/com/mycompany/app/voice/Controller.java b/examples/webhooks/src/main/java/com/mycompany/app/voice/Controller.java index b2eb3482d..42d8df2de 100644 --- a/examples/webhooks/src/main/java/com/mycompany/app/voice/Controller.java +++ b/examples/webhooks/src/main/java/com/mycompany/app/voice/Controller.java @@ -1,12 +1,12 @@ package com.mycompany.app.voice; import com.sinch.sdk.SinchClient; -import com.sinch.sdk.domains.voice.api.v1.WebHooksService; -import com.sinch.sdk.domains.voice.models.v1.webhooks.AnsweredCallEvent; -import com.sinch.sdk.domains.voice.models.v1.webhooks.DisconnectedCallEvent; -import com.sinch.sdk.domains.voice.models.v1.webhooks.IncomingCallEvent; -import com.sinch.sdk.domains.voice.models.v1.webhooks.NotificationEvent; -import com.sinch.sdk.domains.voice.models.v1.webhooks.PromptInputEvent; +import com.sinch.sdk.domains.voice.api.v1.SinchEventsService; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.AnsweredCallEvent; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.DisconnectedCallEvent; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.IncomingCallEvent; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.NotificationEvent; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.PromptInputEvent; import java.util.Map; import java.util.logging.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -39,7 +39,7 @@ public Controller(SinchClient sinchClient, ServerBusinessLogic webhooksBusinessL public ResponseEntity VoiceEvent( @RequestHeader Map headers, @RequestBody String body) { - WebHooksService webhooks = sinchClient.voice().v1().webhooks(); + SinchEventsService webhooks = sinchClient.voice().v1().sinchEvents(); // ensure valid authentication to handle request // set this value to true to validate request from Sinch servers diff --git a/examples/webhooks/src/main/java/com/mycompany/app/voice/ServerBusinessLogic.java b/examples/webhooks/src/main/java/com/mycompany/app/voice/ServerBusinessLogic.java index 4aedb702f..7d4d5e89f 100644 --- a/examples/webhooks/src/main/java/com/mycompany/app/voice/ServerBusinessLogic.java +++ b/examples/webhooks/src/main/java/com/mycompany/app/voice/ServerBusinessLogic.java @@ -1,11 +1,11 @@ package com.mycompany.app.voice; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.AnsweredCallEvent; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.DisconnectedCallEvent; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.IncomingCallEvent; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.NotificationEvent; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.PromptInputEvent; import com.sinch.sdk.domains.voice.models.v1.svaml.SvamlControl; -import com.sinch.sdk.domains.voice.models.v1.webhooks.AnsweredCallEvent; -import com.sinch.sdk.domains.voice.models.v1.webhooks.DisconnectedCallEvent; -import com.sinch.sdk.domains.voice.models.v1.webhooks.IncomingCallEvent; -import com.sinch.sdk.domains.voice.models.v1.webhooks.NotificationEvent; -import com.sinch.sdk.domains.voice.models.v1.webhooks.PromptInputEvent; import java.util.logging.Logger; import org.springframework.stereotype.Component; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/api/v1/ApplicationsService.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/api/v1/ApplicationsService.java index e6b6f7d5d..2bdac3595 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/api/v1/ApplicationsService.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/api/v1/ApplicationsService.java @@ -11,7 +11,7 @@ package com.sinch.sdk.domains.voice.api.v1; import com.sinch.sdk.core.exceptions.ApiException; -import com.sinch.sdk.domains.voice.models.v1.applications.Callbacks; +import com.sinch.sdk.domains.voice.models.v1.applications.EventDestinations; import com.sinch.sdk.domains.voice.models.v1.applications.request.UnAssignNumberRequest; import com.sinch.sdk.domains.voice.models.v1.applications.request.UpdateNumbersRequest; import com.sinch.sdk.domains.voice.models.v1.applications.response.OwnedNumbersListResponse; @@ -35,10 +35,10 @@ public interface ApplicationsService { *

Returns any callback URLs configured for the specified application. * * @param applicationkey The unique identifying key of the application. (required) - * @return Callbacks + * @return EventDestinations * @throws ApiException if fails to make API call */ - Callbacks getCallbackUrls(String applicationkey) throws ApiException; + EventDestinations getEventDestinations(String applicationkey) throws ApiException; /** * Get Numbers @@ -68,8 +68,9 @@ public interface ApplicationsService { *

Update the configured callback URLs for the specified application. * * @param applicationkey The unique identifying key of the application. (required) - * @param callbacks (optional) + * @param eventDestinations (optional) * @throws ApiException if fails to make API call */ - void updateCallbackUrls(String applicationkey, Callbacks callbacks) throws ApiException; + void updateEventDestinations(String applicationkey, EventDestinations eventDestinations) + throws ApiException; } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/api/v1/adapters/ApplicationsServiceImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/api/v1/adapters/ApplicationsServiceImpl.java index f28b536d3..1d51c2268 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/api/v1/adapters/ApplicationsServiceImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/api/v1/adapters/ApplicationsServiceImpl.java @@ -24,7 +24,7 @@ import com.sinch.sdk.core.http.URLPathUtils; import com.sinch.sdk.core.models.ServerConfiguration; import com.sinch.sdk.core.models.pagination.Page; -import com.sinch.sdk.domains.voice.models.v1.applications.Callbacks; +import com.sinch.sdk.domains.voice.models.v1.applications.EventDestinations; import com.sinch.sdk.domains.voice.models.v1.applications.request.UnAssignNumberRequest; import com.sinch.sdk.domains.voice.models.v1.applications.request.UpdateNumbersRequest; import com.sinch.sdk.domains.voice.models.v1.applications.response.OwnedNumbersListResponse; @@ -107,17 +107,17 @@ private HttpRequest assignNumbersRequestBuilder(UpdateNumbersRequest updateNumbe } @Override - public Callbacks getCallbackUrls(String applicationkey) throws ApiException { + public EventDestinations getEventDestinations(String applicationkey) throws ApiException { - LOGGER.finest("[getCallbackUrls]" + " " + "applicationkey: " + applicationkey); + LOGGER.finest("[getEventDestinations]" + " " + "applicationkey: " + applicationkey); - HttpRequest httpRequest = getCallbackUrlsRequestBuilder(applicationkey); + HttpRequest httpRequest = getEventDestinationsRequestBuilder(applicationkey); 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 @@ -128,11 +128,12 @@ public Callbacks getCallbackUrls(String applicationkey) throws ApiException { mapper.deserialize(response, new TypeReference>() {})); } - private HttpRequest getCallbackUrlsRequestBuilder(String applicationkey) throws ApiException { + private HttpRequest getEventDestinationsRequestBuilder(String applicationkey) + throws ApiException { // verify the required parameter 'applicationkey' is set if (applicationkey == null) { throw new ApiException( - 400, "Missing the required parameter 'applicationkey' when calling getCallbackUrls"); + 400, "Missing the required parameter 'applicationkey' when calling getEventDestinations"); } String localVarPath = @@ -270,18 +271,20 @@ private HttpRequest unassignNumberRequestBuilder(UnAssignNumberRequest unAssignN } @Override - public void updateCallbackUrls(String applicationkey, Callbacks callbacks) throws ApiException { + public void updateEventDestinations(String applicationkey, EventDestinations eventDestinations) + throws ApiException { LOGGER.finest( - "[updateCallbackUrls]" + "[updateEventDestinations]" + " " + "applicationkey: " + applicationkey + ", " - + "callbacks: " - + callbacks); + + "eventDestinations: " + + eventDestinations); - HttpRequest httpRequest = updateCallbackUrlsRequestBuilder(applicationkey, callbacks); + HttpRequest httpRequest = + updateEventDestinationsRequestBuilder(applicationkey, eventDestinations); HttpResponse response = httpClient.invokeAPI( this.serverConfiguration, this.authManagersByOasSecuritySchemes, httpRequest); @@ -298,12 +301,13 @@ public void updateCallbackUrls(String applicationkey, Callbacks callbacks) throw mapper.deserialize(response, new TypeReference>() {})); } - private HttpRequest updateCallbackUrlsRequestBuilder(String applicationkey, Callbacks callbacks) - throws ApiException { + private HttpRequest updateEventDestinationsRequestBuilder( + String applicationkey, EventDestinations eventDestinations) throws ApiException { // verify the required parameter 'applicationkey' is set if (applicationkey == null) { throw new ApiException( - 400, "Missing the required parameter 'applicationkey' when calling updateCallbackUrls"); + 400, + "Missing the required parameter 'applicationkey' when calling updateEventDestinations"); } String localVarPath = @@ -321,7 +325,7 @@ private HttpRequest updateCallbackUrlsRequestBuilder(String applicationkey, Call final Collection localVarContentTypes = Arrays.asList("application/json"); final Collection localVarAuthNames = Arrays.asList("Basic", "Signed"); - final String serializedBody = mapper.serialize(localVarContentTypes, callbacks); + final String serializedBody = mapper.serialize(localVarContentTypes, eventDestinations); return new HttpRequest( localVarPath, diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/CallbacksUrl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/EventDestinationTarget.java similarity index 86% rename from openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/CallbacksUrl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/EventDestinationTarget.java index c8299b426..ce3925bd0 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/CallbacksUrl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/EventDestinationTarget.java @@ -13,8 +13,8 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; /** Contains primary and or fallback callback URLs */ -@JsonDeserialize(builder = CallbacksUrlImpl.Builder.class) -public interface CallbacksUrl { +@JsonDeserialize(builder = EventDestinationTargetImpl.Builder.class) +public interface EventDestinationTarget { /** * Your primary callback URL @@ -37,7 +37,7 @@ public interface CallbacksUrl { * @return New Builder instance */ static Builder builder() { - return new CallbacksUrlImpl.Builder(); + return new EventDestinationTargetImpl.Builder(); } /** Dedicated Builder */ @@ -66,6 +66,6 @@ interface Builder { * * @return The instance build with current builder values */ - CallbacksUrl build(); + EventDestinationTarget build(); } } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/CallbacksUrlImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/EventDestinationTargetImpl.java similarity index 82% rename from openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/CallbacksUrlImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/EventDestinationTargetImpl.java index d6457bf99..9e0ee25a5 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/CallbacksUrlImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/EventDestinationTargetImpl.java @@ -10,12 +10,12 @@ import java.util.Objects; @JsonPropertyOrder({ - CallbacksUrlImpl.JSON_PROPERTY_PRIMARY, - CallbacksUrlImpl.JSON_PROPERTY_FALLBACK + EventDestinationTargetImpl.JSON_PROPERTY_PRIMARY, + EventDestinationTargetImpl.JSON_PROPERTY_FALLBACK }) @JsonFilter("uninitializedFilter") @JsonInclude(value = JsonInclude.Include.CUSTOM) -public class CallbacksUrlImpl implements CallbacksUrl { +public class EventDestinationTargetImpl implements EventDestinationTarget { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_PRIMARY = "primary"; @@ -26,9 +26,10 @@ public class CallbacksUrlImpl implements CallbacksUrl { private OptionalValue fallback; - public CallbacksUrlImpl() {} + public EventDestinationTargetImpl() {} - protected CallbacksUrlImpl(OptionalValue primary, OptionalValue fallback) { + protected EventDestinationTargetImpl( + OptionalValue primary, OptionalValue fallback) { this.primary = primary; this.fallback = fallback; } @@ -64,7 +65,7 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - CallbacksUrlImpl callbacksUrl = (CallbacksUrlImpl) o; + EventDestinationTargetImpl callbacksUrl = (EventDestinationTargetImpl) o; return Objects.equals(this.primary, callbacksUrl.primary) && Objects.equals(this.fallback, callbacksUrl.fallback); } @@ -77,7 +78,7 @@ public int hashCode() { @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("class CallbacksUrlImpl {\n"); + sb.append("class EventDestinationTargetImpl {\n"); sb.append(" primary: ").append(toIndentedString(primary)).append("\n"); sb.append(" fallback: ").append(toIndentedString(fallback)).append("\n"); sb.append("}"); @@ -95,7 +96,7 @@ private String toIndentedString(Object o) { } @JsonPOJOBuilder(withPrefix = "set") - static class Builder implements CallbacksUrl.Builder { + static class Builder implements EventDestinationTarget.Builder { OptionalValue primary = OptionalValue.empty(); OptionalValue fallback = OptionalValue.empty(); @@ -111,8 +112,8 @@ public Builder setFallback(String fallback) { return this; } - public CallbacksUrl build() { - return new CallbacksUrlImpl(primary, fallback); + public EventDestinationTarget build() { + return new EventDestinationTargetImpl(primary, fallback); } } } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/Callbacks.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/EventDestinations.java similarity index 64% rename from openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/Callbacks.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/EventDestinations.java index 62b8a08fa..ca4deae86 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/Callbacks.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/EventDestinations.java @@ -12,16 +12,16 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -/** Callbacks */ -@JsonDeserialize(builder = CallbacksImpl.Builder.class) -public interface Callbacks { +/** EventDestinations */ +@JsonDeserialize(builder = EventDestinationsImpl.Builder.class) +public interface EventDestinations { /** - * Get url + * Get target * - * @return url + * @return target */ - CallbacksUrl getUrl(); + EventDestinationTarget getTarget(); /** * Getting builder @@ -29,7 +29,7 @@ public interface Callbacks { * @return New Builder instance */ static Builder builder() { - return new CallbacksImpl.Builder(); + return new EventDestinationsImpl.Builder(); } /** Dedicated Builder */ @@ -38,17 +38,17 @@ interface Builder { /** * see getter * - * @param url see getter + * @param target see getter * @return Current builder - * @see #getUrl + * @see #getTarget */ - Builder setUrl(CallbacksUrl url); + Builder setTarget(EventDestinationTarget target); /** * Create instance * * @return The instance build with current builder values */ - Callbacks build(); + EventDestinations build(); } } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/CallbacksImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/EventDestinationsImpl.java similarity index 59% rename from openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/CallbacksImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/EventDestinationsImpl.java index 266dfd1ec..77dc39ebc 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/CallbacksImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/EventDestinationsImpl.java @@ -9,31 +9,31 @@ import com.sinch.sdk.core.models.OptionalValue; import java.util.Objects; -@JsonPropertyOrder({CallbacksImpl.JSON_PROPERTY_URL}) +@JsonPropertyOrder({EventDestinationsImpl.JSON_PROPERTY_URL}) @JsonFilter("uninitializedFilter") @JsonInclude(value = JsonInclude.Include.CUSTOM) -public class CallbacksImpl implements Callbacks { +public class EventDestinationsImpl implements EventDestinations { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_URL = "url"; - private OptionalValue url; + private OptionalValue target; - public CallbacksImpl() {} + public EventDestinationsImpl() {} - protected CallbacksImpl(OptionalValue url) { - this.url = url; + protected EventDestinationsImpl(OptionalValue target) { + this.target = target; } @JsonIgnore - public CallbacksUrl getUrl() { - return url.orElse(null); + public EventDestinationTarget getTarget() { + return target.orElse(null); } @JsonProperty(JSON_PROPERTY_URL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public OptionalValue url() { - return url; + public OptionalValue target() { + return target; } /** Return true if this callbacks object is equal to o. */ @@ -45,20 +45,20 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - CallbacksImpl callbacks = (CallbacksImpl) o; - return Objects.equals(this.url, callbacks.url); + EventDestinationsImpl callbacks = (EventDestinationsImpl) o; + return Objects.equals(this.target, callbacks.target); } @Override public int hashCode() { - return Objects.hash(url); + return Objects.hash(target); } @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("class CallbacksImpl {\n"); - sb.append(" url: ").append(toIndentedString(url)).append("\n"); + sb.append("class EventDestinationsImpl {\n"); + sb.append(" target: ").append(toIndentedString(target)).append("\n"); sb.append("}"); return sb.toString(); } @@ -74,17 +74,17 @@ private String toIndentedString(Object o) { } @JsonPOJOBuilder(withPrefix = "set") - static class Builder implements Callbacks.Builder { - OptionalValue url = OptionalValue.empty(); + static class Builder implements EventDestinations.Builder { + OptionalValue target = OptionalValue.empty(); @JsonProperty(JSON_PROPERTY_URL) - public Builder setUrl(CallbacksUrl url) { - this.url = OptionalValue.of(url); + public Builder setTarget(EventDestinationTarget target) { + this.target = OptionalValue.of(target); return this; } - public Callbacks build() { - return new CallbacksImpl(url); + public EventDestinations build() { + return new EventDestinationsImpl(target); } } } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/response/QueryNumberInformation.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/response/QueryNumberInformation.java deleted file mode 100644 index be5db3d7f..000000000 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/response/QueryNumberInformation.java +++ /dev/null @@ -1,153 +0,0 @@ -/* - * Voice API | Sinch - * - * OpenAPI document version: 1.0.1 - * Contact: support@sinch.com - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * Do not edit the class manually. - */ - -package com.sinch.sdk.domains.voice.models.v1.applications.response; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.sinch.sdk.core.utils.EnumDynamic; -import com.sinch.sdk.core.utils.EnumSupportDynamic; -import com.sinch.sdk.domains.voice.models.v1.Price; -import java.util.Arrays; -import java.util.stream.Stream; - -/** The number item object. */ -@JsonDeserialize(builder = QueryNumberInformationImpl.Builder.class) -public interface QueryNumberInformation { - - /** - * The ISO 3166-1 formatted country code. - * - * @return countryId - */ - String getCountryId(); - - /** The type of the number. */ - public class NumberTypeEnum extends EnumDynamic { - public static final NumberTypeEnum UNKNOWN = new NumberTypeEnum("Unknown"); - public static final NumberTypeEnum FIXED = new NumberTypeEnum("Fixed"); - public static final NumberTypeEnum MOBILE = new NumberTypeEnum("Mobile"); - public static final NumberTypeEnum OTHER = new NumberTypeEnum("Other"); - - private static final EnumSupportDynamic ENUM_SUPPORT = - new EnumSupportDynamic<>( - NumberTypeEnum.class, - NumberTypeEnum::new, - Arrays.asList(UNKNOWN, FIXED, MOBILE, OTHER)); - - private NumberTypeEnum(String value) { - super(value); - } - - public static Stream values() { - return ENUM_SUPPORT.values(); - } - - public static NumberTypeEnum from(String value) { - return ENUM_SUPPORT.from(value); - } - - public static String valueOf(NumberTypeEnum e) { - return ENUM_SUPPORT.valueOf(e); - } - } - - /** - * The type of the number. - * - * @return numberType - */ - NumberTypeEnum getNumberType(); - - /** - * The number in E.164 format. - * - * @return normalizedNumber - */ - String getNormalizedNumber(); - - /** - * Concerns whether the call is restricted or not. - * - * @return restricted - */ - Boolean getRestricted(); - - /** - * Get rate - * - * @return rate - */ - Price getRate(); - - /** - * Getting builder - * - * @return New Builder instance - */ - static Builder builder() { - return new QueryNumberInformationImpl.Builder(); - } - - /** Dedicated Builder */ - interface Builder { - - /** - * see getter - * - * @param countryId see getter - * @return Current builder - * @see #getCountryId - */ - Builder setCountryId(String countryId); - - /** - * see getter - * - * @param numberType see getter - * @return Current builder - * @see #getNumberType - */ - Builder setNumberType(NumberTypeEnum numberType); - - /** - * see getter - * - * @param normalizedNumber see getter - * @return Current builder - * @see #getNormalizedNumber - */ - Builder setNormalizedNumber(String normalizedNumber); - - /** - * see getter - * - * @param restricted see getter - * @return Current builder - * @see #getRestricted - */ - Builder setRestricted(Boolean restricted); - - /** - * see getter - * - * @param rate see getter - * @return Current builder - * @see #getRate - */ - Builder setRate(Price rate); - - /** - * Create instance - * - * @return The instance build with current builder values - */ - QueryNumberInformation build(); - } -} diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/response/QueryNumberInformationImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/response/QueryNumberInformationImpl.java deleted file mode 100644 index 0a0573c99..000000000 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/response/QueryNumberInformationImpl.java +++ /dev/null @@ -1,203 +0,0 @@ -package com.sinch.sdk.domains.voice.models.v1.applications.response; - -import com.fasterxml.jackson.annotation.JsonFilter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; -import com.sinch.sdk.core.models.OptionalValue; -import com.sinch.sdk.domains.voice.models.v1.Price; -import java.util.Objects; - -@JsonPropertyOrder({ - QueryNumberInformationImpl.JSON_PROPERTY_COUNTRY_ID, - QueryNumberInformationImpl.JSON_PROPERTY_NUMBER_TYPE, - QueryNumberInformationImpl.JSON_PROPERTY_NORMALIZED_NUMBER, - QueryNumberInformationImpl.JSON_PROPERTY_RESTRICTED, - QueryNumberInformationImpl.JSON_PROPERTY_RATE -}) -@JsonFilter("uninitializedFilter") -@JsonInclude(value = JsonInclude.Include.CUSTOM) -public class QueryNumberInformationImpl implements QueryNumberInformation { - private static final long serialVersionUID = 1L; - - public static final String JSON_PROPERTY_COUNTRY_ID = "countryId"; - - private OptionalValue countryId; - - public static final String JSON_PROPERTY_NUMBER_TYPE = "numberType"; - - private OptionalValue numberType; - - public static final String JSON_PROPERTY_NORMALIZED_NUMBER = "normalizedNumber"; - - private OptionalValue normalizedNumber; - - public static final String JSON_PROPERTY_RESTRICTED = "restricted"; - - private OptionalValue restricted; - - public static final String JSON_PROPERTY_RATE = "rate"; - - private OptionalValue rate; - - public QueryNumberInformationImpl() {} - - protected QueryNumberInformationImpl( - OptionalValue countryId, - OptionalValue numberType, - OptionalValue normalizedNumber, - OptionalValue restricted, - OptionalValue rate) { - this.countryId = countryId; - this.numberType = numberType; - this.normalizedNumber = normalizedNumber; - this.restricted = restricted; - this.rate = rate; - } - - @JsonIgnore - public String getCountryId() { - return countryId.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_COUNTRY_ID) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public OptionalValue countryId() { - return countryId; - } - - @JsonIgnore - public NumberTypeEnum getNumberType() { - return numberType.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_NUMBER_TYPE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public OptionalValue numberType() { - return numberType; - } - - @JsonIgnore - public String getNormalizedNumber() { - return normalizedNumber.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_NORMALIZED_NUMBER) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public OptionalValue normalizedNumber() { - return normalizedNumber; - } - - @JsonIgnore - public Boolean getRestricted() { - return restricted.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_RESTRICTED) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public OptionalValue restricted() { - return restricted; - } - - @JsonIgnore - public Price getRate() { - return rate.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_RATE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public OptionalValue rate() { - return rate; - } - - /** Return true if this getQueryNumber_number object is equal to o. */ - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - QueryNumberInformationImpl getQueryNumberNumber = (QueryNumberInformationImpl) o; - return Objects.equals(this.countryId, getQueryNumberNumber.countryId) - && Objects.equals(this.numberType, getQueryNumberNumber.numberType) - && Objects.equals(this.normalizedNumber, getQueryNumberNumber.normalizedNumber) - && Objects.equals(this.restricted, getQueryNumberNumber.restricted) - && Objects.equals(this.rate, getQueryNumberNumber.rate); - } - - @Override - public int hashCode() { - return Objects.hash(countryId, numberType, normalizedNumber, restricted, rate); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class QueryNumberInformationImpl {\n"); - sb.append(" countryId: ").append(toIndentedString(countryId)).append("\n"); - sb.append(" numberType: ").append(toIndentedString(numberType)).append("\n"); - sb.append(" normalizedNumber: ").append(toIndentedString(normalizedNumber)).append("\n"); - sb.append(" restricted: ").append(toIndentedString(restricted)).append("\n"); - sb.append(" rate: ").append(toIndentedString(rate)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } - - @JsonPOJOBuilder(withPrefix = "set") - static class Builder implements QueryNumberInformation.Builder { - OptionalValue countryId = OptionalValue.empty(); - OptionalValue numberType = OptionalValue.empty(); - OptionalValue normalizedNumber = OptionalValue.empty(); - OptionalValue restricted = OptionalValue.empty(); - OptionalValue rate = OptionalValue.empty(); - - @JsonProperty(JSON_PROPERTY_COUNTRY_ID) - public Builder setCountryId(String countryId) { - this.countryId = OptionalValue.of(countryId); - return this; - } - - @JsonProperty(JSON_PROPERTY_NUMBER_TYPE) - public Builder setNumberType(NumberTypeEnum numberType) { - this.numberType = OptionalValue.of(numberType); - return this; - } - - @JsonProperty(JSON_PROPERTY_NORMALIZED_NUMBER) - public Builder setNormalizedNumber(String normalizedNumber) { - this.normalizedNumber = OptionalValue.of(normalizedNumber); - return this; - } - - @JsonProperty(JSON_PROPERTY_RESTRICTED) - public Builder setRestricted(Boolean restricted) { - this.restricted = OptionalValue.of(restricted); - return this; - } - - @JsonProperty(JSON_PROPERTY_RATE) - public Builder setRate(Price rate) { - this.rate = OptionalValue.of(rate); - return this; - } - - public QueryNumberInformation build() { - return new QueryNumberInformationImpl( - countryId, numberType, normalizedNumber, restricted, rate); - } - } -} diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/response/QueryNumberResponse.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/response/QueryNumberResponse.java deleted file mode 100644 index 5827b0688..000000000 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/response/QueryNumberResponse.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Voice API | Sinch - * - * OpenAPI document version: 1.0.1 - * Contact: support@sinch.com - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * Do not edit the class manually. - */ - -package com.sinch.sdk.domains.voice.models.v1.applications.response; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -/** QueryNumberResponse */ -@JsonDeserialize(builder = QueryNumberResponseImpl.Builder.class) -public interface QueryNumberResponse { - - /** - * Get number - * - * @return number - */ - QueryNumberInformation getNumber(); - - /** - * Getting builder - * - * @return New Builder instance - */ - static Builder builder() { - return new QueryNumberResponseImpl.Builder(); - } - - /** Dedicated Builder */ - interface Builder { - - /** - * see getter - * - * @param number see getter - * @return Current builder - * @see #getNumber - */ - Builder setNumber(QueryNumberInformation number); - - /** - * Create instance - * - * @return The instance build with current builder values - */ - QueryNumberResponse build(); - } -} diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/response/QueryNumberResponseImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/response/QueryNumberResponseImpl.java deleted file mode 100644 index 9760055cf..000000000 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/applications/response/QueryNumberResponseImpl.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.sinch.sdk.domains.voice.models.v1.applications.response; - -import com.fasterxml.jackson.annotation.JsonFilter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; -import com.sinch.sdk.core.models.OptionalValue; -import java.util.Objects; - -@JsonPropertyOrder({QueryNumberResponseImpl.JSON_PROPERTY_NUMBER}) -@JsonFilter("uninitializedFilter") -@JsonInclude(value = JsonInclude.Include.CUSTOM) -public class QueryNumberResponseImpl implements QueryNumberResponse { - private static final long serialVersionUID = 1L; - - public static final String JSON_PROPERTY_NUMBER = "number"; - - private OptionalValue number; - - public QueryNumberResponseImpl() {} - - protected QueryNumberResponseImpl(OptionalValue number) { - this.number = number; - } - - @JsonIgnore - public QueryNumberInformation getNumber() { - return number.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_NUMBER) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public OptionalValue number() { - return number; - } - - /** Return true if this getQueryNumber object is equal to o. */ - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - QueryNumberResponseImpl getQueryNumber = (QueryNumberResponseImpl) o; - return Objects.equals(this.number, getQueryNumber.number); - } - - @Override - public int hashCode() { - return Objects.hash(number); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class QueryNumberResponseImpl {\n"); - sb.append(" number: ").append(toIndentedString(number)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } - - @JsonPOJOBuilder(withPrefix = "set") - static class Builder implements QueryNumberResponse.Builder { - OptionalValue number = OptionalValue.empty(); - - @JsonProperty(JSON_PROPERTY_NUMBER) - public Builder setNumber(QueryNumberInformation number) { - this.number = OptionalValue.of(number); - return this; - } - - public QueryNumberResponse build() { - return new QueryNumberResponseImpl(number); - } - } -} diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/callouts/request/CalloutRequestConference.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/callouts/request/CalloutRequestConference.java index 310dc716b..27d254679 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/callouts/request/CalloutRequestConference.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/callouts/request/CalloutRequestConference.java @@ -179,7 +179,7 @@ public static String valueOf(MethodEnum e) { *
* If no “music-on-hold” is specified, the user will only hear silence. * - * @return MusicOnHold + * @return musicOnHold */ MusicOnHold getMusicOnHold(); @@ -313,11 +313,11 @@ interface Builder { /** * see getter * - * @param MusicOnHold see getter + * @param musicOnHold see getter * @return Current builder * @see #getMusicOnHold */ - Builder setMusicOnHold(MusicOnHold MusicOnHold); + Builder setMusicOnHold(MusicOnHold musicOnHold); /** * see getter diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/callouts/request/CalloutRequestConferenceImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/callouts/request/CalloutRequestConferenceImpl.java index f66dfd078..4a7820932 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/callouts/request/CalloutRequestConferenceImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/callouts/request/CalloutRequestConferenceImpl.java @@ -463,8 +463,8 @@ public Builder setGreeting(String greeting) { } @JsonIgnore - public Builder setMusicOnHold(MusicOnHold MusicOnHold) { - getDelegatedBuilder().setMusicOnHold(MusicOnHold); + public Builder setMusicOnHold(MusicOnHold musicOnHold) { + getDelegatedBuilder().setMusicOnHold(musicOnHold); return this; } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/callouts/request/internal/ConferenceCalloutInternal.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/callouts/request/internal/ConferenceCalloutInternal.java index 645b575c9..7ef50fb2f 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/callouts/request/internal/ConferenceCalloutInternal.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/callouts/request/internal/ConferenceCalloutInternal.java @@ -152,7 +152,7 @@ public interface ConferenceCalloutInternal { *
* If no “music-on-hold” is specified, the user will only hear silence. * - * @return MusicOnHold + * @return musicOnHold */ MusicOnHold getMusicOnHold(); @@ -286,11 +286,11 @@ interface Builder { /** * see getter * - * @param MusicOnHold see getter + * @param musicOnHold see getter * @return Current builder * @see #getMusicOnHold */ - Builder setMusicOnHold(MusicOnHold MusicOnHold); + Builder setMusicOnHold(MusicOnHold musicOnHold); /** * see getter diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/callouts/request/internal/ConferenceCalloutInternalImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/callouts/request/internal/ConferenceCalloutInternalImpl.java index 61a344078..d23b1e0db 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/callouts/request/internal/ConferenceCalloutInternalImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/callouts/request/internal/ConferenceCalloutInternalImpl.java @@ -85,7 +85,7 @@ public class ConferenceCalloutInternalImpl implements ConferenceCalloutInternal public static final String JSON_PROPERTY_MOH_CLASS = "mohClass"; - private OptionalValue MusicOnHold; + private OptionalValue musicOnHold; public static final String JSON_PROPERTY_DOMAIN = "domain"; @@ -106,7 +106,7 @@ protected ConferenceCalloutInternalImpl( OptionalValue enablePie, OptionalValue locale, OptionalValue greeting, - OptionalValue MusicOnHold, + OptionalValue musicOnHold, OptionalValue domain) { this.cli = cli; this.dtmf = dtmf; @@ -120,7 +120,7 @@ protected ConferenceCalloutInternalImpl( this.enablePie = enablePie; this.locale = locale; this.greeting = greeting; - this.MusicOnHold = MusicOnHold; + this.musicOnHold = musicOnHold; this.domain = domain; } @@ -258,13 +258,13 @@ public OptionalValue greeting() { @JsonIgnore public MusicOnHold getMusicOnHold() { - return MusicOnHold.orElse(null); + return musicOnHold.orElse(null); } @JsonProperty(JSON_PROPERTY_MOH_CLASS) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OptionalValue musicOnHold() { - return MusicOnHold; + return musicOnHold; } @JsonIgnore @@ -300,7 +300,7 @@ public boolean equals(Object o) { && Objects.equals(this.enablePie, conferenceCallout.enablePie) && Objects.equals(this.locale, conferenceCallout.locale) && Objects.equals(this.greeting, conferenceCallout.greeting) - && Objects.equals(this.MusicOnHold, conferenceCallout.MusicOnHold) + && Objects.equals(this.musicOnHold, conferenceCallout.musicOnHold) && Objects.equals(this.domain, conferenceCallout.domain); } @@ -319,7 +319,7 @@ public int hashCode() { enablePie, locale, greeting, - MusicOnHold, + musicOnHold, domain); } @@ -341,7 +341,7 @@ public String toString() { sb.append(" enablePie: ").append(toIndentedString(enablePie)).append("\n"); sb.append(" locale: ").append(toIndentedString(locale)).append("\n"); sb.append(" greeting: ").append(toIndentedString(greeting)).append("\n"); - sb.append(" MusicOnHold: ").append(toIndentedString(MusicOnHold)).append("\n"); + sb.append(" musicOnHold: ").append(toIndentedString(musicOnHold)).append("\n"); sb.append(" domain: ").append(toIndentedString(domain)).append("\n"); sb.append("}"); return sb.toString(); @@ -371,7 +371,7 @@ static class Builder implements ConferenceCalloutInternal.Builder { OptionalValue enablePie = OptionalValue.empty(); OptionalValue locale = OptionalValue.empty(); OptionalValue greeting = OptionalValue.empty(); - OptionalValue MusicOnHold = OptionalValue.empty(); + OptionalValue musicOnHold = OptionalValue.empty(); OptionalValue domain = OptionalValue.empty(); @JsonProperty(JSON_PROPERTY_CLI) @@ -447,8 +447,8 @@ public Builder setGreeting(String greeting) { } @JsonProperty(JSON_PROPERTY_MOH_CLASS) - public Builder setMusicOnHold(MusicOnHold MusicOnHold) { - this.MusicOnHold = OptionalValue.of(MusicOnHold); + public Builder setMusicOnHold(MusicOnHold musicOnHold) { + this.musicOnHold = OptionalValue.of(musicOnHold); return this; } @@ -472,7 +472,7 @@ public ConferenceCalloutInternal build() { enablePie, locale, greeting, - MusicOnHold, + musicOnHold, domain); } } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/conferences/ConferenceParticipant.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/conferences/ConferenceParticipant.java index 9e1117f18..2c20f8d33 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/conferences/ConferenceParticipant.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/conferences/ConferenceParticipant.java @@ -46,9 +46,9 @@ public interface ConferenceParticipant { Boolean getMuted(); /** - * Get OnHold + * Get onHold * - * @return OnHold + * @return onHold */ Boolean getOnHold(); @@ -103,11 +103,11 @@ interface Builder { /** * see getter * - * @param OnHold see getter + * @param onHold see getter * @return Current builder * @see #getOnHold */ - Builder setOnHold(Boolean OnHold); + Builder setOnHold(Boolean onHold); /** * Create instance diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/conferences/ConferenceParticipantImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/conferences/ConferenceParticipantImpl.java index 551647978..6fba635c4 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/conferences/ConferenceParticipantImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/conferences/ConferenceParticipantImpl.java @@ -39,7 +39,7 @@ public class ConferenceParticipantImpl implements ConferenceParticipant { public static final String JSON_PROPERTY_ONHOLD = "onhold"; - private OptionalValue OnHold; + private OptionalValue onHold; public ConferenceParticipantImpl() {} @@ -48,12 +48,12 @@ protected ConferenceParticipantImpl( OptionalValue id, OptionalValue duration, OptionalValue muted, - OptionalValue OnHold) { + OptionalValue onHold) { this.cli = cli; this.id = id; this.duration = duration; this.muted = muted; - this.OnHold = OnHold; + this.onHold = onHold; } @JsonIgnore @@ -102,13 +102,13 @@ public OptionalValue muted() { @JsonIgnore public Boolean getOnHold() { - return OnHold.orElse(null); + return onHold.orElse(null); } @JsonProperty(JSON_PROPERTY_ONHOLD) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OptionalValue onHold() { - return OnHold; + return onHold; } /** Return true if this getConferenceInfoResponse_participants_inner object is equal to o. */ @@ -126,12 +126,12 @@ public boolean equals(Object o) { && Objects.equals(this.id, getConferenceInfoResponseParticipantsInner.id) && Objects.equals(this.duration, getConferenceInfoResponseParticipantsInner.duration) && Objects.equals(this.muted, getConferenceInfoResponseParticipantsInner.muted) - && Objects.equals(this.OnHold, getConferenceInfoResponseParticipantsInner.OnHold); + && Objects.equals(this.onHold, getConferenceInfoResponseParticipantsInner.onHold); } @Override public int hashCode() { - return Objects.hash(cli, id, duration, muted, OnHold); + return Objects.hash(cli, id, duration, muted, onHold); } @Override @@ -142,7 +142,7 @@ public String toString() { sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" duration: ").append(toIndentedString(duration)).append("\n"); sb.append(" muted: ").append(toIndentedString(muted)).append("\n"); - sb.append(" OnHold: ").append(toIndentedString(OnHold)).append("\n"); + sb.append(" onHold: ").append(toIndentedString(onHold)).append("\n"); sb.append("}"); return sb.toString(); } @@ -163,7 +163,7 @@ static class Builder implements ConferenceParticipant.Builder { OptionalValue id = OptionalValue.empty(); OptionalValue duration = OptionalValue.empty(); OptionalValue muted = OptionalValue.empty(); - OptionalValue OnHold = OptionalValue.empty(); + OptionalValue onHold = OptionalValue.empty(); @JsonProperty(JSON_PROPERTY_CLI) public Builder setCli(String cli) { @@ -190,13 +190,13 @@ public Builder setMuted(Boolean muted) { } @JsonProperty(JSON_PROPERTY_ONHOLD) - public Builder setOnHold(Boolean OnHold) { - this.OnHold = OptionalValue.of(OnHold); + public Builder setOnHold(Boolean onHold) { + this.onHold = OptionalValue.of(onHold); return this; } public ConferenceParticipant build() { - return new ConferenceParticipantImpl(cli, id, duration, muted, OnHold); + return new ConferenceParticipantImpl(cli, id, duration, muted, onHold); } } } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/conferences/request/ManageConferenceParticipantRequest.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/conferences/request/ManageConferenceParticipantRequest.java index 42e0a4bda..e7974f872 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/conferences/request/ManageConferenceParticipantRequest.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/conferences/request/ManageConferenceParticipantRequest.java @@ -64,7 +64,7 @@ public static String valueOf(CommandEnum e) { * join. If moh isn't specified, the user will only hear silence while alone in the * conference. This property is only available to use with the onhold command. * - * @return MusicOnHold + * @return musicOnHold */ MusicOnHold getMusicOnHold(); @@ -92,11 +92,11 @@ interface Builder { /** * see getter * - * @param MusicOnHold see getter + * @param musicOnHold see getter * @return Current builder * @see #getMusicOnHold */ - Builder setMusicOnHold(MusicOnHold MusicOnHold); + Builder setMusicOnHold(MusicOnHold musicOnHold); /** * Create instance diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/conferences/request/ManageConferenceParticipantRequestImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/conferences/request/ManageConferenceParticipantRequestImpl.java index b26a2b875..50b44c08d 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/conferences/request/ManageConferenceParticipantRequestImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/conferences/request/ManageConferenceParticipantRequestImpl.java @@ -25,14 +25,14 @@ public class ManageConferenceParticipantRequestImpl implements ManageConferenceP public static final String JSON_PROPERTY_MOH = "moh"; - private OptionalValue MusicOnHold; + private OptionalValue musicOnHold; public ManageConferenceParticipantRequestImpl() {} protected ManageConferenceParticipantRequestImpl( - OptionalValue command, OptionalValue MusicOnHold) { + OptionalValue command, OptionalValue musicOnHold) { this.command = command; - this.MusicOnHold = MusicOnHold; + this.musicOnHold = musicOnHold; } @JsonIgnore @@ -48,13 +48,13 @@ public OptionalValue command() { @JsonIgnore public MusicOnHold getMusicOnHold() { - return MusicOnHold.orElse(null); + return musicOnHold.orElse(null); } @JsonProperty(JSON_PROPERTY_MOH) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OptionalValue musicOnHold() { - return MusicOnHold; + return musicOnHold; } /** Return true if this manageConferenceParticipantRequest object is equal to o. */ @@ -69,12 +69,12 @@ public boolean equals(Object o) { ManageConferenceParticipantRequestImpl manageConferenceParticipantRequest = (ManageConferenceParticipantRequestImpl) o; return Objects.equals(this.command, manageConferenceParticipantRequest.command) - && Objects.equals(this.MusicOnHold, manageConferenceParticipantRequest.MusicOnHold); + && Objects.equals(this.musicOnHold, manageConferenceParticipantRequest.musicOnHold); } @Override public int hashCode() { - return Objects.hash(command, MusicOnHold); + return Objects.hash(command, musicOnHold); } @Override @@ -82,7 +82,7 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ManageConferenceParticipantRequestImpl {\n"); sb.append(" command: ").append(toIndentedString(command)).append("\n"); - sb.append(" MusicOnHold: ").append(toIndentedString(MusicOnHold)).append("\n"); + sb.append(" musicOnHold: ").append(toIndentedString(musicOnHold)).append("\n"); sb.append("}"); return sb.toString(); } @@ -100,7 +100,7 @@ private String toIndentedString(Object o) { @JsonPOJOBuilder(withPrefix = "set") static class Builder implements ManageConferenceParticipantRequest.Builder { OptionalValue command = OptionalValue.empty(); - OptionalValue MusicOnHold = OptionalValue.empty(); + OptionalValue musicOnHold = OptionalValue.empty(); @JsonProperty(value = JSON_PROPERTY_COMMAND, required = true) public Builder setCommand(CommandEnum command) { @@ -109,13 +109,13 @@ public Builder setCommand(CommandEnum command) { } @JsonProperty(JSON_PROPERTY_MOH) - public Builder setMusicOnHold(MusicOnHold MusicOnHold) { - this.MusicOnHold = OptionalValue.of(MusicOnHold); + public Builder setMusicOnHold(MusicOnHold musicOnHold) { + this.musicOnHold = OptionalValue.of(musicOnHold); return this; } public ManageConferenceParticipantRequest build() { - return new ManageConferenceParticipantRequestImpl(command, MusicOnHold); + return new ManageConferenceParticipantRequestImpl(command, musicOnHold); } } } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/AnsweredCallEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/AnsweredCallEvent.java similarity index 72% rename from openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/AnsweredCallEvent.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/AnsweredCallEvent.java index b05d15324..4dc77638b 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/AnsweredCallEvent.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/AnsweredCallEvent.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.voice.models.v1.webhooks; +package com.sinch.sdk.domains.voice.models.v1.sinchevents; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.sinch.sdk.core.utils.EnumDynamic; @@ -19,7 +19,7 @@ /** The request body of an Answered Call Event. */ @JsonDeserialize(builder = AnsweredCallEventImpl.Builder.class) -public interface AnsweredCallEvent extends VoiceWebhookEvent, VoiceWebhookCallEvent { +public interface AnsweredCallEvent extends VoiceSinchEvent, VoiceCallSinchEvent { /** * The timestamp in UTC format. @@ -44,26 +44,25 @@ public interface AnsweredCallEvent extends VoiceWebhookEvent, VoiceWebhookCallEv String getApplicationKey(); /** Must have the value ace. */ - public class WebhooksEventRequestType extends EnumDynamic { - public static final WebhooksEventRequestType ACE = new WebhooksEventRequestType("ace"); + public class SinchEventType extends EnumDynamic { + public static final SinchEventType ACE = new SinchEventType("ace"); - private static final EnumSupportDynamic ENUM_SUPPORT = - new EnumSupportDynamic<>( - WebhooksEventRequestType.class, WebhooksEventRequestType::new, Arrays.asList(ACE)); + private static final EnumSupportDynamic ENUM_SUPPORT = + new EnumSupportDynamic<>(SinchEventType.class, SinchEventType::new, Arrays.asList(ACE)); - private WebhooksEventRequestType(String value) { + private SinchEventType(String value) { super(value); } - public static Stream values() { + public static Stream values() { return ENUM_SUPPORT.values(); } - public static WebhooksEventRequestType from(String value) { + public static SinchEventType from(String value) { return ENUM_SUPPORT.from(value); } - public static String valueOf(WebhooksEventRequestType e) { + public static String valueOf(SinchEventType e) { return ENUM_SUPPORT.valueOf(e); } } @@ -85,7 +84,7 @@ static Builder builder() { } /** Dedicated Builder */ - interface Builder extends VoiceWebhookEvent.Builder, VoiceWebhookCallEvent.Builder { + interface Builder extends VoiceSinchEvent.Builder, VoiceCallSinchEvent.Builder { /** * see getter diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/AnsweredCallEventImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/AnsweredCallEventImpl.java similarity index 93% rename from openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/AnsweredCallEventImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/AnsweredCallEventImpl.java index 3d34f4a66..d2819ab6f 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/AnsweredCallEventImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/AnsweredCallEventImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.voice.models.v1.webhooks; +package com.sinch.sdk.domains.voice.models.v1.sinchevents; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -31,7 +31,7 @@ */ public class AnsweredCallEventImpl - implements AnsweredCallEvent, VoiceWebhookEvent, VoiceWebhookCallEvent { + implements AnsweredCallEvent, VoiceSinchEvent, VoiceCallSinchEvent { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_TIMESTAMP = "timestamp"; @@ -48,7 +48,7 @@ public class AnsweredCallEventImpl public static final String JSON_PROPERTY_EVENT = "event"; - private OptionalValue event; + private OptionalValue event; public static final String JSON_PROPERTY_AMD = "amd"; @@ -72,7 +72,7 @@ protected AnsweredCallEventImpl( OptionalValue timestamp, OptionalValue custom, OptionalValue applicationKey, - OptionalValue event, + OptionalValue event, OptionalValue amd, OptionalValue callid, OptionalValue conferenceId, @@ -121,13 +121,13 @@ public OptionalValue applicationKey() { } @JsonIgnore - public WebhooksEventRequestType getEvent() { + public SinchEventType getEvent() { return event.orElse(null); } @JsonProperty(JSON_PROPERTY_EVENT) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public OptionalValue event() { + public OptionalValue event() { return event; } @@ -242,7 +242,7 @@ static class Builder implements AnsweredCallEvent.Builder { OptionalValue timestamp = OptionalValue.empty(); OptionalValue custom = OptionalValue.empty(); OptionalValue applicationKey = OptionalValue.empty(); - OptionalValue event = OptionalValue.of(WebhooksEventRequestType.ACE); + OptionalValue event = OptionalValue.of(SinchEventType.ACE); OptionalValue amd = OptionalValue.empty(); OptionalValue callid = OptionalValue.empty(); OptionalValue conferenceId = OptionalValue.empty(); @@ -267,10 +267,10 @@ public Builder setApplicationKey(String applicationKey) { } @JsonProperty(value = JSON_PROPERTY_EVENT, required = true) - Builder setEvent(WebhooksEventRequestType event) { - if (!Objects.equals(event, WebhooksEventRequestType.ACE)) { + Builder setEvent(SinchEventType event) { + if (!Objects.equals(event, SinchEventType.ACE)) { throw new IllegalArgumentException( - String.format("'event' must be '%s' (is '%s')", WebhooksEventRequestType.ACE, event)); + String.format("'event' must be '%s' (is '%s')", SinchEventType.ACE, event)); } return this; } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/AnsweringMachineDetection.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/AnsweringMachineDetection.java similarity index 98% rename from openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/AnsweringMachineDetection.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/AnsweringMachineDetection.java index 8ef04a170..b15b26987 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/AnsweringMachineDetection.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/AnsweringMachineDetection.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.voice.models.v1.webhooks; +package com.sinch.sdk.domains.voice.models.v1.sinchevents; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.sinch.sdk.core.utils.EnumDynamic; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/AnsweringMachineDetectionImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/AnsweringMachineDetectionImpl.java similarity index 98% rename from openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/AnsweringMachineDetectionImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/AnsweringMachineDetectionImpl.java index 2dd2ae3db..4efa268a6 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/AnsweringMachineDetectionImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/AnsweringMachineDetectionImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.voice.models.v1.webhooks; +package com.sinch.sdk.domains.voice.models.v1.sinchevents; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/DisconnectedCallEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/DisconnectedCallEvent.java similarity index 88% rename from openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/DisconnectedCallEvent.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/DisconnectedCallEvent.java index ef4553229..9348440cc 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/DisconnectedCallEvent.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/DisconnectedCallEvent.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.voice.models.v1.webhooks; +package com.sinch.sdk.domains.voice.models.v1.sinchevents; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.sinch.sdk.core.utils.EnumDynamic; @@ -24,7 +24,7 @@ /** The request body of a Disconnected Call Event. */ @JsonDeserialize(builder = DisconnectedCallEventImpl.Builder.class) -public interface DisconnectedCallEvent extends VoiceWebhookEvent, VoiceWebhookCallEvent { +public interface DisconnectedCallEvent extends VoiceSinchEvent, VoiceCallSinchEvent { /** * The timestamp in UTC format. @@ -49,26 +49,25 @@ public interface DisconnectedCallEvent extends VoiceWebhookEvent, VoiceWebhookCa String getApplicationKey(); /** Must have the value dice. */ - public class WebhooksEventRequestType extends EnumDynamic { - public static final WebhooksEventRequestType DICE = new WebhooksEventRequestType("dice"); + public class SinchEventType extends EnumDynamic { + public static final SinchEventType DICE = new SinchEventType("dice"); - private static final EnumSupportDynamic ENUM_SUPPORT = - new EnumSupportDynamic<>( - WebhooksEventRequestType.class, WebhooksEventRequestType::new, Arrays.asList(DICE)); + private static final EnumSupportDynamic ENUM_SUPPORT = + new EnumSupportDynamic<>(SinchEventType.class, SinchEventType::new, Arrays.asList(DICE)); - private WebhooksEventRequestType(String value) { + private SinchEventType(String value) { super(value); } - public static Stream values() { + public static Stream values() { return ENUM_SUPPORT.values(); } - public static WebhooksEventRequestType from(String value) { + public static SinchEventType from(String value) { return ENUM_SUPPORT.from(value); } - public static String valueOf(WebhooksEventRequestType e) { + public static String valueOf(SinchEventType e) { return ENUM_SUPPORT.valueOf(e); } } @@ -197,7 +196,7 @@ static Builder builder() { } /** Dedicated Builder */ - interface Builder extends VoiceWebhookEvent.Builder, VoiceWebhookCallEvent.Builder { + interface Builder extends VoiceSinchEvent.Builder, VoiceCallSinchEvent.Builder { /** * see getter diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/DisconnectedCallEventImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/DisconnectedCallEventImpl.java similarity index 95% rename from openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/DisconnectedCallEventImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/DisconnectedCallEventImpl.java index 60f7d7c15..c877eb303 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/DisconnectedCallEventImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/DisconnectedCallEventImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.voice.models.v1.webhooks; +package com.sinch.sdk.domains.voice.models.v1.sinchevents; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -43,7 +43,7 @@ */ public class DisconnectedCallEventImpl - implements DisconnectedCallEvent, VoiceWebhookEvent, VoiceWebhookCallEvent { + implements DisconnectedCallEvent, VoiceSinchEvent, VoiceCallSinchEvent { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_TIMESTAMP = "timestamp"; @@ -60,7 +60,7 @@ public class DisconnectedCallEventImpl public static final String JSON_PROPERTY_EVENT = "event"; - private OptionalValue event; + private OptionalValue event; public static final String JSON_PROPERTY_REASON = "reason"; @@ -112,7 +112,7 @@ protected DisconnectedCallEventImpl( OptionalValue timestamp, OptionalValue custom, OptionalValue applicationKey, - OptionalValue event, + OptionalValue event, OptionalValue reason, OptionalValue result, OptionalValue debit, @@ -175,13 +175,13 @@ public OptionalValue applicationKey() { } @JsonIgnore - public WebhooksEventRequestType getEvent() { + public SinchEventType getEvent() { return event.orElse(null); } @JsonProperty(JSON_PROPERTY_EVENT) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public OptionalValue event() { + public OptionalValue event() { return event; } @@ -394,7 +394,7 @@ static class Builder implements DisconnectedCallEvent.Builder { OptionalValue timestamp = OptionalValue.empty(); OptionalValue custom = OptionalValue.empty(); OptionalValue applicationKey = OptionalValue.empty(); - OptionalValue event = OptionalValue.of(WebhooksEventRequestType.DICE); + OptionalValue event = OptionalValue.of(SinchEventType.DICE); OptionalValue reason = OptionalValue.empty(); OptionalValue result = OptionalValue.empty(); OptionalValue debit = OptionalValue.empty(); @@ -426,10 +426,10 @@ public Builder setApplicationKey(String applicationKey) { } @JsonProperty(value = JSON_PROPERTY_EVENT, required = true) - Builder setEvent(WebhooksEventRequestType event) { - if (!Objects.equals(event, WebhooksEventRequestType.DICE)) { + Builder setEvent(SinchEventType event) { + if (!Objects.equals(event, SinchEventType.DICE)) { throw new IllegalArgumentException( - String.format("'event' must be '%s' (is '%s')", WebhooksEventRequestType.DICE, event)); + String.format("'event' must be '%s' (is '%s')", SinchEventType.DICE, event)); } return this; } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/IncomingCallEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/IncomingCallEvent.java similarity index 95% rename from openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/IncomingCallEvent.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/IncomingCallEvent.java index 54d83da8d..05833589b 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/IncomingCallEvent.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/IncomingCallEvent.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.voice.models.v1.webhooks; +package com.sinch.sdk.domains.voice.models.v1.sinchevents; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.sinch.sdk.domains.voice.models.v1.Domain; @@ -20,7 +20,7 @@ /** The request body of an Incoming Call Event. */ @JsonDeserialize(builder = IncomingCallEventImpl.Builder.class) -public interface IncomingCallEvent extends VoiceWebhookEvent, VoiceWebhookCallEvent { +public interface IncomingCallEvent extends VoiceSinchEvent, VoiceCallSinchEvent { /** * The timestamp in UTC format. @@ -122,7 +122,7 @@ static Builder builder() { } /** Dedicated Builder */ - interface Builder extends VoiceWebhookEvent.Builder, VoiceWebhookCallEvent.Builder { + interface Builder extends VoiceSinchEvent.Builder, VoiceCallSinchEvent.Builder { /** * see getter diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/IncomingCallEventImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/IncomingCallEventImpl.java similarity index 96% rename from openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/IncomingCallEventImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/IncomingCallEventImpl.java index 5d7f9471e..7e3c9ea30 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/IncomingCallEventImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/IncomingCallEventImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.voice.models.v1.webhooks; +package com.sinch.sdk.domains.voice.models.v1.sinchevents; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -44,7 +44,7 @@ */ public class IncomingCallEventImpl - implements IncomingCallEvent, VoiceWebhookEvent, VoiceWebhookCallEvent { + implements IncomingCallEvent, VoiceSinchEvent, VoiceCallSinchEvent { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_TIMESTAMP = "timestamp"; @@ -61,7 +61,7 @@ public class IncomingCallEventImpl public static final String JSON_PROPERTY_EVENT = "event"; - private OptionalValue event; + private OptionalValue event; public static final String JSON_PROPERTY_CALL_RESOURCE_URL = "callResourceUrl"; @@ -117,7 +117,7 @@ protected IncomingCallEventImpl( OptionalValue timestamp, OptionalValue custom, OptionalValue applicationKey, - OptionalValue event, + OptionalValue event, OptionalValue callResourceUrl, OptionalValue userRate, OptionalValue cli, @@ -182,13 +182,13 @@ public OptionalValue applicationKey() { } @JsonIgnore - public WebhooksEventRequestType getEvent() { + public SinchEventType getEvent() { return event.orElse(null); } @JsonProperty(JSON_PROPERTY_EVENT) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public OptionalValue event() { + public OptionalValue event() { return event; } @@ -415,7 +415,7 @@ static class Builder implements IncomingCallEvent.Builder { OptionalValue timestamp = OptionalValue.empty(); OptionalValue custom = OptionalValue.empty(); OptionalValue applicationKey = OptionalValue.empty(); - OptionalValue event = OptionalValue.of(WebhooksEventRequestType.ICE); + OptionalValue event = OptionalValue.of(SinchEventType.ICE); OptionalValue callResourceUrl = OptionalValue.empty(); OptionalValue userRate = OptionalValue.empty(); OptionalValue cli = OptionalValue.empty(); @@ -448,10 +448,10 @@ public Builder setApplicationKey(String applicationKey) { } @JsonProperty(value = JSON_PROPERTY_EVENT, required = true) - Builder setEvent(WebhooksEventRequestType event) { - if (!Objects.equals(event, WebhooksEventRequestType.ICE)) { + Builder setEvent(SinchEventType event) { + if (!Objects.equals(event, SinchEventType.ICE)) { throw new IllegalArgumentException( - String.format("'event' must be '%s' (is '%s')", WebhooksEventRequestType.ICE, event)); + String.format("'event' must be '%s' (is '%s')", SinchEventType.ICE, event)); } return this; } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/MenuResult.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/MenuResult.java similarity index 98% rename from openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/MenuResult.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/MenuResult.java index a45ae1222..d191d02c3 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/MenuResult.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/MenuResult.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.voice.models.v1.webhooks; +package com.sinch.sdk.domains.voice.models.v1.sinchevents; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.sinch.sdk.core.utils.EnumDynamic; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/MenuResultImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/MenuResultImpl.java similarity index 98% rename from openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/MenuResultImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/MenuResultImpl.java index 251974c73..98c76e9ca 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/MenuResultImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/MenuResultImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.voice.models.v1.webhooks; +package com.sinch.sdk.domains.voice.models.v1.sinchevents; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/NotificationEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/NotificationEvent.java similarity index 73% rename from openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/NotificationEvent.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/NotificationEvent.java index d6c8c1c11..a8478be54 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/NotificationEvent.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/NotificationEvent.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.voice.models.v1.webhooks; +package com.sinch.sdk.domains.voice.models.v1.sinchevents; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.sinch.sdk.core.utils.EnumDynamic; @@ -18,29 +18,28 @@ /** The request body of a Notify Event. */ @JsonDeserialize(builder = NotificationEventImpl.Builder.class) -public interface NotificationEvent extends VoiceWebhookEvent { +public interface NotificationEvent extends VoiceSinchEvent { /** Must have the value notify. */ - public class WebhooksEventRequestType extends EnumDynamic { - public static final WebhooksEventRequestType NOTIFY = new WebhooksEventRequestType("notify"); + public class SinchEventType extends EnumDynamic { + public static final SinchEventType NOTIFY = new SinchEventType("notify"); - private static final EnumSupportDynamic ENUM_SUPPORT = - new EnumSupportDynamic<>( - WebhooksEventRequestType.class, WebhooksEventRequestType::new, Arrays.asList(NOTIFY)); + private static final EnumSupportDynamic ENUM_SUPPORT = + new EnumSupportDynamic<>(SinchEventType.class, SinchEventType::new, Arrays.asList(NOTIFY)); - private WebhooksEventRequestType(String value) { + private SinchEventType(String value) { super(value); } - public static Stream values() { + public static Stream values() { return ENUM_SUPPORT.values(); } - public static WebhooksEventRequestType from(String value) { + public static SinchEventType from(String value) { return ENUM_SUPPORT.from(value); } - public static String valueOf(WebhooksEventRequestType e) { + public static String valueOf(SinchEventType e) { return ENUM_SUPPORT.valueOf(e); } } @@ -84,7 +83,7 @@ static Builder builder() { } /** Dedicated Builder */ - interface Builder extends VoiceWebhookEvent.Builder { + interface Builder extends VoiceSinchEvent.Builder { /** * see getter diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/NotificationEventImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/NotificationEventImpl.java similarity index 93% rename from openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/NotificationEventImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/NotificationEventImpl.java index bbe3448d5..368f55ab4 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/NotificationEventImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/NotificationEventImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.voice.models.v1.webhooks; +package com.sinch.sdk.domains.voice.models.v1.sinchevents; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -29,12 +29,12 @@ /*@JsonTypeInfo(use = JsonTypeInfo.Id.NONE, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "event", visible = true) */ -public class NotificationEventImpl implements NotificationEvent, VoiceWebhookEvent { +public class NotificationEventImpl implements NotificationEvent, VoiceSinchEvent { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_EVENT = "event"; - private OptionalValue event; + private OptionalValue event; public static final String JSON_PROPERTY_TYPE = "type"; @@ -67,7 +67,7 @@ public class NotificationEventImpl implements NotificationEvent, VoiceWebhookEve public NotificationEventImpl() {} protected NotificationEventImpl( - OptionalValue event, + OptionalValue event, OptionalValue type, OptionalValue destination, OptionalValue amd, @@ -86,13 +86,13 @@ protected NotificationEventImpl( } @JsonIgnore - public WebhooksEventRequestType getEvent() { + public SinchEventType getEvent() { return event.orElse(null); } @JsonProperty(JSON_PROPERTY_EVENT) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public OptionalValue event() { + public OptionalValue event() { return event; } @@ -229,8 +229,7 @@ private String toIndentedString(Object o) { @JsonPOJOBuilder(withPrefix = "set") static class Builder implements NotificationEvent.Builder { - OptionalValue event = - OptionalValue.of(WebhooksEventRequestType.NOTIFY); + OptionalValue event = OptionalValue.of(SinchEventType.NOTIFY); OptionalValue type = OptionalValue.empty(); OptionalValue destination = OptionalValue.empty(); OptionalValue amd = OptionalValue.empty(); @@ -240,11 +239,10 @@ static class Builder implements NotificationEvent.Builder { OptionalValue version = OptionalValue.empty(); @JsonProperty(JSON_PROPERTY_EVENT) - Builder setEvent(WebhooksEventRequestType event) { - if (!Objects.equals(event, WebhooksEventRequestType.NOTIFY)) { + Builder setEvent(SinchEventType event) { + if (!Objects.equals(event, SinchEventType.NOTIFY)) { throw new IllegalArgumentException( - String.format( - "'event' must be '%s' (is '%s')", WebhooksEventRequestType.NOTIFY, event)); + String.format("'event' must be '%s' (is '%s')", SinchEventType.NOTIFY, event)); } return this; } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/PromptInputEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/PromptInputEvent.java similarity index 74% rename from openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/PromptInputEvent.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/PromptInputEvent.java index 2c51962a2..dba65be3f 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/PromptInputEvent.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/PromptInputEvent.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.voice.models.v1.webhooks; +package com.sinch.sdk.domains.voice.models.v1.sinchevents; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.sinch.sdk.core.utils.EnumDynamic; @@ -19,29 +19,28 @@ /** The request body of a Prompt Input Event. */ @JsonDeserialize(builder = PromptInputEventImpl.Builder.class) -public interface PromptInputEvent extends VoiceWebhookEvent { +public interface PromptInputEvent extends VoiceSinchEvent { /** Must have the value pie. */ - public class WebhooksEventRequestType extends EnumDynamic { - public static final WebhooksEventRequestType PIE = new WebhooksEventRequestType("pie"); + public class SinchEventType extends EnumDynamic { + public static final SinchEventType PIE = new SinchEventType("pie"); - private static final EnumSupportDynamic ENUM_SUPPORT = - new EnumSupportDynamic<>( - WebhooksEventRequestType.class, WebhooksEventRequestType::new, Arrays.asList(PIE)); + private static final EnumSupportDynamic ENUM_SUPPORT = + new EnumSupportDynamic<>(SinchEventType.class, SinchEventType::new, Arrays.asList(PIE)); - private WebhooksEventRequestType(String value) { + private SinchEventType(String value) { super(value); } - public static Stream values() { + public static Stream values() { return ENUM_SUPPORT.values(); } - public static WebhooksEventRequestType from(String value) { + public static SinchEventType from(String value) { return ENUM_SUPPORT.from(value); } - public static String valueOf(WebhooksEventRequestType e) { + public static String valueOf(SinchEventType e) { return ENUM_SUPPORT.valueOf(e); } } @@ -85,7 +84,7 @@ static Builder builder() { } /** Dedicated Builder */ - interface Builder extends VoiceWebhookEvent.Builder { + interface Builder extends VoiceSinchEvent.Builder { /** * see getter diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/PromptInputEventImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/PromptInputEventImpl.java similarity index 93% rename from openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/PromptInputEventImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/PromptInputEventImpl.java index ab734b767..5385439bb 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/PromptInputEventImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/PromptInputEventImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.voice.models.v1.webhooks; +package com.sinch.sdk.domains.voice.models.v1.sinchevents; import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -30,12 +30,12 @@ /*@JsonTypeInfo(use = JsonTypeInfo.Id.NONE, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "event", visible = true) */ -public class PromptInputEventImpl implements PromptInputEvent, VoiceWebhookEvent { +public class PromptInputEventImpl implements PromptInputEvent, VoiceSinchEvent { private static final long serialVersionUID = 1L; public static final String JSON_PROPERTY_EVENT = "event"; - private OptionalValue event; + private OptionalValue event; public static final String JSON_PROPERTY_TIMESTAMP = "timestamp"; @@ -68,7 +68,7 @@ public class PromptInputEventImpl implements PromptInputEvent, VoiceWebhookEvent public PromptInputEventImpl() {} protected PromptInputEventImpl( - OptionalValue event, + OptionalValue event, OptionalValue timestamp, OptionalValue menuResult, OptionalValue custom, @@ -87,13 +87,13 @@ protected PromptInputEventImpl( } @JsonIgnore - public WebhooksEventRequestType getEvent() { + public SinchEventType getEvent() { return event.orElse(null); } @JsonProperty(JSON_PROPERTY_EVENT) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public OptionalValue event() { + public OptionalValue event() { return event; } @@ -238,7 +238,7 @@ private String toIndentedString(Object o) { @JsonPOJOBuilder(withPrefix = "set") static class Builder implements PromptInputEvent.Builder { - OptionalValue event = OptionalValue.of(WebhooksEventRequestType.PIE); + OptionalValue event = OptionalValue.of(SinchEventType.PIE); OptionalValue timestamp = OptionalValue.empty(); OptionalValue menuResult = OptionalValue.empty(); OptionalValue custom = OptionalValue.empty(); @@ -248,10 +248,10 @@ static class Builder implements PromptInputEvent.Builder { OptionalValue version = OptionalValue.empty(); @JsonProperty(value = JSON_PROPERTY_EVENT, required = true) - Builder setEvent(WebhooksEventRequestType event) { - if (!Objects.equals(event, WebhooksEventRequestType.PIE)) { + Builder setEvent(SinchEventType event) { + if (!Objects.equals(event, SinchEventType.PIE)) { throw new IllegalArgumentException( - String.format("'event' must be '%s' (is '%s')", WebhooksEventRequestType.PIE, event)); + String.format("'event' must be '%s' (is '%s')", SinchEventType.PIE, event)); } return this; } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/WebhooksEventRequestType.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/SinchEventType.java similarity index 50% rename from openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/WebhooksEventRequestType.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/SinchEventType.java index 765bde1a0..f5674247c 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/WebhooksEventRequestType.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/SinchEventType.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.voice.models.v1.webhooks; +package com.sinch.sdk.domains.voice.models.v1.sinchevents; import com.sinch.sdk.core.utils.EnumDynamic; import com.sinch.sdk.core.utils.EnumSupportDynamic; @@ -6,55 +6,53 @@ import java.util.stream.Stream; /** Gets or Sets webhooksEventRequestType */ -public class WebhooksEventRequestType extends EnumDynamic { +public class SinchEventType extends EnumDynamic { /** * An Incoming Call Event is a type of event sent to your server when a phone number assigned to * your Voice application receives an incoming call. */ - public static final WebhooksEventRequestType ICE = new WebhooksEventRequestType("ice"); + public static final SinchEventType ICE = new SinchEventType("ice"); /** * An Answered Call Event is a type of event sent to your server when an outgoing call made by * your Voice application is answered. */ - public static final WebhooksEventRequestType ACE = new WebhooksEventRequestType("ace"); + public static final SinchEventType ACE = new SinchEventType("ace"); /** * A Disconnected Call Event is a type of event sent to your server when a call is disconnected. */ - public static final WebhooksEventRequestType DICE = new WebhooksEventRequestType("dice"); + public static final SinchEventType DICE = new SinchEventType("dice"); /** * A Prompt Input Event is a type of event sent to your server when a prompt input is submitted. */ - public static final WebhooksEventRequestType PIE = new WebhooksEventRequestType("pie"); + public static final SinchEventType PIE = new SinchEventType("pie"); /** * A Notification Event is a type of event sent to your server when a particular action occurs, * such as a recording starting or finishing. */ - public static final WebhooksEventRequestType NOTIFY = new WebhooksEventRequestType("notify"); + public static final SinchEventType NOTIFY = new SinchEventType("notify"); - private static final EnumSupportDynamic ENUM_SUPPORT = + private static final EnumSupportDynamic ENUM_SUPPORT = new EnumSupportDynamic<>( - WebhooksEventRequestType.class, - WebhooksEventRequestType::new, - Arrays.asList(ICE, ACE, DICE, PIE, NOTIFY)); + SinchEventType.class, SinchEventType::new, Arrays.asList(ICE, ACE, DICE, PIE, NOTIFY)); - private WebhooksEventRequestType(String value) { + private SinchEventType(String value) { super(value); } - public static Stream values() { + public static Stream values() { return ENUM_SUPPORT.values(); } - public static WebhooksEventRequestType from(String value) { + public static SinchEventType from(String value) { return ENUM_SUPPORT.from(value); } - public static String valueOf(WebhooksEventRequestType e) { + public static String valueOf(SinchEventType e) { return ENUM_SUPPORT.valueOf(e); } } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/VoiceWebhookCallEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/VoiceCallSinchEvent.java similarity index 89% rename from openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/VoiceWebhookCallEvent.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/VoiceCallSinchEvent.java index 64137eb91..62203331a 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/VoiceWebhookCallEvent.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/VoiceCallSinchEvent.java @@ -8,12 +8,12 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.voice.models.v1.webhooks; +package com.sinch.sdk.domains.voice.models.v1.sinchevents; import java.time.Instant; -/** VoiceWebhookCallEvent */ -public interface VoiceWebhookCallEvent { +/** VoiceCallSinchEvent */ +public interface VoiceCallSinchEvent { /** * The timestamp in UTC format. @@ -72,6 +72,6 @@ interface Builder { * * @return The instance build with current builder values */ - VoiceWebhookCallEvent build(); + VoiceCallSinchEvent build(); } } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/VoiceWebhookEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/VoiceSinchEvent.java similarity index 89% rename from openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/VoiceWebhookEvent.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/VoiceSinchEvent.java index f1a0f8369..a940406d4 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/VoiceWebhookEvent.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/VoiceSinchEvent.java @@ -8,10 +8,10 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.voice.models.v1.webhooks; +package com.sinch.sdk.domains.voice.models.v1.sinchevents; -/** VoiceWebhookEvent */ -public interface VoiceWebhookEvent { +/** VoiceSinchEvent */ +public interface VoiceSinchEvent { /** * Used in some types of events, it presents the unique ID assigned to this call. @@ -69,6 +69,6 @@ interface Builder> { * * @return The instance build with current builder values */ - VoiceWebhookEvent build(); + VoiceSinchEvent build(); } } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/internal/WebhooksEventInternal.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/internal/SinchEventInternal.java similarity index 59% rename from openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/internal/WebhooksEventInternal.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/internal/SinchEventInternal.java index 6e26e7ed7..c9e64af25 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/internal/WebhooksEventInternal.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/internal/SinchEventInternal.java @@ -8,9 +8,9 @@ * Do not edit the class manually. */ -package com.sinch.sdk.domains.voice.models.v1.webhooks.internal; +package com.sinch.sdk.domains.voice.models.v1.sinchevents.internal; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -@JsonDeserialize(using = WebhooksEventInternalImpl.WebhooksEventInternalImplDeserializer.class) -public interface WebhooksEventInternal {} +@JsonDeserialize(using = SinchEventInternalImpl.SinchEventInternalImplDeserializer.class) +public interface SinchEventInternal {} diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/internal/WebhooksEventInternalImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/internal/SinchEventInternalImpl.java similarity index 85% rename from openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/internal/WebhooksEventInternalImpl.java rename to openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/internal/SinchEventInternalImpl.java index 777ebd611..b2daeacb0 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/webhooks/internal/WebhooksEventInternalImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/sinchevents/internal/SinchEventInternalImpl.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.voice.models.v1.webhooks.internal; +package com.sinch.sdk.domains.voice.models.v1.sinchevents.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -16,11 +16,11 @@ import com.fasterxml.jackson.databind.ser.std.StdSerializer; import com.sinch.sdk.core.models.AbstractOpenApiSchema; import com.sinch.sdk.core.utils.databind.JSONNavigator; -import com.sinch.sdk.domains.voice.models.v1.webhooks.AnsweredCallEventImpl; -import com.sinch.sdk.domains.voice.models.v1.webhooks.DisconnectedCallEventImpl; -import com.sinch.sdk.domains.voice.models.v1.webhooks.IncomingCallEventImpl; -import com.sinch.sdk.domains.voice.models.v1.webhooks.NotificationEventImpl; -import com.sinch.sdk.domains.voice.models.v1.webhooks.PromptInputEventImpl; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.AnsweredCallEventImpl; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.DisconnectedCallEventImpl; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.IncomingCallEventImpl; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.NotificationEventImpl; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.PromptInputEventImpl; import java.io.IOException; import java.util.Collections; import java.util.HashMap; @@ -29,81 +29,80 @@ import java.util.logging.Level; import java.util.logging.Logger; -@JsonDeserialize(using = WebhooksEventInternalImpl.WebhooksEventInternalImplDeserializer.class) -@JsonSerialize(using = WebhooksEventInternalImpl.WebhooksEventInternalImplSerializer.class) -public class WebhooksEventInternalImpl extends AbstractOpenApiSchema - implements WebhooksEventInternal { - private static final Logger log = Logger.getLogger(WebhooksEventInternalImpl.class.getName()); +@JsonDeserialize(using = SinchEventInternalImpl.SinchEventInternalImplDeserializer.class) +@JsonSerialize(using = SinchEventInternalImpl.SinchEventInternalImplSerializer.class) +public class SinchEventInternalImpl extends AbstractOpenApiSchema implements SinchEventInternal { + private static final Logger log = Logger.getLogger(SinchEventInternalImpl.class.getName()); - public static final class WebhooksEventInternalImplSerializer - extends StdSerializer { + public static final class SinchEventInternalImplSerializer + extends StdSerializer { private static final long serialVersionUID = 1L; - public WebhooksEventInternalImplSerializer(Class t) { + public SinchEventInternalImplSerializer(Class t) { super(t); } - public WebhooksEventInternalImplSerializer() { + public SinchEventInternalImplSerializer() { this(null); } @Override public void serialize( - WebhooksEventInternalImpl value, JsonGenerator jgen, SerializerProvider provider) + SinchEventInternalImpl value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException { jgen.writeObject(value.getActualInstance()); } } - public static final class WebhooksEventInternalImplDeserializer - extends StdDeserializer { + public static final class SinchEventInternalImplDeserializer + extends StdDeserializer { private static final long serialVersionUID = 1L; - public WebhooksEventInternalImplDeserializer() { - this(WebhooksEventInternalImpl.class); + public SinchEventInternalImplDeserializer() { + this(SinchEventInternalImpl.class); } - public WebhooksEventInternalImplDeserializer(Class vc) { + public SinchEventInternalImplDeserializer(Class vc) { super(vc); } @Override - public WebhooksEventInternalImpl deserialize(JsonParser jp, DeserializationContext ctxt) + public SinchEventInternalImpl deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException { JsonNode tree = jp.readValueAsTree(); Object deserialized = null; - WebhooksEventInternalImpl newWebhooksEventInternalImpl = new WebhooksEventInternalImpl(); + SinchEventInternalImpl newSinchEventInternalImpl = new SinchEventInternalImpl(); Map result2 = tree.traverse(jp.getCodec()).readValueAs(new TypeReference>() {}); String discriminatorValue = (String) result2.get("event"); switch (discriminatorValue) { case "ace": deserialized = tree.traverse(jp.getCodec()).readValueAs(AnsweredCallEventImpl.class); - newWebhooksEventInternalImpl.setActualInstance(deserialized); - return newWebhooksEventInternalImpl; + newSinchEventInternalImpl.setActualInstance(deserialized); + return newSinchEventInternalImpl; case "dice": deserialized = tree.traverse(jp.getCodec()).readValueAs(DisconnectedCallEventImpl.class); - newWebhooksEventInternalImpl.setActualInstance(deserialized); - return newWebhooksEventInternalImpl; + newSinchEventInternalImpl.setActualInstance(deserialized); + return newSinchEventInternalImpl; case "ice": deserialized = tree.traverse(jp.getCodec()).readValueAs(IncomingCallEventImpl.class); - newWebhooksEventInternalImpl.setActualInstance(deserialized); - return newWebhooksEventInternalImpl; + newSinchEventInternalImpl.setActualInstance(deserialized); + return newSinchEventInternalImpl; case "notify": deserialized = tree.traverse(jp.getCodec()).readValueAs(NotificationEventImpl.class); - newWebhooksEventInternalImpl.setActualInstance(deserialized); - return newWebhooksEventInternalImpl; + newSinchEventInternalImpl.setActualInstance(deserialized); + return newSinchEventInternalImpl; case "pie": deserialized = tree.traverse(jp.getCodec()).readValueAs(PromptInputEventImpl.class); - newWebhooksEventInternalImpl.setActualInstance(deserialized); - return newWebhooksEventInternalImpl; + newSinchEventInternalImpl.setActualInstance(deserialized); + return newSinchEventInternalImpl; default: log.log( Level.WARNING, String.format( - "Failed to lookup discriminator value `%s` for WebhooksEventInternalImpl." - + " Possible values: ace dice ice notify pie", + "Failed to lookup discriminator value `%s` for SinchEventInternalImpl. Possible" + + " values: ace dice ice notify pie", discriminatorValue)); } @@ -316,53 +315,53 @@ public WebhooksEventInternalImpl deserialize(JsonParser jp, DeserializationConte } if (match == 1) { - WebhooksEventInternalImpl ret = new WebhooksEventInternalImpl(); + SinchEventInternalImpl ret = new SinchEventInternalImpl(); ret.setActualInstance(deserialized); return ret; } throw new IOException( String.format( - "Failed deserialization for WebhooksEventInternalImpl: %d classes match result," - + " expected 1", + "Failed deserialization for SinchEventInternalImpl: %d classes match result, expected" + + " 1", match)); } /** Handle deserialization of the 'null' value. */ @Override - public WebhooksEventInternalImpl getNullValue(DeserializationContext ctxt) + public SinchEventInternalImpl getNullValue(DeserializationContext ctxt) throws JsonMappingException { - throw new JsonMappingException(ctxt.getParser(), "WebhooksEventInternalImpl cannot be null"); + throw new JsonMappingException(ctxt.getParser(), "SinchEventInternalImpl cannot be null"); } } // store a list of schema names defined in oneOf public static final Map> schemas = new HashMap<>(); - public WebhooksEventInternalImpl() { + public SinchEventInternalImpl() { super("oneOf", Boolean.FALSE); } - public WebhooksEventInternalImpl(AnsweredCallEventImpl o) { + public SinchEventInternalImpl(AnsweredCallEventImpl o) { super("oneOf", Boolean.FALSE); setActualInstance(o); } - public WebhooksEventInternalImpl(DisconnectedCallEventImpl o) { + public SinchEventInternalImpl(DisconnectedCallEventImpl o) { super("oneOf", Boolean.FALSE); setActualInstance(o); } - public WebhooksEventInternalImpl(IncomingCallEventImpl o) { + public SinchEventInternalImpl(IncomingCallEventImpl o) { super("oneOf", Boolean.FALSE); setActualInstance(o); } - public WebhooksEventInternalImpl(NotificationEventImpl o) { + public SinchEventInternalImpl(NotificationEventImpl o) { super("oneOf", Boolean.FALSE); setActualInstance(o); } - public WebhooksEventInternalImpl(PromptInputEventImpl o) { + public SinchEventInternalImpl(PromptInputEventImpl o) { super("oneOf", Boolean.FALSE); setActualInstance(o); } @@ -374,7 +373,7 @@ public WebhooksEventInternalImpl(PromptInputEventImpl o) { schemas.put("NotificationEventImpl", NotificationEventImpl.class); schemas.put("PromptInputEventImpl", PromptInputEventImpl.class); JSONNavigator.registerDescendants( - WebhooksEventInternalImpl.class, Collections.unmodifiableMap(schemas)); + SinchEventInternalImpl.class, Collections.unmodifiableMap(schemas)); // Initialize and register the discriminator mappings. Map> mappings = new HashMap>(); mappings.put("ace", AnsweredCallEventImpl.class); @@ -382,13 +381,13 @@ public WebhooksEventInternalImpl(PromptInputEventImpl o) { mappings.put("ice", IncomingCallEventImpl.class); mappings.put("notify", NotificationEventImpl.class); mappings.put("pie", PromptInputEventImpl.class); - mappings.put("webhooksEvent", WebhooksEventInternalImpl.class); - JSONNavigator.registerDiscriminator(WebhooksEventInternalImpl.class, "event", mappings); + mappings.put("webhooksEvent", SinchEventInternalImpl.class); + JSONNavigator.registerDiscriminator(SinchEventInternalImpl.class, "event", mappings); } @Override public Map> getSchemas() { - return WebhooksEventInternalImpl.schemas; + return SinchEventInternalImpl.schemas; } /** diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/svaml/action/SvamlActionConnectConference.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/svaml/action/SvamlActionConnectConference.java index fd8252a33..5f3504c86 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/svaml/action/SvamlActionConnectConference.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/svaml/action/SvamlActionConnectConference.java @@ -73,7 +73,7 @@ public static String valueOf(NameEnum e) { * join. If moh isn't specified, the user will only hear silence while alone in the * conference. * - * @return MusicOnHold + * @return musicOnHold */ MusicOnHold getMusicOnHold(); @@ -110,11 +110,11 @@ interface Builder { /** * see getter * - * @param MusicOnHold see getter + * @param musicOnHold see getter * @return Current builder * @see #getMusicOnHold */ - Builder setMusicOnHold(MusicOnHold MusicOnHold); + Builder setMusicOnHold(MusicOnHold musicOnHold); /** * Create instance diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/svaml/action/SvamlActionConnectConferenceImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/svaml/action/SvamlActionConnectConferenceImpl.java index df049c518..812da7e24 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/svaml/action/SvamlActionConnectConferenceImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/svaml/action/SvamlActionConnectConferenceImpl.java @@ -38,7 +38,7 @@ public class SvamlActionConnectConferenceImpl public static final String JSON_PROPERTY_MOH = "moh"; - private OptionalValue MusicOnHold; + private OptionalValue musicOnHold; public SvamlActionConnectConferenceImpl() {} @@ -46,11 +46,11 @@ protected SvamlActionConnectConferenceImpl( OptionalValue name, OptionalValue conferenceId, OptionalValue conferenceDtmfOptions, - OptionalValue MusicOnHold) { + OptionalValue musicOnHold) { this.name = name; this.conferenceId = conferenceId; this.conferenceDtmfOptions = conferenceDtmfOptions; - this.MusicOnHold = MusicOnHold; + this.musicOnHold = musicOnHold; } @JsonIgnore @@ -88,13 +88,13 @@ public OptionalValue conferenceDtmfOptions() { @JsonIgnore public MusicOnHold getMusicOnHold() { - return MusicOnHold.orElse(null); + return musicOnHold.orElse(null); } @JsonProperty(JSON_PROPERTY_MOH) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OptionalValue musicOnHold() { - return MusicOnHold; + return musicOnHold; } /** Return true if this svaml.action.connectConf object is equal to o. */ @@ -110,12 +110,12 @@ public boolean equals(Object o) { return Objects.equals(this.name, svamlActionConnectConf.name) && Objects.equals(this.conferenceId, svamlActionConnectConf.conferenceId) && Objects.equals(this.conferenceDtmfOptions, svamlActionConnectConf.conferenceDtmfOptions) - && Objects.equals(this.MusicOnHold, svamlActionConnectConf.MusicOnHold); + && Objects.equals(this.musicOnHold, svamlActionConnectConf.musicOnHold); } @Override public int hashCode() { - return Objects.hash(name, conferenceId, conferenceDtmfOptions, MusicOnHold); + return Objects.hash(name, conferenceId, conferenceDtmfOptions, musicOnHold); } @Override @@ -127,7 +127,7 @@ public String toString() { sb.append(" conferenceDtmfOptions: ") .append(toIndentedString(conferenceDtmfOptions)) .append("\n"); - sb.append(" MusicOnHold: ").append(toIndentedString(MusicOnHold)).append("\n"); + sb.append(" musicOnHold: ").append(toIndentedString(musicOnHold)).append("\n"); sb.append("}"); return sb.toString(); } @@ -147,7 +147,7 @@ static class Builder implements SvamlActionConnectConference.Builder { OptionalValue name = OptionalValue.of(NameEnum.CONNECT_CONF); OptionalValue conferenceId = OptionalValue.empty(); OptionalValue conferenceDtmfOptions = OptionalValue.empty(); - OptionalValue MusicOnHold = OptionalValue.empty(); + OptionalValue musicOnHold = OptionalValue.empty(); @JsonProperty(value = JSON_PROPERTY_NAME, required = true) Builder setName(NameEnum name) { @@ -171,14 +171,14 @@ public Builder setConferenceDtmfOptions(ConferenceDtmfOptions conferenceDtmfOpti } @JsonProperty(JSON_PROPERTY_MOH) - public Builder setMusicOnHold(MusicOnHold MusicOnHold) { - this.MusicOnHold = OptionalValue.of(MusicOnHold); + public Builder setMusicOnHold(MusicOnHold musicOnHold) { + this.musicOnHold = OptionalValue.of(musicOnHold); return this; } public SvamlActionConnectConference build() { return new SvamlActionConnectConferenceImpl( - name, conferenceId, conferenceDtmfOptions, MusicOnHold); + name, conferenceId, conferenceDtmfOptions, musicOnHold); } } } diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/svaml/action/SvamlActionConnectSip.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/svaml/action/SvamlActionConnectSip.java index 012f8f2f6..4258a4fbb 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/svaml/action/SvamlActionConnectSip.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/svaml/action/SvamlActionConnectSip.java @@ -137,7 +137,7 @@ public static String valueOf(TransportEnum e) { * and the SIP call is placed on hold, the user will only hear silence while during the holding * period . * - * @return MusicOnHold + * @return musicOnHold */ MusicOnHold getMusicOnHold(); @@ -210,11 +210,11 @@ interface Builder { /** * see getter * - * @param MusicOnHold see getter + * @param musicOnHold see getter * @return Current builder * @see #getMusicOnHold */ - Builder setMusicOnHold(MusicOnHold MusicOnHold); + Builder setMusicOnHold(MusicOnHold musicOnHold); /** * Create instance diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/svaml/action/SvamlActionConnectSipImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/svaml/action/SvamlActionConnectSipImpl.java index 87b7c50c3..8b23fa5a3 100644 --- a/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/svaml/action/SvamlActionConnectSipImpl.java +++ b/openapi-contracts/src/main/com/sinch/sdk/domains/voice/models/v1/svaml/action/SvamlActionConnectSipImpl.java @@ -59,7 +59,7 @@ public class SvamlActionConnectSipImpl public static final String JSON_PROPERTY_MOH = "moh"; - private OptionalValue MusicOnHold; + private OptionalValue musicOnHold; public SvamlActionConnectSipImpl() {} @@ -71,7 +71,7 @@ protected SvamlActionConnectSipImpl( OptionalValue transport, OptionalValue suppressCallbacks, OptionalValue> callHeaders, - OptionalValue MusicOnHold) { + OptionalValue musicOnHold) { this.name = name; this.destination = destination; this.maxDuration = maxDuration; @@ -79,7 +79,7 @@ protected SvamlActionConnectSipImpl( this.transport = transport; this.suppressCallbacks = suppressCallbacks; this.callHeaders = callHeaders; - this.MusicOnHold = MusicOnHold; + this.musicOnHold = musicOnHold; } @JsonIgnore @@ -161,13 +161,13 @@ public OptionalValue> callHeaders() { @JsonIgnore public MusicOnHold getMusicOnHold() { - return MusicOnHold.orElse(null); + return musicOnHold.orElse(null); } @JsonProperty(JSON_PROPERTY_MOH) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OptionalValue musicOnHold() { - return MusicOnHold; + return musicOnHold; } /** Return true if this svaml.action.connectSip object is equal to o. */ @@ -187,7 +187,7 @@ public boolean equals(Object o) { && Objects.equals(this.transport, svamlActionConnectSip.transport) && Objects.equals(this.suppressCallbacks, svamlActionConnectSip.suppressCallbacks) && Objects.equals(this.callHeaders, svamlActionConnectSip.callHeaders) - && Objects.equals(this.MusicOnHold, svamlActionConnectSip.MusicOnHold); + && Objects.equals(this.musicOnHold, svamlActionConnectSip.musicOnHold); } @Override @@ -200,7 +200,7 @@ public int hashCode() { transport, suppressCallbacks, callHeaders, - MusicOnHold); + musicOnHold); } @Override @@ -214,7 +214,7 @@ public String toString() { sb.append(" transport: ").append(toIndentedString(transport)).append("\n"); sb.append(" suppressCallbacks: ").append(toIndentedString(suppressCallbacks)).append("\n"); sb.append(" callHeaders: ").append(toIndentedString(callHeaders)).append("\n"); - sb.append(" MusicOnHold: ").append(toIndentedString(MusicOnHold)).append("\n"); + sb.append(" musicOnHold: ").append(toIndentedString(musicOnHold)).append("\n"); sb.append("}"); return sb.toString(); } @@ -238,7 +238,7 @@ static class Builder implements SvamlActionConnectSip.Builder { OptionalValue transport = OptionalValue.empty(); OptionalValue suppressCallbacks = OptionalValue.empty(); OptionalValue> callHeaders = OptionalValue.empty(); - OptionalValue MusicOnHold = OptionalValue.empty(); + OptionalValue musicOnHold = OptionalValue.empty(); @JsonProperty(value = JSON_PROPERTY_NAME, required = true) Builder setName(NameEnum name) { @@ -286,8 +286,8 @@ public Builder setCallHeaders(List callHeaders) { } @JsonProperty(JSON_PROPERTY_MOH) - public Builder setMusicOnHold(MusicOnHold MusicOnHold) { - this.MusicOnHold = OptionalValue.of(MusicOnHold); + public Builder setMusicOnHold(MusicOnHold musicOnHold) { + this.musicOnHold = OptionalValue.of(musicOnHold); return this; } @@ -300,7 +300,7 @@ public SvamlActionConnectSip build() { transport, suppressCallbacks, callHeaders, - MusicOnHold); + musicOnHold); } } } diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/voice/models/v1/applications/request/UpdateCallbackUrlsRequestTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/voice/models/v1/applications/request/UpdateEventDestinationsRequestTest.java similarity index 63% rename from openapi-contracts/src/test/java/com/sinch/sdk/domains/voice/models/v1/applications/request/UpdateCallbackUrlsRequestTest.java rename to openapi-contracts/src/test/java/com/sinch/sdk/domains/voice/models/v1/applications/request/UpdateEventDestinationsRequestTest.java index 81e84eb73..422104460 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/voice/models/v1/applications/request/UpdateCallbackUrlsRequestTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/voice/models/v1/applications/request/UpdateEventDestinationsRequestTest.java @@ -4,25 +4,26 @@ import com.adelean.inject.resources.junit.jupiter.TestWithResources; import com.fasterxml.jackson.core.JsonProcessingException; import com.sinch.sdk.BaseTest; -import com.sinch.sdk.domains.voice.models.v1.applications.Callbacks; -import com.sinch.sdk.domains.voice.models.v1.applications.CallbacksUrl; +import com.sinch.sdk.domains.voice.models.v1.applications.EventDestinationTarget; +import com.sinch.sdk.domains.voice.models.v1.applications.EventDestinations; import org.json.JSONException; import org.junit.jupiter.api.Test; import org.skyscreamer.jsonassert.JSONAssert; @TestWithResources -public class UpdateCallbackUrlsRequestTest extends BaseTest { +public class UpdateEventDestinationsRequestTest extends BaseTest { - public static Callbacks expected = - Callbacks.builder() - .setUrl( - CallbacksUrl.builder() + public static EventDestinations expected = + EventDestinations.builder() + .setTarget( + EventDestinationTarget.builder() .setPrimary("https://foo.com") .setFallback("https://fallback.foo.com") .build()) .build(); - @GivenTextResource("/domains/voice/v1/applications/request/UpdateCallbackUrlsRequestDto.json") + @GivenTextResource( + "/domains/voice/v1/applications/request/UpdateEventDestinationsRequestDto.json") String jsonRequest; @Test diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/voice/models/v1/applications/response/GetCallbackUrlsResponseTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/voice/models/v1/applications/response/GetEventDestinationsResponseTest.java similarity index 59% rename from openapi-contracts/src/test/java/com/sinch/sdk/domains/voice/models/v1/applications/response/GetCallbackUrlsResponseTest.java rename to openapi-contracts/src/test/java/com/sinch/sdk/domains/voice/models/v1/applications/response/GetEventDestinationsResponseTest.java index 3c0e75fee..0a24b4012 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/voice/models/v1/applications/response/GetCallbackUrlsResponseTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/voice/models/v1/applications/response/GetEventDestinationsResponseTest.java @@ -4,24 +4,24 @@ import com.adelean.inject.resources.junit.jupiter.TestWithResources; import com.sinch.sdk.BaseTest; import com.sinch.sdk.core.TestHelpers; -import com.sinch.sdk.domains.voice.models.v1.applications.Callbacks; -import com.sinch.sdk.domains.voice.models.v1.applications.CallbacksUrl; +import com.sinch.sdk.domains.voice.models.v1.applications.EventDestinationTarget; +import com.sinch.sdk.domains.voice.models.v1.applications.EventDestinations; import org.junit.jupiter.api.Test; @TestWithResources -public class GetCallbackUrlsResponseTest extends BaseTest { +public class GetEventDestinationsResponseTest extends BaseTest { - public static Callbacks expected = - Callbacks.builder() - .setUrl( - CallbacksUrl.builder() + public static EventDestinations expected = + EventDestinations.builder() + .setTarget( + EventDestinationTarget.builder() .setPrimary("https://foo.com") .setFallback("https://fallback.foo.com") .build()) .build(); - @GivenJsonResource("/domains/voice/v1/applications/response/GetCallbackUrlsResponseDto.json") - Callbacks loaded; + @GivenJsonResource("/domains/voice/v1/applications/response/GetEventDestinationsResponseDto.json") + EventDestinations loaded; @Test void deserializeResponse() { diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/voice/models/v1/applications/response/QueryNumberResponseTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/voice/models/v1/applications/response/QueryNumberResponseTest.java deleted file mode 100644 index cf5b3b1d5..000000000 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/voice/models/v1/applications/response/QueryNumberResponseTest.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.sinch.sdk.domains.voice.models.v1.applications.response; - -import com.adelean.inject.resources.junit.jupiter.GivenJsonResource; -import com.adelean.inject.resources.junit.jupiter.TestWithResources; -import com.sinch.sdk.BaseTest; -import com.sinch.sdk.core.TestHelpers; -import com.sinch.sdk.domains.voice.models.v1.Price; -import com.sinch.sdk.domains.voice.models.v1.applications.response.QueryNumberInformation.NumberTypeEnum; -import org.junit.jupiter.api.Test; - -@TestWithResources -public class QueryNumberResponseTest extends BaseTest { - - public static QueryNumberResponse expected = - QueryNumberResponse.builder() - .setNumber( - QueryNumberInformation.builder() - .setCountryId("FR") - .setNumberType(NumberTypeEnum.MOBILE) - .setNormalizedNumber("+331234567489") - .setRestricted(true) - .setRate(Price.builder().setCurrencyId("USD").setAmount(0.1850F).build()) - .build()) - .build(); - - @GivenJsonResource("/domains/voice/v1/applications/response/QueryNumberResponseDto.json") - QueryNumberResponse loaded; - - @Test - void deserializeResponse() { - TestHelpers.recursiveEquals(loaded, expected); - } -} diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/voice/models/v1/webhooks/VoiceWebhookEventTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/voice/models/v1/sinchevents/VoiceSinchEventTest.java similarity index 86% rename from openapi-contracts/src/test/java/com/sinch/sdk/domains/voice/models/v1/webhooks/VoiceWebhookEventTest.java rename to openapi-contracts/src/test/java/com/sinch/sdk/domains/voice/models/v1/sinchevents/VoiceSinchEventTest.java index fc78a76e6..6ec466443 100644 --- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/voice/models/v1/webhooks/VoiceWebhookEventTest.java +++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/voice/models/v1/sinchevents/VoiceSinchEventTest.java @@ -1,4 +1,4 @@ -package com.sinch.sdk.domains.voice.models.v1.webhooks; +package com.sinch.sdk.domains.voice.models.v1.sinchevents; import com.adelean.inject.resources.junit.jupiter.GivenJsonResource; import com.adelean.inject.resources.junit.jupiter.TestWithResources; @@ -8,30 +8,30 @@ import com.sinch.sdk.domains.voice.models.v1.Price; import com.sinch.sdk.domains.voice.models.v1.calls.response.CallResult; import com.sinch.sdk.domains.voice.models.v1.destination.DestinationPstn; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.DisconnectedCallEvent.ReasonEnum; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.MenuResult.InputMethodEnum; +import com.sinch.sdk.domains.voice.models.v1.sinchevents.MenuResult.TypeEnum; import com.sinch.sdk.domains.voice.models.v1.svaml.action.CallHeader; -import com.sinch.sdk.domains.voice.models.v1.webhooks.DisconnectedCallEvent.ReasonEnum; -import com.sinch.sdk.domains.voice.models.v1.webhooks.MenuResult.InputMethodEnum; -import com.sinch.sdk.domains.voice.models.v1.webhooks.MenuResult.TypeEnum; import java.time.Instant; import java.util.Collections; import org.junit.jupiter.api.Test; @TestWithResources -public class VoiceWebhookEventTest extends VoiceBaseTest { +public class VoiceSinchEventTest extends VoiceBaseTest { - @GivenJsonResource("/domains/voice/v1/webhooks/IncomingCallEventDto.json") + @GivenJsonResource("/domains/voice/v1/sinchevents/IncomingCallEventDto.json") IncomingCallEvent loadedIceRequestDto; - @GivenJsonResource("/domains/voice/v1/webhooks/DisconnectedCallEventDto.json") + @GivenJsonResource("/domains/voice/v1/sinchevents/DisconnectedCallEventDto.json") DisconnectedCallEvent loadedDiceRequestDto; - @GivenJsonResource("/domains/voice/v1/webhooks/AnsweredCallEventDto.json") + @GivenJsonResource("/domains/voice/v1/sinchevents/AnsweredCallEventDto.json") AnsweredCallEvent loadedAceRequestDto; - @GivenJsonResource("/domains/voice/v1/webhooks/PromptInputEventDto.json") + @GivenJsonResource("/domains/voice/v1/sinchevents/PromptInputEventDto.json") PromptInputEvent loadedPieRequestDto; - @GivenJsonResource("/domains/voice/v1/webhooks/NotificationEventDto.json") + @GivenJsonResource("/domains/voice/v1/sinchevents/NotificationEventDto.json") NotificationEvent loadedNotifyRequestDto; public static IncomingCallEvent expectedIceRequestDto = diff --git a/openapi-contracts/src/test/resources/domains/voice/v1/applications/request/UpdateCallbackUrlsRequestDto.json b/openapi-contracts/src/test/resources/domains/voice/v1/applications/request/UpdateEventDestinationsRequestDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/voice/v1/applications/request/UpdateCallbackUrlsRequestDto.json rename to openapi-contracts/src/test/resources/domains/voice/v1/applications/request/UpdateEventDestinationsRequestDto.json diff --git a/openapi-contracts/src/test/resources/domains/voice/v1/applications/response/GetCallbackUrlsResponseDto.json b/openapi-contracts/src/test/resources/domains/voice/v1/applications/response/GetEventDestinationsResponseDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/voice/v1/applications/response/GetCallbackUrlsResponseDto.json rename to openapi-contracts/src/test/resources/domains/voice/v1/applications/response/GetEventDestinationsResponseDto.json diff --git a/openapi-contracts/src/test/resources/domains/voice/v1/webhooks/AnsweredCallEventDto.json b/openapi-contracts/src/test/resources/domains/voice/v1/sinchevents/AnsweredCallEventDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/voice/v1/webhooks/AnsweredCallEventDto.json rename to openapi-contracts/src/test/resources/domains/voice/v1/sinchevents/AnsweredCallEventDto.json diff --git a/openapi-contracts/src/test/resources/domains/voice/v1/webhooks/DisconnectedCallEventDto.json b/openapi-contracts/src/test/resources/domains/voice/v1/sinchevents/DisconnectedCallEventDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/voice/v1/webhooks/DisconnectedCallEventDto.json rename to openapi-contracts/src/test/resources/domains/voice/v1/sinchevents/DisconnectedCallEventDto.json diff --git a/openapi-contracts/src/test/resources/domains/voice/v1/webhooks/IncomingCallEventDto.json b/openapi-contracts/src/test/resources/domains/voice/v1/sinchevents/IncomingCallEventDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/voice/v1/webhooks/IncomingCallEventDto.json rename to openapi-contracts/src/test/resources/domains/voice/v1/sinchevents/IncomingCallEventDto.json diff --git a/openapi-contracts/src/test/resources/domains/voice/v1/webhooks/NotificationEventDto.json b/openapi-contracts/src/test/resources/domains/voice/v1/sinchevents/NotificationEventDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/voice/v1/webhooks/NotificationEventDto.json rename to openapi-contracts/src/test/resources/domains/voice/v1/sinchevents/NotificationEventDto.json diff --git a/openapi-contracts/src/test/resources/domains/voice/v1/webhooks/PromptInputEventDto.json b/openapi-contracts/src/test/resources/domains/voice/v1/sinchevents/PromptInputEventDto.json similarity index 100% rename from openapi-contracts/src/test/resources/domains/voice/v1/webhooks/PromptInputEventDto.json rename to openapi-contracts/src/test/resources/domains/voice/v1/sinchevents/PromptInputEventDto.json